From 851d616c7ac0562e2810e4bba6584b59252824d0 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Fri, 22 Nov 2019 09:25:25 -0800 Subject: [PATCH] kernel: bump to 4.14.155, 4.19.85 --- include/kernel-version.mk | 8 +- ...-t-prevent-IRQ-usage-of-output-GPIOs.patch | 4 +- ...Disable-TCP-Segmentation-Offload-TSO.patch | 2 +- ...e-link-events-to-minimize-poll-storm.patch | 2 +- ...use-default-alignment-for-rx-buffers.patch | 2 +- ...-link-energy-detect-powerdown-for-ex.patch | 2 +- ...-gpio-Allow-nonexclusive-GPIO-access.patch | 2 +- ...le-nonexclusive-gpiods-from-DT-nodes.patch | 2 +- ...able-USB-power-on-Netgear-WNDR3400v3.patch | 48 --- ...able-USB-power-on-Netgear-WNDR3400v3.patch | 48 --- target/linux/brcm63xx/Makefile | 3 +- target/linux/brcm63xx/base-files/etc/diag.sh | 2 +- .../etc/hotplug.d/firmware/10-rt2x00-eeprom | 27 +- .../brcm63xx/{config-4.9 => config-4.19} | 22 +- target/linux/brcm63xx/dts/a226g.dts | 4 +- target/linux/brcm63xx/dts/a226m-fwb.dts | 4 +- target/linux/brcm63xx/dts/a226m.dts | 4 +- target/linux/brcm63xx/dts/a4001n.dts | 4 +- target/linux/brcm63xx/dts/a4001n1.dts | 4 +- target/linux/brcm63xx/dts/ad1018-nor.dts | 2 +- target/linux/brcm63xx/dts/agpf-s0.dts | 4 +- target/linux/brcm63xx/dts/ar-5315u.dts | 4 +- target/linux/brcm63xx/dts/ar-5381u.dts | 4 +- target/linux/brcm63xx/dts/ar-5387un.dts | 4 +- target/linux/brcm63xx/dts/ar1004g.dts | 4 +- target/linux/brcm63xx/dts/av4202n.dts | 4 +- target/linux/brcm63xx/dts/bcm96318ref.dts | 4 +- .../linux/brcm63xx/dts/bcm96318ref_p300.dts | 4 +- .../linux/brcm63xx/dts/bcm963268bu_p300.dts | 2 +- target/linux/brcm63xx/dts/bcm963269bhr.dts | 4 +- target/linux/brcm63xx/dts/bcm963281TAN.dts | 2 +- target/linux/brcm63xx/dts/bcm96328avng.dts | 2 +- target/linux/brcm63xx/dts/bcm96338GW.dts | 2 +- target/linux/brcm63xx/dts/bcm96338W.dts | 2 +- target/linux/brcm63xx/dts/bcm96348GW-10.dts | 4 +- target/linux/brcm63xx/dts/bcm96348GW-11.dts | 4 +- target/linux/brcm63xx/dts/bcm96348GW.dts | 4 +- target/linux/brcm63xx/dts/bcm96348R.dts | 2 +- target/linux/brcm63xx/dts/bcm96358VW.dts | 2 +- target/linux/brcm63xx/dts/bcm96358VW2.dts | 2 +- target/linux/brcm63xx/dts/bcm96368MVNgr.dts | 2 +- target/linux/brcm63xx/dts/bcm96368MVWG.dts | 2 +- target/linux/brcm63xx/dts/cpva502plus.dts | 4 +- target/linux/brcm63xx/dts/cpva642.dts | 4 +- target/linux/brcm63xx/dts/ct-5365.dts | 4 +- target/linux/brcm63xx/dts/ct-6373.dts | 4 +- target/linux/brcm63xx/dts/ct536plus.dts | 4 +- target/linux/brcm63xx/dts/cvg834g.dts | 2 +- target/linux/brcm63xx/dts/dg834g_v4.dts | 4 +- target/linux/brcm63xx/dts/dg834gtpn.dts | 4 +- target/linux/brcm63xx/dts/dgnd3700v1.dts | 4 +- target/linux/brcm63xx/dts/dsl-2640b-b.dts | 4 +- target/linux/brcm63xx/dts/dsl-2640u.dts | 2 +- target/linux/brcm63xx/dts/dsl-2650u.dts | 2 +- target/linux/brcm63xx/dts/dsl-274xb-c.dts | 4 +- target/linux/brcm63xx/dts/dsl-274xb-f.dts | 4 +- target/linux/brcm63xx/dts/dsl-275xb-d.dts | 4 +- target/linux/brcm63xx/dts/dva-g3810bn_tl.dts | 4 +- target/linux/brcm63xx/dts/evg2000.dts | 4 +- target/linux/brcm63xx/dts/f5d7633.dts | 4 +- target/linux/brcm63xx/dts/fast2504n.dts | 4 +- target/linux/brcm63xx/dts/fast2604.dts | 4 +- target/linux/brcm63xx/dts/fast2704n.dts | 4 +- target/linux/brcm63xx/dts/fast2704v2.dts | 4 +- target/linux/brcm63xx/dts/gw6000.dts | 2 +- target/linux/brcm63xx/dts/gw6200.dts | 4 +- target/linux/brcm63xx/dts/hg520v.dts | 4 +- target/linux/brcm63xx/dts/hg553.dts | 4 +- target/linux/brcm63xx/dts/hg556a-a.dts | 4 +- target/linux/brcm63xx/dts/hg556a-b.dts | 4 +- target/linux/brcm63xx/dts/hg556a-c.dts | 4 +- target/linux/brcm63xx/dts/hg622.dts | 4 +- target/linux/brcm63xx/dts/hg655b.dts | 4 +- target/linux/brcm63xx/dts/homehub2a.dts | 2 +- target/linux/brcm63xx/dts/livebox-blue-5g.dts | 4 +- target/linux/brcm63xx/dts/magic.dts | 2 +- target/linux/brcm63xx/dts/nb4-fxc-r1.dts | 4 +- target/linux/brcm63xx/dts/nb4-ser-r0.dts | 4 +- target/linux/brcm63xx/dts/nb6-ser-r0.dts | 2 +- target/linux/brcm63xx/dts/p870hw-51a-v2.dts | 4 +- target/linux/brcm63xx/dts/r1000h.dts | 4 +- target/linux/brcm63xx/dts/r5010unv2.dts | 4 +- target/linux/brcm63xx/dts/rg100a.dts | 2 +- target/linux/brcm63xx/dts/rta1320.dts | 2 +- target/linux/brcm63xx/dts/rta770bw.dts | 4 +- target/linux/brcm63xx/dts/rta770w.dts | 4 +- target/linux/brcm63xx/dts/spw303v.dts | 4 +- target/linux/brcm63xx/dts/spw500v.dts | 4 +- target/linux/brcm63xx/dts/sr102.dts | 4 +- target/linux/brcm63xx/dts/td-w8900gb.dts | 4 +- target/linux/brcm63xx/dts/usr9108.dts | 2 +- target/linux/brcm63xx/dts/v2110.dts | 4 +- target/linux/brcm63xx/dts/v2500v-bb.dts | 4 +- target/linux/brcm63xx/dts/vg50.dts | 2 +- target/linux/brcm63xx/dts/vh4032n.dts | 16 +- target/linux/brcm63xx/dts/vr-3025u.dts | 4 +- target/linux/brcm63xx/dts/vr-3025un.dts | 4 +- target/linux/brcm63xx/dts/vr-3026e.dts | 4 +- target/linux/brcm63xx/dts/wap-5813n.dts | 4 +- target/linux/brcm63xx/image/bcm63xx.mk | 337 +++++++++++++----- ...tree-gpio-hogs-on-dual-role-gpio-pin.patch | 2 +- .../527-board_dva-g3810bn-tl-1.patch | 10 +- .../brcm63xx/patches-4.14/528-board_nb6.patch | 6 +- .../patches-4.14/529-board_fast2604.patch | 4 +- .../patches-4.14/530-board_A4001N1.patch | 4 +- .../patches-4.14/531-board_AR-5387un.patch | 4 +- .../patches-4.14/532-board_AR-5381u.patch | 4 +- .../patches-4.14/533-board_rta770bw.patch | 4 +- .../patches-4.14/534-board_hw556.patch | 4 +- .../patches-4.14/535-board_rta770w.patch | 4 +- .../patches-4.14/536-board_fast2704.patch | 4 +- .../patches-4.14/537-board_fast2504n.patch | 6 +- .../patches-4.14/555-board_96318ref.patch | 4 +- .../556-board_96318ref_p300.patch | 4 +- .../patches-4.14/557-board_bcm963269bhr.patch | 6 +- .../patches-4.14/558-board_AR1004G.patch | 4 +- .../patches-4.14/559-board_vw6339gu.patch | 6 +- .../560-board_963268gu_p300.patch | 6 +- .../patches-4.14/561-board_WAP-5813n.patch | 6 +- .../patches-4.14/562-board_VR-3025u.patch | 6 +- .../patches-4.14/563-board_VR-3025un.patch | 6 +- .../564-board_P870HW-51a_v2.patch | 6 +- .../patches-4.14/565-board_hw520.patch | 4 +- .../patches-4.14/566-board_A4001N.patch | 4 +- .../patches-4.14/567-board_dsl-2751b_e1.patch | 4 +- .../568-board_DGND3700v1_3800B.patch | 6 +- .../patches-4.14/569-board_homehub2a.patch | 4 +- .../patches-4.14/570-board_HG655b.patch | 6 +- .../patches-4.14/571-board_fast2704n.patch | 4 +- .../patches-4.14/572-board_VR-3026e.patch | 6 +- .../patches-4.14/573-board_R5010UNv2.patch | 4 +- .../patches-4.14/574-board_HG622.patch | 6 +- .../patches-4.14/575-board_EVG2000.patch | 6 +- .../patches-4.14/576-board_AV4202N.patch | 6 +- .../patches-4.14/577-board_VH4032N.patch | 6 +- .../patches-4.14/578-board_R1000H.patch | 6 +- .../patches-4.14/579-board_AR-5315u.patch | 4 +- .../patches-4.14/580-board_AD1018.patch | 4 +- .../patches-4.14/598-board_sr102.patch | 6 +- ...p-unused-and-broken-DSP-platform-dev.patch | 12 +- ...63XX-add-USB-host-clock-enable-delay.patch | 2 +- ...-USB-device-clock-enable-delay-to-cl.patch | 4 +- ...e-code-touching-the-USB-private-regi.patch | 8 +- ...-OHCI-EHCI-configuration-bits-to-com.patch | 0 ...roduce-BCM63XX_OHCI-configuration-sy.patch | 4 +- ...-support-for-the-on-chip-OHCI-contro.patch | 2 +- ...ister-OHCI-controller-if-board-enabl.patch | 0 ...roduce-BCM63XX_EHCI-configuration-sy.patch | 4 +- ...-support-for-the-on-chip-EHCI-contro.patch | 2 +- ...ister-EHCI-controller-if-board-enabl.patch | 0 ...I-controller-does-not-support-overcu.patch | 0 ...move-imagetag-parsing-to-its-own-par.patch | 5 +- ...2-mtd-bcm63xxpart-add-of_match_table.patch | 0 ...xx_imagetag-add-of_match_table-suppo.patch | 0 .../130-pinctrl-add-bcm63xx-base-code.patch | 8 +- ...d-BCM6328-pincontroller-binding-docu.patch | 0 ...-add-a-pincontrol-driver-for-BCM6328.patch | 0 ...d-BCM6348-pincontroller-binding-docu.patch | 0 ...-add-a-pincontrol-driver-for-BCM6348.patch | 0 ...d-BCM6358-pincontroller-binding-docu.patch | 0 ...-add-a-pincontrol-driver-for-BCM6358.patch | 0 ...d-BCM6362-pincontroller-binding-docu.patch | 0 ...-add-a-pincontrol-driver-for-BCM6362.patch | 0 ...d-BCM6368-pincontroller-binding-docu.patch | 0 ...-add-a-pincontrol-driver-for-BCM6368.patch | 0 ...d-BCM63268-pincontroller-binding-doc.patch | 0 ...add-a-pincontrol-driver-for-BCM63268.patch | 0 ...tree-gpio-hogs-on-dual-role-gpio-pin.patch | 52 +-- ...low-limiting-ports-for-ehci-platform.patch | 8 +- ...e-device-registration-code-into-its-.patch | 0 ...s-a-mac-addresss-allocator-to-board-.patch | 0 .../309-cfe_version_mod.patch | 0 .../310-cfe_simplify_detection.patch | 4 +- .../311-bcm63xxpart_use_cfedetection.patch | 0 ...ort-for-bcm6345-style-periphery-irq-.patch | 8 +- ...ort-for-bcm6345-style-external-inter.patch | 6 +- ...22-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch | 8 +- ...e-up-BCM6358-s-external-interrupts-4.patch | 6 +- ...BCM63XX-add-a-new-cpu-variant-helper.patch | 4 +- ...MIPS-BCM63XX-define-variant-id-field.patch | 2 +- ...MIPS-BCM63XX-detect-BCM6328-variants.patch | 4 +- ...MIPS-BCM63XX-detect-BCM6362-variants.patch | 4 +- ...MIPS-BCM63XX-detect-BCM6368-variants.patch | 4 +- ...-BCM63XX-fix-PCIe-memory-window-size.patch | 2 +- ...amically-set-the-pcie-memory-windows.patch | 2 +- .../337-MIPS-BCM63XX-widen-cpuid-field.patch | 4 +- ...MIPS-BCM63XX-increase-number-of-IRQs.patch | 4 +- ...IPS-BCM63XX-add-support-for-BCM63268.patch | 66 ++-- ...CM63XX-add-pcie-support-for-BCM63268.patch | 4 +- ...MIPS-BCM63XX-add-support-for-BCM6318.patch | 56 +-- ...IPS-BCM63XX-split-PCIe-reset-signals.patch | 22 +- ...BCM63XX-add-PCIe-support-for-BCM6318.patch | 10 +- ...ect-flash-type-early-and-store-the-r.patch | 2 +- ...ixup-mapped-SPI-flash-access-on-boot.patch | 0 ...-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch | 4 +- .../347-MIPS-BCM6318-USB-support.patch | 8 +- ...-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch | 8 +- ...IPS-BCM63XX-add-BCM63268-USB-support.patch | 4 +- ...63XX-support-settings-num-usbh-ports.patch | 2 +- .../351-set-board-usbh-ports.patch | 0 ...ow-building-support-for-more-than-on.patch | 2 +- ...ow-board-implementations-to-force-fl.patch | 2 +- ...e-fallback-sprom-support-into-its-ow.patch | 2 +- ...63XX-use-platform-data-for-the-sprom.patch | 4 +- ...BCM63XX-make-fallback-sprom-optional.patch | 2 +- ...M63XX-allow-different-types-of-sprom.patch | 0 ...S-BCM63XX-add-support-for-raw-sproms.patch | 0 ...-raw-fallback-sproms-for-most-common.patch | 0 ...o-register-a-fallback-sprom-for-bcma.patch | 4 +- ...M63XX-add-BCMA-based-sprom-templates.patch | 0 ...ow-board-files-to-provide-sprom-fixu.patch | 0 ...ow-setting-a-pci-bus-device-for-fall.patch | 0 ...-BCM63XX-add-support-for-loading-DTB.patch | 2 +- ...-support-for-matching-the-board_info.patch | 0 ...ulate-the-compatible-to-board_info-l.patch | 0 .../371_add_of_node_available_by_alias.patch | 0 ...egister_pflash_when_available_in_dtb.patch | 0 ...ister-interrupt-controllers-through-.patch | 6 +- ...add-a-simple-GPIO-driver-for-bcm63xx.patch | 8 +- ...PS-BCM63XX-switch-to-new-gpio-driver.patch | 12 +- ...-register-lookup-for-ephy-reset-gpio.patch | 11 +- ...not-register-gpio-controller-if-pres.patch | 4 +- ...vide-a-gpio-lookup-for-the-pcmcia-re.patch | 0 ...bcm63xx_pmcia-use-the-new-named-gpio.patch | 4 +- ...d-BCM6318-pincontroller-binding-docu.patch | 0 ...-add-a-pincontrol-driver-for-BCM6318.patch | 0 .../383-bcm63xx_select_pinctrl.patch | 14 +- ...X-add-clkdev-lookups-for-device-tree.patch | 20 +- ...63XX-do-not-register-SPI-controllers.patch | 6 +- ...91-MIPS-BCM63XX-do-not-register-uart.patch | 8 +- ...MIPS-BCM63XX-remove-leds-and-buttons.patch | 0 .../400-bcm963xx_flashmap.patch | 6 +- .../401-bcm963xx_real_rootfs_length.patch | 2 +- ...402_bcm63xx_enet_vlan_incoming_fixed.patch | 8 +- .../403-6358-enet1-external-mii-clk.patch | 2 +- ...-move-phy_-dis-connect-into-probe-re.patch | 36 +- ...enable-rgmii-clock-on-external-ports.patch | 4 +- ...CM63XX-Register-SPI-flash-if-present.patch | 4 +- ...w-providing-fixup-data-in-board-data.patch | 6 +- ...M63XX-export-the-attached-flash-type.patch | 2 +- ...CM63XX-add-a-fixup-for-ath9k-devices.patch | 2 +- ...0-BCM63XX-add-endian-check-for-ath9k.patch | 2 +- .../421-BCM63XX-add-led-pin-for-ath9k.patch | 2 +- ...M63XX-add-a-fixup-for-rt2x00-devices.patch | 8 +- .../423-bcm63xx_enet_add_b53_support.patch | 14 +- ...4-bcm63xx_enet_no_request_mem_region.patch | 2 +- .../427-boards_probe_switch.patch | 0 ...low_better_context_for_board_patches.patch | 0 .../500-board-D4PW.patch | 0 .../501-board-NB4.patch | 0 .../502-board-96338W2_E7T.patch | 0 .../503-board-CPVA642.patch | 0 .../504-board_dsl_274xb_rev_c.patch | 0 .../505-board_spw500v.patch | 0 .../506-board_gw6200_gw6000.patch | 0 .../507-board-MAGIC.patch | 0 .../508-board_hw553.patch | 0 .../509-board_rta1320_16m.patch | 0 .../510-board_spw303v.patch | 0 .../511-board_V2500V.patch | 0 .../512-board_BTV2110.patch | 0 ...BCM63XX-add-inventel-Livebox-support.patch | 2 +- .../514-board_ct536_ct5621.patch | 0 .../515-board_DWV-S0_fixes.patch | 0 .../516-board_96348A-122.patch | 0 .../519_board_CPVA502plus.patch | 0 ...63xx-add-support-for-96368MVWG-board.patch | 0 ...3xx-add-support-for-96368MVNgr-board.patch | 0 ...CM63XX-add-96328avng-reference-board.patch | 0 ...CM63XX-add-963281TAN-reference-board.patch | 0 .../524-board_dsl_274xb_rev_f.patch | 0 .../525-board_96348w3.patch | 0 .../526-board_CT6373-1.patch | 0 .../527-board_dva-g3810bn-tl-1.patch | 10 +- .../528-board_nb6.patch | 6 +- .../529-board_fast2604.patch | 4 +- .../530-board_A4001N1.patch | 4 +- .../531-board_AR-5387un.patch | 4 +- .../532-board_AR-5381u.patch | 4 +- .../533-board_rta770bw.patch | 4 +- .../534-board_hw556.patch | 4 +- .../535-board_rta770w.patch | 4 +- .../536-board_fast2704.patch | 4 +- .../537-board_fast2504n.patch | 6 +- .../555-board_96318ref.patch | 4 +- .../556-board_96318ref_p300.patch | 4 +- .../557-board_bcm963269bhr.patch | 6 +- .../558-board_AR1004G.patch | 4 +- .../559-board_vw6339gu.patch | 6 +- .../560-board_963268gu_p300.patch | 6 +- .../561-board_WAP-5813n.patch | 6 +- .../562-board_VR-3025u.patch | 6 +- .../563-board_VR-3025un.patch | 6 +- .../564-board_P870HW-51a_v2.patch | 6 +- .../565-board_hw520.patch | 4 +- .../566-board_A4001N.patch | 4 +- .../567-board_dsl-2751b_e1.patch | 4 +- .../568-board_DGND3700v1_3800B.patch | 6 +- .../569-board_homehub2a.patch | 4 +- .../570-board_HG655b.patch | 6 +- .../571-board_fast2704n.patch | 4 +- .../572-board_VR-3026e.patch | 6 +- .../573-board_R5010UNv2.patch | 4 +- .../574-board_HG622.patch | 6 +- .../575-board_EVG2000.patch | 6 +- .../576-board_AV4202N.patch | 6 +- .../patches-4.19/577-board_VH4032N.patch | 125 +++++++ .../578-board_R1000H.patch | 6 +- .../579-board_AR-5315u.patch | 4 +- .../580-board_AD1018.patch | 4 +- .../598-board_sr102.patch | 6 +- .../800-wl_exports.patch | 4 +- .../801-ssb_export_fallback_sprom.patch | 0 .../802-rtl8367r_fix_RGMII_support.patch | 0 ...d-unaligned-accesses-failing-on-bcm6.patch | 0 .../804-bcm63xx_enet_63268_rgmii_ports.patch | 2 +- ...-spi-subsystem-aware-of-message-size.patch | 42 --- ...cm63xx-document-device-tree-bindings.patch | 50 --- ...support-for-probing-through-devicetr.patch | 98 ----- ...i-allow-providing-clock-rate-through.patch | 35 -- ...-hsspi-document-device-tree-bindings.patch | 51 --- ...i-add-support-for-probing-through-de.patch | 76 ---- ...07-mdio_bus-Issue-GPIO-RESET-to-PHYs.patch | 192 ---------- ...-reset-after-releasing-PHYs-from-res.patch | 43 --- ...-signal-source-assignment-for-high-l.patch | 34 -- ...PS-BCM63XX-add-clkdev-lookup-support.patch | 210 ----------- ...vide-periph-clock-as-refclk-for-uart.patch | 84 ----- ...-use-refclk-for-the-expected-clock-n.patch | 26 -- ...rt-allow-naming-clock-in-device-tree.patch | 55 --- ...e-the-HSSPI-PLL-HZ-into-its-own-cloc.patch | 62 ---- ...vide-enet-clocks-as-enet-to-the-ethe.patch | 60 ---- ...M63XX-split-out-swpkt_sar-usb-clocks.patch | 105 ------ ...63xx_enet-do-not-rely-on-probe-order.patch | 41 --- ...-managed-functions-for-clock-ioremap.patch | 150 -------- ...net-drop-unneeded-NULL-phy_clk-check.patch | 36 -- ...bcm63xx_enet-remove-unneeded-include.patch | 22 -- ...enet-just-use-enet-as-the-clock-name.patch | 39 -- ...-platform-data-for-dma-channel-numbe.patch | 72 ---- ...x_enet-remove-pointless-mac_id-check.patch | 25 -- ...-platform-device-id-directly-for-mii.patch | 46 --- ...3XX-fix-switch-core-reset-on-BCM6368.patch | 26 -- ...XX-allow-NULL-clock-for-clk_get_rate.patch | 48 --- .../patches-4.9/577-board_VH4032N.patch | 63 ---- .../patches-4.19/080-sata_support.patch | 28 +- ...w_table-add-hardware-offload-support.patch | 6 +- ...q4019-fix-cpu0-s-qcom-saw2-reg-value.patch | 33 -- ...q4019-fix-cpu0-s-qcom-saw2-reg-value.patch | 34 -- ...ow-to-set-regulator-without-opp_list.patch | 2 +- ...rt-adjusting-OPP-voltages-at-runtime.patch | 2 +- ...per-to-get-an-opp-regulator-for-devi.patch | 2 +- ...e-voltage-tolerance-when-adjusting-t.patch | 4 +- ...707-dpaa-ethernet-support-layerscape.patch | 62 ++-- ...-ports-count-from-xhci-in-xhci_mtk_s.patch | 2 +- .../0101-pci-mediatek-backport-fix-pcie.patch | 8 +- 354 files changed, 1117 insertions(+), 2763 deletions(-) delete mode 100644 target/linux/brcm47xx/patches-4.14/034-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch delete mode 100644 target/linux/brcm47xx/patches-4.19/030-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch rename target/linux/brcm63xx/{config-4.9 => config-4.19} (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch (96%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch (93%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch (96%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch (94%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch (95%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/122-mtd-bcm63xxpart-add-of_match_table.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/130-pinctrl-add-bcm63xx-base-code.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch (75%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/309-cfe_version_mod.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/310-cfe_simplify_detection.patch (87%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/311-bcm63xxpart_use_cfedetection.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/321-irqchip-add-support-for-bcm6345-style-external-inter.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch (94%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch (96%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/331-MIPS-BCM63XX-define-variant-id-field.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/332-MIPS-BCM63XX-detect-BCM6328-variants.patch (96%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/333-MIPS-BCM63XX-detect-BCM6362-variants.patch (94%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/334-MIPS-BCM63XX-detect-BCM6368-variants.patch (95%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/337-MIPS-BCM63XX-widen-cpuid-field.patch (93%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/338-MIPS-BCM63XX-increase-number-of-IRQs.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/339-MIPS-BCM63XX-add-support-for-BCM63268.patch (94%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/341-MIPS-BCM63XX-add-support-for-BCM6318.patch (94%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch (95%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch (92%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/347-MIPS-BCM6318-USB-support.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch (91%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/351-set-board-usbh-ports.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/371_add_of_node_available_by_alias.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/372_dont_register_pflash_when_available_in_dtb.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch (93%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch (95%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch (94%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch (95%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch (92%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch (96%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/383-bcm63xx_select_pinctrl.patch (80%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch (87%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/391-MIPS-BCM63XX-do-not-register-uart.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/392-MIPS-BCM63XX-remove-leds-and-buttons.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/400-bcm963xx_flashmap.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/401-bcm963xx_real_rootfs_length.patch (95%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/402_bcm63xx_enet_vlan_incoming_fixed.patch (58%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/403-6358-enet1-external-mii-clk.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch (86%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch (95%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch (96%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/415-MIPS-BCM63XX-export-the-attached-flash-type.patch (93%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/420-BCM63XX-add-endian-check-for-ath9k.patch (98%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/421-BCM63XX-add-led-pin-for-ath9k.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch (97%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/423-bcm63xx_enet_add_b53_support.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/424-bcm63xx_enet_no_request_mem_region.patch (86%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/427-boards_probe_switch.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/499-allow_better_context_for_board_patches.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/500-board-D4PW.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/501-board-NB4.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/502-board-96338W2_E7T.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/503-board-CPVA642.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/504-board_dsl_274xb_rev_c.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/505-board_spw500v.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/506-board_gw6200_gw6000.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/507-board-MAGIC.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/508-board_hw553.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/509-board_rta1320_16m.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/510-board_spw303v.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/511-board_V2500V.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/512-board_BTV2110.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch (99%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/514-board_ct536_ct5621.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/515-board_DWV-S0_fixes.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/516-board_96348A-122.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/519_board_CPVA502plus.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/520-bcm63xx-add-support-for-96368MVWG-board.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/521-bcm63xx-add-support-for-96368MVNgr-board.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/522-MIPS-BCM63XX-add-96328avng-reference-board.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/524-board_dsl_274xb_rev_f.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/525-board_96348w3.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/526-board_CT6373-1.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/527-board_dva-g3810bn-tl-1.patch (81%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/528-board_nb6.patch (86%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/529-board_fast2604.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/530-board_A4001N1.patch (92%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/531-board_AR-5387un.patch (95%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/532-board_AR-5381u.patch (93%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/533-board_rta770bw.patch (87%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/534-board_hw556.patch (95%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/535-board_rta770w.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/536-board_fast2704.patch (93%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/537-board_fast2504n.patch (86%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/555-board_96318ref.patch (92%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/556-board_96318ref_p300.patch (91%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/557-board_bcm963269bhr.patch (86%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/558-board_AR1004G.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/559-board_vw6339gu.patch (85%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/560-board_963268gu_p300.patch (88%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/561-board_WAP-5813n.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/562-board_VR-3025u.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/563-board_VR-3025un.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/564-board_P870HW-51a_v2.patch (88%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/565-board_hw520.patch (91%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/566-board_A4001N.patch (92%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/567-board_dsl-2751b_e1.patch (94%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/568-board_DGND3700v1_3800B.patch (86%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/569-board_homehub2a.patch (90%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/570-board_HG655b.patch (89%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/571-board_fast2704n.patch (91%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/572-board_VR-3026e.patch (91%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/573-board_R5010UNv2.patch (92%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/574-board_HG622.patch (89%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/575-board_EVG2000.patch (88%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/576-board_AV4202N.patch (88%) create mode 100644 target/linux/brcm63xx/patches-4.19/577-board_VH4032N.patch rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/578-board_R1000H.patch (85%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/579-board_AR-5315u.patch (94%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/580-board_AD1018.patch (94%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/598-board_sr102.patch (86%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/800-wl_exports.patch (81%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/801-ssb_export_fallback_sprom.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/802-rtl8367r_fix_RGMII_support.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch (100%) rename target/linux/brcm63xx/{patches-4.9 => patches-4.19}/804-bcm63xx_enet_63268_rgmii_ports.patch (86%) delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.12-01-spi-bcm63xx-make-spi-subsystem-aware-of-message-size.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.12-02-spi-bcm63xx-document-device-tree-bindings.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.12-03-spi-bcm63xx-add-support-for-probing-through-devicetr.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.12-04-spi-bcm63xx-hsspi-allow-providing-clock-rate-through.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.12-05-spi-bcm63xx-hsspi-document-device-tree-bindings.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.12-06-spi-bcm63xx-hsspi-add-support-for-probing-through-de.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.12-07-mdio_bus-Issue-GPIO-RESET-to-PHYs.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.12-08-net-phy-Call-bus-reset-after-releasing-PHYs-from-res.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.13-01-leds-bcm6328-fix-signal-source-assignment-for-high-l.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-03-tty-bcm63xx_uart-use-refclk-for-the-expected-clock-n.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-04-tty-bcm63xx_uart-allow-naming-clock-in-device-tree.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-10-bcm63xx_enet-do-not-rely-on-probe-order.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-11-bcm63xx_enet-use-managed-functions-for-clock-ioremap.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-12-bcm63xx_enet-drop-unneeded-NULL-phy_clk-check.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.15-13-bcm63xx_enet-remove-unneeded-include.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.16-04-bcm63xx_enet-use-platform-device-id-directly-for-mii.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch delete mode 100644 target/linux/brcm63xx/patches-4.9/577-board_VH4032N.patch delete mode 100644 target/linux/ipq40xx/patches-4.14/073-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch delete mode 100644 target/linux/ipq40xx/patches-4.19/073-v4.20-ARM-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b23832707..83efcee89 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,12 +7,12 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-4.9 = .202 -LINUX_VERSION-4.14 = .154 -LINUX_VERSION-4.19 = .84 +LINUX_VERSION-4.14 = .155 +LINUX_VERSION-4.19 = .85 LINUX_KERNEL_HASH-4.9.202 = 8108ec1cd10fc40821c84e9f087dba10b1767aad66596f4a36925faef55e4ebf -LINUX_KERNEL_HASH-4.14.154 = 86de4a24379a78d67fc08b2e249ccf7b689eb6c37fbe329fc3dfbe8ab4300603 -LINUX_KERNEL_HASH-4.19.84 = 868b4a92619cb00ab142a20a67f000525b9605820d1b66faa4a183133eac0660 +LINUX_KERNEL_HASH-4.14.155 = 77d61979556b81c95b81452fa10e1fe9368cbe2f9f80a13e4669b0464722e481 +LINUX_KERNEL_HASH-4.19.85 = 7bf435970aeeafd46263f49730087a61c4858d8b8fc5a4002ceac971b45f4fb7 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch index 2f1d32754..c28ce4081 100644 --- a/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch +++ b/target/linux/brcm2708/patches-4.19/950-0129-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell /* Device and char device-related information */ static DEFINE_IDA(gpio_ida); static dev_t gpio_devt; -@@ -2634,7 +2636,7 @@ int gpiod_direction_output(struct gpio_d +@@ -2654,7 +2656,7 @@ int gpiod_direction_output(struct gpio_d value = !!value; /* GPIOs used for IRQs shall not be set as output */ @@ -35,7 +35,7 @@ Signed-off-by: Phil Elwell gpiod_err(desc, "%s: tried to set a GPIO tied to an IRQ as output\n", __func__); -@@ -3333,7 +3335,7 @@ int gpiochip_lock_as_irq(struct gpio_chi +@@ -3353,7 +3355,7 @@ int gpiochip_lock_as_irq(struct gpio_chi } } diff --git a/target/linux/brcm2708/patches-4.19/950-0134-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/brcm2708/patches-4.19/950-0134-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch index 6a403d486..b33c4f437 100644 --- a/target/linux/brcm2708/patches-4.19/950-0134-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch +++ b/target/linux/brcm2708/patches-4.19/950-0134-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch @@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3006,8 +3015,14 @@ static int lan78xx_bind(struct lan78xx_n +@@ -3011,8 +3020,14 @@ static int lan78xx_bind(struct lan78xx_n if (DEFAULT_RX_CSUM_ENABLE) dev->net->features |= NETIF_F_RXCSUM; diff --git a/target/linux/brcm2708/patches-4.19/950-0298-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/brcm2708/patches-4.19/950-0298-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch index d4e61c218..bff441c5e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0298-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch +++ b/target/linux/brcm2708/patches-4.19/950-0298-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch @@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data) { u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL); -@@ -3819,7 +3824,12 @@ static int lan78xx_probe(struct usb_inte +@@ -3824,7 +3829,12 @@ static int lan78xx_probe(struct usb_inte dev->pipe_intr = usb_rcvintpipe(dev->udev, dev->ep_intr->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); diff --git a/target/linux/brcm2708/patches-4.19/950-0479-lan78xx-use-default-alignment-for-rx-buffers.patch b/target/linux/brcm2708/patches-4.19/950-0479-lan78xx-use-default-alignment-for-rx-buffers.patch index 3bc2582dc..d8cf36f1e 100644 --- a/target/linux/brcm2708/patches-4.19/950-0479-lan78xx-use-default-alignment-for-rx-buffers.patch +++ b/target/linux/brcm2708/patches-4.19/950-0479-lan78xx-use-default-alignment-for-rx-buffers.patch @@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing. --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c -@@ -3253,7 +3253,7 @@ static int rx_submit(struct lan78xx_net +@@ -3258,7 +3258,7 @@ static int rx_submit(struct lan78xx_net size_t size = dev->rx_urb_size; int ret = 0; diff --git a/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch b/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch index 8a1d2f143..c29457500 100644 --- a/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch +++ b/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch @@ -20,7 +20,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c -@@ -286,6 +286,8 @@ int bcmgenet_mii_probe(struct net_device +@@ -285,6 +285,8 @@ int bcmgenet_mii_probe(struct net_device /* Communicate the integrated PHY revision */ if (priv->internal_phy) phy_flags = priv->gphy_rev; diff --git a/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch b/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch index 2c41dc012..627664299 100644 --- a/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch +++ b/target/linux/brcm2708/patches-4.19/950-0802-regulator-gpio-Allow-nonexclusive-GPIO-access.patch @@ -41,7 +41,7 @@ Signed-off-by: Mark Brown --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -3959,8 +3959,23 @@ struct gpio_desc *__must_check gpiod_get +@@ -3979,8 +3979,23 @@ struct gpio_desc *__must_check gpiod_get * the device name as label */ status = gpiod_request(desc, con_id ? con_id : devname); diff --git a/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch b/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch index f7564a58c..d8e87919c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch +++ b/target/linux/brcm2708/patches-4.19/950-0803-gpio-Enable-nonexclusive-gpiods-from-DT-nodes.patch @@ -23,7 +23,7 @@ Signed-off-by: Mark Brown --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -4033,6 +4033,8 @@ struct gpio_desc *gpiod_get_from_of_node +@@ -4053,6 +4053,8 @@ struct gpio_desc *gpiod_get_from_of_node transitory = flags & OF_GPIO_TRANSITORY; ret = gpiod_request(desc, label); diff --git a/target/linux/brcm47xx/patches-4.14/034-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch b/target/linux/brcm47xx/patches-4.14/034-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch deleted file mode 100644 index c824e2831..000000000 --- a/target/linux/brcm47xx/patches-4.14/034-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From feef7918667b84f9d5653c501542dd8d84ae32af Mon Sep 17 00:00:00 2001 -From: Tuomas Tynkkynen -Date: Sun, 19 Aug 2018 22:20:23 +0300 -Subject: [PATCH] MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Setting GPIO 21 high seems to be required to enable power to USB ports -on the WNDR3400v3. As there is already similar code for WNR3500L, -make the existing USB power GPIO code generic and use that. - -Signed-off-by: Tuomas Tynkkynen -Acked-by: Hauke Mehrtens -Signed-off-by: Paul Burton -Patchwork: https://patchwork.linux-mips.org/patch/20259/ -Cc: Rafał Miłecki -Cc: linux-mips@linux-mips.org -Cc: linux-kernel@vger.kernel.org ---- - arch/mips/bcm47xx/workarounds.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/arch/mips/bcm47xx/workarounds.c -+++ b/arch/mips/bcm47xx/workarounds.c -@@ -5,9 +5,8 @@ - #include - #include - --static void __init bcm47xx_workarounds_netgear_wnr3500l(void) -+static void __init bcm47xx_workarounds_enable_usb_power(int usb_power) - { -- const int usb_power = 12; - int err; - - err = gpio_request_one(usb_power, GPIOF_OUT_INIT_HIGH, "usb_power"); -@@ -23,7 +22,10 @@ void __init bcm47xx_workarounds(void) - - switch (board) { - case BCM47XX_BOARD_NETGEAR_WNR3500L: -- bcm47xx_workarounds_netgear_wnr3500l(); -+ bcm47xx_workarounds_enable_usb_power(12); -+ break; -+ case BCM47XX_BOARD_NETGEAR_WNDR3400_V3: -+ bcm47xx_workarounds_enable_usb_power(21); - break; - default: - /* No workaround(s) needed */ diff --git a/target/linux/brcm47xx/patches-4.19/030-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch b/target/linux/brcm47xx/patches-4.19/030-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch deleted file mode 100644 index c824e2831..000000000 --- a/target/linux/brcm47xx/patches-4.19/030-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From feef7918667b84f9d5653c501542dd8d84ae32af Mon Sep 17 00:00:00 2001 -From: Tuomas Tynkkynen -Date: Sun, 19 Aug 2018 22:20:23 +0300 -Subject: [PATCH] MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Setting GPIO 21 high seems to be required to enable power to USB ports -on the WNDR3400v3. As there is already similar code for WNR3500L, -make the existing USB power GPIO code generic and use that. - -Signed-off-by: Tuomas Tynkkynen -Acked-by: Hauke Mehrtens -Signed-off-by: Paul Burton -Patchwork: https://patchwork.linux-mips.org/patch/20259/ -Cc: Rafał Miłecki -Cc: linux-mips@linux-mips.org -Cc: linux-kernel@vger.kernel.org ---- - arch/mips/bcm47xx/workarounds.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - ---- a/arch/mips/bcm47xx/workarounds.c -+++ b/arch/mips/bcm47xx/workarounds.c -@@ -5,9 +5,8 @@ - #include - #include - --static void __init bcm47xx_workarounds_netgear_wnr3500l(void) -+static void __init bcm47xx_workarounds_enable_usb_power(int usb_power) - { -- const int usb_power = 12; - int err; - - err = gpio_request_one(usb_power, GPIOF_OUT_INIT_HIGH, "usb_power"); -@@ -23,7 +22,10 @@ void __init bcm47xx_workarounds(void) - - switch (board) { - case BCM47XX_BOARD_NETGEAR_WNR3500L: -- bcm47xx_workarounds_netgear_wnr3500l(); -+ bcm47xx_workarounds_enable_usb_power(12); -+ break; -+ case BCM47XX_BOARD_NETGEAR_WNDR3400_V3: -+ bcm47xx_workarounds_enable_usb_power(21); - break; - default: - /* No workaround(s) needed */ diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index 3d42e767f..2d31b6673 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2019 OpenWrt.org # Copyright (C) 2016 LEDE project # # This is free software, licensed under the GNU General Public License v2. @@ -13,6 +13,7 @@ BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia usbgadget KERNEL_PATCHVER:=4.14 +KERNEL_TESTING_PATCHVER:=4.19 MAINTAINER:=Jonas Gorski define Target/Description diff --git a/target/linux/brcm63xx/base-files/etc/diag.sh b/target/linux/brcm63xx/base-files/etc/diag.sh index afb347818..34464ec44 100644 --- a/target/linux/brcm63xx/base-files/etc/diag.sh +++ b/target/linux/brcm63xx/base-files/etc/diag.sh @@ -43,7 +43,7 @@ set_state() { status_led="spw303v:green:power+adsl" ;; vh4032n) - status_led="VH4032N:red:power" + status_led="VH4032N:blue:power" ;; vr-3025un) status_led="VR-3025un:green:power" diff --git a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index fe31ed323..2400eb998 100644 --- a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -1,28 +1,9 @@ #!/bin/sh # Based on gabors ralink wisoc implementation. -rt2x00_eeprom_die() { - echo "rt2x00 eeprom: " "$*" - exit 1 -} - -rt2x00_eeprom_extract() { - local part=$1 - local offset=$2 - local count=$3 - local mtd - - mtd=$(find_mtd_part $part) - [ -n "$mtd" ] || \ - rt2x00_eeprom_die "no mtd device found for partition $part" - - dd if=$mtd of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count || \ - rt2x00_eeprom_die "failed to extract from $mtd" -} - [ -e /lib/firmware/$FIRMWARE ] && exit 0 -. /lib/functions.sh +. /lib/functions/caldata.sh board=$(board_name) @@ -30,14 +11,14 @@ case "$FIRMWARE" in "rt2x00.eeprom" ) case $board in hg556a_c) - rt2x00_eeprom_extract "cal_data" 130560 512 + caldata_extract "cal_data" 0x1fe00 0x200 ;; hg622 |\ hg655b) - rt2x00_eeprom_extract "cal_data" 0 512 + caldata_extract "cal_data" 0x0 0x200 ;; *) - rt2x00_eeprom_die "board $board is not supported yet" + caldata_die "board $board is not supported yet" ;; esac ;; diff --git a/target/linux/brcm63xx/config-4.9 b/target/linux/brcm63xx/config-4.19 similarity index 90% rename from target/linux/brcm63xx/config-4.9 rename to target/linux/brcm63xx/config-4.19 index f1c34715f..2a001952e 100644 --- a/target/linux/brcm63xx/config-4.9 +++ b/target/linux/brcm63xx/config-4.19 @@ -4,12 +4,20 @@ CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y # CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set # CONFIG_ARCH_HAS_SG_CHAIN is not set +# CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is not set +# CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_MMAP_RND_BITS_MAX=15 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set +# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_BCM6345_EXT_IRQ=y CONFIG_BCM6345_PERIPH_IRQ=y @@ -59,7 +67,9 @@ CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y CONFIG_CPU_R4K_CACHE_TLB=y CONFIG_CPU_R4K_FPU=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_CPUFREQ=y CONFIG_CPU_SUPPORTS_HIGHMEM=y +CONFIG_CRASH_CORE=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y @@ -71,11 +81,15 @@ CONFIG_FIXED_PHY=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PINCONF=y +CONFIG_GENERIC_PINCTRL_GROUPS=y +CONFIG_GENERIC_PINMUX_FUNCTIONS=y CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y @@ -83,6 +97,7 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_BCM63XX=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_SYSFS=y +# CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y @@ -98,6 +113,7 @@ CONFIG_HAVE_CBPF_JIT=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DEBUG_STACKOVERFLOW=y @@ -140,7 +156,8 @@ CONFIG_LEDS_BCM6328=y CONFIG_LEDS_BCM6358=y CONFIG_LEDS_GPIO=y CONFIG_LIBFDT=y -CONFIG_MDIO_BOARDINFO=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVICE=y CONFIG_MFD_SYSCON=y CONFIG_MIPS=y CONFIG_MIPS_ASID_BITS=8 @@ -150,6 +167,7 @@ CONFIG_MIPS_CLOCK_VSYSCALL=y # CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set CONFIG_MIPS_CMDLINE_FROM_DTB=y # CONFIG_MIPS_ELF_APPENDED_DTB is not set +CONFIG_MIPS_EXTERNAL_TIMER=y # CONFIG_MIPS_HUGE_TLB_SUPPORT is not set CONFIG_MIPS_L1_CACHE_SHIFT=4 CONFIG_MIPS_L1_CACHE_SHIFT_4=y @@ -207,6 +225,7 @@ CONFIG_PINCTRL_BCM6368=y CONFIG_PINCTRL_BCM63XX=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y +# CONFIG_RCU_NEED_SEGCBLIST is not set # CONFIG_RCU_STALL_COMMON is not set CONFIG_REGMAP=y CONFIG_REGMAP_MMIO=y @@ -254,6 +273,7 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y CONFIG_SYS_SUPPORTS_SMP=y CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TINY_SRCU=y CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y CONFIG_VM_EVENT_COUNTERS=y diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/brcm63xx/dts/a226g.dts index a77a1b2ae..44e297c08 100644 --- a/target/linux/brcm63xx/dts/a226g.dts +++ b/target/linux/brcm63xx/dts/a226g.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; voip_red { diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/a226m-fwb.dts index 1785c7a3c..bb1cd2935 100644 --- a/target/linux/brcm63xx/dts/a226m-fwb.dts +++ b/target/linux/brcm63xx/dts/a226m-fwb.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; voip_red { diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/a226m.dts index 190f0933b..e0a6b0769 100644 --- a/target/linux/brcm63xx/dts/a226m.dts +++ b/target/linux/brcm63xx/dts/a226m.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; voip_red { diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/a4001n.dts index 2a42122e2..814274b61 100644 --- a/target/linux/brcm63xx/dts/a4001n.dts +++ b/target/linux/brcm63xx/dts/a4001n.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_red { diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/a4001n1.dts index d4c0b36ed..e58f86558 100644 --- a/target/linux/brcm63xx/dts/a4001n1.dts +++ b/target/linux/brcm63xx/dts/a4001n1.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_red { diff --git a/target/linux/brcm63xx/dts/ad1018-nor.dts b/target/linux/brcm63xx/dts/ad1018-nor.dts index 2763337fb..36899a4cc 100644 --- a/target/linux/brcm63xx/dts/ad1018-nor.dts +++ b/target/linux/brcm63xx/dts/ad1018-nor.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/agpf-s0.dts index aba37672c..0b9c39771 100644 --- a/target/linux/brcm63xx/dts/agpf-s0.dts +++ b/target/linux/brcm63xx/dts/agpf-s0.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/ar-5315u.dts b/target/linux/brcm63xx/dts/ar-5315u.dts index 91ebe489e..d1085e7ee 100644 --- a/target/linux/brcm63xx/dts/ar-5315u.dts +++ b/target/linux/brcm63xx/dts/ar-5315u.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; wps_green { diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/ar-5381u.dts index 5e3513c9f..e33602491 100644 --- a/target/linux/brcm63xx/dts/ar-5381u.dts +++ b/target/linux/brcm63xx/dts/ar-5381u.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; alarm_red { diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/ar-5387un.dts index f30997af8..209eda37f 100644 --- a/target/linux/brcm63xx/dts/ar-5387un.dts +++ b/target/linux/brcm63xx/dts/ar-5387un.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_red { diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/ar1004g.dts index 2dd01bcfa..ffda187fd 100644 --- a/target/linux/brcm63xx/dts/ar1004g.dts +++ b/target/linux/brcm63xx/dts/ar1004g.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/brcm63xx/dts/av4202n.dts index 7600f47f9..df9dc718e 100644 --- a/target/linux/brcm63xx/dts/av4202n.dts +++ b/target/linux/brcm63xx/dts/av4202n.dts @@ -14,7 +14,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -35,7 +35,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_white { diff --git a/target/linux/brcm63xx/dts/bcm96318ref.dts b/target/linux/brcm63xx/dts/bcm96318ref.dts index 8a74a8091..f6136b588 100644 --- a/target/linux/brcm63xx/dts/bcm96318ref.dts +++ b/target/linux/brcm63xx/dts/bcm96318ref.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet { diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts index 506c99226..99f8af218 100644 --- a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts +++ b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet { diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts index d9d2c40c1..57046a787 100644 --- a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts +++ b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/brcm63xx/dts/bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm963269bhr.dts index 4fd41f327..bb1609e04 100644 --- a/target/linux/brcm63xx/dts/bcm963269bhr.dts +++ b/target/linux/brcm63xx/dts/bcm963269bhr.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; usb1 { diff --git a/target/linux/brcm63xx/dts/bcm963281TAN.dts b/target/linux/brcm63xx/dts/bcm963281TAN.dts index 46a79979c..956ca59d6 100644 --- a/target/linux/brcm63xx/dts/bcm963281TAN.dts +++ b/target/linux/brcm63xx/dts/bcm963281TAN.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet { diff --git a/target/linux/brcm63xx/dts/bcm96328avng.dts b/target/linux/brcm63xx/dts/bcm96328avng.dts index e27183852..a0a6c9ec5 100644 --- a/target/linux/brcm63xx/dts/bcm96328avng.dts +++ b/target/linux/brcm63xx/dts/bcm96328avng.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_fail { diff --git a/target/linux/brcm63xx/dts/bcm96338GW.dts b/target/linux/brcm63xx/dts/bcm96338GW.dts index a31c4f564..92363ec3a 100644 --- a/target/linux/brcm63xx/dts/bcm96338GW.dts +++ b/target/linux/brcm63xx/dts/bcm96338GW.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/bcm96338W.dts b/target/linux/brcm63xx/dts/bcm96338W.dts index d7ab476b6..3f6e8c068 100644 --- a/target/linux/brcm63xx/dts/bcm96338W.dts +++ b/target/linux/brcm63xx/dts/bcm96338W.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/brcm63xx/dts/bcm96348GW-10.dts index 94dc38f3b..014fd3fb9 100644 --- a/target/linux/brcm63xx/dts/bcm96348GW-10.dts +++ b/target/linux/brcm63xx/dts/bcm96348GW-10.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm96348GW-11.dts index 5c42ea7dc..aeda3c265 100644 --- a/target/linux/brcm63xx/dts/bcm96348GW-11.dts +++ b/target/linux/brcm63xx/dts/bcm96348GW-11.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/brcm63xx/dts/bcm96348GW.dts index 7961d8c82..61a0a3dd5 100644 --- a/target/linux/brcm63xx/dts/bcm96348GW.dts +++ b/target/linux/brcm63xx/dts/bcm96348GW.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/bcm96348R.dts b/target/linux/brcm63xx/dts/bcm96348R.dts index 2f0778467..20c88c48f 100644 --- a/target/linux/brcm63xx/dts/bcm96348R.dts +++ b/target/linux/brcm63xx/dts/bcm96348R.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/bcm96358VW.dts b/target/linux/brcm63xx/dts/bcm96358VW.dts index 346e24dc1..669d1943f 100644 --- a/target/linux/brcm63xx/dts/bcm96358VW.dts +++ b/target/linux/brcm63xx/dts/bcm96358VW.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/bcm96358VW2.dts b/target/linux/brcm63xx/dts/bcm96358VW2.dts index 02f1ea9ed..a4a977e73 100644 --- a/target/linux/brcm63xx/dts/bcm96358VW2.dts +++ b/target/linux/brcm63xx/dts/bcm96358VW2.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; stop_green { diff --git a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts index ac658b137..3df15144e 100644 --- a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts +++ b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; dsl_green { diff --git a/target/linux/brcm63xx/dts/bcm96368MVWG.dts b/target/linux/brcm63xx/dts/bcm96368MVWG.dts index fdc32d0c9..1004f8839 100644 --- a/target/linux/brcm63xx/dts/bcm96368MVWG.dts +++ b/target/linux/brcm63xx/dts/bcm96368MVWG.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; dsl_green { diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/cpva502plus.dts index 2d45ae3f3..db08e7a97 100644 --- a/target/linux/brcm63xx/dts/cpva502plus.dts +++ b/target/linux/brcm63xx/dts/cpva502plus.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; phone_green { diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/brcm63xx/dts/cpva642.dts index 95ea7da51..e42291229 100644 --- a/target/linux/brcm63xx/dts/cpva642.dts +++ b/target/linux/brcm63xx/dts/cpva642.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; eth_green { diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/brcm63xx/dts/ct-5365.dts index c6600f6e4..0d36aa21e 100644 --- a/target/linux/brcm63xx/dts/ct-5365.dts +++ b/target/linux/brcm63xx/dts/ct-5365.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/ct-6373.dts index 60bf25fb7..c5e38ba6f 100644 --- a/target/linux/brcm63xx/dts/ct-6373.dts +++ b/target/linux/brcm63xx/dts/ct-6373.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/ct536plus.dts index 4533af8a7..d6664ab81 100644 --- a/target/linux/brcm63xx/dts/ct536plus.dts +++ b/target/linux/brcm63xx/dts/ct536plus.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/cvg834g.dts index 9bdc8c242..2b25d009b 100644 --- a/target/linux/brcm63xx/dts/cvg834g.dts +++ b/target/linux/brcm63xx/dts/cvg834g.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/brcm63xx/dts/dg834g_v4.dts index ff2c0d562..4ea096e81 100644 --- a/target/linux/brcm63xx/dts/dg834g_v4.dts +++ b/target/linux/brcm63xx/dts/dg834g_v4.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/dg834gtpn.dts index 8fefe4a6f..32ab365a8 100644 --- a/target/linux/brcm63xx/dts/dg834gtpn.dts +++ b/target/linux/brcm63xx/dts/dg834gtpn.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/brcm63xx/dts/dgnd3700v1.dts index 052f3f6b8..b6aec06e6 100644 --- a/target/linux/brcm63xx/dts/dgnd3700v1.dts +++ b/target/linux/brcm63xx/dts/dgnd3700v1.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; dsl_green { diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/dsl-2640b-b.dts index 79cc061e2..4213822a3 100644 --- a/target/linux/brcm63xx/dts/dsl-2640b-b.dts +++ b/target/linux/brcm63xx/dts/dsl-2640b-b.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/brcm63xx/dts/dsl-2640u.dts index 170a722d4..8cf96a3a5 100644 --- a/target/linux/brcm63xx/dts/dsl-2640u.dts +++ b/target/linux/brcm63xx/dts/dsl-2640u.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; green_power { diff --git a/target/linux/brcm63xx/dts/dsl-2650u.dts b/target/linux/brcm63xx/dts/dsl-2650u.dts index 0ee0ff354..c2dad26b1 100644 --- a/target/linux/brcm63xx/dts/dsl-2650u.dts +++ b/target/linux/brcm63xx/dts/dsl-2650u.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; stop_green { diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/dts/dsl-274xb-c.dts index c5d067287..6897378fe 100644 --- a/target/linux/brcm63xx/dts/dsl-274xb-c.dts +++ b/target/linux/brcm63xx/dts/dsl-274xb-c.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_green { diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/dsl-274xb-f.dts index 3fdcf7c05..1d09232ba 100644 --- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts +++ b/target/linux/brcm63xx/dts/dsl-274xb-f.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_red { diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/dts/dsl-275xb-d.dts index 63388ef14..2052a6e30 100644 --- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts +++ b/target/linux/brcm63xx/dts/dsl-275xb-d.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts index 342a7d605..95a627dfb 100644 --- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts +++ b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; voip { diff --git a/target/linux/brcm63xx/dts/evg2000.dts b/target/linux/brcm63xx/dts/evg2000.dts index d68568a7c..1508291f4 100644 --- a/target/linux/brcm63xx/dts/evg2000.dts +++ b/target/linux/brcm63xx/dts/evg2000.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; voip1_green { diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/f5d7633.dts index 782c70b39..c39247d40 100644 --- a/target/linux/brcm63xx/dts/f5d7633.dts +++ b/target/linux/brcm63xx/dts/f5d7633.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/fast2504n.dts index 508f8d72d..293620664 100644 --- a/target/linux/brcm63xx/dts/fast2504n.dts +++ b/target/linux/brcm63xx/dts/fast2504n.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_orange { diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/fast2604.dts index 72eec5188..52458a253 100644 --- a/target/linux/brcm63xx/dts/fast2604.dts +++ b/target/linux/brcm63xx/dts/fast2604.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/fast2704n.dts index 4438ea2c6..33842cc64 100644 --- a/target/linux/brcm63xx/dts/fast2704n.dts +++ b/target/linux/brcm63xx/dts/fast2704n.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; wps_green { diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/brcm63xx/dts/fast2704v2.dts index 44fe10711..1de853a02 100644 --- a/target/linux/brcm63xx/dts/fast2704v2.dts +++ b/target/linux/brcm63xx/dts/fast2704v2.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; usb_green { diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/brcm63xx/dts/gw6000.dts index 73d59b947..4822b0492 100644 --- a/target/linux/brcm63xx/dts/gw6000.dts +++ b/target/linux/brcm63xx/dts/gw6000.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/gw6200.dts index 951cb5595..c86cbf920 100644 --- a/target/linux/brcm63xx/dts/gw6200.dts +++ b/target/linux/brcm63xx/dts/gw6200.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; line1_green { diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/brcm63xx/dts/hg520v.dts index 4473362c5..ebbf1f3af 100644 --- a/target/linux/brcm63xx/dts/hg520v.dts +++ b/target/linux/brcm63xx/dts/hg520v.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_green { diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/hg553.dts index c23dba00e..92e5e48ac 100644 --- a/target/linux/brcm63xx/dts/hg553.dts +++ b/target/linux/brcm63xx/dts/hg553.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/brcm63xx/dts/hg556a-a.dts index 7c935208b..018b913a8 100644 --- a/target/linux/brcm63xx/dts/hg556a-a.dts +++ b/target/linux/brcm63xx/dts/hg556a-a.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -48,7 +48,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; message_red { diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/hg556a-b.dts index a66dba6c4..034e736f0 100644 --- a/target/linux/brcm63xx/dts/hg556a-b.dts +++ b/target/linux/brcm63xx/dts/hg556a-b.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -48,7 +48,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; message_red { diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/hg556a-c.dts index cfcc70a80..2e5aeb86e 100644 --- a/target/linux/brcm63xx/dts/hg556a-c.dts +++ b/target/linux/brcm63xx/dts/hg556a-c.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -48,7 +48,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; lan1_green { diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/brcm63xx/dts/hg622.dts index de4a5cb62..a7569a780 100644 --- a/target/linux/brcm63xx/dts/hg622.dts +++ b/target/linux/brcm63xx/dts/hg622.dts @@ -14,7 +14,7 @@ }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -28,7 +28,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; dsl_green { diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/brcm63xx/dts/hg655b.dts index 28b2ed11c..f62f23851 100644 --- a/target/linux/brcm63xx/dts/hg655b.dts +++ b/target/linux/brcm63xx/dts/hg655b.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; dsl_green { diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts index 59efb774f..836c43cae 100644 --- a/target/linux/brcm63xx/dts/homehub2a.dts +++ b/target/linux/brcm63xx/dts/homehub2a.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/brcm63xx/dts/livebox-blue-5g.dts b/target/linux/brcm63xx/dts/livebox-blue-5g.dts index 6eba3b855..9d5c2e100 100644 --- a/target/linux/brcm63xx/dts/livebox-blue-5g.dts +++ b/target/linux/brcm63xx/dts/livebox-blue-5g.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; red_adsl_fail { diff --git a/target/linux/brcm63xx/dts/magic.dts b/target/linux/brcm63xx/dts/magic.dts index 2c187b799..1358ebe99 100644 --- a/target/linux/brcm63xx/dts/magic.dts +++ b/target/linux/brcm63xx/dts/magic.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; power { diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts index b9836fd3f..33ad3ed82 100644 --- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts +++ b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -48,7 +48,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; traffic_white { diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/nb4-ser-r0.dts index b546dae96..86cd31be6 100644 --- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts +++ b/target/linux/brcm63xx/dts/nb4-ser-r0.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -48,7 +48,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; traffic_white { diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/nb6-ser-r0.dts index d91f1ebfe..202386a77 100644 --- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts +++ b/target/linux/brcm63xx/dts/nb6-ser-r0.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts index 504817c3e..c12383280 100644 --- a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts +++ b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/r1000h.dts b/target/linux/brcm63xx/dts/r1000h.dts index 22be696b6..05198a1c9 100644 --- a/target/linux/brcm63xx/dts/r1000h.dts +++ b/target/linux/brcm63xx/dts/r1000h.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_green { diff --git a/target/linux/brcm63xx/dts/r5010unv2.dts b/target/linux/brcm63xx/dts/r5010unv2.dts index 8f1142d82..a78212630 100644 --- a/target/linux/brcm63xx/dts/r5010unv2.dts +++ b/target/linux/brcm63xx/dts/r5010unv2.dts @@ -14,7 +14,7 @@ }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -35,7 +35,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_green { diff --git a/target/linux/brcm63xx/dts/rg100a.dts b/target/linux/brcm63xx/dts/rg100a.dts index 7b0e4b276..22f50d5ad 100644 --- a/target/linux/brcm63xx/dts/rg100a.dts +++ b/target/linux/brcm63xx/dts/rg100a.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; stop_green { diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/brcm63xx/dts/rta1320.dts index b249fbd08..bac605651 100644 --- a/target/linux/brcm63xx/dts/rta1320.dts +++ b/target/linux/brcm63xx/dts/rta1320.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; green_power { diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/rta770bw.dts index 17d3cf95d..f678762c8 100644 --- a/target/linux/brcm63xx/dts/rta770bw.dts +++ b/target/linux/brcm63xx/dts/rta770bw.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; usb { diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/rta770w.dts index 09b27e41c..ad0e7ce27 100644 --- a/target/linux/brcm63xx/dts/rta770w.dts +++ b/target/linux/brcm63xx/dts/rta770w.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; usb { diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/brcm63xx/dts/spw303v.dts index 5edab551f..04bbb5a11 100644 --- a/target/linux/brcm63xx/dts/spw303v.dts +++ b/target/linux/brcm63xx/dts/spw303v.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -34,7 +34,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; ses_green { diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/brcm63xx/dts/spw500v.dts index 246102116..8ca6dddd1 100644 --- a/target/linux/brcm63xx/dts/spw500v.dts +++ b/target/linux/brcm63xx/dts/spw500v.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/sr102.dts b/target/linux/brcm63xx/dts/sr102.dts index f5d9044b8..45c130248 100644 --- a/target/linux/brcm63xx/dts/sr102.dts +++ b/target/linux/brcm63xx/dts/sr102.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; lan1_green { diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/td-w8900gb.dts index cb538115f..be111edd4 100644 --- a/target/linux/brcm63xx/dts/td-w8900gb.dts +++ b/target/linux/brcm63xx/dts/td-w8900gb.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/usr9108.dts b/target/linux/brcm63xx/dts/usr9108.dts index 987fc5942..fd0d6d4bc 100644 --- a/target/linux/brcm63xx/dts/usr9108.dts +++ b/target/linux/brcm63xx/dts/usr9108.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-leds { + leds { compatible = "gpio-leds"; usb { diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/v2110.dts index dd66b0082..a1b6c2177 100644 --- a/target/linux/brcm63xx/dts/v2110.dts +++ b/target/linux/brcm63xx/dts/v2110.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/v2500v-bb.dts index 5376d18e5..591d00d50 100644 --- a/target/linux/brcm63xx/dts/v2500v-bb.dts +++ b/target/linux/brcm63xx/dts/v2500v-bb.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; power_green { diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/brcm63xx/dts/vg50.dts index 97b4275df..dbbea13f1 100644 --- a/target/linux/brcm63xx/dts/vg50.dts +++ b/target/linux/brcm63xx/dts/vg50.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/vh4032n.dts index 6788026d6..48f35b16e 100644 --- a/target/linux/brcm63xx/dts/vh4032n.dts +++ b/target/linux/brcm63xx/dts/vh4032n.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -26,15 +26,15 @@ debounce-interval = <60>; }; - wps { - label = "wps"; + wlan { + label = "wlan"; gpios = <&pinctrl 35 1>; - linux,code = ; + linux,code = ; debounce-interval = <60>; }; }; - gpio-leds { + leds { compatible = "gpio-leds"; dsl_blue { @@ -56,11 +56,11 @@ power_blue { label = "VH4032N:blue:power"; gpios = <&pinctrl 22 0>; + default-state = "on"; }; power_red { label = "VH4032N:red:power"; gpios = <&pinctrl 24 0>; - default-state = "on"; }; voice_blue { label = "VH4032N:blue:voice"; @@ -74,6 +74,10 @@ }; &pinctrl { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pci &pinctrl_ephy0_led &pinctrl_ephy1_led + &pinctrl_ephy2_led &pinctrl_ephy3_led>; + usb_hub_reset { gpio-hog; gpios = <27 0>; diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts index 765433133..248ec1d73 100644 --- a/target/linux/brcm63xx/dts/vr-3025u.dts +++ b/target/linux/brcm63xx/dts/vr-3025u.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; dsl_green { diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/vr-3025un.dts index 139d79b4d..ac1f89643 100644 --- a/target/linux/brcm63xx/dts/vr-3025un.dts +++ b/target/linux/brcm63xx/dts/vr-3025un.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; dsl_green { diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/brcm63xx/dts/vr-3026e.dts index 9d4fa5e69..8048d131a 100644 --- a/target/linux/brcm63xx/dts/vr-3026e.dts +++ b/target/linux/brcm63xx/dts/vr-3026e.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -27,7 +27,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; dsl_green { diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/wap-5813n.dts index 298d7791b..abf5ea4f6 100644 --- a/target/linux/brcm63xx/dts/wap-5813n.dts +++ b/target/linux/brcm63xx/dts/wap-5813n.dts @@ -13,7 +13,7 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys-polled { + keys { compatible = "gpio-keys-polled"; #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ }; }; - gpio-leds { + leds { compatible = "gpio-leds"; inet_green { diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk index 0f213bb15..2c8ac3e16 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/brcm63xx/image/bcm63xx.mk @@ -36,6 +36,7 @@ DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS define Device/bcm63xx_netgear $(Device/bcm63xx) + DEVICE_VENDOR := NETGEAR IMAGES := factory.chk sysupgrade.bin IMAGE/factory.chk := cfe-bin | netgear-chk NETGEAR_BOARD_ID := @@ -56,8 +57,9 @@ DEVICE_VARS += REDBOOT_PREFIX ### Generic ### define Device/963281TAN-generic $(Device/bcm63xx) + DEVICE_VENDOR := Generic + DEVICE_MODEL := 963281TAN IMAGES := cfe-4M.bin cfe-8M.bin cfe-16M.bin - DEVICE_TITLE := Generic 963281TAN DEVICE_DTS := bcm963281TAN CFE_BOARD_ID := 963281TAN CFE_CHIP_ID := 6328 @@ -66,8 +68,9 @@ TARGET_DEVICES += 963281TAN-generic define Device/96328avng-generic $(Device/bcm63xx) + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96328avng IMAGES := cfe-4M.bin cfe-8M.bin cfe-16M.bin - DEVICE_TITLE := Generic 96328avng DEVICE_DTS := bcm96328avng CFE_BOARD_ID := 96328avng CFE_CHIP_ID := 6328 @@ -76,7 +79,8 @@ TARGET_DEVICES += 96328avng-generic define Device/96338GW-generic $(Device/bcm63xx) - DEVICE_TITLE := Generic 96338GW + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96338GW DEVICE_DTS := bcm96338GW CFE_BOARD_ID := 6338GW CFE_CHIP_ID := 6338 @@ -85,7 +89,8 @@ TARGET_DEVICES += 96338GW-generic define Device/96338W-generic $(Device/bcm63xx) - DEVICE_TITLE := Generic 96338W + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96338W DEVICE_DTS := bcm96338W CFE_BOARD_ID := 6338W CFE_CHIP_ID := 6338 @@ -94,18 +99,21 @@ TARGET_DEVICES += 96338W-generic define Device/96345GW2-generic $(Device/bcm63xx) + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96345GW2 IMAGES += cfe-bc221.bin - DEVICE_TITLE := Generic 96345GW2 DEVICE_DTS := bcm96345GW2 CFE_BOARD_ID := 96345GW2 CFE_CHIP_ID := 6345 + DEFAULT := n endef TARGET_DEVICES += 96345GW2-generic define Device/96348GW-generic $(Device/bcm63xx) + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96348GW IMAGES += cfe-bc221.bin - DEVICE_TITLE := Generic 96348GW DEVICE_DTS := bcm96348GW CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 @@ -114,7 +122,8 @@ TARGET_DEVICES += 96348GW-generic define Device/96348GW-10-generic $(Device/bcm63xx) - DEVICE_TITLE := Generic 96348GW-10 + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96348GW-10 DEVICE_DTS := bcm96348GW-10 CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 @@ -123,7 +132,8 @@ TARGET_DEVICES += 96348GW-10-generic define Device/96348GW-11-generic $(Device/bcm63xx) - DEVICE_TITLE := Generic 96348GW-11 + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96348GW-11 DEVICE_DTS := bcm96348GW-11 CFE_BOARD_ID := 96348GW-11 CFE_CHIP_ID := 6348 @@ -132,7 +142,8 @@ TARGET_DEVICES += 96348GW-11-generic define Device/96348R-generic $(Device/bcm63xx) - DEVICE_TITLE := Generic 96348R + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96348R DEVICE_DTS := bcm96348R CFE_BOARD_ID := 96348R CFE_CHIP_ID := 6348 @@ -141,7 +152,8 @@ TARGET_DEVICES += 96348R-generic define Device/96358VW-generic $(Device/bcm63xx) - DEVICE_TITLE := Generic 96358VW + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96358VW DEVICE_DTS := bcm96358VW CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 @@ -150,7 +162,8 @@ TARGET_DEVICES += 96358VW-generic define Device/96358VW2-generic $(Device/bcm63xx) - DEVICE_TITLE := Generic 96358VW2 + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96358VW2 DEVICE_DTS := bcm96358VW2 CFE_BOARD_ID := 96358VW2 CFE_CHIP_ID := 6358 @@ -159,7 +172,8 @@ TARGET_DEVICES += 96358VW2-generic define Device/96368MVNgr-generic $(Device/bcm63xx) - DEVICE_TITLE := Generic 96368MVNgr + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96368MVNgr DEVICE_DTS := bcm96368MVNgr CFE_BOARD_ID := 96368MVNgr CFE_CHIP_ID := 6368 @@ -168,7 +182,8 @@ TARGET_DEVICES += 96368MVNgr-generic define Device/96368MVWG-generic $(Device/bcm63xx) - DEVICE_TITLE := Generic 96368MVWG + DEVICE_VENDOR := Generic + DEVICE_MODEL := 96368MVWG DEVICE_DTS := bcm96368MVWG CFE_BOARD_ID := 96368MVWG CFE_CHIP_ID := 6368 @@ -178,8 +193,9 @@ TARGET_DEVICES += 96368MVWG-generic ### Actiontec ### define Device/R1000H $(Device/bcm63xx) + DEVICE_VENDOR := Actiontec + DEVICE_MODEL := R1000H FILESYSTEMS := squashfs - DEVICE_TITLE := Actiontec R1000H DEVICE_DTS := r1000h CFE_BOARD_ID := 96368MVWG CFE_CHIP_ID := 6368 @@ -193,7 +209,8 @@ TARGET_DEVICES += R1000H ### ADB ### define Device/A4001N $(Device/bcm63xx) - DEVICE_TITLE := ADB P.DG A4001N + DEVICE_VENDOR := ADB + DEVICE_MODEL := P.DG A4001N DEVICE_DTS := a4001n CFE_BOARD_ID := 96328dg2x2 CFE_CHIP_ID := 6328 @@ -205,8 +222,9 @@ TARGET_DEVICES += A4001N define Device/A4001N1 $(Device/bcm63xx) + DEVICE_VENDOR := ADB + DEVICE_MODEL := P.DG A4001N1 IMAGES += sysupgrade.bin - DEVICE_TITLE := ADB P.DG A4001N1 DEVICE_DTS := a4001n1 CFE_BOARD_ID := 963281T_TEF CFE_CHIP_ID := 6328 @@ -218,8 +236,9 @@ TARGET_DEVICES += A4001N1 define Device/AV4202N $(Device/bcm63xx) + DEVICE_VENDOR := ADB + DEVICE_MODEL := P.DG AV4202N IMAGE_OFFSET := 0x20000 - DEVICE_TITLE := ADB P.DG AV4202N DEVICE_DTS := av4202n CFE_BOARD_ID := 96368_Swiss_S1 CFE_CHIP_ID := 6368 @@ -231,7 +250,8 @@ TARGET_DEVICES += AV4202N ### Alcatel ### define Device/RG100A $(Device/bcm63xx) - DEVICE_TITLE := Alcatel RG100A + DEVICE_VENDOR := Alcatel + DEVICE_MODEL := RG100A DEVICE_DTS := rg100a CFE_BOARD_ID := 96358VW2 CFE_CHIP_ID := 6358 @@ -244,33 +264,38 @@ TARGET_DEVICES += RG100A ### Asmax ### define Device/AR1004G $(Device/bcm63xx) - DEVICE_TITLE := Asmax AR 1004g + DEVICE_VENDOR := Asmax + DEVICE_MODEL := AR 1004g DEVICE_DTS := ar1004g CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += AR1004G ### Belkin ### define Device/F5D7633 $(Device/bcm63xx) - DEVICE_TITLE := Belkin F5D7633 + DEVICE_VENDOR := Belkin + DEVICE_MODEL := F5D7633 DEVICE_DTS := f5d7633 CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 BLOCK_SIZE := 0x20000 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += F5D7633 ### Broadcom ### define Device/BCM96318REF $(Device/bcm63xx) + DEVICE_VENDOR := Broadcom + DEVICE_MODEL := BCM96318REF reference board IMAGES := - DEVICE_TITLE := Broadcom BCM96318REF reference board DEVICE_DTS := bcm96318ref CFE_BOARD_ID := 96318REF CFE_CHIP_ID := 6318 @@ -282,8 +307,9 @@ TARGET_DEVICES += BCM96318REF define Device/BCM96318REF_P300 $(Device/bcm63xx) + DEVICE_VENDOR := Broadcom + DEVICE_MODEL := BCM96318REF_P300 reference board IMAGES := - DEVICE_TITLE := Broadcom BCM96318REF_P300 reference board DEVICE_DTS := bcm96318ref_p300 CFE_BOARD_ID := 96318REF_P300 CFE_CHIP_ID := 6318 @@ -295,8 +321,9 @@ TARGET_DEVICES += BCM96318REF_P300 define Device/BCM963268BU_P300 $(Device/bcm63xx) + DEVICE_VENDOR := Broadcom + DEVICE_MODEL := BCM963268BU_P300 reference board IMAGES := - DEVICE_TITLE := Broadcom BCM963268BU_P300 reference board DEVICE_DTS := bcm963268bu_p300 CFE_BOARD_ID := 963268BU_P300 CFE_CHIP_ID := 63268 @@ -308,8 +335,9 @@ TARGET_DEVICES += BCM963268BU_P300 define Device/BCM963269BHR $(Device/bcm63xx) + DEVICE_VENDOR := Broadcom + DEVICE_MODEL := BCM963269BHR reference board IMAGES := - DEVICE_TITLE := Broadcom BCM963269BHR reference board DEVICE_DTS := bcm963269bhr CFE_BOARD_ID := 963269BHR CFE_CHIP_ID := 63268 @@ -322,7 +350,9 @@ TARGET_DEVICES += BCM963269BHR ### BT ### define Device/HomeHub2A $(Device/bcm63xx) - DEVICE_TITLE := BT Home Hub 2.0 A + DEVICE_VENDOR := BT + DEVICE_MODEL := Home Hub 2.0 + DEVICE_VARIANT := A DEVICE_DTS := homehub2a CFE_BOARD_ID := HOMEHUB2A CFE_CHIP_ID := 6358 @@ -334,33 +364,38 @@ TARGET_DEVICES += HomeHub2A define Device/BTV2110 $(Device/bcm63xx) - DEVICE_TITLE := BT Voyager V2110 + DEVICE_VENDOR := BT + DEVICE_MODEL := Voyager V2110 DEVICE_DTS := v2110 CFE_BOARD_ID := V2110 CFE_CHIP_ID := 6348 CFE_EXTRAS += --layoutver 5 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += BTV2110 define Device/BTV2500V $(Device/bcm63xx) - DEVICE_TITLE := BT Voyager V2500V + DEVICE_VENDOR := BT + DEVICE_MODEL := Voyager V2500V DEVICE_DTS := v2500v-bb CFE_BOARD_ID := V2500V_BB CFE_CHIP_ID := 6348 CFE_EXTRAS += --layoutver 5 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += BTV2500V ### Comtrend ### define Device/AR5315u $(Device/bcm63xx) + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := AR-5315u IMAGES += sysupgrade.bin - DEVICE_TITLE := Comtrend AR-5315u DEVICE_DTS := ar-5315u CFE_BOARD_ID := 96318A-1441N1 CFE_CHIP_ID := 6318 @@ -372,8 +407,9 @@ TARGET_DEVICES += AR5315u define Device/AR5381u $(Device/bcm63xx) + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := AR-5381u IMAGES += sysupgrade.bin - DEVICE_TITLE := Comtrend AR-5381u DEVICE_DTS := ar-5381u CFE_BOARD_ID := 96328A-1241N CFE_CHIP_ID := 6328 @@ -385,8 +421,9 @@ TARGET_DEVICES += AR5381u define Device/AR5387un $(Device/bcm63xx) + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := AR-5387un IMAGES += sysupgrade.bin - DEVICE_TITLE := Comtrend AR-5387un DEVICE_DTS := ar-5387un CFE_BOARD_ID := 96328A-1441N1 CFE_CHIP_ID := 6328 @@ -398,29 +435,36 @@ TARGET_DEVICES += AR5387un define Device/CT-536_CT-5621 $(Device/bcm63xx) - DEVICE_TITLE := Comtrend CT-536+/CT-5621 + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := CT-536+ + DEVICE_ALT0_VENDOR := Comtrend + DEVICE_ALT0_MODEL := CT-5621 DEVICE_DTS := ct536plus CFE_BOARD_ID := 96348GW-11 CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += CT-536_CT-5621 define Device/CT-5365 $(Device/bcm63xx) - DEVICE_TITLE := Comtrend CT-5365 + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := CT-5365 DEVICE_DTS := ct-5365 CFE_BOARD_ID := 96348A-122 CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += CT-5365 define Device/CT-6373 $(Device/bcm63xx) - DEVICE_TITLE := Comtrend CT-6373 + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := CT-6373 DEVICE_DTS := ct-6373 CFE_BOARD_ID := CT6373-1 CFE_CHIP_ID := 6358 @@ -431,8 +475,9 @@ TARGET_DEVICES += CT-6373 define Device/VR-3025u $(Device/bcm63xx) + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := VR-3025u IMAGES += sysupgrade.bin - DEVICE_TITLE := Comtrend VR-3025u DEVICE_DTS := vr-3025u CFE_BOARD_ID := 96368M-1541N CFE_CHIP_ID := 6368 @@ -445,7 +490,8 @@ TARGET_DEVICES += VR-3025u define Device/VR-3025un $(Device/bcm63xx) - DEVICE_TITLE := Comtrend VR-3025un + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := VR-3025un DEVICE_DTS := vr-3025un CFE_BOARD_ID := 96368M-1341N CFE_CHIP_ID := 6368 @@ -457,7 +503,8 @@ TARGET_DEVICES += VR-3025un define Device/VR-3026e $(Device/bcm63xx) - DEVICE_TITLE := Comtrend VR-3026e + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := VR-3026e DEVICE_DTS := vr-3026e CFE_BOARD_ID := 96368MT-1341N1 CFE_CHIP_ID := 6368 @@ -469,7 +516,8 @@ TARGET_DEVICES += VR-3026e define Device/WAP-5813n $(Device/bcm63xx) - DEVICE_TITLE := Comtrend WAP-5813n + DEVICE_VENDOR := Comtrend + DEVICE_MODEL := WAP-5813n DEVICE_DTS := wap-5813n CFE_BOARD_ID := 96369R-1231N CFE_CHIP_ID := 6368 @@ -482,29 +530,38 @@ TARGET_DEVICES += WAP-5813n ### D-Link ### define Device/DSL2640B-B $(Device/bcm63xx) - DEVICE_TITLE := D-Link DSL-2640B rev B2 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DSL-2640B + DEVICE_VARIANT := B2 DEVICE_DTS := dsl-2640b-b CFE_BOARD_ID := D-4P-W CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += DSL2640B-B define Device/DSL2640U $(Device/bcm63xx) - DEVICE_TITLE := D-Link DSL-2640U/BRU/C + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DSL-2640U + DEVICE_VARIANT := C1 + DEVICE_ALT0_VENDOR := D-Link + DEVICE_ALT0_MODEL := DSL-2640U/BRU/C DEVICE_DTS := dsl-2640u CFE_BOARD_ID := 96338W2_E7T CFE_CHIP_ID := 6338 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += DSL2640U define Device/DSL2650U $(Device/bcm63xx) - DEVICE_TITLE := D-Link DSL-2650U + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DSL-2650U DEVICE_DTS := dsl-2650u CFE_BOARD_ID := 96358VW2 CFE_CHIP_ID := 6358 @@ -515,7 +572,12 @@ TARGET_DEVICES += DSL2650U define Device/DSL274XB-C2 $(Device/bcm63xx) - DEVICE_TITLE := D-Link DSL-2740B/DSL-2741B rev C2 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DSL-2740B + DEVICE_VARIANT := C2 + DEVICE_ALT0_VENDOR := D-Link + DEVICE_ALT0_MODEL := DSL-2741B + DEVICE_ALT0_VARIANT := C2 DEVICE_DTS := dsl-274xb-c CFE_BOARD_ID := 96358GW CFE_CHIP_ID := 6358 @@ -526,7 +588,12 @@ TARGET_DEVICES += DSL274XB-C2 define Device/DSL274XB-C3 $(Device/bcm63xx) - DEVICE_TITLE := D-Link DSL-2740B/DSL-2741B rev C3 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DSL-2740B + DEVICE_VARIANT := C3 + DEVICE_ALT0_VENDOR := D-Link + DEVICE_ALT0_MODEL := DSL-2741B + DEVICE_ALT0_VARIANT := C3 DEVICE_DTS := dsl-274xb-c CFE_BOARD_ID := AW4139 CFE_CHIP_ID := 6358 @@ -537,7 +604,12 @@ TARGET_DEVICES += DSL274XB-C3 define Device/DSL274XB-F1 $(Device/bcm63xx) - DEVICE_TITLE := D-Link DSL-2740B/DSL-2741B rev F1 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DSL-2740B + DEVICE_VARIANT := F1 + DEVICE_ALT0_VENDOR := D-Link + DEVICE_ALT0_MODEL := DSL-2741B + DEVICE_ALT0_VARIANT := F1 DEVICE_DTS := dsl-274xb-f CFE_BOARD_ID := AW4339U CFE_CHIP_ID := 6328 @@ -551,7 +623,12 @@ TARGET_DEVICES += DSL274XB-F1 define Device/DSL275XB-D1 $(Device/bcm63xx) - DEVICE_TITLE := D-Link DSL-2750B/DSL-2751 rev D1 + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DSL-2750B + DEVICE_VARIANT := D1 + DEVICE_ALT0_VENDOR := D-Link + DEVICE_ALT0_MODEL := DSL-2751 + DEVICE_ALT0_VARIANT := D1 DEVICE_DTS := dsl-275xb-d CFE_BOARD_ID := AW5200B CFE_CHIP_ID := 6318 @@ -563,7 +640,8 @@ TARGET_DEVICES += DSL275XB-D1 define Device/DVAG3810BN $(Device/bcm63xx) - DEVICE_TITLE := D-Link DVA-G3810BN/TL + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DVA-G3810BN/TL DEVICE_DTS := dva-g3810bn_tl CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 @@ -575,69 +653,82 @@ TARGET_DEVICES += DVAG3810BN ### Davolink ### define Device/DV-201AMR $(Device/bcm63xx) + DEVICE_VENDOR := Davolink + DEVICE_MODEL := DV-201AMR IMAGES := cfe-old.bin - DEVICE_TITLE := Davolink DV-201AMR DEVICE_DTS := dv-201amr CFE_BOARD_ID := DV201AMR CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += DV-201AMR ### Dynalink ### define Device/RTA770BW $(Device/bcm63xx) + DEVICE_VENDOR := Dynalink + DEVICE_MODEL := RTA770BW + DEVICE_ALT0_VENDOR := Siemens + DEVICE_ALT0_MODEL := SE515 IMAGES = - DEVICE_TITLE := Dynalink RTA770BW (Siemens SE 515) DEVICE_DTS := rta770bw CFE_BOARD_ID := RTA770BW CFE_CHIP_ID := 6345 CFE_EXTRAS += --layoutver 5 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += RTA770BW define Device/RTA770W $(Device/bcm63xx) + DEVICE_VENDOR := Dynalink + DEVICE_MODEL := RTA770W IMAGES = - DEVICE_TITLE := Dynalink RTA770W DEVICE_DTS := rta770w CFE_BOARD_ID := RTA770W CFE_CHIP_ID := 6345 CFE_EXTRAS += --layoutver 5 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += RTA770W define Device/RTA1025W_16 $(Device/bcm63xx) - DEVICE_TITLE := Dynalink RTA1025W + DEVICE_VENDOR := Dynalink + DEVICE_MODEL := RTA1025W DEVICE_DTS := rta1025w CFE_BOARD_ID := RTA1025W_16 CFE_CHIP_ID := 6348 CFE_EXTRAS += --layoutver 5 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += RTA1025W_16 define Device/RTA1320_16M $(Device/bcm63xx) - DEVICE_TITLE := Dynalink RTA1320 + DEVICE_VENDOR := Dynalink + DEVICE_MODEL := RTA1320 DEVICE_DTS := rta1320 CFE_BOARD_ID := RTA1320_16M CFE_CHIP_ID := 6338 CFE_EXTRAS += --layoutver 5 + DEFAULT := n endef TARGET_DEVICES += RTA1320_16M ### Huawei ### define Device/HG520v $(Device/bcm63xx) - DEVICE_TITLE := Huawei EchoLife HG520v + DEVICE_VENDOR := Huawei + DEVICE_MODEL := EchoLife HG520v DEVICE_DTS := hg520v CFE_BOARD_ID := HW6358GW_B CFE_CHIP_ID := 6358 @@ -649,7 +740,8 @@ TARGET_DEVICES += HG520v define Device/HG553 $(Device/bcm63xx) - DEVICE_TITLE := Huawei EchoLife HG553 + DEVICE_VENDOR := Huawei + DEVICE_MODEL := EchoLife HG553 DEVICE_DTS := hg553 CFE_BOARD_ID := HW553 CFE_CHIP_ID := 6358 @@ -662,7 +754,9 @@ TARGET_DEVICES += HG553 define Device/HG556a-A $(Device/bcm63xx) - DEVICE_TITLE := Huawei EchoLife HG556a rev A + DEVICE_VENDOR := Huawei + DEVICE_MODEL := EchoLife HG556a + DEVICE_VARIANT := A DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version A (Atheros) DEVICE_DTS := hg556a-a CFE_BOARD_ID := HW556 @@ -676,7 +770,9 @@ TARGET_DEVICES += HG556a-A define Device/HG556a-B $(Device/bcm63xx) - DEVICE_TITLE := Huawei EchoLife HG556a rev B + DEVICE_VENDOR := Huawei + DEVICE_MODEL := EchoLife HG556a + DEVICE_VARIANT := B DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version B (Atheros) DEVICE_DTS := hg556a-b CFE_BOARD_ID := HW556 @@ -690,7 +786,9 @@ TARGET_DEVICES += HG556a-B define Device/HG556a-C $(Device/bcm63xx) - DEVICE_TITLE := Huawei EchoLife HG556a rev C + DEVICE_VENDOR := Huawei + DEVICE_MODEL := EchoLife HG556a + DEVICE_VARIANT := C DEVICE_DESCRIPTION = Build firmware images for Huawei HG556a version C (Ralink) DEVICE_DTS := hg556a-c CFE_BOARD_ID := HW556 @@ -704,8 +802,9 @@ TARGET_DEVICES += HG556a-C define Device/HG622 $(Device/bcm63xx) + DEVICE_VENDOR := Huawei + DEVICE_MODEL := EchoLife HG622 IMAGES += sysupgrade.bin - DEVICE_TITLE := Huawei EchoLife HG622 DEVICE_DTS := hg622 CFE_BOARD_ID := 96368MVWG_hg622 CFE_CHIP_ID := 6368 @@ -719,7 +818,8 @@ TARGET_DEVICES += HG622 define Device/HG655b $(Device/bcm63xx) - DEVICE_TITLE := Huawei EchoLife HG655b + DEVICE_VENDOR := Huawei + DEVICE_MODEL := EchoLife HG655b DEVICE_DTS := hg655b CFE_BOARD_ID := HW65x CFE_CHIP_ID := 6368 @@ -734,8 +834,9 @@ TARGET_DEVICES += HG655b ### Inteno ### define Device/VG50 $(Device/bcm63xx) + DEVICE_VENDOR := Inteno + DEVICE_MODEL := VG50 Multi-WAN CPE IMAGES := - DEVICE_TITLE := Inteno VG50 Multi-WAN CPE DEVICE_DTS := vg50 CFE_BOARD_ID := VW6339GU CFE_CHIP_ID := 63268 @@ -747,17 +848,20 @@ TARGET_DEVICES += VG50 ### Inventel ### define Device/livebox $(Device/bcm63xx_redboot) - DEVICE_TITLE := Inventel Livebox 1 + DEVICE_VENDOR := Inventel + DEVICE_MODEL := Livebox 1 DEVICE_DTS := livebox-blue-5g DEVICE_PACKAGES := \ $(B43_PACKAGES) $(USB1_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += livebox ### Netgear ### define Device/CVG834G $(Device/bcm33xx) - DEVICE_TITLE := Netgear CVG834G + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := CVG834G DEVICE_DTS := cvg834g HCS_MAGIC_BYTES := 0xa020 HCS_REV_MIN := 0001 @@ -767,31 +871,38 @@ TARGET_DEVICES += CVG834G define Device/DG834GT_PN $(Device/bcm63xx) - DEVICE_TITLE := Netgear DG834GT/PN + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DG834GT + DEVICE_ALT0_VENDOR := NETGEAR + DEVICE_ALT0_MODEL := DG834PN DEVICE_DTS := dg834gtpn CFE_BOARD_ID := 96348GW-10 CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(ATH5K_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += DG834GT_PN define Device/DG834GTv4 $(Device/bcm63xx) + DEVICE_VENDOR := NETGEAR + DEVICE_MODEL := DG834G + DEVICE_VARIANT := v4 IMAGES := - DEVICE_TITLE := Netgear DG834G v4 DEVICE_DTS := dg834g_v4 CFE_BOARD_ID := 96348W3 CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += DG834GTv4 define Device/DGND3700v1 $(Device/bcm63xx_netgear) - IMAGES := factory.chk sysupgrade.bin - DEVICE_TITLE := Netgear DGND3700 v1 + DEVICE_MODEL := DGND3700 + DEVICE_VARIANT := v1 DEVICE_DTS := dgnd3700v1 CFE_BOARD_ID := 96368MVWG CFE_CHIP_ID := 6368 @@ -805,8 +916,7 @@ TARGET_DEVICES += DGND3700v1 define Device/DGND3800B $(Device/bcm63xx_netgear) - IMAGES := factory.chk sysupgrade.bin - DEVICE_TITLE := Netgear DGND3800B + DEVICE_MODEL := DGND3800B DEVICE_DTS := dgnd3700v1 CFE_BOARD_ID := 96368MVWG CFE_CHIP_ID := 6368 @@ -820,8 +930,7 @@ TARGET_DEVICES += DGND3800B define Device/EVG2000 $(Device/bcm63xx_netgear) - IMAGES := factory.chk sysupgrade.bin - DEVICE_TITLE := Netgear EVG2000 + DEVICE_MODEL := EVG2000 DEVICE_DTS := evg2000 CFE_BOARD_ID := 96369PVG CFE_CHIP_ID := 6368 @@ -836,8 +945,10 @@ TARGET_DEVICES += EVG2000 ### NuCom ### define Device/R5010UNv2 $(Device/bcm63xx) + DEVICE_VENDOR := NuCom + DEVICE_MODEL := R5010UN + DEVICE_VARIANT := v2 IMAGES += sysupgrade.bin - DEVICE_TITLE := NuCom R5010UN v2 DEVICE_DTS := r5010unv2 CFE_BOARD_ID := 96328ang CFE_CHIP_ID := 6328 @@ -850,8 +961,9 @@ TARGET_DEVICES += R5010UNv2 ### Observa ### define Device/VH4032N $(Device/bcm63xx) + DEVICE_VENDOR := Observa + DEVICE_MODEL := VH4032N IMAGES += sysupgrade.bin - DEVICE_TITLE := Observa VH4032N DEVICE_DTS := vh4032n CFE_BOARD_ID := 96368VVW CFE_CHIP_ID := 6368 @@ -865,7 +977,8 @@ TARGET_DEVICES += VH4032N ### Pirelli ### define Device/A226G $(Device/bcm63xx) - DEVICE_TITLE := Pirelli A226G + DEVICE_VENDOR := Pirelli + DEVICE_MODEL := A226G DEVICE_DTS := a226g CFE_BOARD_ID := DWV-S0 CFE_CHIP_ID := 6358 @@ -877,7 +990,8 @@ TARGET_DEVICES += A226G define Device/A226M $(Device/bcm63xx) - DEVICE_TITLE := Pirelli A226M + DEVICE_VENDOR := Pirelli + DEVICE_MODEL := A226M DEVICE_DTS := a226m CFE_BOARD_ID := DWV-S0 CFE_CHIP_ID := 6358 @@ -889,7 +1003,8 @@ TARGET_DEVICES += A226M define Device/A226M-FWB $(Device/bcm63xx) - DEVICE_TITLE := Pirelli A226M-FWB + DEVICE_VENDOR := Pirelli + DEVICE_MODEL := A226M-FWB DEVICE_DTS := a226m-fwb CFE_BOARD_ID := DWV-S0 CFE_CHIP_ID := 6358 @@ -902,7 +1017,8 @@ TARGET_DEVICES += A226M-FWB define Device/AGPF-S0 $(Device/bcm63xx) - DEVICE_TITLE := Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0 + DEVICE_VENDOR := Pirelli + DEVICE_MODEL := Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0 DEVICE_DTS := agpf-s0 CFE_BOARD_ID := AGPF-S0 CFE_CHIP_ID := 6358 @@ -916,18 +1032,21 @@ TARGET_DEVICES += AGPF-S0 ### Sagem ### define Device/FAST2404 $(Device/bcm63xx) - DEVICE_TITLE := Sagem F@ST2404 + DEVICE_VENDOR := Sagemcom + DEVICE_MODEL := F@st 2404 DEVICE_DTS := fast2404 CFE_BOARD_ID := F@ST2404 CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += FAST2404 define Device/FAST2504n $(Device/bcm63xx) - DEVICE_TITLE := Sagem F@ST2504n + DEVICE_VENDOR := Sagemcom + DEVICE_MODEL := F@st 2504N DEVICE_DTS := fast2504n CFE_BOARD_ID := F@ST2504n CFE_CHIP_ID := 6362 @@ -938,18 +1057,21 @@ TARGET_DEVICES += FAST2504n define Device/FAST2604 $(Device/bcm63xx) - DEVICE_TITLE := Sagem F@ST2604 + DEVICE_VENDOR := Sagemcom + DEVICE_MODEL := F@st 2604 DEVICE_DTS := fast2604 CFE_BOARD_ID := F@ST2604 CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += FAST2604 define Device/FAST2704N $(Device/bcm63xx) - DEVICE_TITLE := Sagem F@ST2704N + DEVICE_VENDOR := Sagemcom + DEVICE_MODEL := F@st 2704N DEVICE_DTS := fast2704n CFE_BOARD_ID := F@ST2704N CFE_CHIP_ID := 6318 @@ -961,7 +1083,8 @@ TARGET_DEVICES += FAST2704N define Device/FAST2704V2 $(Device/bcm63xx) - DEVICE_TITLE := Sagem F@ST2704V2 + DEVICE_VENDOR := Sagemcom + DEVICE_MODEL := F@st 2704 V2 DEVICE_DTS := fast2704v2 CFE_BOARD_ID := F@ST2704V2 CFE_CHIP_ID := 6328 @@ -974,7 +1097,9 @@ TARGET_DEVICES += FAST2704V2 ### Sercomm ### define Device/AD1018-SPI_flash $(Device/bcm63xx) - DEVICE_TITLE := Sercomm AD1018 (SPI flash mod) + DEVICE_VENDOR := Sercomm + DEVICE_MODEL := AD1018 + DEVICE_VARIANT := SPI flash mod DEVICE_DTS := ad1018-nor CFE_BOARD_ID := 96328avngr CFE_CHIP_ID := 6328 @@ -986,7 +1111,9 @@ TARGET_DEVICES += AD1018-SPI_flash ### SFR ### define Device/NEUFBOX4-SER $(Device/bcm63xx) - DEVICE_TITLE := SFR Neufbox4 (Sercomm) + DEVICE_VENDOR := SFR + DEVICE_MODEL := Neufbox4 + DEVICE_VARIANT := Sercomm DEVICE_DTS := nb4-ser-r0 CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 @@ -998,7 +1125,9 @@ TARGET_DEVICES += NEUFBOX4-SER define Device/NEUFBOX4-FXC $(Device/bcm63xx) - DEVICE_TITLE := SFR Neufbox4 (Foxconn) + DEVICE_VENDOR := SFR + DEVICE_MODEL := Neufbox4 + DEVICE_VARIANT := Foxconn DEVICE_DTS := nb4-fxc-r1 CFE_BOARD_ID := 96358VW CFE_CHIP_ID := 6358 @@ -1010,7 +1139,8 @@ TARGET_DEVICES += NEUFBOX4-FXC define Device/NEUFBOX6 $(Device/bcm63xx) - DEVICE_TITLE := SFR Neufbox6 + DEVICE_VENDOR := SFR + DEVICE_MODEL := Neufbox6 DEVICE_DTS := nb6-ser-r0 CFE_BOARD_ID := NB6-SER-r0 CFE_CHIP_ID := 6362 @@ -1022,7 +1152,8 @@ TARGET_DEVICES += NEUFBOX6 define Device/SR102 $(Device/bcm63xx) - DEVICE_TITLE := SKY-SR102 + DEVICE_VENDOR := SKY + DEVICE_MODEL := SR102 DEVICE_DTS := sr102 CFE_BOARD_ID := BSKYB_63168 CFE_CHIP_ID := 63268 @@ -1035,10 +1166,11 @@ TARGET_DEVICES += SR102 ### T-Com ### define Device/SPW303V $(Device/bcm63xx) + DEVICE_VENDOR := T-Com + DEVICE_MODEL := Speedport W 303V IMAGES := factory.bin sysupgrade.bin IMAGE/factory.bin := cfe-spw303v-bin --pad 4 | spw303v-bin | xor-image IMAGE/sysupgrade.bin := cfe-spw303v-bin | spw303v-bin - DEVICE_TITLE := T-Com Speedport W 303V DEVICE_DTS := spw303v CFE_BOARD_ID := 96358-502V CFE_CHIP_ID := 6358 @@ -1049,19 +1181,22 @@ TARGET_DEVICES += SPW303V define Device/SPW500V $(Device/bcm63xx) - DEVICE_TITLE := T-Com Speedport W 500V + DEVICE_VENDOR := T-Com + DEVICE_MODEL := Speedport W 500V DEVICE_DTS := spw500v CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += SPW500V ### Tecom ### define Device/GW6000 $(Device/bcm63xx) - DEVICE_TITLE := Tecom GW6000 + DEVICE_VENDOR := Tecom + DEVICE_MODEL := GW6000 DEVICE_DTS := gw6000 CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 @@ -1072,7 +1207,8 @@ TARGET_DEVICES += GW6000 define Device/GW6200 $(Device/bcm63xx) - DEVICE_TITLE := Tecom GW6200 + DEVICE_VENDOR := Tecom + DEVICE_MODEL := GW6200 DEVICE_DTS := gw6200 CFE_BOARD_ID := 96348GW CFE_CHIP_ID := 6348 @@ -1085,19 +1221,22 @@ TARGET_DEVICES += GW6200 ### Telsey ### define Device/CPVA502PLUS $(Device/bcm63xx) - DEVICE_TITLE := Telsey CPVA502+ + DEVICE_VENDOR := Telsey + DEVICE_MODEL := CPVA502+ DEVICE_DTS := cpva502plus CFE_BOARD_ID := CPVA502+ CFE_CHIP_ID := 6348 CFE_EXTRAS += --signature "Telsey Tlc" --signature2 "99.99.999" DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += CPVA502PLUS define Device/CPA-ZNTE60T $(Device/bcm63xx) - DEVICE_TITLE := Telsey CPVA642-type (CPA-ZNTE60T) + DEVICE_VENDOR := Telsey + DEVICE_MODEL := CPVA642-type (CPA-ZNTE60T) DEVICE_DTS := cpva642 CFE_BOARD_ID := CPVA642 CFE_CHIP_ID := 6358 @@ -1110,20 +1249,25 @@ TARGET_DEVICES += CPA-ZNTE60T define Device/MAGIC $(Device/bcm63xx) + DEVICE_VENDOR := Alice + DEVICE_MODEL := W-Gate + DEVICE_ALT0_VENDOR := Telsey + DEVICE_ALT0_MODEL := MAGIC IMAGES := - DEVICE_TITLE := Telsey MAGIC (Alice W-Gate) DEVICE_DTS := magic CFE_BOARD_ID := MAGIC CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(RT63_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += MAGIC ### TP-Link ### define Device/TD-W8900GB $(Device/bcm63xx) - DEVICE_TITLE := TP-Link TD-W8900GB + DEVICE_VENDOR := TP-Link + DEVICE_MODEL := TD-W8900GB DEVICE_DTS := td-w8900gb CFE_BOARD_ID := 96348GW-11 CFE_CHIP_ID := 6348 @@ -1131,27 +1275,32 @@ define Device/TD-W8900GB IMAGE_OFFSET := 0x20000 DEVICE_PACKAGES := \ $(B43_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += TD-W8900GB ### USRobotics ### define Device/USR9108 $(Device/bcm63xx) - DEVICE_TITLE := USRobotics 9108 + DEVICE_VENDOR := USRobotics + DEVICE_MODEL := 9108 DEVICE_DTS := usr9108 CFE_BOARD_ID := 96348GW-A CFE_CHIP_ID := 6348 DEVICE_PACKAGES := \ $(B43_PACKAGES) $(USB1_PACKAGES) + DEFAULT := n endef TARGET_DEVICES += USR9108 ### ZyXEL ### define Device/P870HW-51a_v2 $(Device/bcm63xx) + DEVICE_VENDOR := ZyXEL + DEVICE_MODEL := P870HW-51a + DEVICE_VARIANT := v2 IMAGES := factory.bin IMAGE/factory.bin := cfe-bin | zyxel-bin - DEVICE_TITLE := ZyXEL P870HW-51a v2 DEVICE_DTS := p870hw-51a-v2 CFE_BOARD_ID := 96368VVW CFE_CHIP_ID := 6368 diff --git a/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index 5fb6e3e9e..31d2a1794 100644 --- a/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -77,7 +77,7 @@ Signed-off-by: Jonas Gorski - of_node_put(chip->of_node); - gpiochip_remove_pin_ranges(chip); + if (!chip->request) { -+ status = of_gpiochip_scan_gpios(chip); ++ status = of_gpiochip_scan_gpios(chip, 0, chip->ngpio); + if (status) { + of_node_put(chip->of_node); + gpiochip_remove_pin_ranges(chip); diff --git a/target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch index 15194a0ea..53d7890a4 100644 --- a/target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch +++ b/target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -937,6 +937,35 @@ static struct board_info __initdata boar +@@ -937,6 +937,33 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, }; @@ -15,10 +15,8 @@ + .has_pci = 1, + + .enet0 = { -+ .has_phy = 0, ++ .has_phy = 1, + .use_internal_phy = 1, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, + }, + + .enet1 = { @@ -36,7 +34,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1085,6 +1114,7 @@ static const struct board_info __initcon +@@ -1085,6 +1112,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, @@ -44,7 +42,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1144,6 +1174,7 @@ static struct of_device_id const bcm963x +@@ -1144,6 +1172,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-4.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-4.14/528-board_nb6.patch index a51e5e3ee..349478d4f 100644 --- a/target/linux/brcm63xx/patches-4.14/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-4.14/528-board_nb6.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -968,6 +968,32 @@ static struct board_info __initdata boar +@@ -966,6 +966,32 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -33,7 +33,7 @@ /* * known 6368 boards */ -@@ -1117,6 +1143,10 @@ static const struct board_info __initcon +@@ -1115,6 +1141,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -44,7 +44,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -1185,6 +1215,9 @@ static struct of_device_id const bcm963x +@@ -1183,6 +1213,9 @@ static struct of_device_id const bcm963x { .compatible = "t-com,spw303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch b/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch index 098b69dc7..b4b7352a0 100644 --- a/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch +++ b/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch @@ -23,7 +23,7 @@ static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -1114,6 +1130,7 @@ static const struct board_info __initcon +@@ -1112,6 +1128,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, @@ -31,7 +31,7 @@ &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, -@@ -1189,6 +1206,7 @@ static struct of_device_id const bcm963x +@@ -1187,6 +1204,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, diff --git a/target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch index a7ac6f826..8e83bc2e9 100644 --- a/target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch +++ b/target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -1111,6 +1154,7 @@ static const struct board_info __initcon +@@ -1109,6 +1152,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -58,7 +58,7 @@ &board_dsl_274xb_f1, #endif #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1176,6 +1220,7 @@ static struct of_device_id const bcm963x +@@ -1174,6 +1218,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch index 32a264cb1..b9e50ce38 100644 --- a/target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch +++ b/target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch @@ -79,7 +79,7 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -1153,6 +1225,7 @@ static const struct board_info __initcon +@@ -1151,6 +1223,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -87,7 +87,7 @@ &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, -@@ -1223,6 +1296,7 @@ static struct of_device_id const bcm963x +@@ -1221,6 +1294,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch index 5596a6730..679a40821 100644 --- a/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch +++ b/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch @@ -61,7 +61,7 @@ static struct sprom_fixup __initdata ar5387un_fixups[] = { { .offset = 2, .value = 0x05bb }, { .offset = 65, .value = 0x1204 }, -@@ -1225,6 +1279,7 @@ static const struct board_info __initcon +@@ -1223,6 +1277,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -69,7 +69,7 @@ &board_AR5387un, &board_963281TAN, &board_A4001N1, -@@ -1296,6 +1351,7 @@ static struct of_device_id const bcm963x +@@ -1294,6 +1349,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch index 4cf7d6138..d56df5562 100644 --- a/target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch +++ b/target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch @@ -21,7 +21,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1293,6 +1307,7 @@ static const struct board_info __initcon +@@ -1291,6 +1305,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, @@ -29,7 +29,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1363,6 +1378,7 @@ static struct of_device_id const bcm963x +@@ -1361,6 +1376,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, diff --git a/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch b/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch index 718b287ee..731860983 100644 --- a/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch +++ b/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch @@ -101,7 +101,7 @@ /* T-Home Speedport W 303V Typ B */ static struct board_info __initdata board_spw303v = { .name = "96358-502V", -@@ -1343,6 +1430,9 @@ static const struct board_info __initcon +@@ -1341,6 +1428,9 @@ static const struct board_info __initcon &board_nb4_fxc_r1, &board_ct6373_1, &board_HW553, @@ -111,7 +111,7 @@ &board_spw303v, &board_DVAG3810BN, #endif -@@ -1415,6 +1505,9 @@ static struct of_device_id const bcm963x +@@ -1413,6 +1503,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, { .compatible = "huawei,hg553", .data = &board_HW553, }, diff --git a/target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch b/target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch index 0e64c5d3a..c78e59efd 100644 --- a/target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch +++ b/target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch @@ -26,7 +26,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1395,6 +1414,7 @@ static const struct board_info __initcon +@@ -1393,6 +1412,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, @@ -34,7 +34,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1469,6 +1489,7 @@ static struct of_device_id const bcm963x +@@ -1467,6 +1487,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, diff --git a/target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch b/target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch index 021239309..9eb2d3e44 100644 --- a/target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch @@ -56,7 +56,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1404,6 +1441,7 @@ static const struct board_info __initcon +@@ -1402,6 +1439,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, @@ -64,7 +64,7 @@ Signed-off-by: Marcin Jurkowski #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1479,6 +1517,7 @@ static struct of_device_id const bcm963x +@@ -1477,6 +1515,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch index bb5698ba3..8059184c7 100644 --- a/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch +++ b/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch @@ -6,7 +6,7 @@ Signed-off-by: Max Staudt --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1334,6 +1334,41 @@ static struct board_info __initdata boar +@@ -1332,6 +1332,41 @@ static struct board_info __initdata boar }, }, }; @@ -48,7 +48,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1497,6 +1532,7 @@ static const struct board_info __initcon +@@ -1495,6 +1530,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -56,7 +56,7 @@ Signed-off-by: Max Staudt #endif #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1578,6 +1614,7 @@ static struct of_device_id const bcm963x +@@ -1576,6 +1612,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch b/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch index 8223d5c8f..3c929793b 100644 --- a/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch +++ b/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch @@ -56,7 +56,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1469,6 +1518,9 @@ static const struct board_info __initcon +@@ -1467,6 +1516,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif @@ -66,7 +66,7 @@ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_AR5381u, -@@ -1546,6 +1598,9 @@ static struct of_device_id const bcm963x +@@ -1544,6 +1596,9 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_3368 { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif diff --git a/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch index 222e21651..bfce6f8df 100644 --- a/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch +++ b/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1520,6 +1564,7 @@ static const struct board_info __initcon +@@ -1518,6 +1562,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, @@ -59,7 +59,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1600,6 +1645,7 @@ static struct of_device_id const bcm963x +@@ -1598,6 +1643,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, diff --git a/target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch index dd3c4b485..d5af2f0d1 100644 --- a/target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch +++ b/target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1556,6 +1556,50 @@ static struct board_info __initdata boar +@@ -1554,6 +1554,50 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -51,7 +51,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1636,6 +1680,9 @@ static const struct board_info __initcon +@@ -1634,6 +1678,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, #endif @@ -61,7 +61,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1723,6 +1770,7 @@ static struct of_device_id const bcm963x +@@ -1721,6 +1768,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch index 53cbddd80..60256391d 100644 --- a/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch +++ b/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch @@ -30,7 +30,7 @@ Signed-off-by: Adrian Feliks /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { -@@ -1651,6 +1666,7 @@ static const struct board_info __initcon +@@ -1649,6 +1664,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, @@ -38,7 +38,7 @@ Signed-off-by: Adrian Feliks #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1715,6 +1731,7 @@ static struct of_device_id const bcm963x +@@ -1713,6 +1729,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch index 329b62440..355bdb276 100644 --- a/target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch +++ b/target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1612,6 +1612,51 @@ static struct board_info __initdata boar +@@ -1610,6 +1610,51 @@ static struct board_info __initdata boar }, }, }; @@ -52,7 +52,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1698,6 +1743,7 @@ static const struct board_info __initcon +@@ -1696,6 +1741,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, @@ -60,7 +60,7 @@ #endif }; -@@ -1788,6 +1834,7 @@ static struct of_device_id const bcm963x +@@ -1786,6 +1832,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch index aa7ed4979..26c236898 100644 --- a/target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch +++ b/target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1574,6 +1574,64 @@ static struct board_info __initdata boar +@@ -1572,6 +1572,64 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -65,7 +65,7 @@ static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -1742,6 +1800,7 @@ static const struct board_info __initcon +@@ -1740,6 +1798,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif #ifdef CONFIG_BCM63XX_CPU_63268 @@ -73,7 +73,7 @@ &board_963269bhr, &board_vw6339gu, #endif -@@ -1833,6 +1892,7 @@ static struct of_device_id const bcm963x +@@ -1831,6 +1890,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch index 33b89992a..abd511437 100644 --- a/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch +++ b/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch @@ -9,7 +9,7 @@ #include #include #include -@@ -1568,6 +1570,47 @@ static struct board_info __initdata boar +@@ -1566,6 +1568,47 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, }; @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1798,6 +1841,7 @@ static const struct board_info __initcon +@@ -1796,6 +1839,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -65,7 +65,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -1890,6 +1934,7 @@ static struct of_device_id const bcm963x +@@ -1888,6 +1932,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/brcm63xx/patches-4.14/562-board_VR-3025u.patch b/target/linux/brcm63xx/patches-4.14/562-board_VR-3025u.patch index 096620ead..36014ea49 100644 --- a/target/linux/brcm63xx/patches-4.14/562-board_VR-3025u.patch +++ b/target/linux/brcm63xx/patches-4.14/562-board_VR-3025u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1571,6 +1571,59 @@ static struct board_info __initdata boar +@@ -1569,6 +1569,59 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1841,6 +1894,7 @@ static const struct board_info __initcon +@@ -1839,6 +1892,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1934,6 +1988,7 @@ static struct of_device_id const bcm963x +@@ -1932,6 +1986,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/brcm63xx/patches-4.14/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-4.14/563-board_VR-3025un.patch index 812857561..a34b7a1f3 100644 --- a/target/linux/brcm63xx/patches-4.14/563-board_VR-3025un.patch +++ b/target/linux/brcm63xx/patches-4.14/563-board_VR-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1624,6 +1624,59 @@ static struct board_info __initdata boar +@@ -1622,6 +1622,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1895,6 +1948,7 @@ static const struct board_info __initcon +@@ -1893,6 +1946,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1989,6 +2043,7 @@ static struct of_device_id const bcm963x +@@ -1987,6 +2041,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, diff --git a/target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch index 5a08a3939..1e49ad457 100644 --- a/target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch +++ b/target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1580,6 +1580,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1578,6 +1578,48 @@ static struct sprom_fixup __initdata vr3 { .offset = 115, .value = 0xfad9 }, }; @@ -49,7 +49,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -1947,6 +1989,7 @@ static const struct board_info __initcon +@@ -1945,6 +1987,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -2045,6 +2088,7 @@ static struct of_device_id const bcm963x +@@ -2043,6 +2086,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch b/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch index 1210dfc68..53ea1232b 100644 --- a/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch +++ b/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch @@ -37,7 +37,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1973,6 +2003,7 @@ static const struct board_info __initcon +@@ -1971,6 +2001,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -45,7 +45,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2065,6 +2096,7 @@ static struct of_device_id const bcm963x +@@ -2063,6 +2094,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, diff --git a/target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch b/target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch index 83503cc24..75c0c5bcd 100644 --- a/target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch +++ b/target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -1954,6 +1997,7 @@ static const struct board_info __initcon +@@ -1952,6 +1995,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2042,6 +2086,7 @@ static struct of_device_id const bcm963x +@@ -2040,6 +2084,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch index 8a37dbef6..93e5c9fff 100644 --- a/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch +++ b/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch @@ -75,7 +75,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1991,6 +2059,7 @@ static const struct board_info __initcon +@@ -1989,6 +2057,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -83,7 +83,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2084,6 +2153,7 @@ static struct of_device_id const bcm963x +@@ -2082,6 +2151,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch b/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch index 5b5601ed3..aa40412e4 100644 --- a/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch +++ b/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1712,6 +1712,30 @@ static struct board_info __initdata boar +@@ -1710,6 +1710,30 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -31,7 +31,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2133,6 +2157,7 @@ static const struct board_info __initcon +@@ -2131,6 +2155,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -39,7 +39,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2235,6 +2260,7 @@ static struct of_device_id const bcm963x +@@ -2233,6 +2258,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch b/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch index 35d409831..d2b78780a 100644 --- a/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch +++ b/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch @@ -32,7 +32,7 @@ static struct board_info __initdata board_HW520 = { .name = "HW6358GW_B", .expected_cpu_id = 0x6358, -@@ -2140,6 +2165,7 @@ static const struct board_info __initcon +@@ -2138,6 +2163,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -40,7 +40,7 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2249,6 +2275,7 @@ static struct of_device_id const bcm963x +@@ -2247,6 +2273,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "t-com,spw303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, diff --git a/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch b/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch index 207546174..8523af685 100644 --- a/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch +++ b/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1761,6 +1761,52 @@ static struct board_info __initdata boar +@@ -1759,6 +1759,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2184,6 +2230,7 @@ static const struct board_info __initcon +@@ -2182,6 +2228,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2287,6 +2334,7 @@ static struct of_device_id const bcm963x +@@ -2285,6 +2332,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch b/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch index 6c399b013..62eb3f103 100644 --- a/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch +++ b/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2155,6 +2194,7 @@ static const struct board_info __initcon +@@ -2153,6 +2192,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, @@ -54,7 +54,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2252,6 +2292,7 @@ static struct of_device_id const bcm963x +@@ -2250,6 +2290,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, diff --git a/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch b/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch index f41700a1f..59e0389ba 100644 --- a/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch +++ b/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1994,6 +1994,59 @@ static struct board_info __initdata boar +@@ -1992,6 +1992,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2274,6 +2327,7 @@ static const struct board_info __initcon +@@ -2272,6 +2325,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2374,6 +2428,7 @@ static struct of_device_id const bcm963x +@@ -2372,6 +2426,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, diff --git a/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch b/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch index 93004db05..059e7c0cb 100644 --- a/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch +++ b/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2258,6 +2302,7 @@ static const struct board_info __initcon +@@ -2256,6 +2300,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, @@ -59,7 +59,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2356,6 +2401,7 @@ static struct of_device_id const bcm963x +@@ -2354,6 +2399,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch b/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch index 2bd09a0f5..3ec7a077e 100644 --- a/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch +++ b/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1890,6 +1890,52 @@ static struct board_info __initdata boar +@@ -1888,6 +1888,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2368,6 +2414,7 @@ static const struct board_info __initcon +@@ -2366,6 +2412,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_HG655b, &board_P870HW51A_V2, &board_VR3025u, -@@ -2476,6 +2523,7 @@ static struct of_device_id const bcm963x +@@ -2474,6 +2521,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch b/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch index c156a7f08..9d068f27e 100644 --- a/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch +++ b/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1844,6 +1844,42 @@ static struct board_info __initdata boar +@@ -1842,6 +1842,42 @@ static struct board_info __initdata boar }, }; @@ -43,7 +43,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2414,6 +2450,7 @@ static const struct board_info __initcon +@@ -2412,6 +2448,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -51,7 +51,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2526,6 +2563,7 @@ static struct of_device_id const bcm963x +@@ -2524,6 +2561,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,hg622", .data = &board_HG622, }, { .compatible = "huawei,hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch b/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch index 2307e3eaf..d106c2702 100644 --- a/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch +++ b/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1734,6 +1734,51 @@ static struct board_info __initdata boar +@@ -1732,6 +1732,51 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -52,7 +52,7 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2447,6 +2492,7 @@ static const struct board_info __initcon +@@ -2445,6 +2490,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6368 @@ -60,7 +60,7 @@ &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2554,6 +2600,7 @@ static struct of_device_id const bcm963x +@@ -2552,6 +2598,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch b/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch index b1a76433b..9a4727a21 100644 --- a/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch +++ b/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2218,6 +2218,106 @@ static struct board_info __initdata boar +@@ -2216,6 +2216,106 @@ static struct board_info __initdata boar }, }; @@ -107,7 +107,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2500,6 +2600,7 @@ static const struct board_info __initcon +@@ -2498,6 +2598,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2611,6 +2712,7 @@ static struct of_device_id const bcm963x +@@ -2609,6 +2710,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, diff --git a/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch b/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch index 313dff4e4..e52cdb07e 100644 --- a/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch +++ b/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2068,6 +2068,29 @@ static struct board_info __initdata boar +@@ -2066,6 +2066,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2600,6 +2623,7 @@ static const struct board_info __initcon +@@ -2598,6 +2621,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2701,6 +2725,7 @@ static struct of_device_id const bcm963x +@@ -2699,6 +2723,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch b/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch index e4e163cfd..e7a6ed611 100644 --- a/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch +++ b/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch @@ -68,7 +68,7 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2540,6 +2601,7 @@ static const struct board_info __initcon +@@ -2538,6 +2599,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -76,7 +76,7 @@ &board_dsl_2751b_d1, &board_FAST2704N, #endif -@@ -2645,6 +2707,7 @@ static struct of_device_id const bcm963x +@@ -2643,6 +2705,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch b/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch index 4ccdb046c..6d12c6122 100644 --- a/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch +++ b/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch @@ -74,7 +74,7 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2607,6 +2674,7 @@ static const struct board_info __initcon +@@ -2605,6 +2672,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -82,7 +82,7 @@ &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2721,6 +2789,7 @@ static struct of_device_id const bcm963x +@@ -2719,6 +2787,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010unv2", .data = &board_R5010UNV2, }, { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch b/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch index bb5eb491c..d790ea710 100644 --- a/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch +++ b/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2656,6 +2656,49 @@ static struct board_info __initdata boar +@@ -2654,6 +2654,49 @@ static struct board_info __initdata boar }, }, }; @@ -50,7 +50,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2764,6 +2807,7 @@ static const struct board_info __initcon +@@ -2762,6 +2805,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -58,7 +58,7 @@ #endif }; -@@ -2876,6 +2920,7 @@ static struct of_device_id const bcm963x +@@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, diff --git a/target/linux/brcm63xx/patches-4.9/001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch b/target/linux/brcm63xx/patches-4.19/001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.9/001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch rename to target/linux/brcm63xx/patches-4.19/001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch index 16a22e1fa..ac03e643b 100644 --- a/target/linux/brcm63xx/patches-4.9/001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch +++ b/target/linux/brcm63xx/patches-4.19/001-4.22-01-MIPS-BCM63XX-drop-unused-and-broken-DSP-platform-dev.patch @@ -35,7 +35,8 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile -@@ -1,7 +1,7 @@ +@@ -1,8 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ - setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \ - dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \ @@ -157,7 +158,8 @@ Signed-off-by: Jonas Gorski -} --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h +++ /dev/null -@@ -1,13 +0,0 @@ +@@ -1,14 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __BCM63XX_DSP_H -#define __BCM63XX_DSP_H - @@ -173,7 +175,7 @@ Signed-off-by: Jonas Gorski -#endif /* __BCM63XX_DSP_H */ --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -6,7 +6,6 @@ +@@ -7,7 +7,6 @@ #include #include #include @@ -181,7 +183,7 @@ Signed-off-by: Jonas Gorski /* * flash mapping -@@ -30,7 +29,6 @@ struct board_info { +@@ -31,7 +30,6 @@ struct board_info { unsigned int has_ohci0:1; unsigned int has_ehci0:1; unsigned int has_usbd:1; @@ -189,7 +191,7 @@ Signed-off-by: Jonas Gorski unsigned int has_uart0:1; unsigned int has_uart1:1; -@@ -42,9 +40,6 @@ struct board_info { +@@ -43,9 +41,6 @@ struct board_info { /* USB config */ struct bcm63xx_usbd_platform_data usbd; diff --git a/target/linux/brcm63xx/patches-4.9/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch b/target/linux/brcm63xx/patches-4.19/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.9/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch rename to target/linux/brcm63xx/patches-4.19/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch index 67c5ef450..3974b9bd3 100644 --- a/target/linux/brcm63xx/patches-4.9/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch +++ b/target/linux/brcm63xx/patches-4.19/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch @@ -14,7 +14,7 @@ Signed-off-by: Florian Fainelli --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -213,6 +213,11 @@ static void usbh_set(struct clk *clk, in +@@ -214,6 +214,11 @@ static void usbh_set(struct clk *clk, in bcm_hwclock_set(CKCTL_6362_USBH_EN, enable); else if (BCMCPU_IS_6368()) bcm_hwclock_set(CKCTL_6368_USBH_EN, enable); diff --git a/target/linux/brcm63xx/patches-4.9/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch b/target/linux/brcm63xx/patches-4.19/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch rename to target/linux/brcm63xx/patches-4.19/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch index 1c6fa7c03..0bbf7c8e8 100644 --- a/target/linux/brcm63xx/patches-4.9/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch +++ b/target/linux/brcm63xx/patches-4.19/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch @@ -17,7 +17,7 @@ Signed-off-by: Florian Fainelli --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -235,6 +235,11 @@ static void usbd_set(struct clk *clk, in +@@ -236,6 +236,11 @@ static void usbd_set(struct clk *clk, in bcm_hwclock_set(CKCTL_6362_USBD_EN, enable); else if (BCMCPU_IS_6368()) bcm_hwclock_set(CKCTL_6368_USBD_EN, enable); @@ -31,7 +31,7 @@ Signed-off-by: Florian Fainelli static struct clk clk_usbd = { --- a/drivers/usb/gadget/udc/bcm63xx_udc.c +++ b/drivers/usb/gadget/udc/bcm63xx_udc.c -@@ -410,7 +410,6 @@ static inline void set_clocks(struct bcm +@@ -402,7 +402,6 @@ static inline void set_clocks(struct bcm if (is_enabled) { clk_enable(udc->usbh_clk); clk_enable(udc->usbd_clk); diff --git a/target/linux/brcm63xx/patches-4.9/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch b/target/linux/brcm63xx/patches-4.19/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.9/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch rename to target/linux/brcm63xx/patches-4.19/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch index 442eb37ed..d276e0876 100644 --- a/target/linux/brcm63xx/patches-4.9/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch +++ b/target/linux/brcm63xx/patches-4.19/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch @@ -21,7 +21,7 @@ Signed-off-by: Florian Fainelli --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile -@@ -1,7 +1,7 @@ +@@ -2,7 +2,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \ @@ -100,7 +100,7 @@ Signed-off-by: Florian Fainelli +#endif /* BCM63XX_USB_PRIV_H_ */ --- a/drivers/usb/gadget/udc/bcm63xx_udc.c +++ b/drivers/usb/gadget/udc/bcm63xx_udc.c -@@ -39,6 +39,7 @@ +@@ -35,6 +35,7 @@ #include #include #include @@ -108,7 +108,7 @@ Signed-off-by: Florian Fainelli #define DRV_MODULE_NAME "bcm63xx_udc" -@@ -887,22 +888,7 @@ static void bcm63xx_select_phy_mode(stru +@@ -879,22 +880,7 @@ static void bcm63xx_select_phy_mode(stru bcm_gpio_writel(val, GPIO_PINMUX_OTHR_REG); } @@ -132,7 +132,7 @@ Signed-off-by: Florian Fainelli } /** -@@ -916,14 +902,9 @@ static void bcm63xx_select_phy_mode(stru +@@ -908,14 +894,9 @@ static void bcm63xx_select_phy_mode(stru */ static void bcm63xx_select_pullup(struct bcm63xx_udc *udc, bool is_on) { diff --git a/target/linux/brcm63xx/patches-4.9/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch b/target/linux/brcm63xx/patches-4.19/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch rename to target/linux/brcm63xx/patches-4.19/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch diff --git a/target/linux/brcm63xx/patches-4.9/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch b/target/linux/brcm63xx/patches-4.19/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.9/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch rename to target/linux/brcm63xx/patches-4.19/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch index 768dccac5..64ea4731a 100644 --- a/target/linux/brcm63xx/patches-4.9/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch +++ b/target/linux/brcm63xx/patches-4.19/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch @@ -16,7 +16,7 @@ Signed-off-by: Florian Fainelli --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig -@@ -6,10 +6,17 @@ config BCM63XX_CPU_3368 +@@ -7,10 +7,17 @@ config BCM63XX_CPU_3368 select SYS_HAS_CPU_BMIPS4350 select HW_HAS_PCI @@ -34,7 +34,7 @@ Signed-off-by: Florian Fainelli config BCM63XX_CPU_6338 bool "support 6338 CPU" -@@ -24,21 +31,25 @@ config BCM63XX_CPU_6348 +@@ -25,21 +32,25 @@ config BCM63XX_CPU_6348 bool "support 6348 CPU" select SYS_HAS_CPU_BMIPS32_3300 select HW_HAS_PCI diff --git a/target/linux/brcm63xx/patches-4.9/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch b/target/linux/brcm63xx/patches-4.19/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch rename to target/linux/brcm63xx/patches-4.19/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch index 76c6a5c89..8a532fe5d 100644 --- a/target/linux/brcm63xx/patches-4.9/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch +++ b/target/linux/brcm63xx/patches-4.19/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch @@ -21,7 +21,7 @@ Signed-off-by: Florian Fainelli --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile -@@ -1,7 +1,7 @@ +@@ -2,7 +2,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \ diff --git a/target/linux/brcm63xx/patches-4.9/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch b/target/linux/brcm63xx/patches-4.19/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch rename to target/linux/brcm63xx/patches-4.19/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch diff --git a/target/linux/brcm63xx/patches-4.9/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch b/target/linux/brcm63xx/patches-4.19/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.9/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch rename to target/linux/brcm63xx/patches-4.19/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch index bce91e373..f7311a8f8 100644 --- a/target/linux/brcm63xx/patches-4.9/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch +++ b/target/linux/brcm63xx/patches-4.19/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch @@ -19,7 +19,7 @@ Signed-off-by: Florian Fainelli --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig -@@ -12,11 +12,18 @@ config BCM63XX_OHCI +@@ -13,11 +13,18 @@ config BCM63XX_OHCI select USB_OHCI_BIG_ENDIAN_DESC if USB_OHCI_HCD select USB_OHCI_BIG_ENDIAN_MMIO if USB_OHCI_HCD @@ -38,7 +38,7 @@ Signed-off-by: Florian Fainelli config BCM63XX_CPU_6338 bool "support 6338 CPU" -@@ -38,18 +45,21 @@ config BCM63XX_CPU_6358 +@@ -39,18 +46,21 @@ config BCM63XX_CPU_6358 select SYS_HAS_CPU_BMIPS4350 select HW_HAS_PCI select BCM63XX_OHCI diff --git a/target/linux/brcm63xx/patches-4.9/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch b/target/linux/brcm63xx/patches-4.19/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch rename to target/linux/brcm63xx/patches-4.19/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch index 94896d914..7d0a35c62 100644 --- a/target/linux/brcm63xx/patches-4.9/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch +++ b/target/linux/brcm63xx/patches-4.19/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch @@ -21,7 +21,7 @@ Signed-off-by: Florian Fainelli --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile -@@ -1,7 +1,7 @@ +@@ -2,7 +2,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \ diff --git a/target/linux/brcm63xx/patches-4.9/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch b/target/linux/brcm63xx/patches-4.19/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch rename to target/linux/brcm63xx/patches-4.19/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch diff --git a/target/linux/brcm63xx/patches-4.9/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch b/target/linux/brcm63xx/patches-4.19/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch rename to target/linux/brcm63xx/patches-4.19/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch diff --git a/target/linux/brcm63xx/patches-4.9/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch b/target/linux/brcm63xx/patches-4.19/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch rename to target/linux/brcm63xx/patches-4.19/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch index 6a714eb91..6fd5cbb9e 100644 --- a/target/linux/brcm63xx/patches-4.9/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch +++ b/target/linux/brcm63xx/patches-4.19/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch @@ -32,7 +32,7 @@ there. --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -163,6 +163,7 @@ config MTD_BCM63XX_PARTS +@@ -162,6 +162,7 @@ config MTD_BCM63XX_PARTS tristate "BCM63XX CFE partitioning support" depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST select CRC32 @@ -259,9 +259,10 @@ there. depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST) --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile -@@ -1 +1,2 @@ +@@ -1,2 +1,3 @@ +obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o + obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o --- /dev/null +++ b/drivers/mtd/parsers/parser_imagetag.c @@ -0,0 +1,214 @@ diff --git a/target/linux/brcm63xx/patches-4.9/122-mtd-bcm63xxpart-add-of_match_table.patch b/target/linux/brcm63xx/patches-4.19/122-mtd-bcm63xxpart-add-of_match_table.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/122-mtd-bcm63xxpart-add-of_match_table.patch rename to target/linux/brcm63xx/patches-4.19/122-mtd-bcm63xxpart-add-of_match_table.patch diff --git a/target/linux/brcm63xx/patches-4.9/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch b/target/linux/brcm63xx/patches-4.19/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch rename to target/linux/brcm63xx/patches-4.19/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch diff --git a/target/linux/brcm63xx/patches-4.9/130-pinctrl-add-bcm63xx-base-code.patch b/target/linux/brcm63xx/patches-4.19/130-pinctrl-add-bcm63xx-base-code.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/130-pinctrl-add-bcm63xx-base-code.patch rename to target/linux/brcm63xx/patches-4.19/130-pinctrl-add-bcm63xx-base-code.patch index cb90732b5..19ea476ca 100644 --- a/target/linux/brcm63xx/patches-4.9/130-pinctrl-add-bcm63xx-base-code.patch +++ b/target/linux/brcm63xx/patches-4.19/130-pinctrl-add-bcm63xx-base-code.patch @@ -21,8 +21,8 @@ Signed-off-by: Jonas Gorski --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig -@@ -258,6 +258,7 @@ config PINCTRL_ZYNQ - +@@ -341,6 +341,7 @@ config PINCTRL_OCELOT + source "drivers/pinctrl/actions/Kconfig" source "drivers/pinctrl/aspeed/Kconfig" source "drivers/pinctrl/bcm/Kconfig" +source "drivers/pinctrl/bcm63xx/Kconfig" @@ -31,8 +31,8 @@ Signed-off-by: Jonas Gorski source "drivers/pinctrl/intel/Kconfig" --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile -@@ -39,6 +39,7 @@ obj-$(CONFIG_PINCTRL_ZYNQ) += pinctrl-zy - +@@ -46,6 +46,7 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl- + obj-y += actions/ obj-$(CONFIG_ARCH_ASPEED) += aspeed/ obj-y += bcm/ +obj-y += bcm63xx/ diff --git a/target/linux/brcm63xx/patches-4.9/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch b/target/linux/brcm63xx/patches-4.19/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch rename to target/linux/brcm63xx/patches-4.19/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.9/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch b/target/linux/brcm63xx/patches-4.19/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch rename to target/linux/brcm63xx/patches-4.19/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch diff --git a/target/linux/brcm63xx/patches-4.9/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch b/target/linux/brcm63xx/patches-4.19/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch rename to target/linux/brcm63xx/patches-4.19/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.9/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch b/target/linux/brcm63xx/patches-4.19/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch rename to target/linux/brcm63xx/patches-4.19/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch diff --git a/target/linux/brcm63xx/patches-4.9/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch b/target/linux/brcm63xx/patches-4.19/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch rename to target/linux/brcm63xx/patches-4.19/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.9/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch b/target/linux/brcm63xx/patches-4.19/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch rename to target/linux/brcm63xx/patches-4.19/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch diff --git a/target/linux/brcm63xx/patches-4.9/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch b/target/linux/brcm63xx/patches-4.19/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch rename to target/linux/brcm63xx/patches-4.19/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.9/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch b/target/linux/brcm63xx/patches-4.19/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch rename to target/linux/brcm63xx/patches-4.19/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch diff --git a/target/linux/brcm63xx/patches-4.9/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch b/target/linux/brcm63xx/patches-4.19/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch rename to target/linux/brcm63xx/patches-4.19/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.9/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch b/target/linux/brcm63xx/patches-4.19/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch rename to target/linux/brcm63xx/patches-4.19/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch diff --git a/target/linux/brcm63xx/patches-4.9/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch b/target/linux/brcm63xx/patches-4.19/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch rename to target/linux/brcm63xx/patches-4.19/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch diff --git a/target/linux/brcm63xx/patches-4.9/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch b/target/linux/brcm63xx/patches-4.19/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch rename to target/linux/brcm63xx/patches-4.19/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch diff --git a/target/linux/brcm63xx/patches-4.9/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch similarity index 75% rename from target/linux/brcm63xx/patches-4.9/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch rename to target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index 502894145..395b17c8d 100644 --- a/target/linux/brcm63xx/patches-4.9/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/brcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -29,7 +29,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c -@@ -274,19 +274,22 @@ static void of_gpiochip_set_names(struct +@@ -363,12 +363,15 @@ static struct gpio_desc *of_parse_own_gp /** * of_gpiochip_scan_gpios - Scan gpio-controller for gpio definitions * @chip: gpio chip to act on @@ -40,7 +40,7 @@ Signed-off-by: Jonas Gorski - * configuration. + * This is used by of_gpiochip_add, gpiochip_add_pingroup_range and + * gpiochip_add_pin_range to request/set GPIO initial configuration. - * It retures error if it fails otherwise 0 on success. + * It returns error if it fails otherwise 0 on success. */ -static int of_gpiochip_scan_gpios(struct gpio_chip *chip) +int of_gpiochip_scan_gpios(struct gpio_chip *chip, unsigned int start, @@ -48,40 +48,48 @@ Signed-off-by: Jonas Gorski { struct gpio_desc *desc = NULL; struct device_node *np; - const char *name; +@@ -376,7 +379,7 @@ static int of_gpiochip_scan_gpios(struct enum gpio_lookup_flags lflags; enum gpiod_flags dflags; + unsigned int i; - int ret; + int ret, hwgpio; for_each_available_child_of_node(chip->of_node, np) { if (!of_property_read_bool(np, "gpio-hog")) -@@ -296,6 +299,10 @@ static int of_gpiochip_scan_gpios(struct - if (IS_ERR(desc)) - continue; +@@ -388,6 +391,10 @@ static int of_gpiochip_scan_gpios(struct + if (IS_ERR(desc)) + break; -+ hwgpio = gpio_chip_hwgpio(desc); -+ if (hwgpio < start || hwgpio >= (start + num)) -+ continue; ++ hwgpio = gpio_chip_hwgpio(desc); ++ if (hwgpio < start || hwgpio >= (start + num)) ++ continue; + - ret = gpiod_hog(desc, name, lflags, dflags); - if (ret < 0) - return ret; -@@ -531,7 +538,10 @@ int of_gpiochip_add(struct gpio_chip *ch + ret = gpiod_hog(desc, name, lflags, dflags); + if (ret < 0) { + of_node_put(np); +@@ -646,12 +653,13 @@ int of_gpiochip_add(struct gpio_chip *ch of_node_get(chip->of_node); -- return of_gpiochip_scan_gpios(chip); -+ if (!chip->request) +- status = of_gpiochip_scan_gpios(chip); +- if (status) { +- of_node_put(chip->of_node); +- gpiochip_remove_pin_ranges(chip); ++ if (!chip->request) { + status = of_gpiochip_scan_gpios(chip, 0, chip->ngpio); -+ -+ return status; ++ if (status) { ++ of_node_put(chip->of_node); ++ gpiochip_remove_pin_ranges(chip); ++ } + } +- + return status; } - void of_gpiochip_remove(struct gpio_chip *chip) --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -1884,7 +1884,8 @@ int gpiochip_add_pingroup_range(struct g +@@ -2197,7 +2197,8 @@ int gpiochip_add_pingroup_range(struct g list_add_tail(&pin_range->node, &gdev->pin_ranges); @@ -91,7 +99,7 @@ Signed-off-by: Jonas Gorski } EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range); -@@ -1933,7 +1934,7 @@ int gpiochip_add_pin_range(struct gpio_c +@@ -2254,7 +2255,7 @@ int gpiochip_add_pin_range(struct gpio_c list_add_tail(&pin_range->node, &gdev->pin_ranges); @@ -102,7 +110,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h -@@ -96,6 +96,8 @@ struct gpio_desc *of_get_named_gpiod_fla +@@ -103,6 +103,8 @@ struct gpio_desc *of_get_named_gpiod_fla const char *list_name, int index, enum of_gpio_flags *flags); int of_gpiochip_add(struct gpio_chip *gc); void of_gpiochip_remove(struct gpio_chip *gc); @@ -111,7 +119,7 @@ Signed-off-by: Jonas Gorski #else static inline struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, -@@ -111,6 +113,12 @@ static inline struct gpio_desc *of_get_n +@@ -118,6 +120,12 @@ static inline struct gpio_desc *of_get_n } static inline int of_gpiochip_add(struct gpio_chip *gc) { return 0; } static inline void of_gpiochip_remove(struct gpio_chip *gc) { } diff --git a/target/linux/brcm63xx/patches-4.9/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch b/target/linux/brcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch rename to target/linux/brcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch index 29dd56e7b..6425869dc 100644 --- a/target/linux/brcm63xx/patches-4.9/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch +++ b/target/linux/brcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch @@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -678,6 +678,10 @@ int ehci_setup(struct usb_hcd *hcd) +@@ -665,6 +665,10 @@ int ehci_setup(struct usb_hcd *hcd) /* cache this readonly data; minimize chip reads */ ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); @@ -34,7 +34,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/usb/host/ehci-platform.c +++ b/drivers/usb/host/ehci-platform.c -@@ -61,6 +61,9 @@ static int ehci_platform_reset(struct us +@@ -57,6 +57,9 @@ static int ehci_platform_reset(struct us ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug; @@ -46,7 +46,7 @@ Signed-off-by: Jonas Gorski if (retval < 0) --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h -@@ -216,6 +216,7 @@ struct ehci_hcd { /* one per controlle +@@ -203,6 +203,7 @@ struct ehci_hcd { /* one per controlle u32 command; /* SILICON QUIRKS */ @@ -56,7 +56,7 @@ Signed-off-by: Jonas Gorski unsigned has_fsl_hs_errata:1; /* Freescale HS quirk */ --- a/include/linux/usb/ehci_pdriver.h +++ b/include/linux/usb/ehci_pdriver.h -@@ -42,6 +42,7 @@ struct usb_hcd; +@@ -43,6 +43,7 @@ struct usb_hcd; */ struct usb_ehci_pdata { int caps_offset; diff --git a/target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/brcm63xx/patches-4.19/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch rename to target/linux/brcm63xx/patches-4.19/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch diff --git a/target/linux/brcm63xx/patches-4.9/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch b/target/linux/brcm63xx/patches-4.19/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch rename to target/linux/brcm63xx/patches-4.19/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch diff --git a/target/linux/brcm63xx/patches-4.9/309-cfe_version_mod.patch b/target/linux/brcm63xx/patches-4.19/309-cfe_version_mod.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/309-cfe_version_mod.patch rename to target/linux/brcm63xx/patches-4.19/309-cfe_version_mod.patch diff --git a/target/linux/brcm63xx/patches-4.9/310-cfe_simplify_detection.patch b/target/linux/brcm63xx/patches-4.19/310-cfe_simplify_detection.patch similarity index 87% rename from target/linux/brcm63xx/patches-4.9/310-cfe_simplify_detection.patch rename to target/linux/brcm63xx/patches-4.19/310-cfe_simplify_detection.patch index e05c91d93..0e4e759ab 100644 --- a/target/linux/brcm63xx/patches-4.9/310-cfe_simplify_detection.patch +++ b/target/linux/brcm63xx/patches-4.19/310-cfe_simplify_detection.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h -@@ -1,6 +1,8 @@ +@@ -2,6 +2,8 @@ #ifndef BCM63XX_BOARD_H_ #define BCM63XX_BOARD_H_ @@ -9,7 +9,7 @@ const char *board_get_name(void); void board_prom_init(void); -@@ -9,4 +11,8 @@ void board_setup(void); +@@ -10,4 +12,8 @@ void board_setup(void); int board_register_devices(void); diff --git a/target/linux/brcm63xx/patches-4.9/311-bcm63xxpart_use_cfedetection.patch b/target/linux/brcm63xx/patches-4.19/311-bcm63xxpart_use_cfedetection.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/311-bcm63xxpart_use_cfedetection.patch rename to target/linux/brcm63xx/patches-4.19/311-bcm63xxpart_use_cfedetection.patch diff --git a/target/linux/brcm63xx/patches-4.9/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch b/target/linux/brcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch rename to target/linux/brcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch index 1d63e91a8..b75987ef3 100644 --- a/target/linux/brcm63xx/patches-4.9/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch +++ b/target/linux/brcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch @@ -71,7 +71,7 @@ Signed-off-by: Jonas Gorski +}; --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig -@@ -110,6 +110,10 @@ config BRCMSTB_L2_IRQ +@@ -129,6 +129,10 @@ config BRCMSTB_L2_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN @@ -84,14 +84,14 @@ Signed-off-by: Jonas Gorski select GENERIC_IRQ_CHIP --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile -@@ -12,6 +12,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o +@@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o +obj-$(CONFIG_BCM6345_PERIPH_IRQ) += irq-bcm6345-periph.o obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o - obj-$(CONFIG_METAG) += irq-metag-ext.o - obj-$(CONFIG_METAG_PERFCOUNTER_IRQS) += irq-metag.o + obj-$(CONFIG_CLPS711X_IRQCHIP) += irq-clps711x.o + obj-$(CONFIG_OMPIC) += irq-ompic.o --- /dev/null +++ b/drivers/irqchip/irq-bcm6345-periph.c @@ -0,0 +1,339 @@ diff --git a/target/linux/brcm63xx/patches-4.9/321-irqchip-add-support-for-bcm6345-style-external-inter.patch b/target/linux/brcm63xx/patches-4.19/321-irqchip-add-support-for-bcm6345-style-external-inter.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/321-irqchip-add-support-for-bcm6345-style-external-inter.patch rename to target/linux/brcm63xx/patches-4.19/321-irqchip-add-support-for-bcm6345-style-external-inter.patch index 94952c64a..4db80ef53 100644 --- a/target/linux/brcm63xx/patches-4.9/321-irqchip-add-support-for-bcm6345-style-external-inter.patch +++ b/target/linux/brcm63xx/patches-4.19/321-irqchip-add-support-for-bcm6345-style-external-inter.patch @@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski +}; --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig -@@ -110,6 +110,10 @@ config BRCMSTB_L2_IRQ +@@ -129,6 +129,10 @@ config BRCMSTB_L2_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN @@ -63,14 +63,14 @@ Signed-off-by: Jonas Gorski select IRQ_DOMAIN --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile -@@ -12,6 +12,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o +@@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o +obj-$(CONFIG_BCM6345_EXT_IRQ) += irq-bcm6345-ext.o obj-$(CONFIG_BCM6345_PERIPH_IRQ) += irq-bcm6345-periph.o obj-$(CONFIG_DW_APB_ICTL) += irq-dw-apb-ictl.o - obj-$(CONFIG_METAG) += irq-metag-ext.o + obj-$(CONFIG_CLPS711X_IRQCHIP) += irq-clps711x.o --- /dev/null +++ b/drivers/irqchip/irq-bcm6345-ext.c @@ -0,0 +1,301 @@ diff --git a/target/linux/brcm63xx/patches-4.9/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch b/target/linux/brcm63xx/patches-4.19/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch rename to target/linux/brcm63xx/patches-4.19/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch index ee0d4d657..f0ffc654f 100644 --- a/target/linux/brcm63xx/patches-4.9/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch +++ b/target/linux/brcm63xx/patches-4.19/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -265,6 +265,9 @@ config BCM63XX +@@ -283,6 +283,9 @@ config BCM63XX select SYNC_R4K select DMA_NONCOHERENT select IRQ_MIPS_CPU @@ -26,9 +26,9 @@ Signed-off-by: Jonas Gorski select SYS_HAS_EARLY_PRINTK --- a/arch/mips/bcm63xx/irq.c +++ b/arch/mips/bcm63xx/irq.c -@@ -12,7 +12,9 @@ +@@ -11,7 +11,9 @@ + #include #include - #include #include -#include +#include @@ -37,7 +37,7 @@ Signed-off-by: Jonas Gorski #include #include #include -@@ -20,544 +22,140 @@ +@@ -19,544 +21,140 @@ #include #include diff --git a/target/linux/brcm63xx/patches-4.9/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch b/target/linux/brcm63xx/patches-4.19/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.9/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch rename to target/linux/brcm63xx/patches-4.19/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch index 0796bb552..e911f0ead 100644 --- a/target/linux/brcm63xx/patches-4.9/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch +++ b/target/linux/brcm63xx/patches-4.19/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch @@ -18,7 +18,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/irq.c +++ b/arch/mips/bcm63xx/irq.c -@@ -109,11 +109,14 @@ void __init arch_init_irq(void) +@@ -108,11 +108,14 @@ void __init arch_init_irq(void) periph_width = 1; ext_intc_bases[0] += PERF_EXTIRQ_CFG_REG_6358; @@ -36,7 +36,7 @@ Signed-off-by: Jonas Gorski case BCM6362_CPU_ID: --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -895,6 +895,8 @@ enum bcm63xx_irq { +@@ -896,6 +896,8 @@ enum bcm63xx_irq { #define BCM_6358_EXT_IRQ1 (IRQ_INTERNAL_BASE + 26) #define BCM_6358_EXT_IRQ2 (IRQ_INTERNAL_BASE + 27) #define BCM_6358_EXT_IRQ3 (IRQ_INTERNAL_BASE + 28) @@ -47,7 +47,7 @@ Signed-off-by: Jonas Gorski * 6362 irqs --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -243,6 +243,7 @@ +@@ -244,6 +244,7 @@ #define PERF_EXTIRQ_CFG_REG_6362 0x18 #define PERF_EXTIRQ_CFG_REG_6368 0x18 diff --git a/target/linux/brcm63xx/patches-4.9/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch b/target/linux/brcm63xx/patches-4.19/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.9/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch rename to target/linux/brcm63xx/patches-4.19/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch index 661abf6d8..07d3f9dbc 100644 --- a/target/linux/brcm63xx/patches-4.9/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch +++ b/target/linux/brcm63xx/patches-4.19/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch @@ -43,7 +43,7 @@ Subject: [PATCH 40/53] MIPS: BCM63XX: add a new cpu variant helper switch (bcm63xx_cpu_id) { --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -19,6 +19,7 @@ +@@ -20,6 +20,7 @@ #define BCM6368_CPU_ID 0x6368 void __init bcm63xx_cpu_init(void); @@ -51,7 +51,7 @@ Subject: [PATCH 40/53] MIPS: BCM63XX: add a new cpu variant helper u8 bcm63xx_get_cpu_rev(void); unsigned int bcm63xx_get_cpu_freq(void); -@@ -82,6 +83,23 @@ static inline u16 __pure bcm63xx_get_cpu +@@ -83,6 +84,23 @@ static inline u16 __pure bcm63xx_get_cpu #define BCMCPU_IS_6362() (bcm63xx_get_cpu_id() == BCM6362_CPU_ID) #define BCMCPU_IS_6368() (bcm63xx_get_cpu_id() == BCM6368_CPU_ID) diff --git a/target/linux/brcm63xx/patches-4.9/331-MIPS-BCM63XX-define-variant-id-field.patch b/target/linux/brcm63xx/patches-4.19/331-MIPS-BCM63XX-define-variant-id-field.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/331-MIPS-BCM63XX-define-variant-id-field.patch rename to target/linux/brcm63xx/patches-4.19/331-MIPS-BCM63XX-define-variant-id-field.patch index 2e21c6500..57af83685 100644 --- a/target/linux/brcm63xx/patches-4.9/331-MIPS-BCM63XX-define-variant-id-field.patch +++ b/target/linux/brcm63xx/patches-4.19/331-MIPS-BCM63XX-define-variant-id-field.patch @@ -12,7 +12,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -9,6 +9,8 @@ +@@ -10,6 +10,8 @@ #define PERF_REV_REG 0x0 #define REV_CHIPID_SHIFT 16 #define REV_CHIPID_MASK (0xffff << REV_CHIPID_SHIFT) diff --git a/target/linux/brcm63xx/patches-4.9/332-MIPS-BCM63XX-detect-BCM6328-variants.patch b/target/linux/brcm63xx/patches-4.19/332-MIPS-BCM63XX-detect-BCM6328-variants.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.9/332-MIPS-BCM63XX-detect-BCM6328-variants.patch rename to target/linux/brcm63xx/patches-4.19/332-MIPS-BCM63XX-detect-BCM6328-variants.patch index faa002e1e..a05a4b3e2 100644 --- a/target/linux/brcm63xx/patches-4.9/332-MIPS-BCM63XX-detect-BCM6328-variants.patch +++ b/target/linux/brcm63xx/patches-4.19/332-MIPS-BCM63XX-detect-BCM6328-variants.patch @@ -44,7 +44,7 @@ Signed-off-by: Jonas Gorski bcm63xx_regs_base = bcm6338_regs_base; --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -11,6 +11,8 @@ +@@ -12,6 +12,8 @@ */ #define BCM3368_CPU_ID 0x3368 #define BCM6328_CPU_ID 0x6328 @@ -53,7 +53,7 @@ Signed-off-by: Jonas Gorski #define BCM6338_CPU_ID 0x6338 #define BCM6345_CPU_ID 0x6345 #define BCM6348_CPU_ID 0x6348 -@@ -85,8 +87,10 @@ static inline u16 __pure bcm63xx_get_cpu +@@ -86,8 +88,10 @@ static inline u16 __pure bcm63xx_get_cpu #define BCMCPU_VARIANT_IS_3368() \ (bcm63xx_get_cpu_variant() == BCM3368_CPU_ID) diff --git a/target/linux/brcm63xx/patches-4.9/333-MIPS-BCM63XX-detect-BCM6362-variants.patch b/target/linux/brcm63xx/patches-4.19/333-MIPS-BCM63XX-detect-BCM6362-variants.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.9/333-MIPS-BCM63XX-detect-BCM6362-variants.patch rename to target/linux/brcm63xx/patches-4.19/333-MIPS-BCM63XX-detect-BCM6362-variants.patch index 62ce12eda..2efbf36d3 100644 --- a/target/linux/brcm63xx/patches-4.9/333-MIPS-BCM63XX-detect-BCM6362-variants.patch +++ b/target/linux/brcm63xx/patches-4.19/333-MIPS-BCM63XX-detect-BCM6362-variants.patch @@ -27,7 +27,7 @@ Subject: [PATCH 23/45] MIPS: BCM63XX: detect BCM6362 variants bcm63xx_regs_base = bcm6368_regs_base; --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -17,6 +17,7 @@ +@@ -18,6 +18,7 @@ #define BCM6345_CPU_ID 0x6345 #define BCM6348_CPU_ID 0x6348 #define BCM6358_CPU_ID 0x6358 @@ -35,7 +35,7 @@ Subject: [PATCH 23/45] MIPS: BCM63XX: detect BCM6362 variants #define BCM6362_CPU_ID 0x6362 #define BCM6368_CPU_ID 0x6368 -@@ -99,6 +100,8 @@ static inline u16 __pure bcm63xx_get_cpu +@@ -100,6 +101,8 @@ static inline u16 __pure bcm63xx_get_cpu (bcm63xx_get_cpu_variant() == BCM6348_CPU_ID) #define BCMCPU_VARIANT_IS_6358() \ (bcm63xx_get_cpu_cariant() == BCM6358_CPU_ID) diff --git a/target/linux/brcm63xx/patches-4.9/334-MIPS-BCM63XX-detect-BCM6368-variants.patch b/target/linux/brcm63xx/patches-4.19/334-MIPS-BCM63XX-detect-BCM6368-variants.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.9/334-MIPS-BCM63XX-detect-BCM6368-variants.patch rename to target/linux/brcm63xx/patches-4.19/334-MIPS-BCM63XX-detect-BCM6368-variants.patch index a993e238e..64bcd8f19 100644 --- a/target/linux/brcm63xx/patches-4.9/334-MIPS-BCM63XX-detect-BCM6368-variants.patch +++ b/target/linux/brcm63xx/patches-4.19/334-MIPS-BCM63XX-detect-BCM6368-variants.patch @@ -29,7 +29,7 @@ Signed-off-by: Jonas Gorski panic("unsupported broadcom CPU %x", bcm63xx_cpu_id); --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -20,6 +20,7 @@ +@@ -21,6 +21,7 @@ #define BCM6361_CPU_ID 0x6361 #define BCM6362_CPU_ID 0x6362 #define BCM6368_CPU_ID 0x6368 @@ -37,7 +37,7 @@ Signed-off-by: Jonas Gorski void __init bcm63xx_cpu_init(void); u32 bcm63xx_get_cpu_variant(void); -@@ -106,6 +107,8 @@ static inline u16 __pure bcm63xx_get_cpu +@@ -107,6 +108,8 @@ static inline u16 __pure bcm63xx_get_cpu (bcm63xx_get_cpu_variant() == BCM6362_CPU_ID) #define BCMCPU_VARIANT_IS_6368() \ (bcm63xx_get_cpu_variant() == BCM6368_CPU_ID) diff --git a/target/linux/brcm63xx/patches-4.9/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch b/target/linux/brcm63xx/patches-4.19/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch rename to target/linux/brcm63xx/patches-4.19/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch index 3230add27..54900d72a 100644 --- a/target/linux/brcm63xx/patches-4.9/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch +++ b/target/linux/brcm63xx/patches-4.19/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch @@ -9,7 +9,7 @@ Subject: [PATCH 45/53] MIPS: BCM63XX: fix PCIe memory window size --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ BCM_CB_MEM_SIZE - 1) #define BCM_PCIE_MEM_BASE_PA 0x10f00000 diff --git a/target/linux/brcm63xx/patches-4.9/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch b/target/linux/brcm63xx/patches-4.19/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch rename to target/linux/brcm63xx/patches-4.19/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch index d6eb54d2e..05142a8e4 100644 --- a/target/linux/brcm63xx/patches-4.9/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch +++ b/target/linux/brcm63xx/patches-4.19/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch @@ -12,7 +12,7 @@ hardcode it. --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h -@@ -40,10 +40,10 @@ +@@ -41,10 +41,10 @@ #define BCM_CB_MEM_END_PA (BCM_CB_MEM_BASE_PA + \ BCM_CB_MEM_SIZE - 1) diff --git a/target/linux/brcm63xx/patches-4.9/337-MIPS-BCM63XX-widen-cpuid-field.patch b/target/linux/brcm63xx/patches-4.19/337-MIPS-BCM63XX-widen-cpuid-field.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.9/337-MIPS-BCM63XX-widen-cpuid-field.patch rename to target/linux/brcm63xx/patches-4.19/337-MIPS-BCM63XX-widen-cpuid-field.patch index 0ead82e86..c38b43112 100644 --- a/target/linux/brcm63xx/patches-4.9/337-MIPS-BCM63XX-widen-cpuid-field.patch +++ b/target/linux/brcm63xx/patches-4.19/337-MIPS-BCM63XX-widen-cpuid-field.patch @@ -30,7 +30,7 @@ Subject: [PATCH 47/53] MIPS: BCM63XX: widen cpuid field case BCM3368_CPU_ID: --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -27,7 +27,7 @@ u32 bcm63xx_get_cpu_variant(void); +@@ -28,7 +28,7 @@ u32 bcm63xx_get_cpu_variant(void); u8 bcm63xx_get_cpu_rev(void); unsigned int bcm63xx_get_cpu_freq(void); @@ -39,7 +39,7 @@ Subject: [PATCH 47/53] MIPS: BCM63XX: widen cpuid field { switch (cpu_id) { #ifdef CONFIG_BCM63XX_CPU_3368 -@@ -69,11 +69,11 @@ static inline u16 __pure __bcm63xx_get_c +@@ -70,11 +70,11 @@ static inline u16 __pure __bcm63xx_get_c return cpu_id; } diff --git a/target/linux/brcm63xx/patches-4.9/338-MIPS-BCM63XX-increase-number-of-IRQs.patch b/target/linux/brcm63xx/patches-4.19/338-MIPS-BCM63XX-increase-number-of-IRQs.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/338-MIPS-BCM63XX-increase-number-of-IRQs.patch rename to target/linux/brcm63xx/patches-4.19/338-MIPS-BCM63XX-increase-number-of-IRQs.patch index 9132e4231..1809a3cac 100644 --- a/target/linux/brcm63xx/patches-4.9/338-MIPS-BCM63XX-increase-number-of-IRQs.patch +++ b/target/linux/brcm63xx/patches-4.19/338-MIPS-BCM63XX-increase-number-of-IRQs.patch @@ -12,7 +12,7 @@ interupts. --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h -@@ -1,10 +1,12 @@ +@@ -2,10 +2,12 @@ #ifndef BCM63XX_IRQ_H_ #define BCM63XX_IRQ_H_ @@ -28,7 +28,7 @@ interupts. #define IRQ_EXT_2 (IRQ_EXTERNAL_BASE + 2) --- a/arch/mips/include/asm/mach-bcm63xx/irq.h +++ b/arch/mips/include/asm/mach-bcm63xx/irq.h -@@ -1,7 +1,7 @@ +@@ -2,7 +2,7 @@ #ifndef __ASM_MACH_BCM63XX_IRQ_H #define __ASM_MACH_BCM63XX_IRQ_H diff --git a/target/linux/brcm63xx/patches-4.9/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/brcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.9/339-MIPS-BCM63XX-add-support-for-BCM63268.patch rename to target/linux/brcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch index d7d627be2..54ec47232 100644 --- a/target/linux/brcm63xx/patches-4.9/339-MIPS-BCM63XX-add-support-for-BCM63268.patch +++ b/target/linux/brcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch @@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig -@@ -60,6 +60,11 @@ config BCM63XX_CPU_6368 +@@ -61,6 +61,11 @@ config BCM63XX_CPU_6368 select HW_HAS_PCI select BCM63XX_OHCI select BCM63XX_EHCI @@ -46,7 +46,7 @@ Signed-off-by: Jonas Gorski val = bcm_mpi_readl(MPI_CSBASE_REG(0)); --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -168,6 +168,8 @@ static void enetsw_set(struct clk *clk, +@@ -169,6 +169,8 @@ static void enetsw_set(struct clk *clk, clk_disable_unlocked(&clk_swpkt_sar); } bcm_hwclock_set(CKCTL_6368_ROBOSW_EN, enable); @@ -55,7 +55,7 @@ Signed-off-by: Jonas Gorski } else { return; } -@@ -213,6 +215,8 @@ static void usbh_set(struct clk *clk, in +@@ -214,6 +216,8 @@ static void usbh_set(struct clk *clk, in bcm_hwclock_set(CKCTL_6362_USBH_EN, enable); else if (BCMCPU_IS_6368()) bcm_hwclock_set(CKCTL_6368_USBH_EN, enable); @@ -64,7 +64,7 @@ Signed-off-by: Jonas Gorski else return; -@@ -235,6 +239,8 @@ static void usbd_set(struct clk *clk, in +@@ -236,6 +240,8 @@ static void usbd_set(struct clk *clk, in bcm_hwclock_set(CKCTL_6362_USBD_EN, enable); else if (BCMCPU_IS_6368()) bcm_hwclock_set(CKCTL_6368_USBD_EN, enable); @@ -73,7 +73,7 @@ Signed-off-by: Jonas Gorski else return; -@@ -261,9 +267,13 @@ static void spi_set(struct clk *clk, int +@@ -262,9 +268,13 @@ static void spi_set(struct clk *clk, int mask = CKCTL_6358_SPI_EN; else if (BCMCPU_IS_6362()) mask = CKCTL_6362_SPI_EN; @@ -89,7 +89,7 @@ Signed-off-by: Jonas Gorski bcm_hwclock_set(mask, enable); } -@@ -282,6 +292,8 @@ static void hsspi_set(struct clk *clk, i +@@ -283,6 +293,8 @@ static void hsspi_set(struct clk *clk, i mask = CKCTL_6328_HSSPI_EN; else if (BCMCPU_IS_6362()) mask = CKCTL_6362_HSSPI_EN; @@ -98,7 +98,7 @@ Signed-off-by: Jonas Gorski else return; -@@ -351,6 +363,8 @@ static void pcie_set(struct clk *clk, in +@@ -352,6 +364,8 @@ static void pcie_set(struct clk *clk, in bcm_hwclock_set(CKCTL_6328_PCIE_EN, enable); else if (BCMCPU_IS_6362()) bcm_hwclock_set(CKCTL_6362_PCIE_EN, enable); @@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski } static struct clk clk_pcie = { -@@ -535,6 +549,21 @@ static struct clk_lookup bcm6368_clks[] +@@ -536,6 +550,21 @@ static struct clk_lookup bcm6368_clks[] CLKDEV_INIT(NULL, "ipsec", &clk_ipsec), }; @@ -129,7 +129,7 @@ Signed-off-by: Jonas Gorski #define HSSPI_PLL_HZ_6328 133333333 #define HSSPI_PLL_HZ_6362 400000000 -@@ -567,6 +596,10 @@ static int __init bcm63xx_clk_init(void) +@@ -568,6 +597,10 @@ static int __init bcm63xx_clk_init(void) case BCM6368_CPU_ID: clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks)); break; @@ -286,7 +286,7 @@ Signed-off-by: Jonas Gorski } --- a/arch/mips/bcm63xx/irq.c +++ b/arch/mips/bcm63xx/irq.c -@@ -150,6 +150,20 @@ void __init arch_init_irq(void) +@@ -149,6 +149,20 @@ void __init arch_init_irq(void) ext_irqs[5] = BCM_6368_EXT_IRQ5; ext_shift = 4; break; @@ -309,7 +309,7 @@ Signed-off-by: Jonas Gorski } --- a/arch/mips/bcm63xx/reset.c +++ b/arch/mips/bcm63xx/reset.c -@@ -125,6 +125,20 @@ +@@ -126,6 +126,20 @@ #define BCM6368_RESET_PCIE 0 #define BCM6368_RESET_PCIE_EXT 0 @@ -330,7 +330,7 @@ Signed-off-by: Jonas Gorski /* * core reset bits */ -@@ -156,6 +170,10 @@ static const u32 bcm6368_reset_bits[] = +@@ -157,6 +171,10 @@ static const u32 bcm6368_reset_bits[] = __GEN_RESET_BITS_TABLE(6368) }; @@ -341,7 +341,7 @@ Signed-off-by: Jonas Gorski const u32 *bcm63xx_reset_bits; static int reset_reg; -@@ -182,6 +200,9 @@ static int __init bcm63xx_reset_bits_ini +@@ -183,6 +201,9 @@ static int __init bcm63xx_reset_bits_ini } else if (BCMCPU_IS_6368()) { reset_reg = PERF_SOFTRESET_6368_REG; bcm63xx_reset_bits = bcm6368_reset_bits; @@ -353,7 +353,7 @@ Signed-off-by: Jonas Gorski return 0; --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -21,6 +21,10 @@ +@@ -22,6 +22,10 @@ #define BCM6362_CPU_ID 0x6362 #define BCM6368_CPU_ID 0x6368 #define BCM6369_CPU_ID 0x6369 @@ -364,7 +364,7 @@ Signed-off-by: Jonas Gorski void __init bcm63xx_cpu_init(void); u32 bcm63xx_get_cpu_variant(void); -@@ -61,6 +65,10 @@ static inline u32 __pure __bcm63xx_get_c +@@ -62,6 +66,10 @@ static inline u32 __pure __bcm63xx_get_c #ifdef CONFIG_BCM63XX_CPU_6368 case BCM6368_CPU_ID: #endif @@ -375,7 +375,7 @@ Signed-off-by: Jonas Gorski break; default: unreachable(); -@@ -86,6 +94,7 @@ static inline u32 __pure bcm63xx_get_cpu +@@ -87,6 +95,7 @@ static inline u32 __pure bcm63xx_get_cpu #define BCMCPU_IS_6358() (bcm63xx_get_cpu_id() == BCM6358_CPU_ID) #define BCMCPU_IS_6362() (bcm63xx_get_cpu_id() == BCM6362_CPU_ID) #define BCMCPU_IS_6368() (bcm63xx_get_cpu_id() == BCM6368_CPU_ID) @@ -383,7 +383,7 @@ Signed-off-by: Jonas Gorski #define BCMCPU_VARIANT_IS_3368() \ (bcm63xx_get_cpu_variant() == BCM3368_CPU_ID) -@@ -109,6 +118,14 @@ static inline u32 __pure bcm63xx_get_cpu +@@ -110,6 +119,14 @@ static inline u32 __pure bcm63xx_get_cpu (bcm63xx_get_cpu_variant() == BCM6368_CPU_ID) #define BCMCPU_VARIANT_IS_6369() \ (bcm63xx_get_cpu_variant() == BCM6369_CPU_ID) @@ -398,7 +398,7 @@ Signed-off-by: Jonas Gorski /* * While registers sets are (mostly) the same across 63xx CPU, base -@@ -573,6 +590,52 @@ enum bcm63xx_regs_set { +@@ -574,6 +591,52 @@ enum bcm63xx_regs_set { #define BCM_6368_RNG_BASE (0xb0004180) #define BCM_6368_MISC_BASE (0xdeadbeef) @@ -451,7 +451,7 @@ Signed-off-by: Jonas Gorski extern const unsigned long *bcm63xx_regs_base; -@@ -1041,6 +1104,73 @@ enum bcm63xx_irq { +@@ -1042,6 +1105,73 @@ enum bcm63xx_irq { #define BCM_6368_EXT_IRQ4 (IRQ_INTERNAL_BASE + 24) #define BCM_6368_EXT_IRQ5 (IRQ_INTERNAL_BASE + 25) @@ -527,7 +527,7 @@ Signed-off-by: Jonas Gorski #define __GEN_CPU_IRQ_TABLE(__cpu) \ --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h -@@ -22,6 +22,8 @@ static inline unsigned long bcm63xx_gpio +@@ -23,6 +23,8 @@ static inline unsigned long bcm63xx_gpio return 48; case BCM6368_CPU_ID: return 38; @@ -538,7 +538,7 @@ Signed-off-by: Jonas Gorski return 37; --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -9,6 +9,8 @@ +@@ -10,6 +10,8 @@ #define PERF_REV_REG 0x0 #define REV_CHIPID_SHIFT 16 #define REV_CHIPID_MASK (0xffff << REV_CHIPID_SHIFT) @@ -547,7 +547,7 @@ Signed-off-by: Jonas Gorski #define REV_VARID_SHIFT 12 #define REV_VARID_MASK (0xf << REV_VARID_SHIFT) #define REV_REVID_SHIFT 0 -@@ -211,6 +213,52 @@ +@@ -212,6 +214,52 @@ CKCTL_6368_NAND_EN | \ CKCTL_6368_IPSEC_EN) @@ -600,7 +600,7 @@ Signed-off-by: Jonas Gorski /* System PLL Control register */ #define PERF_SYS_PLL_CTL_REG 0x8 #define SYS_PLL_SOFT_RESET 0x1 -@@ -224,6 +272,7 @@ +@@ -225,6 +273,7 @@ #define PERF_IRQMASK_6358_REG(x) (0xc + (x) * 0x2c) #define PERF_IRQMASK_6362_REG(x) (0x20 + (x) * 0x10) #define PERF_IRQMASK_6368_REG(x) (0x20 + (x) * 0x10) @@ -608,7 +608,7 @@ Signed-off-by: Jonas Gorski /* Interrupt Status register */ #define PERF_IRQSTAT_3368_REG 0x10 -@@ -234,6 +283,7 @@ +@@ -235,6 +284,7 @@ #define PERF_IRQSTAT_6358_REG(x) (0x10 + (x) * 0x2c) #define PERF_IRQSTAT_6362_REG(x) (0x28 + (x) * 0x10) #define PERF_IRQSTAT_6368_REG(x) (0x28 + (x) * 0x10) @@ -616,7 +616,7 @@ Signed-off-by: Jonas Gorski /* External Interrupt Configuration register */ #define PERF_EXTIRQ_CFG_REG_3368 0x14 -@@ -244,6 +294,7 @@ +@@ -245,6 +295,7 @@ #define PERF_EXTIRQ_CFG_REG_6358 0x14 #define PERF_EXTIRQ_CFG_REG_6362 0x18 #define PERF_EXTIRQ_CFG_REG_6368 0x18 @@ -624,7 +624,7 @@ Signed-off-by: Jonas Gorski #define PERF_EXTIRQ_CFG_REG2_6358 0x1c #define PERF_EXTIRQ_CFG_REG2_6368 0x1c -@@ -274,6 +325,7 @@ +@@ -275,6 +326,7 @@ #define PERF_SOFTRESET_6358_REG 0x34 #define PERF_SOFTRESET_6362_REG 0x10 #define PERF_SOFTRESET_6368_REG 0x10 @@ -632,7 +632,7 @@ Signed-off-by: Jonas Gorski #define SOFTRESET_3368_SPI_MASK (1 << 0) #define SOFTRESET_3368_ENET_MASK (1 << 2) -@@ -367,6 +419,26 @@ +@@ -368,6 +420,26 @@ #define SOFTRESET_6368_USBH_MASK (1 << 12) #define SOFTRESET_6368_PCM_MASK (1 << 13) @@ -659,7 +659,7 @@ Signed-off-by: Jonas Gorski /* MIPS PLL control register */ #define PERF_MIPSPLLCTL_REG 0x34 #define MIPSPLLCTL_N1_SHIFT 20 -@@ -1366,6 +1438,13 @@ +@@ -1367,6 +1439,13 @@ #define STRAPBUS_6362_BOOT_SEL_SERIAL (1 << 15) #define STRAPBUS_6362_BOOT_SEL_NAND (0 << 15) @@ -675,7 +675,7 @@ Signed-off-by: Jonas Gorski #define STRAPBUS_6328_FCVO_MASK (0x1f << STRAPBUS_6328_FCVO_SHIFT) --- a/arch/mips/include/asm/mach-bcm63xx/ioremap.h +++ b/arch/mips/include/asm/mach-bcm63xx/ioremap.h -@@ -25,6 +25,7 @@ static inline int is_bcm63xx_internal_re +@@ -26,6 +26,7 @@ static inline int is_bcm63xx_internal_re case BCM6328_CPU_ID: case BCM6362_CPU_ID: case BCM6368_CPU_ID: @@ -696,7 +696,7 @@ Signed-off-by: Jonas Gorski spi_resources[0].start = bcm63xx_regset_address(RSET_HSSPI); --- a/arch/mips/bcm63xx/dev-enet.c +++ b/arch/mips/bcm63xx/dev-enet.c -@@ -176,7 +176,8 @@ static int __init register_shared(void) +@@ -184,7 +184,8 @@ static int __init register_shared(void) else shared_res[0].end += (RSET_ENETDMA_SIZE) - 1; @@ -706,7 +706,7 @@ Signed-off-by: Jonas Gorski chan_count = 32; else if (BCMCPU_IS_6345()) chan_count = 8; -@@ -284,7 +285,8 @@ bcm63xx_enetsw_register(const struct bcm +@@ -292,7 +293,8 @@ bcm63xx_enetsw_register(const struct bcm { int ret; @@ -716,7 +716,7 @@ Signed-off-by: Jonas Gorski return -ENODEV; ret = register_shared(); -@@ -305,6 +307,8 @@ bcm63xx_enetsw_register(const struct bcm +@@ -313,6 +315,8 @@ bcm63xx_enetsw_register(const struct bcm enetsw_pd.num_ports = ENETSW_PORTS_6328; else if (BCMCPU_IS_6362() || BCMCPU_IS_6368()) enetsw_pd.num_ports = ENETSW_PORTS_6368; @@ -727,7 +727,7 @@ Signed-off-by: Jonas Gorski enetsw_pd.dma_chan_width = ENETDMA_CHAN_WIDTH; --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h -@@ -66,6 +66,7 @@ struct bcm63xx_enet_platform_data { +@@ -67,6 +67,7 @@ struct bcm63xx_enet_platform_data { #define ENETSW_MAX_PORT 8 #define ENETSW_PORTS_6328 5 /* 4 FE PHY + 1 RGMII */ #define ENETSW_PORTS_6368 6 /* 4 FE PHY + 2 RGMII */ diff --git a/target/linux/brcm63xx/patches-4.9/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch b/target/linux/brcm63xx/patches-4.19/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch rename to target/linux/brcm63xx/patches-4.19/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch index 4e8a09079..e9f9e2b01 100644 --- a/target/linux/brcm63xx/patches-4.9/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch +++ b/target/linux/brcm63xx/patches-4.19/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch @@ -11,7 +11,7 @@ Subject: [PATCH 50/53] MIPS: BCM63XX: add pcie support for BCM63268 --- a/arch/mips/bcm63xx/reset.c +++ b/arch/mips/bcm63xx/reset.c -@@ -136,7 +136,8 @@ +@@ -137,7 +137,8 @@ #define BCM63268_RESET_PCM SOFTRESET_63268_PCM_MASK #define BCM63268_RESET_MPI 0 #define BCM63268_RESET_PCIE (SOFTRESET_63268_PCIE_MASK | \ @@ -23,7 +23,7 @@ Subject: [PATCH 50/53] MIPS: BCM63XX: add pcie support for BCM63268 /* --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h -@@ -45,6 +45,11 @@ +@@ -46,6 +46,11 @@ #define BCM_PCIE_MEM_END_PA_6328 (BCM_PCIE_MEM_BASE_PA_6328 + \ BCM_PCIE_MEM_SIZE_6328 - 1) diff --git a/target/linux/brcm63xx/patches-4.9/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/brcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.9/341-MIPS-BCM63XX-add-support-for-BCM6318.patch rename to target/linux/brcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch index cdb1ff596..b6119e91e 100644 --- a/target/linux/brcm63xx/patches-4.9/341-MIPS-BCM63XX-add-support-for-BCM6318.patch +++ b/target/linux/brcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch @@ -21,7 +21,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig -@@ -18,6 +18,11 @@ config BCM63XX_EHCI +@@ -19,6 +19,11 @@ config BCM63XX_EHCI select USB_EHCI_BIG_ENDIAN_DESC if USB_EHCI_HCD select USB_EHCI_BIG_ENDIAN_MMIO if USB_EHCI_HCD @@ -46,7 +46,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 val = bcm_mpi_readl(MPI_CSBASE_REG(0)); --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -288,7 +288,9 @@ static void hsspi_set(struct clk *clk, i +@@ -289,7 +289,9 @@ static void hsspi_set(struct clk *clk, i { u32 mask; @@ -57,7 +57,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 mask = CKCTL_6328_HSSPI_EN; else if (BCMCPU_IS_6362()) mask = CKCTL_6362_HSSPI_EN; -@@ -443,6 +445,19 @@ static struct clk_lookup bcm3368_clks[] +@@ -444,6 +446,19 @@ static struct clk_lookup bcm3368_clks[] CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1), }; @@ -77,7 +77,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 static struct clk_lookup bcm6328_clks[] = { /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), -@@ -564,6 +579,7 @@ static struct clk_lookup bcm63268_clks[] +@@ -565,6 +580,7 @@ static struct clk_lookup bcm63268_clks[] CLKDEV_INIT(NULL, "pcie", &clk_pcie), }; @@ -85,7 +85,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define HSSPI_PLL_HZ_6328 133333333 #define HSSPI_PLL_HZ_6362 400000000 -@@ -573,6 +589,10 @@ static int __init bcm63xx_clk_init(void) +@@ -574,6 +590,10 @@ static int __init bcm63xx_clk_init(void) case BCM3368_CPU_ID: clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks)); break; @@ -216,7 +216,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 spi_resources[0].start = bcm63xx_regset_address(RSET_SPI); --- a/arch/mips/bcm63xx/irq.c +++ b/arch/mips/bcm63xx/irq.c -@@ -49,6 +49,19 @@ void __init arch_init_irq(void) +@@ -48,6 +48,19 @@ void __init arch_init_irq(void) ext_irqs[3] = BCM_3368_EXT_IRQ3; ext_shift = 4; break; @@ -249,7 +249,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 --- a/arch/mips/bcm63xx/reset.c +++ b/arch/mips/bcm63xx/reset.c -@@ -43,6 +43,23 @@ +@@ -44,6 +44,23 @@ #define BCM3368_RESET_PCIE 0 #define BCM3368_RESET_PCIE_EXT 0 @@ -273,7 +273,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define BCM6328_RESET_SPI SOFTRESET_6328_SPI_MASK #define BCM6328_RESET_ENET 0 #define BCM6328_RESET_USBH SOFTRESET_6328_USBH_MASK -@@ -147,6 +164,10 @@ static const u32 bcm3368_reset_bits[] = +@@ -148,6 +165,10 @@ static const u32 bcm3368_reset_bits[] = __GEN_RESET_BITS_TABLE(3368) }; @@ -284,7 +284,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 static const u32 bcm6328_reset_bits[] = { __GEN_RESET_BITS_TABLE(6328) }; -@@ -183,6 +204,9 @@ static int __init bcm63xx_reset_bits_ini +@@ -184,6 +205,9 @@ static int __init bcm63xx_reset_bits_ini if (BCMCPU_IS_3368()) { reset_reg = PERF_SOFTRESET_6358_REG; bcm63xx_reset_bits = bcm3368_reset_bits; @@ -317,7 +317,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 reg = bcm_perf_readl(PERF_SYS_PLL_CTL_REG); --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -10,6 +10,7 @@ +@@ -11,6 +11,7 @@ * arm mach-types) */ #define BCM3368_CPU_ID 0x3368 @@ -325,7 +325,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define BCM6328_CPU_ID 0x6328 #define BCM63281_CPU_ID 0x63281 #define BCM63283_CPU_ID 0x63283 -@@ -38,6 +39,10 @@ static inline u32 __pure __bcm63xx_get_c +@@ -39,6 +40,10 @@ static inline u32 __pure __bcm63xx_get_c case BCM3368_CPU_ID: #endif @@ -336,7 +336,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #ifdef CONFIG_BCM63XX_CPU_6328 case BCM6328_CPU_ID: #endif -@@ -87,6 +92,7 @@ static inline u32 __pure bcm63xx_get_cpu +@@ -88,6 +93,7 @@ static inline u32 __pure bcm63xx_get_cpu } #define BCMCPU_IS_3368() (bcm63xx_get_cpu_id() == BCM3368_CPU_ID) @@ -344,7 +344,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define BCMCPU_IS_6328() (bcm63xx_get_cpu_id() == BCM6328_CPU_ID) #define BCMCPU_IS_6338() (bcm63xx_get_cpu_id() == BCM6338_CPU_ID) #define BCMCPU_IS_6345() (bcm63xx_get_cpu_id() == BCM6345_CPU_ID) -@@ -98,6 +104,8 @@ static inline u32 __pure bcm63xx_get_cpu +@@ -99,6 +105,8 @@ static inline u32 __pure bcm63xx_get_cpu #define BCMCPU_VARIANT_IS_3368() \ (bcm63xx_get_cpu_variant() == BCM3368_CPU_ID) @@ -353,7 +353,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define BCMCPU_VARIANT_IS_63281() \ (bcm63xx_get_cpu_variant() == BCM63281_CPU_ID) #define BCMCPU_VARIANT_IS_63283() \ -@@ -252,6 +260,56 @@ enum bcm63xx_regs_set { +@@ -253,6 +261,56 @@ enum bcm63xx_regs_set { #define BCM_3368_MISC_BASE (0xdeadbeef) /* @@ -410,7 +410,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 * 6328 register sets base address */ #define BCM_6328_DSL_LMEM_BASE (0xdeadbeef) -@@ -774,6 +832,55 @@ enum bcm63xx_irq { +@@ -775,6 +833,55 @@ enum bcm63xx_irq { #define BCM_3368_EXT_IRQ2 (IRQ_INTERNAL_BASE + 27) #define BCM_3368_EXT_IRQ3 (IRQ_INTERNAL_BASE + 28) @@ -468,7 +468,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 * 6328 irqs --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -52,6 +52,39 @@ +@@ -53,6 +53,39 @@ CKCTL_3368_EMUSB_EN | \ CKCTL_3368_USBU_EN) @@ -508,7 +508,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define CKCTL_6328_PHYMIPS_EN (1 << 0) #define CKCTL_6328_ADSL_QPROC_EN (1 << 1) #define CKCTL_6328_ADSL_AFE_EN (1 << 2) -@@ -259,12 +292,27 @@ +@@ -260,12 +293,27 @@ CKCTL_63268_TBUS_EN | \ CKCTL_63268_ROBOSW250_EN) @@ -536,7 +536,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define PERF_IRQMASK_6328_REG(x) (0x20 + (x) * 0x10) #define PERF_IRQMASK_6338_REG 0xc #define PERF_IRQMASK_6345_REG 0xc -@@ -276,6 +324,7 @@ +@@ -277,6 +325,7 @@ /* Interrupt Status register */ #define PERF_IRQSTAT_3368_REG 0x10 @@ -544,7 +544,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define PERF_IRQSTAT_6328_REG(x) (0x28 + (x) * 0x10) #define PERF_IRQSTAT_6338_REG 0x10 #define PERF_IRQSTAT_6345_REG 0x10 -@@ -287,6 +336,7 @@ +@@ -288,6 +337,7 @@ /* External Interrupt Configuration register */ #define PERF_EXTIRQ_CFG_REG_3368 0x14 @@ -552,7 +552,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define PERF_EXTIRQ_CFG_REG_6328 0x18 #define PERF_EXTIRQ_CFG_REG_6338 0x14 #define PERF_EXTIRQ_CFG_REG_6345 0x14 -@@ -321,6 +371,7 @@ +@@ -322,6 +372,7 @@ /* Soft Reset register */ #define PERF_SOFTRESET_REG 0x28 @@ -560,7 +560,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define PERF_SOFTRESET_6328_REG 0x10 #define PERF_SOFTRESET_6358_REG 0x34 #define PERF_SOFTRESET_6362_REG 0x10 -@@ -334,6 +385,18 @@ +@@ -335,6 +386,18 @@ #define SOFTRESET_3368_USBS_MASK (1 << 11) #define SOFTRESET_3368_PCM_MASK (1 << 13) @@ -579,7 +579,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define SOFTRESET_6328_SPI_MASK (1 << 0) #define SOFTRESET_6328_EPHY_MASK (1 << 1) #define SOFTRESET_6328_SAR_MASK (1 << 2) -@@ -505,8 +568,17 @@ +@@ -506,8 +569,17 @@ #define TIMER_IRQSTAT_TIMER1_IR_EN (1 << 9) #define TIMER_IRQSTAT_TIMER2_IR_EN (1 << 10) @@ -597,7 +597,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 #define TIMER_CTL0_REG 0x4 #define TIMER_CTL1_REG 0x8 #define TIMER_CTL2_REG 0xC -@@ -1253,6 +1325,8 @@ +@@ -1254,6 +1326,8 @@ #define SDRAM_CFG_32B_MASK (1 << SDRAM_CFG_32B_SHIFT) #define SDRAM_CFG_BANK_SHIFT 13 #define SDRAM_CFG_BANK_MASK (1 << SDRAM_CFG_BANK_SHIFT) @@ -608,7 +608,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 --- a/arch/mips/include/asm/mach-bcm63xx/ioremap.h +++ b/arch/mips/include/asm/mach-bcm63xx/ioremap.h -@@ -22,6 +22,7 @@ static inline int is_bcm63xx_internal_re +@@ -23,6 +23,7 @@ static inline int is_bcm63xx_internal_re if (offset >= 0xfff00000) return 1; break; @@ -641,7 +641,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 usbd_resources[0].start = bcm63xx_regset_address(RSET_USBD); --- a/arch/mips/bcm63xx/dev-enet.c +++ b/arch/mips/bcm63xx/dev-enet.c -@@ -176,8 +176,8 @@ static int __init register_shared(void) +@@ -184,8 +184,8 @@ static int __init register_shared(void) else shared_res[0].end += (RSET_ENETDMA_SIZE) - 1; @@ -652,7 +652,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 chan_count = 32; else if (BCMCPU_IS_6345()) chan_count = 8; -@@ -285,8 +285,8 @@ bcm63xx_enetsw_register(const struct bcm +@@ -293,8 +293,8 @@ bcm63xx_enetsw_register(const struct bcm { int ret; @@ -663,7 +663,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 return -ENODEV; ret = register_shared(); -@@ -303,7 +303,7 @@ bcm63xx_enetsw_register(const struct bcm +@@ -311,7 +311,7 @@ bcm63xx_enetsw_register(const struct bcm memcpy(bcm63xx_enetsw_device.dev.platform_data, pd, sizeof(*pd)); @@ -674,7 +674,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 enetsw_pd.num_ports = ENETSW_PORTS_6368; --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h -@@ -9,6 +9,8 @@ int __init bcm63xx_gpio_init(void); +@@ -10,6 +10,8 @@ int __init bcm63xx_gpio_init(void); static inline unsigned long bcm63xx_gpio_count(void) { switch (bcm63xx_get_cpu_id()) { diff --git a/target/linux/brcm63xx/patches-4.9/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch b/target/linux/brcm63xx/patches-4.19/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.9/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch rename to target/linux/brcm63xx/patches-4.19/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch index 71044f846..e35931175 100644 --- a/target/linux/brcm63xx/patches-4.9/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch +++ b/target/linux/brcm63xx/patches-4.19/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch @@ -11,7 +11,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals --- a/arch/mips/bcm63xx/reset.c +++ b/arch/mips/bcm63xx/reset.c -@@ -28,7 +28,9 @@ +@@ -29,7 +29,9 @@ [BCM63XX_RESET_PCM] = BCM## __cpu ##_RESET_PCM, \ [BCM63XX_RESET_MPI] = BCM## __cpu ##_RESET_MPI, \ [BCM63XX_RESET_PCIE] = BCM## __cpu ##_RESET_PCIE, \ @@ -22,7 +22,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals #define BCM3368_RESET_SPI SOFTRESET_3368_SPI_MASK #define BCM3368_RESET_ENET SOFTRESET_3368_ENET_MASK -@@ -42,6 +44,8 @@ +@@ -43,6 +45,8 @@ #define BCM3368_RESET_MPI SOFTRESET_3368_MPI_MASK #define BCM3368_RESET_PCIE 0 #define BCM3368_RESET_PCIE_EXT 0 @@ -31,7 +31,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals #define BCM6318_RESET_SPI SOFTRESET_6318_SPI_MASK -@@ -54,11 +58,10 @@ +@@ -55,11 +59,10 @@ #define BCM6318_RESET_ENETSW SOFTRESET_6318_ENETSW_MASK #define BCM6318_RESET_PCM 0 #define BCM6318_RESET_MPI 0 @@ -46,7 +46,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals #define BCM6328_RESET_SPI SOFTRESET_6328_SPI_MASK #define BCM6328_RESET_ENET 0 -@@ -70,11 +73,10 @@ +@@ -71,11 +74,10 @@ #define BCM6328_RESET_ENETSW SOFTRESET_6328_ENETSW_MASK #define BCM6328_RESET_PCM SOFTRESET_6328_PCM_MASK #define BCM6328_RESET_MPI 0 @@ -61,7 +61,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals #define BCM6338_RESET_SPI SOFTRESET_6338_SPI_MASK #define BCM6338_RESET_ENET SOFTRESET_6338_ENET_MASK -@@ -88,6 +90,8 @@ +@@ -89,6 +91,8 @@ #define BCM6338_RESET_MPI 0 #define BCM6338_RESET_PCIE 0 #define BCM6338_RESET_PCIE_EXT 0 @@ -70,7 +70,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals #define BCM6348_RESET_SPI SOFTRESET_6348_SPI_MASK #define BCM6348_RESET_ENET SOFTRESET_6348_ENET_MASK -@@ -101,6 +105,8 @@ +@@ -102,6 +106,8 @@ #define BCM6348_RESET_MPI 0 #define BCM6348_RESET_PCIE 0 #define BCM6348_RESET_PCIE_EXT 0 @@ -79,7 +79,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals #define BCM6358_RESET_SPI SOFTRESET_6358_SPI_MASK #define BCM6358_RESET_ENET SOFTRESET_6358_ENET_MASK -@@ -114,6 +120,8 @@ +@@ -115,6 +121,8 @@ #define BCM6358_RESET_MPI SOFTRESET_6358_MPI_MASK #define BCM6358_RESET_PCIE 0 #define BCM6358_RESET_PCIE_EXT 0 @@ -88,7 +88,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals #define BCM6362_RESET_SPI SOFTRESET_6362_SPI_MASK #define BCM6362_RESET_ENET 0 -@@ -125,9 +133,10 @@ +@@ -126,9 +134,10 @@ #define BCM6362_RESET_ENETSW SOFTRESET_6362_ENETSW_MASK #define BCM6362_RESET_PCM SOFTRESET_6362_PCM_MASK #define BCM6362_RESET_MPI 0 @@ -101,7 +101,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals #define BCM6368_RESET_SPI SOFTRESET_6368_SPI_MASK #define BCM6368_RESET_ENET 0 -@@ -141,6 +150,8 @@ +@@ -142,6 +151,8 @@ #define BCM6368_RESET_MPI SOFTRESET_6368_MPI_MASK #define BCM6368_RESET_PCIE 0 #define BCM6368_RESET_PCIE_EXT 0 @@ -110,7 +110,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals #define BCM63268_RESET_SPI SOFTRESET_63268_SPI_MASK #define BCM63268_RESET_ENET 0 -@@ -152,10 +163,10 @@ +@@ -153,10 +164,10 @@ #define BCM63268_RESET_ENETSW SOFTRESET_63268_ENETSW_MASK #define BCM63268_RESET_PCM SOFTRESET_63268_PCM_MASK #define BCM63268_RESET_MPI 0 @@ -126,7 +126,7 @@ Subject: [PATCH 52/53] MIPS: BCM63XX: split PCIE reset signals * core reset bits --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h -@@ -14,6 +14,8 @@ enum bcm63xx_core_reset { +@@ -15,6 +15,8 @@ enum bcm63xx_core_reset { BCM63XX_RESET_MPI, BCM63XX_RESET_PCIE, BCM63XX_RESET_PCIE_EXT, diff --git a/target/linux/brcm63xx/patches-4.9/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch b/target/linux/brcm63xx/patches-4.19/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch rename to target/linux/brcm63xx/patches-4.19/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch index cc2937c57..3d9835df2 100644 --- a/target/linux/brcm63xx/patches-4.9/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch +++ b/target/linux/brcm63xx/patches-4.19/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch @@ -13,7 +13,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318 --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -51,6 +51,18 @@ static void bcm_hwclock_set(u32 mask, in +@@ -52,6 +52,18 @@ static void bcm_hwclock_set(u32 mask, in bcm_perf_writel(reg, PERF_CKCTL_REG); } @@ -32,7 +32,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318 /* * Ethernet MAC "misc" clock: dma clocks and main clock on 6348 */ -@@ -361,12 +373,17 @@ static struct clk clk_ipsec = { +@@ -362,12 +374,17 @@ static struct clk clk_ipsec = { static void pcie_set(struct clk *clk, int enable) { @@ -55,7 +55,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318 static struct clk clk_pcie = { --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h -@@ -40,6 +40,12 @@ +@@ -41,6 +41,12 @@ #define BCM_CB_MEM_END_PA (BCM_CB_MEM_BASE_PA + \ BCM_CB_MEM_SIZE - 1) @@ -70,7 +70,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318 #define BCM_PCIE_MEM_END_PA_6328 (BCM_PCIE_MEM_BASE_PA_6328 + \ --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -1529,6 +1529,17 @@ +@@ -1530,6 +1530,17 @@ * _REG relative to RSET_PCIE *************************************************************************/ @@ -88,7 +88,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318 #define PCIE_CONFIG2_REG 0x408 #define CONFIG2_BAR1_SIZE_EN 1 #define CONFIG2_BAR1_SIZE_MASK 0xf -@@ -1574,7 +1585,54 @@ +@@ -1575,7 +1586,54 @@ #define PCIE_RC_INT_C (1 << 2) #define PCIE_RC_INT_D (1 << 3) diff --git a/target/linux/brcm63xx/patches-4.9/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch b/target/linux/brcm63xx/patches-4.19/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch rename to target/linux/brcm63xx/patches-4.19/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch index f5b0e7766..298fffdfa 100644 --- a/target/linux/brcm63xx/patches-4.9/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch +++ b/target/linux/brcm63xx/patches-4.19/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch @@ -63,7 +63,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h -@@ -7,6 +7,8 @@ enum { +@@ -8,6 +8,8 @@ enum { BCM63XX_FLASH_TYPE_NAND, }; diff --git a/target/linux/brcm63xx/patches-4.9/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch b/target/linux/brcm63xx/patches-4.19/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch rename to target/linux/brcm63xx/patches-4.19/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch diff --git a/target/linux/brcm63xx/patches-4.9/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch b/target/linux/brcm63xx/patches-4.19/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.9/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch rename to target/linux/brcm63xx/patches-4.19/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch index 8e4efeb8d..a8eea5b11 100644 --- a/target/linux/brcm63xx/patches-4.9/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch +++ b/target/linux/brcm63xx/patches-4.19/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -167,7 +167,11 @@ static struct clk clk_swpkt_usb = { +@@ -168,7 +168,11 @@ static struct clk clk_swpkt_usb = { */ static void enetsw_set(struct clk *clk, int enable) { @@ -13,7 +13,7 @@ bcm_hwclock_set(CKCTL_6328_ROBOSW_EN, enable); } else if (BCMCPU_IS_6362()) { bcm_hwclock_set(CKCTL_6362_ROBOSW_EN, enable); -@@ -219,18 +223,22 @@ static struct clk clk_pcm = { +@@ -220,18 +224,22 @@ static struct clk clk_pcm = { */ static void usbh_set(struct clk *clk, int enable) { diff --git a/target/linux/brcm63xx/patches-4.9/347-MIPS-BCM6318-USB-support.patch b/target/linux/brcm63xx/patches-4.19/347-MIPS-BCM6318-USB-support.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/347-MIPS-BCM6318-USB-support.patch rename to target/linux/brcm63xx/patches-4.19/347-MIPS-BCM6318-USB-support.patch index e36d6bc9b..92c37c130 100644 --- a/target/linux/brcm63xx/patches-4.9/347-MIPS-BCM6318-USB-support.patch +++ b/target/linux/brcm63xx/patches-4.19/347-MIPS-BCM6318-USB-support.patch @@ -58,7 +58,7 @@ spin_unlock_irqrestore(&usb_priv_reg_lock, flags); --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -681,6 +681,12 @@ +@@ -682,6 +682,12 @@ #define GPIO_MODE_6368_SPI_SSN4 (1 << 30) #define GPIO_MODE_6368_SPI_SSN5 (1 << 31) @@ -71,7 +71,7 @@ #define GPIO_PINMUX_OTHR_REG 0x24 #define GPIO_PINMUX_OTHR_6328_USB_SHIFT 12 -@@ -999,6 +1005,7 @@ +@@ -1000,6 +1006,7 @@ #define USBH_PRIV_SWAP_6358_REG 0x0 #define USBH_PRIV_SWAP_6368_REG 0x1c @@ -79,7 +79,7 @@ #define USBH_PRIV_SWAP_USBD_SHIFT 6 #define USBH_PRIV_SWAP_USBD_MASK (1 << USBH_PRIV_SWAP_USBD_SHIFT) -@@ -1024,6 +1031,13 @@ +@@ -1025,6 +1032,13 @@ #define USBH_PRIV_SETUP_IOC_SHIFT 4 #define USBH_PRIV_SETUP_IOC_MASK (1 << USBH_PRIV_SETUP_IOC_SHIFT) @@ -113,7 +113,7 @@ --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig -@@ -22,6 +22,8 @@ config BCM63XX_CPU_6318 +@@ -23,6 +23,8 @@ config BCM63XX_CPU_6318 bool "support 6318 CPU" select SYS_HAS_CPU_BMIPS32_3300 select HW_HAS_PCI diff --git a/target/linux/brcm63xx/patches-4.9/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch b/target/linux/brcm63xx/patches-4.19/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.9/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch rename to target/linux/brcm63xx/patches-4.19/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch index 0b8a5a170..cdff8d5a4 100644 --- a/target/linux/brcm63xx/patches-4.9/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch +++ b/target/linux/brcm63xx/patches-4.19/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -586,6 +586,9 @@ +@@ -587,6 +587,9 @@ #define TIMER_CTL_MONOTONIC_MASK (1 << 30) #define TIMER_CTL_ENABLE_MASK (1 << 31) @@ -10,7 +10,7 @@ /************************************************************************* * _REG relative to RSET_WDT -@@ -1533,6 +1536,11 @@ +@@ -1534,6 +1537,11 @@ #define STRAPBUS_63268_FCVO_SHIFT 21 #define STRAPBUS_63268_FCVO_MASK (0xf << STRAPBUS_63268_FCVO_SHIFT) @@ -24,7 +24,7 @@ #define STRAPBUS_6328_FCVO_MASK (0x1f << STRAPBUS_6328_FCVO_SHIFT) --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -63,6 +63,26 @@ static void bcm_ub_hwclock_set(u32 mask, +@@ -64,6 +64,26 @@ static void bcm_ub_hwclock_set(u32 mask, bcm_perf_writel(reg, PERF_UB_CKCTL_REG); } @@ -51,7 +51,7 @@ /* * Ethernet MAC "misc" clock: dma clocks and main clock on 6348 */ -@@ -235,7 +255,17 @@ static void usbh_set(struct clk *clk, in +@@ -236,7 +256,17 @@ static void usbh_set(struct clk *clk, in } else if (BCMCPU_IS_6368()) { bcm_hwclock_set(CKCTL_6368_USBH_EN, enable); } else if (BCMCPU_IS_63268()) { diff --git a/target/linux/brcm63xx/patches-4.9/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch b/target/linux/brcm63xx/patches-4.19/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch rename to target/linux/brcm63xx/patches-4.19/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch index 0b709915a..41f48b93d 100644 --- a/target/linux/brcm63xx/patches-4.9/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch +++ b/target/linux/brcm63xx/patches-4.19/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -1033,11 +1033,18 @@ +@@ -1034,11 +1034,18 @@ #define USBH_PRIV_SETUP_6368_REG 0x28 #define USBH_PRIV_SETUP_IOC_SHIFT 4 #define USBH_PRIV_SETUP_IOC_MASK (1 << USBH_PRIV_SETUP_IOC_SHIFT) @@ -23,7 +23,7 @@ --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig -@@ -72,6 +72,8 @@ config BCM63XX_CPU_63268 +@@ -73,6 +73,8 @@ config BCM63XX_CPU_63268 bool "support 63268 CPU" select SYS_HAS_CPU_BMIPS4350 select HW_HAS_PCI diff --git a/target/linux/brcm63xx/patches-4.9/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch b/target/linux/brcm63xx/patches-4.19/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch rename to target/linux/brcm63xx/patches-4.19/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch index cd516f188..35c2ef63e 100644 --- a/target/linux/brcm63xx/patches-4.9/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch +++ b/target/linux/brcm63xx/patches-4.19/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -39,6 +39,7 @@ struct board_info { +@@ -40,6 +40,7 @@ struct board_info { /* USB config */ struct bcm63xx_usbd_platform_data usbd; diff --git a/target/linux/brcm63xx/patches-4.9/351-set-board-usbh-ports.patch b/target/linux/brcm63xx/patches-4.19/351-set-board-usbh-ports.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/351-set-board-usbh-ports.patch rename to target/linux/brcm63xx/patches-4.19/351-set-board-usbh-ports.patch diff --git a/target/linux/brcm63xx/patches-4.9/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch b/target/linux/brcm63xx/patches-4.19/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch rename to target/linux/brcm63xx/patches-4.19/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch index 72d5dbb2b..deca2260f 100644 --- a/target/linux/brcm63xx/patches-4.9/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch +++ b/target/linux/brcm63xx/patches-4.19/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch @@ -19,6 +19,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/Kconfig +++ b/arch/mips/bcm63xx/boards/Kconfig @@ -1,11 +1,10 @@ + # SPDX-License-Identifier: GPL-2.0 -choice - prompt "Board support" +menu "Board support" @@ -29,7 +30,6 @@ Signed-off-by: Jonas Gorski bool "Generic Broadcom 963xx boards" select SSB + default y - help -endchoice +endmenu diff --git a/target/linux/brcm63xx/patches-4.9/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch b/target/linux/brcm63xx/patches-4.19/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch rename to target/linux/brcm63xx/patches-4.19/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch index bdbba036b..846f0b81d 100644 --- a/target/linux/brcm63xx/patches-4.9/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch +++ b/target/linux/brcm63xx/patches-4.19/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch @@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski case BCM63XX_FLASH_TYPE_SERIAL: --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h -@@ -9,6 +9,8 @@ enum { +@@ -10,6 +10,8 @@ enum { void bcm63xx_flash_detect(void); diff --git a/target/linux/brcm63xx/patches-4.9/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch b/target/linux/brcm63xx/patches-4.19/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch rename to target/linux/brcm63xx/patches-4.19/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch index 859aa739b..886fb2d6f 100644 --- a/target/linux/brcm63xx/patches-4.9/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch +++ b/target/linux/brcm63xx/patches-4.19/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch @@ -20,7 +20,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile -@@ -1,7 +1,8 @@ +@@ -2,7 +2,8 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \ diff --git a/target/linux/brcm63xx/patches-4.9/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch b/target/linux/brcm63xx/patches-4.19/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch rename to target/linux/brcm63xx/patches-4.19/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch index 43a741c1f..d0e37efd5 100644 --- a/target/linux/brcm63xx/patches-4.9/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch +++ b/target/linux/brcm63xx/patches-4.19/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch @@ -75,7 +75,7 @@ Signed-off-by: Jonas Gorski #endif --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -6,6 +6,7 @@ +@@ -7,6 +7,7 @@ #include #include #include @@ -83,7 +83,7 @@ Signed-off-by: Jonas Gorski /* * flash mapping -@@ -49,6 +50,9 @@ struct board_info { +@@ -50,6 +51,9 @@ struct board_info { /* External PHY reset GPIO flags from gpio.h */ unsigned long ephy_reset_gpio_flags; diff --git a/target/linux/brcm63xx/patches-4.9/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch b/target/linux/brcm63xx/patches-4.19/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch rename to target/linux/brcm63xx/patches-4.19/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch index 9531410b2..f540eabef 100644 --- a/target/linux/brcm63xx/patches-4.9/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch +++ b/target/linux/brcm63xx/patches-4.19/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch @@ -130,7 +130,7 @@ Signed-off-by: Jonas Gorski bcm63xx_spi_register(); --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -32,6 +32,7 @@ struct board_info { +@@ -33,6 +33,7 @@ struct board_info { unsigned int has_usbd:1; unsigned int has_uart0:1; unsigned int has_uart1:1; diff --git a/target/linux/brcm63xx/patches-4.9/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch b/target/linux/brcm63xx/patches-4.19/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch rename to target/linux/brcm63xx/patches-4.19/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch diff --git a/target/linux/brcm63xx/patches-4.9/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch b/target/linux/brcm63xx/patches-4.19/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch rename to target/linux/brcm63xx/patches-4.19/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch diff --git a/target/linux/brcm63xx/patches-4.9/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch b/target/linux/brcm63xx/patches-4.19/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch rename to target/linux/brcm63xx/patches-4.19/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch diff --git a/target/linux/brcm63xx/patches-4.9/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch b/target/linux/brcm63xx/patches-4.19/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch rename to target/linux/brcm63xx/patches-4.19/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch index 6475f9fa2..11153c1b1 100644 --- a/target/linux/brcm63xx/patches-4.9/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch +++ b/target/linux/brcm63xx/patches-4.19/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch @@ -13,14 +13,14 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/Kconfig +++ b/arch/mips/bcm63xx/boards/Kconfig -@@ -4,6 +4,7 @@ menu "Board support" +@@ -5,6 +5,7 @@ menu "Board support" config BOARD_BCM963XX bool "Generic Broadcom 963xx boards" select SSB + select BCMA default y - help + endmenu --- a/arch/mips/bcm63xx/sprom.c +++ b/arch/mips/bcm63xx/sprom.c @@ -12,6 +12,7 @@ diff --git a/target/linux/brcm63xx/patches-4.9/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch b/target/linux/brcm63xx/patches-4.19/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch rename to target/linux/brcm63xx/patches-4.19/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch diff --git a/target/linux/brcm63xx/patches-4.9/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch b/target/linux/brcm63xx/patches-4.19/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch rename to target/linux/brcm63xx/patches-4.19/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch diff --git a/target/linux/brcm63xx/patches-4.9/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch b/target/linux/brcm63xx/patches-4.19/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch rename to target/linux/brcm63xx/patches-4.19/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch diff --git a/target/linux/brcm63xx/patches-4.9/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch b/target/linux/brcm63xx/patches-4.19/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch rename to target/linux/brcm63xx/patches-4.19/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch index 053ffe8ac..a49181640 100644 --- a/target/linux/brcm63xx/patches-4.9/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch +++ b/target/linux/brcm63xx/patches-4.19/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch @@ -12,7 +12,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/Kconfig +++ b/arch/mips/bcm63xx/boards/Kconfig -@@ -1,6 +1,10 @@ +@@ -2,6 +2,10 @@ menu "Board support" depends on BCM63XX diff --git a/target/linux/brcm63xx/patches-4.9/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/brcm63xx/patches-4.19/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch rename to target/linux/brcm63xx/patches-4.19/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch diff --git a/target/linux/brcm63xx/patches-4.9/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch b/target/linux/brcm63xx/patches-4.19/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch rename to target/linux/brcm63xx/patches-4.19/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch diff --git a/target/linux/brcm63xx/patches-4.9/371_add_of_node_available_by_alias.patch b/target/linux/brcm63xx/patches-4.19/371_add_of_node_available_by_alias.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/371_add_of_node_available_by_alias.patch rename to target/linux/brcm63xx/patches-4.19/371_add_of_node_available_by_alias.patch diff --git a/target/linux/brcm63xx/patches-4.9/372_dont_register_pflash_when_available_in_dtb.patch b/target/linux/brcm63xx/patches-4.19/372_dont_register_pflash_when_available_in_dtb.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/372_dont_register_pflash_when_available_in_dtb.patch rename to target/linux/brcm63xx/patches-4.19/372_dont_register_pflash_when_available_in_dtb.patch diff --git a/target/linux/brcm63xx/patches-4.9/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch b/target/linux/brcm63xx/patches-4.19/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.9/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch rename to target/linux/brcm63xx/patches-4.19/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch index 555352ef1..c5041a923 100644 --- a/target/linux/brcm63xx/patches-4.9/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch +++ b/target/linux/brcm63xx/patches-4.19/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch @@ -10,7 +10,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/irq.c +++ b/arch/mips/bcm63xx/irq.c -@@ -15,6 +15,8 @@ +@@ -14,6 +14,8 @@ #include #include #include @@ -19,7 +19,7 @@ Signed-off-by: Jonas Gorski #include #include #include -@@ -22,6 +24,9 @@ +@@ -21,6 +23,9 @@ #include #include @@ -29,7 +29,7 @@ Signed-off-by: Jonas Gorski void __init arch_init_irq(void) { void __iomem *periph_bases[2]; -@@ -30,6 +35,13 @@ void __init arch_init_irq(void) +@@ -29,6 +34,13 @@ void __init arch_init_irq(void) int periph_irqs[2] = { 2, 3 }; int ext_irqs[6]; diff --git a/target/linux/brcm63xx/patches-4.9/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch b/target/linux/brcm63xx/patches-4.19/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.9/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch rename to target/linux/brcm63xx/patches-4.19/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch index 2eaf0b6b5..6307d5640 100644 --- a/target/linux/brcm63xx/patches-4.9/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch +++ b/target/linux/brcm63xx/patches-4.19/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig -@@ -134,6 +134,13 @@ config GPIO_BCM_KONA +@@ -151,6 +151,13 @@ config GPIO_BCM_KONA help Turn on GPIO support for Broadcom "Kona" chips. @@ -30,14 +30,14 @@ Signed-off-by: Jonas Gorski default y if (ARCH_BRCMSTB || BMIPS_GENERIC) --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -31,6 +31,7 @@ obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o +@@ -34,6 +34,7 @@ obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o - obj-$(CONFIG_GPIO_AXP209) += gpio-axp209.o + obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o +obj-$(CONFIG_GPIO_BCM63XX) += gpio-bcm63xx.o + obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o - obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o --- /dev/null +++ b/drivers/gpio/gpio-bcm63xx.c @@ -0,0 +1,135 @@ diff --git a/target/linux/brcm63xx/patches-4.9/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch b/target/linux/brcm63xx/patches-4.19/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.9/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch rename to target/linux/brcm63xx/patches-4.19/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch index 7c39e21ff..fe56da083 100644 --- a/target/linux/brcm63xx/patches-4.9/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch +++ b/target/linux/brcm63xx/patches-4.19/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch @@ -1,4 +1,4 @@ -From cc99dca188bb63ba390008e2f7fa62d0300233e0 Mon Sep 17 00:00:00 2001 +From 302f69453721e5ee19f583339a3a646821d4a173 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 20 Feb 2015 23:58:54 +0100 Subject: [PATCH 2/6] MIPS: BCM63XX: switch to new gpio driver @@ -6,9 +6,9 @@ Subject: [PATCH 2/6] MIPS: BCM63XX: switch to new gpio driver Signed-off-by: Jonas Gorski --- arch/mips/bcm63xx/boards/board_common.c | 2 + - arch/mips/bcm63xx/gpio.c | 147 +++++++------------------------ - arch/mips/bcm63xx/setup.c | 3 - - 3 files changed, 33 insertions(+), 119 deletions(-) + arch/mips/bcm63xx/gpio.c | 145 ++++++++++------------------------------------ + arch/mips/bcm63xx/setup.c | 3 - + 3 files changed, 32 insertions(+), 118 deletions(-) --- a/arch/mips/bcm63xx/boards/board_common.c +++ b/arch/mips/bcm63xx/boards/board_common.c @@ -23,7 +23,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/gpio.c +++ b/arch/mips/bcm63xx/gpio.c -@@ -5,147 +5,61 @@ +@@ -5,147 +5,62 @@ * * Copyright (C) 2008 Maxime Bizon * Copyright (C) 2008-2011 Florian Fainelli @@ -31,7 +31,7 @@ Signed-off-by: Jonas Gorski */ #include --#include + #include -#include #include #include diff --git a/target/linux/brcm63xx/patches-4.9/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch b/target/linux/brcm63xx/patches-4.19/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.9/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch rename to target/linux/brcm63xx/patches-4.19/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch index 9e2db8ca6..c061ec4e6 100644 --- a/target/linux/brcm63xx/patches-4.9/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch +++ b/target/linux/brcm63xx/patches-4.19/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch @@ -42,13 +42,14 @@ Signed-off-by: Jonas Gorski } --- a/arch/mips/bcm63xx/gpio.c +++ b/arch/mips/bcm63xx/gpio.c -@@ -8,14 +8,22 @@ +@@ -8,15 +8,23 @@ * Copyright (C) Jonas Gorski */ +#include + #include + #include #include #include +#include @@ -65,7 +66,7 @@ Signed-off-by: Jonas Gorski static void __init bcm63xx_gpio_init_one(int id, int dir, int data, int ngpio) { struct resource res[2]; -@@ -63,3 +71,25 @@ int __init bcm63xx_gpio_init(void) +@@ -64,3 +72,25 @@ int __init bcm63xx_gpio_init(void) return 0; } @@ -93,7 +94,7 @@ Signed-off-by: Jonas Gorski +} --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h -@@ -2,9 +2,11 @@ +@@ -3,9 +3,11 @@ #define BCM63XX_GPIO_H #include @@ -107,7 +108,7 @@ Signed-off-by: Jonas Gorski { --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -3,6 +3,7 @@ +@@ -4,6 +4,7 @@ #include #include @@ -115,7 +116,7 @@ Signed-off-by: Jonas Gorski #include #include #include -@@ -49,8 +50,8 @@ struct board_info { +@@ -50,8 +51,8 @@ struct board_info { /* External PHY reset GPIO */ unsigned int ephy_reset_gpio; diff --git a/target/linux/brcm63xx/patches-4.9/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch b/target/linux/brcm63xx/patches-4.19/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.9/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch rename to target/linux/brcm63xx/patches-4.19/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch index 1db543f40..6eb1bd028 100644 --- a/target/linux/brcm63xx/patches-4.9/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch +++ b/target/linux/brcm63xx/patches-4.19/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch @@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/gpio.c +++ b/arch/mips/bcm63xx/gpio.c -@@ -19,6 +19,8 @@ +@@ -20,6 +20,8 @@ #include #include @@ -20,7 +20,7 @@ Signed-off-by: Jonas Gorski static const char * const gpio_chip_labels[] = { "bcm63xx-gpio.0", "bcm63xx-gpio.1", -@@ -47,8 +49,10 @@ static void __init bcm63xx_gpio_init_one +@@ -48,8 +50,10 @@ static void __init bcm63xx_gpio_init_one pdata.base = id * 32; pdata.ngpio = ngpio; diff --git a/target/linux/brcm63xx/patches-4.9/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch b/target/linux/brcm63xx/patches-4.19/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch rename to target/linux/brcm63xx/patches-4.19/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch diff --git a/target/linux/brcm63xx/patches-4.9/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch b/target/linux/brcm63xx/patches-4.19/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.9/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch rename to target/linux/brcm63xx/patches-4.19/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch index 524ca1aa0..253417153 100644 --- a/target/linux/brcm63xx/patches-4.9/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch +++ b/target/linux/brcm63xx/patches-4.19/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch @@ -39,7 +39,7 @@ Signed-off-by: Jonas Gorski sock->ops = &bcm63xx_pcmcia_operations; --- a/drivers/pcmcia/bcm63xx_pcmcia.h +++ b/drivers/pcmcia/bcm63xx_pcmcia.h -@@ -3,6 +3,7 @@ +@@ -4,6 +4,7 @@ #include #include @@ -47,7 +47,7 @@ Signed-off-by: Jonas Gorski #include #include -@@ -55,6 +56,9 @@ struct bcm63xx_pcmcia_socket { +@@ -56,6 +57,9 @@ struct bcm63xx_pcmcia_socket { /* base address of io memory */ void __iomem *io_base; diff --git a/target/linux/brcm63xx/patches-4.9/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch b/target/linux/brcm63xx/patches-4.19/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch rename to target/linux/brcm63xx/patches-4.19/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch diff --git a/target/linux/brcm63xx/patches-4.9/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch b/target/linux/brcm63xx/patches-4.19/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch rename to target/linux/brcm63xx/patches-4.19/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch diff --git a/target/linux/brcm63xx/patches-4.9/383-bcm63xx_select_pinctrl.patch b/target/linux/brcm63xx/patches-4.19/383-bcm63xx_select_pinctrl.patch similarity index 80% rename from target/linux/brcm63xx/patches-4.9/383-bcm63xx_select_pinctrl.patch rename to target/linux/brcm63xx/patches-4.19/383-bcm63xx_select_pinctrl.patch index 52c240ff4..67c8cee22 100644 --- a/target/linux/brcm63xx/patches-4.9/383-bcm63xx_select_pinctrl.patch +++ b/target/linux/brcm63xx/patches-4.19/383-bcm63xx_select_pinctrl.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig -@@ -24,6 +24,8 @@ config BCM63XX_CPU_6318 +@@ -25,6 +25,8 @@ config BCM63XX_CPU_6318 select HW_HAS_PCI select BCM63XX_OHCI select BCM63XX_EHCI @@ -9,7 +9,7 @@ config BCM63XX_CPU_6328 bool "support 6328 CPU" -@@ -31,6 +33,8 @@ config BCM63XX_CPU_6328 +@@ -32,6 +34,8 @@ config BCM63XX_CPU_6328 select HW_HAS_PCI select BCM63XX_OHCI select BCM63XX_EHCI @@ -18,7 +18,7 @@ config BCM63XX_CPU_6338 bool "support 6338 CPU" -@@ -46,6 +50,8 @@ config BCM63XX_CPU_6348 +@@ -47,6 +51,8 @@ config BCM63XX_CPU_6348 select SYS_HAS_CPU_BMIPS32_3300 select HW_HAS_PCI select BCM63XX_OHCI @@ -27,7 +27,7 @@ config BCM63XX_CPU_6358 bool "support 6358 CPU" -@@ -53,6 +59,8 @@ config BCM63XX_CPU_6358 +@@ -54,6 +60,8 @@ config BCM63XX_CPU_6358 select HW_HAS_PCI select BCM63XX_OHCI select BCM63XX_EHCI @@ -36,7 +36,7 @@ config BCM63XX_CPU_6362 bool "support 6362 CPU" -@@ -60,6 +68,8 @@ config BCM63XX_CPU_6362 +@@ -61,6 +69,8 @@ config BCM63XX_CPU_6362 select HW_HAS_PCI select BCM63XX_OHCI select BCM63XX_EHCI @@ -45,7 +45,7 @@ config BCM63XX_CPU_6368 bool "support 6368 CPU" -@@ -67,6 +77,8 @@ config BCM63XX_CPU_6368 +@@ -68,6 +78,8 @@ config BCM63XX_CPU_6368 select HW_HAS_PCI select BCM63XX_OHCI select BCM63XX_EHCI @@ -54,7 +54,7 @@ config BCM63XX_CPU_63268 bool "support 63268 CPU" -@@ -74,6 +86,8 @@ config BCM63XX_CPU_63268 +@@ -75,6 +87,8 @@ config BCM63XX_CPU_63268 select HW_HAS_PCI select BCM63XX_OHCI select BCM63XX_EHCI diff --git a/target/linux/brcm63xx/patches-4.9/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch b/target/linux/brcm63xx/patches-4.19/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch similarity index 87% rename from target/linux/brcm63xx/patches-4.9/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch rename to target/linux/brcm63xx/patches-4.19/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch index 051c8fb88..fe4dbe3e1 100644 --- a/target/linux/brcm63xx/patches-4.9/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch +++ b/target/linux/brcm63xx/patches-4.19/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch @@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c -@@ -488,6 +488,8 @@ static struct clk_lookup bcm3368_clks[] +@@ -489,6 +489,8 @@ static struct clk_lookup bcm3368_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -18,7 +18,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -504,7 +506,9 @@ static struct clk_lookup bcm6318_clks[] +@@ -505,7 +507,9 @@ static struct clk_lookup bcm6318_clks[] /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), @@ -28,7 +28,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -518,7 +522,10 @@ static struct clk_lookup bcm6328_clks[] +@@ -519,7 +523,10 @@ static struct clk_lookup bcm6328_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -39,7 +39,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -531,6 +538,7 @@ static struct clk_lookup bcm6338_clks[] +@@ -532,6 +539,7 @@ static struct clk_lookup bcm6338_clks[] /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), @@ -47,7 +47,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -545,6 +553,7 @@ static struct clk_lookup bcm6345_clks[] +@@ -546,6 +554,7 @@ static struct clk_lookup bcm6345_clks[] /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), @@ -55,7 +55,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -559,6 +568,7 @@ static struct clk_lookup bcm6348_clks[] +@@ -560,6 +569,7 @@ static struct clk_lookup bcm6348_clks[] /* fixed rate clocks */ CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), @@ -63,7 +63,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -575,6 +585,8 @@ static struct clk_lookup bcm6358_clks[] +@@ -576,6 +586,8 @@ static struct clk_lookup bcm6358_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -72,7 +72,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -594,7 +606,10 @@ static struct clk_lookup bcm6362_clks[] +@@ -595,7 +607,10 @@ static struct clk_lookup bcm6362_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -83,7 +83,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -610,6 +625,8 @@ static struct clk_lookup bcm6368_clks[] +@@ -611,6 +626,8 @@ static struct clk_lookup bcm6368_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), @@ -92,7 +92,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree /* gated clocks */ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -624,7 +641,10 @@ static struct clk_lookup bcm63268_clks[] +@@ -625,7 +642,10 @@ static struct clk_lookup bcm63268_clks[] CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), diff --git a/target/linux/brcm63xx/patches-4.9/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch b/target/linux/brcm63xx/patches-4.19/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch rename to target/linux/brcm63xx/patches-4.19/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch index 5c76f8fb2..03b8bfc7c 100644 --- a/target/linux/brcm63xx/patches-4.9/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch +++ b/target/linux/brcm63xx/patches-4.19/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch @@ -35,7 +35,8 @@ Signed-off-by: Jonas Gorski bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds); --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ - dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \ @@ -159,7 +160,8 @@ Signed-off-by: Jonas Gorski -} --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h +++ /dev/null -@@ -1,8 +0,0 @@ +@@ -1,9 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef BCM63XX_DEV_HSSPI_H -#define BCM63XX_DEV_HSSPI_H - diff --git a/target/linux/brcm63xx/patches-4.9/391-MIPS-BCM63XX-do-not-register-uart.patch b/target/linux/brcm63xx/patches-4.19/391-MIPS-BCM63XX-do-not-register-uart.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/391-MIPS-BCM63XX-do-not-register-uart.patch rename to target/linux/brcm63xx/patches-4.19/391-MIPS-BCM63XX-do-not-register-uart.patch index 9bf1f45ce..e9d4481d1 100644 --- a/target/linux/brcm63xx/patches-4.9/391-MIPS-BCM63XX-do-not-register-uart.patch +++ b/target/linux/brcm63xx/patches-4.19/391-MIPS-BCM63XX-do-not-register-uart.patch @@ -1,6 +1,7 @@ --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ - dev-rng.o dev-uart.o dev-wdt.o \ @@ -89,7 +90,8 @@ -} --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h +++ /dev/null -@@ -1,6 +0,0 @@ +@@ -1,7 +0,0 @@ +-/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef BCM63XX_DEV_UART_H_ -#define BCM63XX_DEV_UART_H_ - @@ -98,7 +100,7 @@ -#endif /* BCM63XX_DEV_UART_H_ */ --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -31,8 +31,6 @@ struct board_info { +@@ -32,8 +32,6 @@ struct board_info { unsigned int has_ohci0:1; unsigned int has_ehci0:1; unsigned int has_usbd:1; diff --git a/target/linux/brcm63xx/patches-4.9/392-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/brcm63xx/patches-4.19/392-MIPS-BCM63XX-remove-leds-and-buttons.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/392-MIPS-BCM63XX-remove-leds-and-buttons.patch rename to target/linux/brcm63xx/patches-4.19/392-MIPS-BCM63XX-remove-leds-and-buttons.patch diff --git a/target/linux/brcm63xx/patches-4.9/400-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-4.19/400-bcm963xx_flashmap.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/400-bcm963xx_flashmap.patch rename to target/linux/brcm63xx/patches-4.19/400-bcm963xx_flashmap.patch index 6b4f0f138..c693ace36 100644 --- a/target/linux/brcm63xx/patches-4.9/400-bcm963xx_flashmap.patch +++ b/target/linux/brcm63xx/patches-4.19/400-bcm963xx_flashmap.patch @@ -23,7 +23,7 @@ Signed-off-by: Axel Gembe .width = 2, --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c -@@ -73,6 +73,7 @@ static int parse_redboot_partitions(stru +@@ -72,6 +72,7 @@ static int parse_redboot_partitions(stru int nulllen = 0; int numslots; unsigned long offset; @@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED static char nullstring[] = "unallocated"; #endif -@@ -177,6 +178,16 @@ static int parse_redboot_partitions(stru +@@ -176,6 +177,16 @@ static int parse_redboot_partitions(stru goto out; } @@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe for (i = 0; i < numslots; i++) { struct fis_list *new_fl, **prev; -@@ -197,10 +208,10 @@ static int parse_redboot_partitions(stru +@@ -196,10 +207,10 @@ static int parse_redboot_partitions(stru goto out; } new_fl->img = &buf[i]; diff --git a/target/linux/brcm63xx/patches-4.9/401-bcm963xx_real_rootfs_length.patch b/target/linux/brcm63xx/patches-4.19/401-bcm963xx_real_rootfs_length.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.9/401-bcm963xx_real_rootfs_length.patch rename to target/linux/brcm63xx/patches-4.19/401-bcm963xx_real_rootfs_length.patch index 2ac6160f2..efefba41b 100644 --- a/target/linux/brcm63xx/patches-4.9/401-bcm963xx_real_rootfs_length.patch +++ b/target/linux/brcm63xx/patches-4.19/401-bcm963xx_real_rootfs_length.patch @@ -1,6 +1,6 @@ --- a/include/linux/bcm963xx_tag.h +++ b/include/linux/bcm963xx_tag.h -@@ -91,8 +91,10 @@ struct bcm_tag { +@@ -92,8 +92,10 @@ struct bcm_tag { __u32 rootfs_crc; /* 224-227: CRC32 of kernel partition */ __u32 kernel_crc; diff --git a/target/linux/brcm63xx/patches-4.9/402_bcm63xx_enet_vlan_incoming_fixed.patch b/target/linux/brcm63xx/patches-4.19/402_bcm63xx_enet_vlan_incoming_fixed.patch similarity index 58% rename from target/linux/brcm63xx/patches-4.9/402_bcm63xx_enet_vlan_incoming_fixed.patch rename to target/linux/brcm63xx/patches-4.19/402_bcm63xx_enet_vlan_incoming_fixed.patch index 650ad11c7..c3b5778e0 100644 --- a/target/linux/brcm63xx/patches-4.9/402_bcm63xx_enet_vlan_incoming_fixed.patch +++ b/target/linux/brcm63xx/patches-4.19/402_bcm63xx_enet_vlan_incoming_fixed.patch @@ -1,11 +1,11 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1635,7 +1635,7 @@ static int compute_hw_mtu(struct bcm_ene - actual_mtu = mtu; +@@ -1634,7 +1634,7 @@ static int bcm_enet_change_mtu(struct ne + return -EBUSY; /* add ethernet header + vlan tag size */ - actual_mtu += VLAN_ETH_HLEN; + actual_mtu += VLAN_ETH_HLEN + VLAN_HLEN; - if (actual_mtu < 64 || actual_mtu > BCMENET_MAX_MTU) - return -EINVAL; + /* + * setup maximum size before we get overflow mark in diff --git a/target/linux/brcm63xx/patches-4.9/403-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-4.19/403-6358-enet1-external-mii-clk.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/403-6358-enet1-external-mii-clk.patch rename to target/linux/brcm63xx/patches-4.19/403-6358-enet1-external-mii-clk.patch index 1edec6a91..efd9763a4 100644 --- a/target/linux/brcm63xx/patches-4.9/403-6358-enet1-external-mii-clk.patch +++ b/target/linux/brcm63xx/patches-4.19/403-6358-enet1-external-mii-clk.patch @@ -11,7 +11,7 @@ bcm_gpio_writel(val, GPIO_MODE_REG); --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -651,6 +651,8 @@ +@@ -652,6 +652,8 @@ #define GPIO_MODE_6358_EXTRA_SPI_SS (1 << 7) #define GPIO_MODE_6358_SERIAL_LED (1 << 10) #define GPIO_MODE_6358_UTOPIA (1 << 12) diff --git a/target/linux/brcm63xx/patches-4.9/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch b/target/linux/brcm63xx/patches-4.19/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.9/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch rename to target/linux/brcm63xx/patches-4.19/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch index d0bd9218d..e30bd5b10 100644 --- a/target/linux/brcm63xx/patches-4.9/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch +++ b/target/linux/brcm63xx/patches-4.19/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -870,10 +870,8 @@ static int bcm_enet_open(struct net_devi +@@ -867,10 +867,8 @@ static int bcm_enet_open(struct net_devi struct bcm_enet_priv *priv; struct sockaddr addr; struct device *kdev; @@ -26,7 +26,7 @@ Signed-off-by: Jonas Gorski void *p; u32 val; -@@ -881,40 +879,10 @@ static int bcm_enet_open(struct net_devi +@@ -878,40 +876,10 @@ static int bcm_enet_open(struct net_devi kdev = &priv->pdev->dev; if (priv->has_phy) { @@ -68,7 +68,7 @@ Signed-off-by: Jonas Gorski } /* mask all interrupts and request them */ -@@ -924,7 +892,7 @@ static int bcm_enet_open(struct net_devi +@@ -921,7 +889,7 @@ static int bcm_enet_open(struct net_devi ret = request_irq(dev->irq, bcm_enet_isr_mac, 0, dev->name, dev); if (ret) @@ -77,7 +77,7 @@ Signed-off-by: Jonas Gorski ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, 0, dev->name, dev); -@@ -1086,8 +1054,8 @@ static int bcm_enet_open(struct net_devi +@@ -1083,8 +1051,8 @@ static int bcm_enet_open(struct net_devi enet_dmac_writel(priv, priv->dma_chan_int_mask, ENETDMAC_IRMASK, priv->tx_chan); @@ -88,7 +88,7 @@ Signed-off-by: Jonas Gorski else bcm_enet_adjust_link(dev); -@@ -1128,10 +1096,6 @@ out_freeirq_rx: +@@ -1125,10 +1093,6 @@ out_freeirq_rx: out_freeirq: free_irq(dev->irq, dev); @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski return ret; } -@@ -1236,10 +1200,6 @@ static int bcm_enet_stop(struct net_devi +@@ -1233,10 +1197,6 @@ static int bcm_enet_stop(struct net_devi free_irq(priv->irq_rx, dev); free_irq(dev->irq, dev); @@ -110,16 +110,14 @@ Signed-off-by: Jonas Gorski return 0; } -@@ -1821,14 +1781,46 @@ static int bcm_enet_probe(struct platfor +@@ -1802,14 +1762,47 @@ static int bcm_enet_probe(struct platfor /* do minimal hardware init to be able to probe mii bus */ bcm_enet_hw_preinit(priv); + spin_lock_init(&priv->rx_lock); + + /* init rx timeout (used for oom) */ -+ init_timer(&priv->rx_timeout); -+ priv->rx_timeout.function = bcm_enet_refill_rx_timer; -+ priv->rx_timeout.data = (unsigned long)dev; ++ timer_setup(&priv->rx_timeout, bcm_enet_refill_rx_timer, 0); + + /* init the mib update lock&work */ + mutex_init(&priv->mib_update_lock); @@ -134,6 +132,9 @@ Signed-off-by: Jonas Gorski + netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16); + + dev->ethtool_ops = &bcm_enet_ethtool_ops; ++ /* MTU range: 46 - 2028 */ ++ dev->min_mtu = ETH_ZLEN - ETH_HLEN; ++ dev->max_mtu = BCMENET_MAX_MTU - VLAN_ETH_HLEN; + SET_NETDEV_DEV(dev, &pdev->dev); + + ret = register_netdev(dev); @@ -158,7 +159,7 @@ Signed-off-by: Jonas Gorski } bus = priv->mii_bus; -@@ -1852,6 +1844,35 @@ static int bcm_enet_probe(struct platfor +@@ -1833,6 +1826,35 @@ static int bcm_enet_probe(struct platfor dev_err(&pdev->dev, "unable to register mdio bus\n"); goto out_free_mdio; } @@ -194,7 +195,7 @@ Signed-off-by: Jonas Gorski } else { /* run platform code to initialize PHY device */ -@@ -1859,44 +1880,16 @@ static int bcm_enet_probe(struct platfor +@@ -1840,45 +1862,16 @@ static int bcm_enet_probe(struct platfor pd->mii_config(dev, 1, bcm_enet_mdio_read_mii, bcm_enet_mdio_write_mii)) { dev_err(&pdev->dev, "unable to configure mdio bus\n"); @@ -206,9 +207,7 @@ Signed-off-by: Jonas Gorski - spin_lock_init(&priv->rx_lock); - - /* init rx timeout (used for oom) */ -- init_timer(&priv->rx_timeout); -- priv->rx_timeout.function = bcm_enet_refill_rx_timer; -- priv->rx_timeout.data = (unsigned long)dev; +- timer_setup(&priv->rx_timeout, bcm_enet_refill_rx_timer, 0); - - /* init the mib update lock&work */ - mutex_init(&priv->mib_update_lock); @@ -223,6 +222,9 @@ Signed-off-by: Jonas Gorski - netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16); - - dev->ethtool_ops = &bcm_enet_ethtool_ops; +- /* MTU range: 46 - 2028 */ +- dev->min_mtu = ETH_ZLEN - ETH_HLEN; +- dev->max_mtu = BCMENET_MAX_MTU - VLAN_ETH_HLEN; - SET_NETDEV_DEV(dev, &pdev->dev); - - ret = register_netdev(dev); @@ -243,7 +245,7 @@ Signed-off-by: Jonas Gorski if (priv->mii_bus) mdiobus_unregister(priv->mii_bus); -@@ -1904,6 +1897,9 @@ out_free_mdio: +@@ -1886,6 +1879,9 @@ out_free_mdio: if (priv->mii_bus) mdiobus_free(priv->mii_bus); @@ -253,7 +255,7 @@ Signed-off-by: Jonas Gorski out_uninit_hw: /* turn off mdc clock */ enet_writel(priv, 0, ENET_MIISC_REG); -@@ -1934,6 +1930,7 @@ static int bcm_enet_remove(struct platfo +@@ -1916,6 +1912,7 @@ static int bcm_enet_remove(struct platfo enet_writel(priv, 0, ENET_MIISC_REG); if (priv->has_phy) { diff --git a/target/linux/brcm63xx/patches-4.9/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch b/target/linux/brcm63xx/patches-4.19/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.9/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch rename to target/linux/brcm63xx/patches-4.19/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch index bfa1ad0a2..86940ae14 100644 --- a/target/linux/brcm63xx/patches-4.9/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch +++ b/target/linux/brcm63xx/patches-4.19/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch @@ -10,7 +10,7 @@ Subject: [PATCH 54/81] bcm63xx_enet: enable rgmii clock on external ports --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -967,6 +967,19 @@ +@@ -968,6 +968,19 @@ #define ENETSW_PORTOV_FDX_MASK (1 << 1) #define ENETSW_PORTOV_LINKUP_MASK (1 << 0) @@ -32,7 +32,7 @@ Subject: [PATCH 54/81] bcm63xx_enet: enable rgmii clock on external ports #define ENETSW_MDIOC_EXT_MASK (1 << 16) --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2205,6 +2205,18 @@ static int bcm_enetsw_open(struct net_de +@@ -2185,6 +2185,18 @@ static int bcm_enetsw_open(struct net_de priv->sw_port_link[i] = 0; } diff --git a/target/linux/brcm63xx/patches-4.9/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/brcm63xx/patches-4.19/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch rename to target/linux/brcm63xx/patches-4.19/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch index 608ad8e39..a91494db4 100644 --- a/target/linux/brcm63xx/patches-4.9/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch +++ b/target/linux/brcm63xx/patches-4.19/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch @@ -139,7 +139,7 @@ Signed-off-by: Jonas Gorski return -ENODEV; --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -708,6 +708,7 @@ +@@ -709,6 +709,7 @@ #define GPIO_STRAPBUS_REG 0x40 #define STRAPBUS_6358_BOOT_SEL_PARALLEL (1 << 1) #define STRAPBUS_6358_BOOT_SEL_SERIAL (0 << 1) @@ -147,7 +147,7 @@ Signed-off-by: Jonas Gorski #define STRAPBUS_6368_BOOT_SEL_MASK 0x3 #define STRAPBUS_6368_BOOT_SEL_NAND 0 #define STRAPBUS_6368_BOOT_SEL_SERIAL 1 -@@ -1564,6 +1565,7 @@ +@@ -1565,6 +1566,7 @@ #define IDDQ_CTRL_63268_USBH (1 << 4) #define MISC_STRAPBUS_6328_REG 0x240 diff --git a/target/linux/brcm63xx/patches-4.9/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-4.19/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch similarity index 96% rename from target/linux/brcm63xx/patches-4.9/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch rename to target/linux/brcm63xx/patches-4.19/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch index a0ecbba27..16d47b4c5 100644 --- a/target/linux/brcm63xx/patches-4.9/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch +++ b/target/linux/brcm63xx/patches-4.19/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch @@ -39,7 +39,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -8,6 +8,7 @@ +@@ -9,6 +9,7 @@ #include #include #include @@ -47,7 +47,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data /* * flash mapping -@@ -15,6 +16,11 @@ +@@ -16,6 +17,11 @@ #define BCM963XX_CFE_VERSION_OFFSET 0x570 #define BCM963XX_NVRAM_OFFSET 0x580 @@ -59,7 +59,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data /* * board definition */ -@@ -32,6 +38,10 @@ struct board_info { +@@ -33,6 +39,10 @@ struct board_info { unsigned int has_ehci0:1; unsigned int has_usbd:1; unsigned int use_fallback_sprom:1; diff --git a/target/linux/brcm63xx/patches-4.9/415-MIPS-BCM63XX-export-the-attached-flash-type.patch b/target/linux/brcm63xx/patches-4.19/415-MIPS-BCM63XX-export-the-attached-flash-type.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.9/415-MIPS-BCM63XX-export-the-attached-flash-type.patch rename to target/linux/brcm63xx/patches-4.19/415-MIPS-BCM63XX-export-the-attached-flash-type.patch index 94c63c5e8..9fbfae4a0 100644 --- a/target/linux/brcm63xx/patches-4.9/415-MIPS-BCM63XX-export-the-attached-flash-type.patch +++ b/target/linux/brcm63xx/patches-4.19/415-MIPS-BCM63XX-export-the-attached-flash-type.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski +} --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h -@@ -13,4 +13,6 @@ void bcm63xx_flash_force_phys_base_addre +@@ -14,4 +14,6 @@ void bcm63xx_flash_force_phys_base_addre int __init bcm63xx_flash_register(void); diff --git a/target/linux/brcm63xx/patches-4.9/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch b/target/linux/brcm63xx/patches-4.19/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch rename to target/linux/brcm63xx/patches-4.19/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch index c4c69071c..c9d2ee179 100644 --- a/target/linux/brcm63xx/patches-4.9/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch +++ b/target/linux/brcm63xx/patches-4.19/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch @@ -13,7 +13,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile -@@ -2,7 +2,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o +@@ -3,7 +3,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ dev-rng.o dev-wdt.o \ dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o \ diff --git a/target/linux/brcm63xx/patches-4.9/420-BCM63XX-add-endian-check-for-ath9k.patch b/target/linux/brcm63xx/patches-4.19/420-BCM63XX-add-endian-check-for-ath9k.patch similarity index 98% rename from target/linux/brcm63xx/patches-4.9/420-BCM63XX-add-endian-check-for-ath9k.patch rename to target/linux/brcm63xx/patches-4.19/420-BCM63XX-add-endian-check-for-ath9k.patch index f8c971e1a..2076879ed 100644 --- a/target/linux/brcm63xx/patches-4.9/420-BCM63XX-add-endian-check-for-ath9k.patch +++ b/target/linux/brcm63xx/patches-4.19/420-BCM63XX-add-endian-check-for-ath9k.patch @@ -11,7 +11,7 @@ #endif /* _PCI_ATH9K_FIXUP */ --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -19,6 +19,7 @@ +@@ -20,6 +20,7 @@ struct ath9k_caldata { unsigned int slot; u32 caldata_offset; diff --git a/target/linux/brcm63xx/patches-4.9/421-BCM63XX-add-led-pin-for-ath9k.patch b/target/linux/brcm63xx/patches-4.19/421-BCM63XX-add-led-pin-for-ath9k.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/421-BCM63XX-add-led-pin-for-ath9k.patch rename to target/linux/brcm63xx/patches-4.19/421-BCM63XX-add-led-pin-for-ath9k.patch index af847ab13..bb111dc9d 100644 --- a/target/linux/brcm63xx/patches-4.9/421-BCM63XX-add-led-pin-for-ath9k.patch +++ b/target/linux/brcm63xx/patches-4.19/421-BCM63XX-add-led-pin-for-ath9k.patch @@ -30,7 +30,7 @@ return; --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -20,6 +20,8 @@ struct ath9k_caldata { +@@ -21,6 +21,8 @@ struct ath9k_caldata { unsigned int slot; u32 caldata_offset; unsigned int endian_check:1; diff --git a/target/linux/brcm63xx/patches-4.9/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch b/target/linux/brcm63xx/patches-4.19/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch similarity index 97% rename from target/linux/brcm63xx/patches-4.9/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch rename to target/linux/brcm63xx/patches-4.19/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch index defc26b97..cc980a14d 100644 --- a/target/linux/brcm63xx/patches-4.9/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch +++ b/target/linux/brcm63xx/patches-4.19/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch @@ -17,7 +17,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices --- a/arch/mips/bcm63xx/Makefile +++ b/arch/mips/bcm63xx/Makefile -@@ -2,7 +2,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o +@@ -3,7 +3,7 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ dev-rng.o dev-wdt.o \ dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o \ @@ -136,7 +136,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices + --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -9,6 +9,7 @@ +@@ -10,6 +10,7 @@ #include #include #include @@ -144,7 +144,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices /* * flash mapping -@@ -16,12 +17,16 @@ +@@ -17,12 +18,16 @@ #define BCM963XX_CFE_VERSION_OFFSET 0x570 #define BCM963XX_NVRAM_OFFSET 0x580 @@ -162,7 +162,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices }; /* -@@ -44,7 +49,7 @@ struct board_info { +@@ -45,7 +50,7 @@ struct board_info { unsigned int has_caldata:2; /* wifi calibration data config */ diff --git a/target/linux/brcm63xx/patches-4.9/423-bcm63xx_enet_add_b53_support.patch b/target/linux/brcm63xx/patches-4.19/423-bcm63xx_enet_add_b53_support.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/423-bcm63xx_enet_add_b53_support.patch rename to target/linux/brcm63xx/patches-4.19/423-bcm63xx_enet_add_b53_support.patch index eb7b9fff3..3f093cf65 100644 --- a/target/linux/brcm63xx/patches-4.9/423-bcm63xx_enet_add_b53_support.patch +++ b/target/linux/brcm63xx/patches-4.19/423-bcm63xx_enet_add_b53_support.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h -@@ -331,6 +331,9 @@ struct bcm_enet_priv { +@@ -332,6 +332,9 @@ struct bcm_enet_priv { struct bcm63xx_enetsw_port used_ports[ENETSW_MAX_PORT]; int sw_port_link[ENETSW_MAX_PORT]; @@ -20,7 +20,7 @@ #include #include "bcm63xx_enet.h" -@@ -1950,7 +1951,8 @@ static int bcm_enet_remove(struct platfo +@@ -1932,7 +1933,8 @@ static int bcm_enet_remove(struct platfo return 0; } @@ -30,7 +30,7 @@ .probe = bcm_enet_probe, .remove = bcm_enet_remove, .driver = { -@@ -1959,6 +1961,42 @@ struct platform_driver bcm63xx_enet_driv +@@ -1941,6 +1943,42 @@ struct platform_driver bcm63xx_enet_driv }, }; @@ -73,7 +73,7 @@ /* * switch mii access callbacks */ -@@ -2217,29 +2255,6 @@ static int bcm_enetsw_open(struct net_de +@@ -2197,29 +2235,6 @@ static int bcm_enetsw_open(struct net_de enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i)); } @@ -103,7 +103,7 @@ /* initialize flow control buffer allocation */ enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0, ENETDMA_BUFALLOC_REG(priv->rx_chan)); -@@ -2698,6 +2713,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2675,6 +2690,9 @@ static int bcm_enetsw_probe(struct platf struct bcm63xx_enetsw_platform_data *pd; struct resource *res_mem; int ret, irq_rx, irq_tx; @@ -113,7 +113,7 @@ if (!bcm_enet_shared_base[0]) return -EPROBE_DEFER; -@@ -2780,6 +2798,43 @@ static int bcm_enetsw_probe(struct platf +@@ -2755,6 +2773,43 @@ static int bcm_enetsw_probe(struct platf priv->pdev = pdev; priv->net_dev = dev; @@ -157,7 +157,7 @@ return 0; out_disable_clk: -@@ -2801,6 +2856,9 @@ static int bcm_enetsw_remove(struct plat +@@ -2776,6 +2831,9 @@ static int bcm_enetsw_remove(struct plat priv = netdev_priv(dev); unregister_netdev(dev); diff --git a/target/linux/brcm63xx/patches-4.9/424-bcm63xx_enet_no_request_mem_region.patch b/target/linux/brcm63xx/patches-4.19/424-bcm63xx_enet_no_request_mem_region.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.9/424-bcm63xx_enet_no_request_mem_region.patch rename to target/linux/brcm63xx/patches-4.19/424-bcm63xx_enet_no_request_mem_region.patch index 6128780f5..e956deac1 100644 --- a/target/linux/brcm63xx/patches-4.9/424-bcm63xx_enet_no_request_mem_region.patch +++ b/target/linux/brcm63xx/patches-4.19/424-bcm63xx_enet_no_request_mem_region.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2757,9 +2757,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2734,9 +2734,9 @@ static int bcm_enetsw_probe(struct platf if (ret) goto out; diff --git a/target/linux/brcm63xx/patches-4.9/427-boards_probe_switch.patch b/target/linux/brcm63xx/patches-4.19/427-boards_probe_switch.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/427-boards_probe_switch.patch rename to target/linux/brcm63xx/patches-4.19/427-boards_probe_switch.patch diff --git a/target/linux/brcm63xx/patches-4.9/499-allow_better_context_for_board_patches.patch b/target/linux/brcm63xx/patches-4.19/499-allow_better_context_for_board_patches.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/499-allow_better_context_for_board_patches.patch rename to target/linux/brcm63xx/patches-4.19/499-allow_better_context_for_board_patches.patch diff --git a/target/linux/brcm63xx/patches-4.9/500-board-D4PW.patch b/target/linux/brcm63xx/patches-4.19/500-board-D4PW.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/500-board-D4PW.patch rename to target/linux/brcm63xx/patches-4.19/500-board-D4PW.patch diff --git a/target/linux/brcm63xx/patches-4.9/501-board-NB4.patch b/target/linux/brcm63xx/patches-4.19/501-board-NB4.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/501-board-NB4.patch rename to target/linux/brcm63xx/patches-4.19/501-board-NB4.patch diff --git a/target/linux/brcm63xx/patches-4.9/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-4.19/502-board-96338W2_E7T.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/502-board-96338W2_E7T.patch rename to target/linux/brcm63xx/patches-4.19/502-board-96338W2_E7T.patch diff --git a/target/linux/brcm63xx/patches-4.9/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-4.19/503-board-CPVA642.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/503-board-CPVA642.patch rename to target/linux/brcm63xx/patches-4.19/503-board-CPVA642.patch diff --git a/target/linux/brcm63xx/patches-4.9/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-4.19/504-board_dsl_274xb_rev_c.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/504-board_dsl_274xb_rev_c.patch rename to target/linux/brcm63xx/patches-4.19/504-board_dsl_274xb_rev_c.patch diff --git a/target/linux/brcm63xx/patches-4.9/505-board_spw500v.patch b/target/linux/brcm63xx/patches-4.19/505-board_spw500v.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/505-board_spw500v.patch rename to target/linux/brcm63xx/patches-4.19/505-board_spw500v.patch diff --git a/target/linux/brcm63xx/patches-4.9/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-4.19/506-board_gw6200_gw6000.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/506-board_gw6200_gw6000.patch rename to target/linux/brcm63xx/patches-4.19/506-board_gw6200_gw6000.patch diff --git a/target/linux/brcm63xx/patches-4.9/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-4.19/507-board-MAGIC.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/507-board-MAGIC.patch rename to target/linux/brcm63xx/patches-4.19/507-board-MAGIC.patch diff --git a/target/linux/brcm63xx/patches-4.9/508-board_hw553.patch b/target/linux/brcm63xx/patches-4.19/508-board_hw553.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/508-board_hw553.patch rename to target/linux/brcm63xx/patches-4.19/508-board_hw553.patch diff --git a/target/linux/brcm63xx/patches-4.9/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-4.19/509-board_rta1320_16m.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/509-board_rta1320_16m.patch rename to target/linux/brcm63xx/patches-4.19/509-board_rta1320_16m.patch diff --git a/target/linux/brcm63xx/patches-4.9/510-board_spw303v.patch b/target/linux/brcm63xx/patches-4.19/510-board_spw303v.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/510-board_spw303v.patch rename to target/linux/brcm63xx/patches-4.19/510-board_spw303v.patch diff --git a/target/linux/brcm63xx/patches-4.9/511-board_V2500V.patch b/target/linux/brcm63xx/patches-4.19/511-board_V2500V.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/511-board_V2500V.patch rename to target/linux/brcm63xx/patches-4.19/511-board_V2500V.patch diff --git a/target/linux/brcm63xx/patches-4.9/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-4.19/512-board_BTV2110.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/512-board_BTV2110.patch rename to target/linux/brcm63xx/patches-4.19/512-board_BTV2110.patch diff --git a/target/linux/brcm63xx/patches-4.9/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch b/target/linux/brcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch similarity index 99% rename from target/linux/brcm63xx/patches-4.9/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch rename to target/linux/brcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch index 8c59b5b73..8e9e516a7 100644 --- a/target/linux/brcm63xx/patches-4.9/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch +++ b/target/linux/brcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch @@ -15,8 +15,8 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support --- a/arch/mips/bcm63xx/boards/Kconfig +++ b/arch/mips/bcm63xx/boards/Kconfig @@ -12,4 +12,10 @@ config BOARD_BCM963XX + select BCMA default y - help +config BOARD_LIVEBOX + bool "Inventel Livebox(es) boards" diff --git a/target/linux/brcm63xx/patches-4.9/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-4.19/514-board_ct536_ct5621.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/514-board_ct536_ct5621.patch rename to target/linux/brcm63xx/patches-4.19/514-board_ct536_ct5621.patch diff --git a/target/linux/brcm63xx/patches-4.9/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-4.19/515-board_DWV-S0_fixes.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/515-board_DWV-S0_fixes.patch rename to target/linux/brcm63xx/patches-4.19/515-board_DWV-S0_fixes.patch diff --git a/target/linux/brcm63xx/patches-4.9/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-4.19/516-board_96348A-122.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/516-board_96348A-122.patch rename to target/linux/brcm63xx/patches-4.19/516-board_96348A-122.patch diff --git a/target/linux/brcm63xx/patches-4.9/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-4.19/519_board_CPVA502plus.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/519_board_CPVA502plus.patch rename to target/linux/brcm63xx/patches-4.19/519_board_CPVA502plus.patch diff --git a/target/linux/brcm63xx/patches-4.9/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-4.19/520-bcm63xx-add-support-for-96368MVWG-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/520-bcm63xx-add-support-for-96368MVWG-board.patch rename to target/linux/brcm63xx/patches-4.19/520-bcm63xx-add-support-for-96368MVWG-board.patch diff --git a/target/linux/brcm63xx/patches-4.9/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-4.19/521-bcm63xx-add-support-for-96368MVNgr-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/521-bcm63xx-add-support-for-96368MVNgr-board.patch rename to target/linux/brcm63xx/patches-4.19/521-bcm63xx-add-support-for-96368MVNgr-board.patch diff --git a/target/linux/brcm63xx/patches-4.9/522-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/brcm63xx/patches-4.19/522-MIPS-BCM63XX-add-96328avng-reference-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/522-MIPS-BCM63XX-add-96328avng-reference-board.patch rename to target/linux/brcm63xx/patches-4.19/522-MIPS-BCM63XX-add-96328avng-reference-board.patch diff --git a/target/linux/brcm63xx/patches-4.9/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-4.19/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch rename to target/linux/brcm63xx/patches-4.19/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch diff --git a/target/linux/brcm63xx/patches-4.9/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-4.19/524-board_dsl_274xb_rev_f.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/524-board_dsl_274xb_rev_f.patch rename to target/linux/brcm63xx/patches-4.19/524-board_dsl_274xb_rev_f.patch diff --git a/target/linux/brcm63xx/patches-4.9/525-board_96348w3.patch b/target/linux/brcm63xx/patches-4.19/525-board_96348w3.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/525-board_96348w3.patch rename to target/linux/brcm63xx/patches-4.19/525-board_96348w3.patch diff --git a/target/linux/brcm63xx/patches-4.9/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-4.19/526-board_CT6373-1.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/526-board_CT6373-1.patch rename to target/linux/brcm63xx/patches-4.19/526-board_CT6373-1.patch diff --git a/target/linux/brcm63xx/patches-4.9/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-4.19/527-board_dva-g3810bn-tl-1.patch similarity index 81% rename from target/linux/brcm63xx/patches-4.9/527-board_dva-g3810bn-tl-1.patch rename to target/linux/brcm63xx/patches-4.19/527-board_dva-g3810bn-tl-1.patch index 15194a0ea..53d7890a4 100644 --- a/target/linux/brcm63xx/patches-4.9/527-board_dva-g3810bn-tl-1.patch +++ b/target/linux/brcm63xx/patches-4.19/527-board_dva-g3810bn-tl-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -937,6 +937,35 @@ static struct board_info __initdata boar +@@ -937,6 +937,33 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, }; @@ -15,10 +15,8 @@ + .has_pci = 1, + + .enet0 = { -+ .has_phy = 0, ++ .has_phy = 1, + .use_internal_phy = 1, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, + }, + + .enet1 = { @@ -36,7 +34,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1085,6 +1114,7 @@ static const struct board_info __initcon +@@ -1085,6 +1112,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, @@ -44,7 +42,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1144,6 +1174,7 @@ static struct of_device_id const bcm963x +@@ -1144,6 +1172,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-4.9/528-board_nb6.patch b/target/linux/brcm63xx/patches-4.19/528-board_nb6.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.9/528-board_nb6.patch rename to target/linux/brcm63xx/patches-4.19/528-board_nb6.patch index a51e5e3ee..349478d4f 100644 --- a/target/linux/brcm63xx/patches-4.9/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-4.19/528-board_nb6.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -968,6 +968,32 @@ static struct board_info __initdata boar +@@ -966,6 +966,32 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -33,7 +33,7 @@ /* * known 6368 boards */ -@@ -1117,6 +1143,10 @@ static const struct board_info __initcon +@@ -1115,6 +1141,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -44,7 +44,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -1185,6 +1215,9 @@ static struct of_device_id const bcm963x +@@ -1183,6 +1213,9 @@ static struct of_device_id const bcm963x { .compatible = "t-com,spw303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif diff --git a/target/linux/brcm63xx/patches-4.9/529-board_fast2604.patch b/target/linux/brcm63xx/patches-4.19/529-board_fast2604.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/529-board_fast2604.patch rename to target/linux/brcm63xx/patches-4.19/529-board_fast2604.patch index 098b69dc7..b4b7352a0 100644 --- a/target/linux/brcm63xx/patches-4.9/529-board_fast2604.patch +++ b/target/linux/brcm63xx/patches-4.19/529-board_fast2604.patch @@ -23,7 +23,7 @@ static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -1114,6 +1130,7 @@ static const struct board_info __initcon +@@ -1112,6 +1128,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, @@ -31,7 +31,7 @@ &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, -@@ -1189,6 +1206,7 @@ static struct of_device_id const bcm963x +@@ -1187,6 +1204,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, diff --git a/target/linux/brcm63xx/patches-4.9/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-4.19/530-board_A4001N1.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.9/530-board_A4001N1.patch rename to target/linux/brcm63xx/patches-4.19/530-board_A4001N1.patch index a7ac6f826..8e83bc2e9 100644 --- a/target/linux/brcm63xx/patches-4.9/530-board_A4001N1.patch +++ b/target/linux/brcm63xx/patches-4.19/530-board_A4001N1.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -1111,6 +1154,7 @@ static const struct board_info __initcon +@@ -1109,6 +1152,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -58,7 +58,7 @@ &board_dsl_274xb_f1, #endif #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1176,6 +1220,7 @@ static struct of_device_id const bcm963x +@@ -1174,6 +1218,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/brcm63xx/patches-4.9/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-4.19/531-board_AR-5387un.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.9/531-board_AR-5387un.patch rename to target/linux/brcm63xx/patches-4.19/531-board_AR-5387un.patch index 32a264cb1..b9e50ce38 100644 --- a/target/linux/brcm63xx/patches-4.9/531-board_AR-5387un.patch +++ b/target/linux/brcm63xx/patches-4.19/531-board_AR-5387un.patch @@ -79,7 +79,7 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -1153,6 +1225,7 @@ static const struct board_info __initcon +@@ -1151,6 +1223,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -87,7 +87,7 @@ &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, -@@ -1223,6 +1296,7 @@ static struct of_device_id const bcm963x +@@ -1221,6 +1294,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-4.9/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-4.19/532-board_AR-5381u.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.9/532-board_AR-5381u.patch rename to target/linux/brcm63xx/patches-4.19/532-board_AR-5381u.patch index 5596a6730..679a40821 100644 --- a/target/linux/brcm63xx/patches-4.9/532-board_AR-5381u.patch +++ b/target/linux/brcm63xx/patches-4.19/532-board_AR-5381u.patch @@ -61,7 +61,7 @@ static struct sprom_fixup __initdata ar5387un_fixups[] = { { .offset = 2, .value = 0x05bb }, { .offset = 65, .value = 0x1204 }, -@@ -1225,6 +1279,7 @@ static const struct board_info __initcon +@@ -1223,6 +1277,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -69,7 +69,7 @@ &board_AR5387un, &board_963281TAN, &board_A4001N1, -@@ -1296,6 +1351,7 @@ static struct of_device_id const bcm963x +@@ -1294,6 +1349,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-4.9/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-4.19/533-board_rta770bw.patch similarity index 87% rename from target/linux/brcm63xx/patches-4.9/533-board_rta770bw.patch rename to target/linux/brcm63xx/patches-4.19/533-board_rta770bw.patch index 4cf7d6138..d56df5562 100644 --- a/target/linux/brcm63xx/patches-4.9/533-board_rta770bw.patch +++ b/target/linux/brcm63xx/patches-4.19/533-board_rta770bw.patch @@ -21,7 +21,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1293,6 +1307,7 @@ static const struct board_info __initcon +@@ -1291,6 +1305,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, @@ -29,7 +29,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1363,6 +1378,7 @@ static struct of_device_id const bcm963x +@@ -1361,6 +1376,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, diff --git a/target/linux/brcm63xx/patches-4.9/534-board_hw556.patch b/target/linux/brcm63xx/patches-4.19/534-board_hw556.patch similarity index 95% rename from target/linux/brcm63xx/patches-4.9/534-board_hw556.patch rename to target/linux/brcm63xx/patches-4.19/534-board_hw556.patch index 718b287ee..731860983 100644 --- a/target/linux/brcm63xx/patches-4.9/534-board_hw556.patch +++ b/target/linux/brcm63xx/patches-4.19/534-board_hw556.patch @@ -101,7 +101,7 @@ /* T-Home Speedport W 303V Typ B */ static struct board_info __initdata board_spw303v = { .name = "96358-502V", -@@ -1343,6 +1430,9 @@ static const struct board_info __initcon +@@ -1341,6 +1428,9 @@ static const struct board_info __initcon &board_nb4_fxc_r1, &board_ct6373_1, &board_HW553, @@ -111,7 +111,7 @@ &board_spw303v, &board_DVAG3810BN, #endif -@@ -1415,6 +1505,9 @@ static struct of_device_id const bcm963x +@@ -1413,6 +1503,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, { .compatible = "huawei,hg553", .data = &board_HW553, }, diff --git a/target/linux/brcm63xx/patches-4.9/535-board_rta770w.patch b/target/linux/brcm63xx/patches-4.19/535-board_rta770w.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/535-board_rta770w.patch rename to target/linux/brcm63xx/patches-4.19/535-board_rta770w.patch index 0e64c5d3a..c78e59efd 100644 --- a/target/linux/brcm63xx/patches-4.9/535-board_rta770w.patch +++ b/target/linux/brcm63xx/patches-4.19/535-board_rta770w.patch @@ -26,7 +26,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1395,6 +1414,7 @@ static const struct board_info __initcon +@@ -1393,6 +1412,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, @@ -34,7 +34,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1469,6 +1489,7 @@ static struct of_device_id const bcm963x +@@ -1467,6 +1487,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, diff --git a/target/linux/brcm63xx/patches-4.9/536-board_fast2704.patch b/target/linux/brcm63xx/patches-4.19/536-board_fast2704.patch similarity index 93% rename from target/linux/brcm63xx/patches-4.9/536-board_fast2704.patch rename to target/linux/brcm63xx/patches-4.19/536-board_fast2704.patch index 021239309..9eb2d3e44 100644 --- a/target/linux/brcm63xx/patches-4.9/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-4.19/536-board_fast2704.patch @@ -56,7 +56,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1404,6 +1441,7 @@ static const struct board_info __initcon +@@ -1402,6 +1439,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, @@ -64,7 +64,7 @@ Signed-off-by: Marcin Jurkowski #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1479,6 +1517,7 @@ static struct of_device_id const bcm963x +@@ -1477,6 +1515,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/brcm63xx/patches-4.9/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-4.19/537-board_fast2504n.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.9/537-board_fast2504n.patch rename to target/linux/brcm63xx/patches-4.19/537-board_fast2504n.patch index bb5698ba3..8059184c7 100644 --- a/target/linux/brcm63xx/patches-4.9/537-board_fast2504n.patch +++ b/target/linux/brcm63xx/patches-4.19/537-board_fast2504n.patch @@ -6,7 +6,7 @@ Signed-off-by: Max Staudt --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1334,6 +1334,41 @@ static struct board_info __initdata boar +@@ -1332,6 +1332,41 @@ static struct board_info __initdata boar }, }, }; @@ -48,7 +48,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1497,6 +1532,7 @@ static const struct board_info __initcon +@@ -1495,6 +1530,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -56,7 +56,7 @@ Signed-off-by: Max Staudt #endif #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1578,6 +1614,7 @@ static struct of_device_id const bcm963x +@@ -1576,6 +1612,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/brcm63xx/patches-4.9/555-board_96318ref.patch b/target/linux/brcm63xx/patches-4.19/555-board_96318ref.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.9/555-board_96318ref.patch rename to target/linux/brcm63xx/patches-4.19/555-board_96318ref.patch index 8223d5c8f..3c929793b 100644 --- a/target/linux/brcm63xx/patches-4.9/555-board_96318ref.patch +++ b/target/linux/brcm63xx/patches-4.19/555-board_96318ref.patch @@ -56,7 +56,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1469,6 +1518,9 @@ static const struct board_info __initcon +@@ -1467,6 +1516,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif @@ -66,7 +66,7 @@ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_AR5381u, -@@ -1546,6 +1598,9 @@ static struct of_device_id const bcm963x +@@ -1544,6 +1596,9 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_3368 { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif diff --git a/target/linux/brcm63xx/patches-4.9/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-4.19/556-board_96318ref_p300.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.9/556-board_96318ref_p300.patch rename to target/linux/brcm63xx/patches-4.19/556-board_96318ref_p300.patch index 222e21651..bfce6f8df 100644 --- a/target/linux/brcm63xx/patches-4.9/556-board_96318ref_p300.patch +++ b/target/linux/brcm63xx/patches-4.19/556-board_96318ref_p300.patch @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1520,6 +1564,7 @@ static const struct board_info __initcon +@@ -1518,6 +1562,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, @@ -59,7 +59,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1600,6 +1645,7 @@ static struct of_device_id const bcm963x +@@ -1598,6 +1643,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, diff --git a/target/linux/brcm63xx/patches-4.9/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-4.19/557-board_bcm963269bhr.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.9/557-board_bcm963269bhr.patch rename to target/linux/brcm63xx/patches-4.19/557-board_bcm963269bhr.patch index dd3c4b485..d5af2f0d1 100644 --- a/target/linux/brcm63xx/patches-4.9/557-board_bcm963269bhr.patch +++ b/target/linux/brcm63xx/patches-4.19/557-board_bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1556,6 +1556,50 @@ static struct board_info __initdata boar +@@ -1554,6 +1554,50 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -51,7 +51,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1636,6 +1680,9 @@ static const struct board_info __initcon +@@ -1634,6 +1678,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, #endif @@ -61,7 +61,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1723,6 +1770,7 @@ static struct of_device_id const bcm963x +@@ -1721,6 +1768,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/brcm63xx/patches-4.9/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-4.19/558-board_AR1004G.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/558-board_AR1004G.patch rename to target/linux/brcm63xx/patches-4.19/558-board_AR1004G.patch index 53cbddd80..60256391d 100644 --- a/target/linux/brcm63xx/patches-4.9/558-board_AR1004G.patch +++ b/target/linux/brcm63xx/patches-4.19/558-board_AR1004G.patch @@ -30,7 +30,7 @@ Signed-off-by: Adrian Feliks /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { -@@ -1651,6 +1666,7 @@ static const struct board_info __initcon +@@ -1649,6 +1664,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, @@ -38,7 +38,7 @@ Signed-off-by: Adrian Feliks #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1715,6 +1731,7 @@ static struct of_device_id const bcm963x +@@ -1713,6 +1729,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/brcm63xx/patches-4.9/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-4.19/559-board_vw6339gu.patch similarity index 85% rename from target/linux/brcm63xx/patches-4.9/559-board_vw6339gu.patch rename to target/linux/brcm63xx/patches-4.19/559-board_vw6339gu.patch index 329b62440..355bdb276 100644 --- a/target/linux/brcm63xx/patches-4.9/559-board_vw6339gu.patch +++ b/target/linux/brcm63xx/patches-4.19/559-board_vw6339gu.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1612,6 +1612,51 @@ static struct board_info __initdata boar +@@ -1610,6 +1610,51 @@ static struct board_info __initdata boar }, }, }; @@ -52,7 +52,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1698,6 +1743,7 @@ static const struct board_info __initcon +@@ -1696,6 +1741,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, @@ -60,7 +60,7 @@ #endif }; -@@ -1788,6 +1834,7 @@ static struct of_device_id const bcm963x +@@ -1786,6 +1832,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/brcm63xx/patches-4.9/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-4.19/560-board_963268gu_p300.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.9/560-board_963268gu_p300.patch rename to target/linux/brcm63xx/patches-4.19/560-board_963268gu_p300.patch index aa7ed4979..26c236898 100644 --- a/target/linux/brcm63xx/patches-4.9/560-board_963268gu_p300.patch +++ b/target/linux/brcm63xx/patches-4.19/560-board_963268gu_p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1574,6 +1574,64 @@ static struct board_info __initdata boar +@@ -1572,6 +1572,64 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -65,7 +65,7 @@ static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -1742,6 +1800,7 @@ static const struct board_info __initcon +@@ -1740,6 +1798,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif #ifdef CONFIG_BCM63XX_CPU_63268 @@ -73,7 +73,7 @@ &board_963269bhr, &board_vw6339gu, #endif -@@ -1833,6 +1892,7 @@ static struct of_device_id const bcm963x +@@ -1831,6 +1890,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/brcm63xx/patches-4.9/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-4.19/561-board_WAP-5813n.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/561-board_WAP-5813n.patch rename to target/linux/brcm63xx/patches-4.19/561-board_WAP-5813n.patch index 33b89992a..abd511437 100644 --- a/target/linux/brcm63xx/patches-4.9/561-board_WAP-5813n.patch +++ b/target/linux/brcm63xx/patches-4.19/561-board_WAP-5813n.patch @@ -9,7 +9,7 @@ #include #include #include -@@ -1568,6 +1570,47 @@ static struct board_info __initdata boar +@@ -1566,6 +1568,47 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, }; @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1798,6 +1841,7 @@ static const struct board_info __initcon +@@ -1796,6 +1839,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -65,7 +65,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -1890,6 +1934,7 @@ static struct of_device_id const bcm963x +@@ -1888,6 +1932,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/brcm63xx/patches-4.9/562-board_VR-3025u.patch b/target/linux/brcm63xx/patches-4.19/562-board_VR-3025u.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/562-board_VR-3025u.patch rename to target/linux/brcm63xx/patches-4.19/562-board_VR-3025u.patch index 096620ead..36014ea49 100644 --- a/target/linux/brcm63xx/patches-4.9/562-board_VR-3025u.patch +++ b/target/linux/brcm63xx/patches-4.19/562-board_VR-3025u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1571,6 +1571,59 @@ static struct board_info __initdata boar +@@ -1569,6 +1569,59 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1841,6 +1894,7 @@ static const struct board_info __initcon +@@ -1839,6 +1892,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1934,6 +1988,7 @@ static struct of_device_id const bcm963x +@@ -1932,6 +1986,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/brcm63xx/patches-4.9/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-4.19/563-board_VR-3025un.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/563-board_VR-3025un.patch rename to target/linux/brcm63xx/patches-4.19/563-board_VR-3025un.patch index 812857561..a34b7a1f3 100644 --- a/target/linux/brcm63xx/patches-4.9/563-board_VR-3025un.patch +++ b/target/linux/brcm63xx/patches-4.19/563-board_VR-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1624,6 +1624,59 @@ static struct board_info __initdata boar +@@ -1622,6 +1622,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1895,6 +1948,7 @@ static const struct board_info __initcon +@@ -1893,6 +1946,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1989,6 +2043,7 @@ static struct of_device_id const bcm963x +@@ -1987,6 +2041,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, diff --git a/target/linux/brcm63xx/patches-4.9/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-4.19/564-board_P870HW-51a_v2.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.9/564-board_P870HW-51a_v2.patch rename to target/linux/brcm63xx/patches-4.19/564-board_P870HW-51a_v2.patch index 5a08a3939..1e49ad457 100644 --- a/target/linux/brcm63xx/patches-4.9/564-board_P870HW-51a_v2.patch +++ b/target/linux/brcm63xx/patches-4.19/564-board_P870HW-51a_v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1580,6 +1580,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1578,6 +1578,48 @@ static struct sprom_fixup __initdata vr3 { .offset = 115, .value = 0xfad9 }, }; @@ -49,7 +49,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -1947,6 +1989,7 @@ static const struct board_info __initcon +@@ -1945,6 +1987,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -2045,6 +2088,7 @@ static struct of_device_id const bcm963x +@@ -2043,6 +2086,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/brcm63xx/patches-4.9/565-board_hw520.patch b/target/linux/brcm63xx/patches-4.19/565-board_hw520.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.9/565-board_hw520.patch rename to target/linux/brcm63xx/patches-4.19/565-board_hw520.patch index 1210dfc68..53ea1232b 100644 --- a/target/linux/brcm63xx/patches-4.9/565-board_hw520.patch +++ b/target/linux/brcm63xx/patches-4.19/565-board_hw520.patch @@ -37,7 +37,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1973,6 +2003,7 @@ static const struct board_info __initcon +@@ -1971,6 +2001,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -45,7 +45,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2065,6 +2096,7 @@ static struct of_device_id const bcm963x +@@ -2063,6 +2094,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, diff --git a/target/linux/brcm63xx/patches-4.9/566-board_A4001N.patch b/target/linux/brcm63xx/patches-4.19/566-board_A4001N.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.9/566-board_A4001N.patch rename to target/linux/brcm63xx/patches-4.19/566-board_A4001N.patch index 83503cc24..75c0c5bcd 100644 --- a/target/linux/brcm63xx/patches-4.9/566-board_A4001N.patch +++ b/target/linux/brcm63xx/patches-4.19/566-board_A4001N.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -1954,6 +1997,7 @@ static const struct board_info __initcon +@@ -1952,6 +1995,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2042,6 +2086,7 @@ static struct of_device_id const bcm963x +@@ -2040,6 +2084,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/brcm63xx/patches-4.9/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-4.19/567-board_dsl-2751b_e1.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.9/567-board_dsl-2751b_e1.patch rename to target/linux/brcm63xx/patches-4.19/567-board_dsl-2751b_e1.patch index 8a37dbef6..93e5c9fff 100644 --- a/target/linux/brcm63xx/patches-4.9/567-board_dsl-2751b_e1.patch +++ b/target/linux/brcm63xx/patches-4.19/567-board_dsl-2751b_e1.patch @@ -75,7 +75,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1991,6 +2059,7 @@ static const struct board_info __initcon +@@ -1989,6 +2057,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -83,7 +83,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2084,6 +2153,7 @@ static struct of_device_id const bcm963x +@@ -2082,6 +2151,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/brcm63xx/patches-4.9/568-board_DGND3700v1_3800B.patch b/target/linux/brcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.9/568-board_DGND3700v1_3800B.patch rename to target/linux/brcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch index 5b5601ed3..aa40412e4 100644 --- a/target/linux/brcm63xx/patches-4.9/568-board_DGND3700v1_3800B.patch +++ b/target/linux/brcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1712,6 +1712,30 @@ static struct board_info __initdata boar +@@ -1710,6 +1710,30 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -31,7 +31,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2133,6 +2157,7 @@ static const struct board_info __initcon +@@ -2131,6 +2155,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -39,7 +39,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2235,6 +2260,7 @@ static struct of_device_id const bcm963x +@@ -2233,6 +2258,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/brcm63xx/patches-4.9/569-board_homehub2a.patch b/target/linux/brcm63xx/patches-4.19/569-board_homehub2a.patch similarity index 90% rename from target/linux/brcm63xx/patches-4.9/569-board_homehub2a.patch rename to target/linux/brcm63xx/patches-4.19/569-board_homehub2a.patch index 35d409831..d2b78780a 100644 --- a/target/linux/brcm63xx/patches-4.9/569-board_homehub2a.patch +++ b/target/linux/brcm63xx/patches-4.19/569-board_homehub2a.patch @@ -32,7 +32,7 @@ static struct board_info __initdata board_HW520 = { .name = "HW6358GW_B", .expected_cpu_id = 0x6358, -@@ -2140,6 +2165,7 @@ static const struct board_info __initcon +@@ -2138,6 +2163,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -40,7 +40,7 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2249,6 +2275,7 @@ static struct of_device_id const bcm963x +@@ -2247,6 +2273,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "t-com,spw303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, diff --git a/target/linux/brcm63xx/patches-4.9/570-board_HG655b.patch b/target/linux/brcm63xx/patches-4.19/570-board_HG655b.patch similarity index 89% rename from target/linux/brcm63xx/patches-4.9/570-board_HG655b.patch rename to target/linux/brcm63xx/patches-4.19/570-board_HG655b.patch index 207546174..8523af685 100644 --- a/target/linux/brcm63xx/patches-4.9/570-board_HG655b.patch +++ b/target/linux/brcm63xx/patches-4.19/570-board_HG655b.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1761,6 +1761,52 @@ static struct board_info __initdata boar +@@ -1759,6 +1759,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2184,6 +2230,7 @@ static const struct board_info __initcon +@@ -2182,6 +2228,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2287,6 +2334,7 @@ static struct of_device_id const bcm963x +@@ -2285,6 +2332,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/brcm63xx/patches-4.9/571-board_fast2704n.patch b/target/linux/brcm63xx/patches-4.19/571-board_fast2704n.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.9/571-board_fast2704n.patch rename to target/linux/brcm63xx/patches-4.19/571-board_fast2704n.patch index 6c399b013..62eb3f103 100644 --- a/target/linux/brcm63xx/patches-4.9/571-board_fast2704n.patch +++ b/target/linux/brcm63xx/patches-4.19/571-board_fast2704n.patch @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2155,6 +2194,7 @@ static const struct board_info __initcon +@@ -2153,6 +2192,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, @@ -54,7 +54,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2252,6 +2292,7 @@ static struct of_device_id const bcm963x +@@ -2250,6 +2290,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, { .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, }, diff --git a/target/linux/brcm63xx/patches-4.9/572-board_VR-3026e.patch b/target/linux/brcm63xx/patches-4.19/572-board_VR-3026e.patch similarity index 91% rename from target/linux/brcm63xx/patches-4.9/572-board_VR-3026e.patch rename to target/linux/brcm63xx/patches-4.19/572-board_VR-3026e.patch index f41700a1f..59e0389ba 100644 --- a/target/linux/brcm63xx/patches-4.9/572-board_VR-3026e.patch +++ b/target/linux/brcm63xx/patches-4.19/572-board_VR-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1994,6 +1994,59 @@ static struct board_info __initdata boar +@@ -1992,6 +1992,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2274,6 +2327,7 @@ static const struct board_info __initcon +@@ -2272,6 +2325,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2374,6 +2428,7 @@ static struct of_device_id const bcm963x +@@ -2372,6 +2426,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, diff --git a/target/linux/brcm63xx/patches-4.9/573-board_R5010UNv2.patch b/target/linux/brcm63xx/patches-4.19/573-board_R5010UNv2.patch similarity index 92% rename from target/linux/brcm63xx/patches-4.9/573-board_R5010UNv2.patch rename to target/linux/brcm63xx/patches-4.19/573-board_R5010UNv2.patch index 93004db05..059e7c0cb 100644 --- a/target/linux/brcm63xx/patches-4.9/573-board_R5010UNv2.patch +++ b/target/linux/brcm63xx/patches-4.19/573-board_R5010UNv2.patch @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2258,6 +2302,7 @@ static const struct board_info __initcon +@@ -2256,6 +2300,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, @@ -59,7 +59,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2356,6 +2401,7 @@ static struct of_device_id const bcm963x +@@ -2354,6 +2399,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/brcm63xx/patches-4.9/574-board_HG622.patch b/target/linux/brcm63xx/patches-4.19/574-board_HG622.patch similarity index 89% rename from target/linux/brcm63xx/patches-4.9/574-board_HG622.patch rename to target/linux/brcm63xx/patches-4.19/574-board_HG622.patch index 2bd09a0f5..3ec7a077e 100644 --- a/target/linux/brcm63xx/patches-4.9/574-board_HG622.patch +++ b/target/linux/brcm63xx/patches-4.19/574-board_HG622.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1890,6 +1890,52 @@ static struct board_info __initdata boar +@@ -1888,6 +1888,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2368,6 +2414,7 @@ static const struct board_info __initcon +@@ -2366,6 +2412,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_HG655b, &board_P870HW51A_V2, &board_VR3025u, -@@ -2476,6 +2523,7 @@ static struct of_device_id const bcm963x +@@ -2474,6 +2521,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/brcm63xx/patches-4.9/575-board_EVG2000.patch b/target/linux/brcm63xx/patches-4.19/575-board_EVG2000.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.9/575-board_EVG2000.patch rename to target/linux/brcm63xx/patches-4.19/575-board_EVG2000.patch index c156a7f08..9d068f27e 100644 --- a/target/linux/brcm63xx/patches-4.9/575-board_EVG2000.patch +++ b/target/linux/brcm63xx/patches-4.19/575-board_EVG2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1844,6 +1844,42 @@ static struct board_info __initdata boar +@@ -1842,6 +1842,42 @@ static struct board_info __initdata boar }, }; @@ -43,7 +43,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2414,6 +2450,7 @@ static const struct board_info __initcon +@@ -2412,6 +2448,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -51,7 +51,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2526,6 +2563,7 @@ static struct of_device_id const bcm963x +@@ -2524,6 +2561,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,hg622", .data = &board_HG622, }, { .compatible = "huawei,hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/brcm63xx/patches-4.9/576-board_AV4202N.patch b/target/linux/brcm63xx/patches-4.19/576-board_AV4202N.patch similarity index 88% rename from target/linux/brcm63xx/patches-4.9/576-board_AV4202N.patch rename to target/linux/brcm63xx/patches-4.19/576-board_AV4202N.patch index 2307e3eaf..d106c2702 100644 --- a/target/linux/brcm63xx/patches-4.9/576-board_AV4202N.patch +++ b/target/linux/brcm63xx/patches-4.19/576-board_AV4202N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1734,6 +1734,51 @@ static struct board_info __initdata boar +@@ -1732,6 +1732,51 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -52,7 +52,7 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2447,6 +2492,7 @@ static const struct board_info __initcon +@@ -2445,6 +2490,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6368 @@ -60,7 +60,7 @@ &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2554,6 +2600,7 @@ static struct of_device_id const bcm963x +@@ -2552,6 +2598,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.19/577-board_VH4032N.patch b/target/linux/brcm63xx/patches-4.19/577-board_VH4032N.patch new file mode 100644 index 000000000..9a4727a21 --- /dev/null +++ b/target/linux/brcm63xx/patches-4.19/577-board_VH4032N.patch @@ -0,0 +1,125 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -2216,6 +2216,106 @@ static struct board_info __initdata boar + }, + }; + ++static struct sprom_fixup __initdata vh4032n_fixups[] = { ++ { .offset = 2, .value = 0x04d2 }, ++ { .offset = 4, .value = 0x4350 }, ++ { .offset = 65, .value = 0x1300 }, ++ { .offset = 68, .value = 0x0402 }, ++ { .offset = 70, .value = 0x0090 }, ++ { .offset = 71, .value = 0x4c19 }, ++ { .offset = 72, .value = 0x2345 }, ++ { .offset = 87, .value = 0x0315 }, ++ { .offset = 88, .value = 0x0315 }, ++ { .offset = 96, .value = 0x2048 }, ++ { .offset = 97, .value = 0xfed7 }, ++ { .offset = 98, .value = 0x15a6 }, ++ { .offset = 99, .value = 0xfaee }, ++ { .offset = 100, .value = 0x3e3a }, ++ { .offset = 101, .value = 0x3a36 }, ++ { .offset = 102, .value = 0xff7f }, ++ { .offset = 103, .value = 0x11b9 }, ++ { .offset = 104, .value = 0xfc53 }, ++ { .offset = 105, .value = 0xffe6 }, ++ { .offset = 106, .value = 0xfdd2 }, ++ { .offset = 107, .value = 0xfe49 }, ++ { .offset = 108, .value = 0xff6a }, ++ { .offset = 109, .value = 0x136e }, ++ { .offset = 110, .value = 0xfbed }, ++ { .offset = 111, .value = 0x0000 }, ++ { .offset = 112, .value = 0x2048 }, ++ { .offset = 113, .value = 0xfee2 }, ++ { .offset = 114, .value = 0x15e5 }, ++ { .offset = 115, .value = 0xfaed }, ++ { .offset = 116, .value = 0x3e3a }, ++ { .offset = 117, .value = 0x3a36 }, ++ { .offset = 118, .value = 0xffc8 }, ++ { .offset = 119, .value = 0x12b8 }, ++ { .offset = 120, .value = 0xfca1 }, ++ { .offset = 121, .value = 0xff9b }, ++ { .offset = 122, .value = 0x122a }, ++ { .offset = 123, .value = 0xfcc8 }, ++ { .offset = 124, .value = 0xff95 }, ++ { .offset = 125, .value = 0x146b }, ++ { .offset = 126, .value = 0xfbba }, ++ { .offset = 127, .value = 0x0000 }, ++ { .offset = 161, .value = 0x0000 }, ++ { .offset = 162, .value = 0x0000 }, ++ { .offset = 169, .value = 0x0000 }, ++ { .offset = 170, .value = 0x0000 }, ++ { .offset = 171, .value = 0x0000 }, ++ { .offset = 172, .value = 0x0000 }, ++ { .offset = 173, .value = 0x0000 }, ++ { .offset = 174, .value = 0x0000 }, ++ { .offset = 175, .value = 0x0000 }, ++ { .offset = 176, .value = 0x0000 }, ++ { .offset = 219, .value = 0x1108 }, ++}; ++ ++static struct board_info __initdata board_VH4032N = { ++ .name = "VH4032N", ++ .expected_cpu_id = 0x6368, ++ ++ .has_pci = 1, ++ .use_fallback_sprom = 1, ++ .has_ohci0 = 1, ++ .has_ehci0 = 1, ++ .num_usbh_ports = 2, ++ ++ .has_enetsw = 1, ++ .enetsw = { ++ .used_ports = { ++ [0] = { ++ .used = 1, ++ .phy_id = 1, ++ .name = "LAN4", ++ }, ++ [1] = { ++ .used = 1, ++ .phy_id = 2, ++ .name = "LAN3", ++ }, ++ [2] = { ++ .used = 1, ++ .phy_id = 3, ++ .name = "LAN2", ++ }, ++ [3] = { ++ .used = 1, ++ .phy_id = 4, ++ .name = "LAN1", ++ }, ++ }, ++ }, ++ ++ .fallback_sprom = { ++ .type = SPROM_BCM43222, ++ .pci_bus = 0, ++ .pci_dev = 1, ++ .board_fixups = vh4032n_fixups, ++ .num_board_fixups = ARRAY_SIZE(vh4032n_fixups), ++ }, ++}; ++ + static struct sprom_fixup __initdata wap5813n_fixups[] = { + { .offset = 97, .value = 0xfeed }, + { .offset = 98, .value = 0x15d1 }, +@@ -2498,6 +2598,7 @@ static const struct board_info __initcon + &board_HG622, + &board_HG655b, + &board_P870HW51A_V2, ++ &board_VH4032N, + &board_VR3025u, + &board_VR3025un, + &board_VR3026e, +@@ -2609,6 +2710,7 @@ static struct of_device_id const bcm963x + { .compatible = "huawei,hg655b", .data = &board_HG655b, }, + { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, + { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, ++ { .compatible = "observa,vh4032n", .data = &board_VH4032N, }, + { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, + #endif + #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/brcm63xx/patches-4.9/578-board_R1000H.patch b/target/linux/brcm63xx/patches-4.19/578-board_R1000H.patch similarity index 85% rename from target/linux/brcm63xx/patches-4.9/578-board_R1000H.patch rename to target/linux/brcm63xx/patches-4.19/578-board_R1000H.patch index 6266ae56b..e52cdb07e 100644 --- a/target/linux/brcm63xx/patches-4.9/578-board_R1000H.patch +++ b/target/linux/brcm63xx/patches-4.19/578-board_R1000H.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2068,6 +2068,29 @@ static struct board_info __initdata boar +@@ -2066,6 +2066,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2538,6 +2561,7 @@ static const struct board_info __initcon +@@ -2598,6 +2621,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2639,6 +2663,7 @@ static struct of_device_id const bcm963x +@@ -2699,6 +2723,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.9/579-board_AR-5315u.patch b/target/linux/brcm63xx/patches-4.19/579-board_AR-5315u.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.9/579-board_AR-5315u.patch rename to target/linux/brcm63xx/patches-4.19/579-board_AR-5315u.patch index ba564b80c..e7a6ed611 100644 --- a/target/linux/brcm63xx/patches-4.9/579-board_AR-5315u.patch +++ b/target/linux/brcm63xx/patches-4.19/579-board_AR-5315u.patch @@ -68,7 +68,7 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2478,6 +2539,7 @@ static const struct board_info __initcon +@@ -2538,6 +2599,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -76,7 +76,7 @@ &board_dsl_2751b_d1, &board_FAST2704N, #endif -@@ -2583,6 +2645,7 @@ static struct of_device_id const bcm963x +@@ -2643,6 +2705,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/brcm63xx/patches-4.9/580-board_AD1018.patch b/target/linux/brcm63xx/patches-4.19/580-board_AD1018.patch similarity index 94% rename from target/linux/brcm63xx/patches-4.9/580-board_AD1018.patch rename to target/linux/brcm63xx/patches-4.19/580-board_AD1018.patch index 9070ffb01..6d12c6122 100644 --- a/target/linux/brcm63xx/patches-4.9/580-board_AD1018.patch +++ b/target/linux/brcm63xx/patches-4.19/580-board_AD1018.patch @@ -74,7 +74,7 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2545,6 +2612,7 @@ static const struct board_info __initcon +@@ -2605,6 +2672,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -82,7 +82,7 @@ &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2659,6 +2727,7 @@ static struct of_device_id const bcm963x +@@ -2719,6 +2787,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010unv2", .data = &board_R5010UNV2, }, { .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/brcm63xx/patches-4.9/598-board_sr102.patch b/target/linux/brcm63xx/patches-4.19/598-board_sr102.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.9/598-board_sr102.patch rename to target/linux/brcm63xx/patches-4.19/598-board_sr102.patch index 396745264..d790ea710 100644 --- a/target/linux/brcm63xx/patches-4.9/598-board_sr102.patch +++ b/target/linux/brcm63xx/patches-4.19/598-board_sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2594,6 +2594,49 @@ static struct board_info __initdata boar +@@ -2654,6 +2654,49 @@ static struct board_info __initdata boar }, }, }; @@ -50,7 +50,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2702,6 +2745,7 @@ static const struct board_info __initcon +@@ -2762,6 +2805,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -58,7 +58,7 @@ #endif }; -@@ -2814,6 +2858,7 @@ static struct of_device_id const bcm963x +@@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, diff --git a/target/linux/brcm63xx/patches-4.9/800-wl_exports.patch b/target/linux/brcm63xx/patches-4.19/800-wl_exports.patch similarity index 81% rename from target/linux/brcm63xx/patches-4.9/800-wl_exports.patch rename to target/linux/brcm63xx/patches-4.19/800-wl_exports.patch index 7460c8a3f..a2f1f2646 100644 --- a/target/linux/brcm63xx/patches-4.9/800-wl_exports.patch +++ b/target/linux/brcm63xx/patches-4.19/800-wl_exports.patch @@ -15,11 +15,11 @@ u32 crc, expected_crc; --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -63,6 +63,7 @@ void (*_dma_cache_wback)(unsigned long s +@@ -64,6 +64,7 @@ void (*_dma_cache_wback)(unsigned long s void (*_dma_cache_inv)(unsigned long start, unsigned long size); EXPORT_SYMBOL(_dma_cache_wback_inv); +EXPORT_SYMBOL(_dma_cache_inv); - #endif /* CONFIG_DMA_NONCOHERENT || CONFIG_DMA_MAYBE_COHERENT */ + #endif /* CONFIG_DMA_NONCOHERENT */ diff --git a/target/linux/brcm63xx/patches-4.9/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-4.19/801-ssb_export_fallback_sprom.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/801-ssb_export_fallback_sprom.patch rename to target/linux/brcm63xx/patches-4.19/801-ssb_export_fallback_sprom.patch diff --git a/target/linux/brcm63xx/patches-4.9/802-rtl8367r_fix_RGMII_support.patch b/target/linux/brcm63xx/patches-4.19/802-rtl8367r_fix_RGMII_support.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/802-rtl8367r_fix_RGMII_support.patch rename to target/linux/brcm63xx/patches-4.19/802-rtl8367r_fix_RGMII_support.patch diff --git a/target/linux/brcm63xx/patches-4.9/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch b/target/linux/brcm63xx/patches-4.19/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch similarity index 100% rename from target/linux/brcm63xx/patches-4.9/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch rename to target/linux/brcm63xx/patches-4.19/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch diff --git a/target/linux/brcm63xx/patches-4.9/804-bcm63xx_enet_63268_rgmii_ports.patch b/target/linux/brcm63xx/patches-4.19/804-bcm63xx_enet_63268_rgmii_ports.patch similarity index 86% rename from target/linux/brcm63xx/patches-4.9/804-bcm63xx_enet_63268_rgmii_ports.patch rename to target/linux/brcm63xx/patches-4.19/804-bcm63xx_enet_63268_rgmii_ports.patch index 42c52ef12..683221d76 100644 --- a/target/linux/brcm63xx/patches-4.9/804-bcm63xx_enet_63268_rgmii_ports.patch +++ b/target/linux/brcm63xx/patches-4.19/804-bcm63xx_enet_63268_rgmii_ports.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2252,6 +2252,10 @@ static int bcm_enetsw_open(struct net_de +@@ -2232,6 +2232,10 @@ static int bcm_enetsw_open(struct net_de rgmii_ctrl = enetsw_readb(priv, ENETSW_RGMII_CTRL_REG(i)); rgmii_ctrl |= ENETSW_RGMII_CTRL_GMII_CLK_EN; diff --git a/target/linux/brcm63xx/patches-4.9/001-4.12-01-spi-bcm63xx-make-spi-subsystem-aware-of-message-size.patch b/target/linux/brcm63xx/patches-4.9/001-4.12-01-spi-bcm63xx-make-spi-subsystem-aware-of-message-size.patch deleted file mode 100644 index f049af0d8..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.12-01-spi-bcm63xx-make-spi-subsystem-aware-of-message-size.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3fcc36962c32ad0af2d5904103e2b2b824b6b1aa Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sat, 4 Feb 2017 12:32:59 +0100 -Subject: [PATCH 2/8] spi/bcm63xx: make spi subsystem aware of message size - limits - -The bcm63xx LS SPI controller does not allow manual control of the CS -lines and will toggle it automatically before after sending data, so we -are limited to messages that fit in the FIFO buffer. Since the CS lines -aren't available as GPIOs either, we will need to make slave drivers -aware of this limitation and handle it accordingly. - -Signed-off-by: Jonas Gorski ---- - drivers/spi/spi-bcm63xx.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -428,6 +428,13 @@ static irqreturn_t bcm63xx_spi_interrupt - return IRQ_HANDLED; - } - -+static size_t bcm63xx_spi_max_length(struct spi_device *spi) -+{ -+ struct bcm63xx_spi *bs = spi_master_get_devdata(spi->master); -+ -+ return bs->fifo_size; -+} -+ - static const unsigned long bcm6348_spi_reg_offsets[] = { - [SPI_CMD] = SPI_6348_CMD, - [SPI_INT_STATUS] = SPI_6348_INT_STATUS, -@@ -541,6 +548,8 @@ static int bcm63xx_spi_probe(struct plat - master->transfer_one_message = bcm63xx_spi_transfer_one; - master->mode_bits = MODEBITS; - master->bits_per_word_mask = SPI_BPW_MASK(8); -+ master->max_transfer_size = bcm63xx_spi_max_length; -+ master->max_message_size = bcm63xx_spi_max_length; - master->auto_runtime_pm = true; - bs->msg_type_shift = bs->reg_offsets[SPI_MSG_TYPE_SHIFT]; - bs->msg_ctl_width = bs->reg_offsets[SPI_MSG_CTL_WIDTH]; diff --git a/target/linux/brcm63xx/patches-4.9/001-4.12-02-spi-bcm63xx-document-device-tree-bindings.patch b/target/linux/brcm63xx/patches-4.9/001-4.12-02-spi-bcm63xx-document-device-tree-bindings.patch deleted file mode 100644 index 524c50e61..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.12-02-spi-bcm63xx-document-device-tree-bindings.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0a0c39044332a75eaf4a3c5654079df953b0d839 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Mon, 7 Sep 2015 21:00:38 +0200 -Subject: [PATCH 3/8] spi/bcm63xx: document device tree bindings - -Add documentation for the bindings of the low speed SPI controller found -on most bcm63xx SoCs. - -Signed-off-by: Jonas Gorski ---- - .../devicetree/bindings/spi/spi-bcm63xx.txt | 33 ++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - create mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx.txt - ---- /dev/null -+++ b/Documentation/devicetree/bindings/spi/spi-bcm63xx.txt -@@ -0,0 +1,33 @@ -+Binding for Broadcom BCM6348/BCM6358 SPI controller -+ -+Required properties: -+- compatible: must contain one of "brcm,bcm6348-spi", "brcm,bcm6358-spi". -+- reg: Base address and size of the controllers memory area. -+- interrupts: Interrupt for the SPI block. -+- clocks: phandle of the SPI clock. -+- clock-names: has to be "spi". -+- #address-cells: <1>, as required by generic SPI binding. -+- #size-cells: <0>, also as required by generic SPI binding. -+ -+Optional properties: -+- num-cs: some controllers have less than 8 cs signals. Defaults to 8 -+ if absent. -+ -+Child nodes as per the generic SPI binding. -+ -+Example: -+ -+ spi@10000800 { -+ compatible = "brcm,bcm6368-spi", "brcm,bcm6358-spi"; -+ reg = <0x10000800 0x70c>; -+ -+ interrupts = <1>; -+ -+ clocks = <&clkctl 9>; -+ clock-names = "spi"; -+ -+ num-cs = <5>; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ }; diff --git a/target/linux/brcm63xx/patches-4.9/001-4.12-03-spi-bcm63xx-add-support-for-probing-through-devicetr.patch b/target/linux/brcm63xx/patches-4.9/001-4.12-03-spi-bcm63xx-add-support-for-probing-through-devicetr.patch deleted file mode 100644 index 97c596ae2..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.12-03-spi-bcm63xx-add-support-for-probing-through-devicetr.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 3353228a04a004ec67073871f40cf58dc4e209aa Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Mon, 7 Sep 2015 21:01:38 +0200 -Subject: [PATCH 4/8] spi/bcm63xx: add support for probing through devicetree - -Add required binding support to probe through device tree. - -Use the compatible instead of the resource size for identifiying the -block type, and allow reducing the number of cs lines through OF. - -Signed-off-by: Jonas Gorski ---- - drivers/spi/spi-bcm63xx.c | 42 ++++++++++++++++++++++++++++++++++++------ - 1 file changed, 36 insertions(+), 6 deletions(-) - ---- a/drivers/spi/spi-bcm63xx.c -+++ b/drivers/spi/spi-bcm63xx.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - /* BCM 6338/6348 SPI core */ - #define SPI_6348_RSET_SIZE 64 -@@ -484,21 +485,48 @@ static const struct platform_device_id b - }, - }; - -+static const struct of_device_id bcm63xx_spi_of_match[] = { -+ { .compatible = "brcm,bcm6348-spi", .data = &bcm6348_spi_reg_offsets }, -+ { .compatible = "brcm,bcm6358-spi", .data = &bcm6358_spi_reg_offsets }, -+ { }, -+}; -+ - static int bcm63xx_spi_probe(struct platform_device *pdev) - { - struct resource *r; - const unsigned long *bcm63xx_spireg; - struct device *dev = &pdev->dev; -- int irq; -+ int irq, bus_num; - struct spi_master *master; - struct clk *clk; - struct bcm63xx_spi *bs; - int ret; -+ u32 num_cs = BCM63XX_SPI_MAX_CS; - -- if (!pdev->id_entry->driver_data) -- return -EINVAL; -+ if (dev->of_node) { -+ const struct of_device_id *match; - -- bcm63xx_spireg = (const unsigned long *)pdev->id_entry->driver_data; -+ match = of_match_node(bcm63xx_spi_of_match, dev->of_node); -+ if (!match) -+ return -EINVAL; -+ bcm63xx_spireg = match->data; -+ -+ of_property_read_u32(dev->of_node, "num-cs", &num_cs); -+ if (num_cs > BCM63XX_SPI_MAX_CS) { -+ dev_warn(dev, "unsupported number of cs (%i), reducing to 8\n", -+ num_cs); -+ num_cs = BCM63XX_SPI_MAX_CS; -+ } -+ -+ bus_num = -1; -+ } else if (pdev->id_entry->driver_data) { -+ const struct platform_device_id *match = pdev->id_entry; -+ -+ bcm63xx_spireg = (const unsigned long *)match->driver_data; -+ bus_num = BCM63XX_SPI_BUS_NUM; -+ } else { -+ return -EINVAL; -+ } - - irq = platform_get_irq(pdev, 0); - if (irq < 0) { -@@ -543,8 +571,9 @@ static int bcm63xx_spi_probe(struct plat - goto out_err; - } - -- master->bus_num = BCM63XX_SPI_BUS_NUM; -- master->num_chipselect = BCM63XX_SPI_MAX_CS; -+ master->dev.of_node = dev->of_node; -+ master->bus_num = bus_num; -+ master->num_chipselect = num_cs; - master->transfer_one_message = bcm63xx_spi_transfer_one; - master->mode_bits = MODEBITS; - master->bits_per_word_mask = SPI_BPW_MASK(8); -@@ -633,6 +662,7 @@ static struct platform_driver bcm63xx_sp - .driver = { - .name = "bcm63xx-spi", - .pm = &bcm63xx_spi_pm_ops, -+ .of_match_table = bcm63xx_spi_of_match, - }, - .id_table = bcm63xx_spi_dev_match, - .probe = bcm63xx_spi_probe, diff --git a/target/linux/brcm63xx/patches-4.9/001-4.12-04-spi-bcm63xx-hsspi-allow-providing-clock-rate-through.patch b/target/linux/brcm63xx/patches-4.9/001-4.12-04-spi-bcm63xx-hsspi-allow-providing-clock-rate-through.patch deleted file mode 100644 index 30e673468..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.12-04-spi-bcm63xx-hsspi-allow-providing-clock-rate-through.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d03f23df6ff47898d76f06b3aa5dadcfa1ec8f4f Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 19 Feb 2017 23:40:22 +0100 -Subject: [PATCH 1/3] spi/bcm63xx-hsspi: allow providing clock rate through a - second clock - -Instead of requiring the hsspi clock to have a rate, allow using a second -clock for providing the Hz rate, which is probably more correct anyway. - -Signed-off-by: Jonas Gorski ---- - drivers/spi/spi-bcm63xx-hsspi.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -351,8 +351,16 @@ static int bcm63xx_hsspi_probe(struct pl - return PTR_ERR(clk); - - rate = clk_get_rate(clk); -- if (!rate) -- return -EINVAL; -+ if (!rate) { -+ struct clk *pll_clk = devm_clk_get(dev, "pll"); -+ -+ if (IS_ERR(pll_clk)) -+ return PTR_ERR(pll_clk); -+ -+ rate = clk_get_rate(pll_clk); -+ if (!rate) -+ return -EINVAL; -+ } - - ret = clk_prepare_enable(clk); - if (ret) diff --git a/target/linux/brcm63xx/patches-4.9/001-4.12-05-spi-bcm63xx-hsspi-document-device-tree-bindings.patch b/target/linux/brcm63xx/patches-4.9/001-4.12-05-spi-bcm63xx-hsspi-document-device-tree-bindings.patch deleted file mode 100644 index 8f77f4eb2..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.12-05-spi-bcm63xx-hsspi-document-device-tree-bindings.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ff759cc25db31bbb3469abb16a0306f110c4c7fa Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Thu, 10 Sep 2015 14:52:32 +0200 -Subject: [PATCH 2/3] dt-bindings: spi: document bcm63xx HS SPI devicetree - bindings - -Add documentation for the bindings of the high speed SPI controller found -on newer bcm63xx SoCs. - -Signed-off-by: Jonas Gorski ---- - .../devicetree/bindings/spi/spi-bcm63xx-hsspi.txt | 33 ++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - create mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx-hsspi.txt - ---- /dev/null -+++ b/Documentation/devicetree/bindings/spi/spi-bcm63xx-hsspi.txt -@@ -0,0 +1,33 @@ -+Binding for Broadcom BCM6328 High Speed SPI controller -+ -+Required properties: -+- compatible: must contain of "brcm,bcm6328-hsspi". -+- reg: Base address and size of the controllers memory area. -+- interrupts: Interrupt for the SPI block. -+- clocks: phandles of the SPI clock and the PLL clock. -+- clock-names: must be "hsspi", "pll". -+- #address-cells: <1>, as required by generic SPI binding. -+- #size-cells: <0>, also as required by generic SPI binding. -+ -+Optional properties: -+- num-cs: some controllers have less than 8 cs signals. Defaults to 8 -+ if absent. -+ -+Child nodes as per the generic SPI binding. -+ -+Example: -+ -+ spi@10001000 { -+ compatible = "brcm,bcm6328-hsspi"; -+ reg = <0x10001000 0x600>; -+ -+ interrupts = <29>; -+ -+ clocks = <&clkctl 9>, <&hsspi_pll>; -+ clock-names = "hsspi", "pll"; -+ -+ num-cs = <2>; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ }; diff --git a/target/linux/brcm63xx/patches-4.9/001-4.12-06-spi-bcm63xx-hsspi-add-support-for-probing-through-de.patch b/target/linux/brcm63xx/patches-4.9/001-4.12-06-spi-bcm63xx-hsspi-add-support-for-probing-through-de.patch deleted file mode 100644 index aaf4a59d1..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.12-06-spi-bcm63xx-hsspi-add-support-for-probing-through-de.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 776041498c2b285a7f745c924e10fc11ef720eae Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Thu, 10 Sep 2015 14:53:53 +0200 -Subject: [PATCH 3/3] spi/bcm63xx-hsspi: allow for probing through devicetree - -Add required binding support to probe through device tree. - -Signed-off-by: Jonas Gorski ---- - drivers/spi/spi-bcm63xx-hsspi.c | 23 ++++++++++++++++++++--- - 1 file changed, 20 insertions(+), 3 deletions(-) - ---- a/drivers/spi/spi-bcm63xx-hsspi.c -+++ b/drivers/spi/spi-bcm63xx-hsspi.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - #define HSSPI_GLOBAL_CTRL_REG 0x0 - #define GLOBAL_CTRL_CS_POLARITY_SHIFT 0 -@@ -91,6 +92,7 @@ - - #define HSSPI_MAX_SYNC_CLOCK 30000000 - -+#define HSSPI_SPI_MAX_CS 8 - #define HSSPI_BUS_NUM 1 /* 0 is legacy SPI */ - - struct bcm63xx_hsspi { -@@ -332,7 +334,7 @@ static int bcm63xx_hsspi_probe(struct pl - struct device *dev = &pdev->dev; - struct clk *clk; - int irq, ret; -- u32 reg, rate; -+ u32 reg, rate, num_cs = HSSPI_SPI_MAX_CS; - - irq = platform_get_irq(pdev, 0); - if (irq < 0) { -@@ -382,8 +384,17 @@ static int bcm63xx_hsspi_probe(struct pl - mutex_init(&bs->bus_mutex); - init_completion(&bs->done); - -- master->bus_num = HSSPI_BUS_NUM; -- master->num_chipselect = 8; -+ master->dev.of_node = dev->of_node; -+ if (!dev->of_node) -+ master->bus_num = HSSPI_BUS_NUM; -+ -+ of_property_read_u32(dev->of_node, "num-cs", &num_cs); -+ if (num_cs > 8) { -+ dev_warn(dev, "unsupported number of cs (%i), reducing to 8\n", -+ num_cs); -+ num_cs = HSSPI_SPI_MAX_CS; -+ } -+ master->num_chipselect = num_cs; - master->setup = bcm63xx_hsspi_setup; - master->transfer_one_message = bcm63xx_hsspi_transfer_one; - master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | -@@ -469,10 +480,16 @@ static int bcm63xx_hsspi_resume(struct d - static SIMPLE_DEV_PM_OPS(bcm63xx_hsspi_pm_ops, bcm63xx_hsspi_suspend, - bcm63xx_hsspi_resume); - -+static const struct of_device_id bcm63xx_hsspi_of_match[] = { -+ { .compatible = "brcm,bcm6328-hsspi", }, -+ { }, -+}; -+ - static struct platform_driver bcm63xx_hsspi_driver = { - .driver = { - .name = "bcm63xx-hsspi", - .pm = &bcm63xx_hsspi_pm_ops, -+ .of_match_table = bcm63xx_hsspi_of_match, - }, - .probe = bcm63xx_hsspi_probe, - .remove = bcm63xx_hsspi_remove, diff --git a/target/linux/brcm63xx/patches-4.9/001-4.12-07-mdio_bus-Issue-GPIO-RESET-to-PHYs.patch b/target/linux/brcm63xx/patches-4.9/001-4.12-07-mdio_bus-Issue-GPIO-RESET-to-PHYs.patch deleted file mode 100644 index eb72f6a82..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.12-07-mdio_bus-Issue-GPIO-RESET-to-PHYs.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 69226896ad636b94f6d2e55d75ff21a29c4de83b Mon Sep 17 00:00:00 2001 -From: Roger Quadros -Date: Fri, 21 Apr 2017 16:15:38 +0300 -Subject: [PATCH] mdio_bus: Issue GPIO RESET to PHYs. - -Some boards [1] leave the PHYs at an invalid state -during system power-up or reset thus causing unreliability -issues with the PHY which manifests as PHY not being detected -or link not functional. To fix this, these PHYs need to be RESET -via a GPIO connected to the PHY's RESET pin. - -Some boards have a single GPIO controlling the PHY RESET pin of all -PHYs on the bus whereas some others have separate GPIOs controlling -individual PHY RESETs. - -In both cases, the RESET de-assertion cannot be done in the PHY driver -as the PHY will not probe till its reset is de-asserted. -So do the RESET de-assertion in the MDIO bus driver. - -[1] - am572x-idk, am571x-idk, a437x-idk - -Signed-off-by: Roger Quadros -Signed-off-by: David S. Miller ---- - Documentation/devicetree/bindings/net/mdio.txt | 33 ++++++++++++++++++ - drivers/net/phy/mdio_bus.c | 47 ++++++++++++++++++++++++++ - drivers/of/of_mdio.c | 7 ++++ - include/linux/phy.h | 7 ++++ - 4 files changed, 94 insertions(+) - create mode 100644 Documentation/devicetree/bindings/net/mdio.txt - ---- /dev/null -+++ b/Documentation/devicetree/bindings/net/mdio.txt -@@ -0,0 +1,33 @@ -+Common MDIO bus properties. -+ -+These are generic properties that can apply to any MDIO bus. -+ -+Optional properties: -+- reset-gpios: List of one or more GPIOs that control the RESET lines -+ of the PHYs on that MDIO bus. -+- reset-delay-us: RESET pulse width in microseconds as per PHY datasheet. -+ -+A list of child nodes, one per device on the bus is expected. These -+should follow the generic phy.txt, or a device specific binding document. -+ -+Example : -+This example shows these optional properties, plus other properties -+required for the TI Davinci MDIO driver. -+ -+ davinci_mdio: ethernet@0x5c030000 { -+ compatible = "ti,davinci_mdio"; -+ reg = <0x5c030000 0x1000>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; -+ reset-delay-us = <2>; /* PHY datasheet states 1us min */ -+ -+ ethphy0: ethernet-phy@1 { -+ reg = <1>; -+ }; -+ -+ ethphy1: ethernet-phy@3 { -+ reg = <3>; -+ }; -+ }; ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -22,8 +22,11 @@ - #include - #include - #include -+#include -+#include - #include - #include -+#include - #include - #include - #include -@@ -304,6 +307,7 @@ int __mdiobus_register(struct mii_bus *b - { - struct mdio_device *mdiodev; - int i, err; -+ struct gpio_desc *gpiod; - - if (NULL == bus || NULL == bus->name || - NULL == bus->read || NULL == bus->write) -@@ -329,6 +333,35 @@ int __mdiobus_register(struct mii_bus *b - if (bus->reset) - bus->reset(bus); - -+ /* de-assert bus level PHY GPIO resets */ -+ if (bus->num_reset_gpios > 0) { -+ bus->reset_gpiod = devm_kcalloc(&bus->dev, -+ bus->num_reset_gpios, -+ sizeof(struct gpio_desc *), -+ GFP_KERNEL); -+ if (!bus->reset_gpiod) -+ return -ENOMEM; -+ } -+ -+ for (i = 0; i < bus->num_reset_gpios; i++) { -+ gpiod = devm_gpiod_get_index(&bus->dev, "reset", i, -+ GPIOD_OUT_LOW); -+ if (IS_ERR(gpiod)) { -+ err = PTR_ERR(gpiod); -+ if (err != -ENOENT) { -+ dev_err(&bus->dev, -+ "mii_bus %s couldn't get reset GPIO\n", -+ bus->id); -+ return err; -+ } -+ } else { -+ bus->reset_gpiod[i] = gpiod; -+ gpiod_set_value_cansleep(gpiod, 1); -+ udelay(bus->reset_delay_us); -+ gpiod_set_value_cansleep(gpiod, 0); -+ } -+ } -+ - for (i = 0; i < PHY_MAX_ADDR; i++) { - if ((bus->phy_mask & (1 << i)) == 0) { - struct phy_device *phydev; -@@ -354,6 +387,13 @@ error: - mdiodev->device_remove(mdiodev); - mdiodev->device_free(mdiodev); - } -+ -+ /* Put PHYs in RESET to save power */ -+ for (i = 0; i < bus->num_reset_gpios; i++) { -+ if (bus->reset_gpiod[i]) -+ gpiod_set_value_cansleep(bus->reset_gpiod[i], 1); -+ } -+ - device_del(&bus->dev); - return err; - } -@@ -375,6 +415,13 @@ void mdiobus_unregister(struct mii_bus * - mdiodev->device_remove(mdiodev); - mdiodev->device_free(mdiodev); - } -+ -+ /* Put PHYs in RESET to save power */ -+ for (i = 0; i < bus->num_reset_gpios; i++) { -+ if (bus->reset_gpiod[i]) -+ gpiod_set_value_cansleep(bus->reset_gpiod[i], 1); -+ } -+ - device_del(&bus->dev); - } - EXPORT_SYMBOL(mdiobus_unregister); ---- a/drivers/of/of_mdio.c -+++ b/drivers/of/of_mdio.c -@@ -22,6 +22,8 @@ - #include - #include - -+#define DEFAULT_GPIO_RESET_DELAY 10 /* in microseconds */ -+ - MODULE_AUTHOR("Grant Likely "); - MODULE_LICENSE("GPL"); - -@@ -220,6 +222,11 @@ int of_mdiobus_register(struct mii_bus * - - mdio->dev.of_node = np; - -+ /* Get bus level PHY reset GPIO details */ -+ mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY; -+ of_property_read_u32(np, "reset-delay-us", &mdio->reset_delay_us); -+ mdio->num_reset_gpios = of_gpio_named_count(np, "reset-gpios"); -+ - /* Register the MDIO bus */ - rc = mdiobus_register(mdio); - if (rc) ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -193,6 +193,13 @@ struct mii_bus { - * matching its address - */ - int irq[PHY_MAX_ADDR]; -+ -+ /* GPIO reset pulse width in microseconds */ -+ int reset_delay_us; -+ /* Number of reset GPIOs */ -+ int num_reset_gpios; -+ /* Array of RESET GPIO descriptors */ -+ struct gpio_desc **reset_gpiod; - }; - #define to_mii_bus(d) container_of(d, struct mii_bus, dev) - diff --git a/target/linux/brcm63xx/patches-4.9/001-4.12-08-net-phy-Call-bus-reset-after-releasing-PHYs-from-res.patch b/target/linux/brcm63xx/patches-4.9/001-4.12-08-net-phy-Call-bus-reset-after-releasing-PHYs-from-res.patch deleted file mode 100644 index 182ad62bf..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.12-08-net-phy-Call-bus-reset-after-releasing-PHYs-from-res.patch +++ /dev/null @@ -1,43 +0,0 @@ -From df0c8d911abf6ba97b2c2fc3c5a12769e0b081a3 Mon Sep 17 00:00:00 2001 -From: Florian Fainelli -Date: Thu, 11 May 2017 11:24:16 -0700 -Subject: [PATCH] net: phy: Call bus->reset() after releasing PHYs from reset - -The API convention makes it that a given MDIO bus reset should be able -to access PHY devices in its reset() callback and perform additional -MDIO accesses in order to bring the bus and PHYs in a working state. - -Commit 69226896ad63 ("mdio_bus: Issue GPIO RESET to PHYs.") broke that -contract by first calling bus->reset() and then release all PHYs from -reset using their shared GPIO line, so restore the expected -functionality here. - -Fixes: 69226896ad63 ("mdio_bus: Issue GPIO RESET to PHYs.") -Signed-off-by: Florian Fainelli -Signed-off-by: David S. Miller ---- - drivers/net/phy/mdio_bus.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -330,9 +330,6 @@ int __mdiobus_register(struct mii_bus *b - - mutex_init(&bus->mdio_lock); - -- if (bus->reset) -- bus->reset(bus); -- - /* de-assert bus level PHY GPIO resets */ - if (bus->num_reset_gpios > 0) { - bus->reset_gpiod = devm_kcalloc(&bus->dev, -@@ -362,6 +359,9 @@ int __mdiobus_register(struct mii_bus *b - } - } - -+ if (bus->reset) -+ bus->reset(bus); -+ - for (i = 0; i < PHY_MAX_ADDR; i++) { - if ((bus->phy_mask & (1 << i)) == 0) { - struct phy_device *phydev; diff --git a/target/linux/brcm63xx/patches-4.9/001-4.13-01-leds-bcm6328-fix-signal-source-assignment-for-high-l.patch b/target/linux/brcm63xx/patches-4.9/001-4.13-01-leds-bcm6328-fix-signal-source-assignment-for-high-l.patch deleted file mode 100644 index 5280baff2..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.13-01-leds-bcm6328-fix-signal-source-assignment-for-high-l.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dc90895d776d7b8017bc3b14f588d569d8edbe1f Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Thu, 11 May 2017 13:36:52 +0200 -Subject: [PATCH] leds: bcm6328: fix signal source assignment for high leds - -Each nibble represents 4 LEDs, and in case of the higher register, bit 0 -represents LED 4, so we need to use modulus for the LED number as well. - -Fixes: fd7b025a238d0a5440bfa26c585eb78097bf48dc ("leds: add BCM6328 LED driver") -Signed-off-by: Jonas Gorski ---- - drivers/leds/leds-bcm6328.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/leds/leds-bcm6328.c -+++ b/drivers/leds/leds-bcm6328.c -@@ -242,7 +242,7 @@ static int bcm6328_hwled(struct device * - - spin_lock_irqsave(lock, flags); - val = bcm6328_led_read(addr); -- val |= (BIT(reg) << (((sel % 4) * 4) + 16)); -+ val |= (BIT(reg % 4) << (((sel % 4) * 4) + 16)); - bcm6328_led_write(addr, val); - spin_unlock_irqrestore(lock, flags); - } -@@ -269,7 +269,7 @@ static int bcm6328_hwled(struct device * - - spin_lock_irqsave(lock, flags); - val = bcm6328_led_read(addr); -- val |= (BIT(reg) << ((sel % 4) * 4)); -+ val |= (BIT(reg % 4) << ((sel % 4) * 4)); - bcm6328_led_write(addr, val); - spin_unlock_irqrestore(lock, flags); - } diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch deleted file mode 100644 index c193c72ab..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-01-MIPS-BCM63XX-add-clkdev-lookup-support.patch +++ /dev/null @@ -1,210 +0,0 @@ -From e74caf41aec5338b8cbbd0a1483650848f16f532 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 16 Jul 2017 12:23:47 +0200 -Subject: [PATCH V2 1/8] MIPS: BCM63XX: add clkdev lookup support - -Enable clkdev lookup support to allow us providing clocks under -different names to devices more easily, so we don't need to care -about clock name clashes anymore. - -Reviewed-by: Florian Fainelli -Signed-off-by: Jonas Gorski ---- - arch/mips/Kconfig | 1 + - arch/mips/bcm63xx/clk.c | 150 +++++++++++++++++++++++++++++++++++++----------- - 2 files changed, 116 insertions(+), 35 deletions(-) - ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -272,6 +272,7 @@ config BCM63XX - select GPIOLIB - select HAVE_CLK - select MIPS_L1_CACHE_SHIFT_4 -+ select CLKDEV_LOOKUP - help - Support for BCM63XX based boards - ---- a/arch/mips/bcm63xx/clk.c -+++ b/arch/mips/bcm63xx/clk.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -355,44 +356,103 @@ long clk_round_rate(struct clk *clk, uns - } - EXPORT_SYMBOL_GPL(clk_round_rate); - --struct clk *clk_get(struct device *dev, const char *id) --{ -- if (!strcmp(id, "enet0")) -- return &clk_enet0; -- if (!strcmp(id, "enet1")) -- return &clk_enet1; -- if (!strcmp(id, "enetsw")) -- return &clk_enetsw; -- if (!strcmp(id, "ephy")) -- return &clk_ephy; -- if (!strcmp(id, "usbh")) -- return &clk_usbh; -- if (!strcmp(id, "usbd")) -- return &clk_usbd; -- if (!strcmp(id, "spi")) -- return &clk_spi; -- if (!strcmp(id, "hsspi")) -- return &clk_hsspi; -- if (!strcmp(id, "xtm")) -- return &clk_xtm; -- if (!strcmp(id, "periph")) -- return &clk_periph; -- if ((BCMCPU_IS_3368() || BCMCPU_IS_6358()) && !strcmp(id, "pcm")) -- return &clk_pcm; -- if ((BCMCPU_IS_6362() || BCMCPU_IS_6368()) && !strcmp(id, "ipsec")) -- return &clk_ipsec; -- if ((BCMCPU_IS_6328() || BCMCPU_IS_6362()) && !strcmp(id, "pcie")) -- return &clk_pcie; -- return ERR_PTR(-ENOENT); --} -- --EXPORT_SYMBOL(clk_get); -- --void clk_put(struct clk *clk) --{ --} -- --EXPORT_SYMBOL(clk_put); -+static struct clk_lookup bcm3368_clks[] = { -+ /* fixed rate clocks */ -+ CLKDEV_INIT(NULL, "periph", &clk_periph), -+ /* gated clocks */ -+ CLKDEV_INIT(NULL, "enet0", &clk_enet0), -+ CLKDEV_INIT(NULL, "enet1", &clk_enet1), -+ CLKDEV_INIT(NULL, "ephy", &clk_ephy), -+ CLKDEV_INIT(NULL, "usbh", &clk_usbh), -+ CLKDEV_INIT(NULL, "usbd", &clk_usbd), -+ CLKDEV_INIT(NULL, "spi", &clk_spi), -+ CLKDEV_INIT(NULL, "pcm", &clk_pcm), -+}; -+ -+static struct clk_lookup bcm6328_clks[] = { -+ /* fixed rate clocks */ -+ CLKDEV_INIT(NULL, "periph", &clk_periph), -+ /* gated clocks */ -+ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), -+ CLKDEV_INIT(NULL, "usbh", &clk_usbh), -+ CLKDEV_INIT(NULL, "usbd", &clk_usbd), -+ CLKDEV_INIT(NULL, "hsspi", &clk_hsspi), -+ CLKDEV_INIT(NULL, "pcie", &clk_pcie), -+}; -+ -+static struct clk_lookup bcm6338_clks[] = { -+ /* fixed rate clocks */ -+ CLKDEV_INIT(NULL, "periph", &clk_periph), -+ /* gated clocks */ -+ CLKDEV_INIT(NULL, "enet0", &clk_enet0), -+ CLKDEV_INIT(NULL, "enet1", &clk_enet1), -+ CLKDEV_INIT(NULL, "ephy", &clk_ephy), -+ CLKDEV_INIT(NULL, "usbh", &clk_usbh), -+ CLKDEV_INIT(NULL, "usbd", &clk_usbd), -+ CLKDEV_INIT(NULL, "spi", &clk_spi), -+}; -+ -+static struct clk_lookup bcm6345_clks[] = { -+ /* fixed rate clocks */ -+ CLKDEV_INIT(NULL, "periph", &clk_periph), -+ /* gated clocks */ -+ CLKDEV_INIT(NULL, "enet0", &clk_enet0), -+ CLKDEV_INIT(NULL, "enet1", &clk_enet1), -+ CLKDEV_INIT(NULL, "ephy", &clk_ephy), -+ CLKDEV_INIT(NULL, "usbh", &clk_usbh), -+ CLKDEV_INIT(NULL, "usbd", &clk_usbd), -+ CLKDEV_INIT(NULL, "spi", &clk_spi), -+}; -+ -+static struct clk_lookup bcm6348_clks[] = { -+ /* fixed rate clocks */ -+ CLKDEV_INIT(NULL, "periph", &clk_periph), -+ /* gated clocks */ -+ CLKDEV_INIT(NULL, "enet0", &clk_enet0), -+ CLKDEV_INIT(NULL, "enet1", &clk_enet1), -+ CLKDEV_INIT(NULL, "ephy", &clk_ephy), -+ CLKDEV_INIT(NULL, "usbh", &clk_usbh), -+ CLKDEV_INIT(NULL, "usbd", &clk_usbd), -+ CLKDEV_INIT(NULL, "spi", &clk_spi), -+}; -+ -+static struct clk_lookup bcm6358_clks[] = { -+ /* fixed rate clocks */ -+ CLKDEV_INIT(NULL, "periph", &clk_periph), -+ /* gated clocks */ -+ CLKDEV_INIT(NULL, "enet0", &clk_enet0), -+ CLKDEV_INIT(NULL, "enet1", &clk_enet1), -+ CLKDEV_INIT(NULL, "ephy", &clk_ephy), -+ CLKDEV_INIT(NULL, "usbh", &clk_usbh), -+ CLKDEV_INIT(NULL, "usbd", &clk_usbd), -+ CLKDEV_INIT(NULL, "spi", &clk_spi), -+ CLKDEV_INIT(NULL, "pcm", &clk_pcm), -+}; -+ -+static struct clk_lookup bcm6362_clks[] = { -+ /* fixed rate clocks */ -+ CLKDEV_INIT(NULL, "periph", &clk_periph), -+ /* gated clocks */ -+ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), -+ CLKDEV_INIT(NULL, "usbh", &clk_usbh), -+ CLKDEV_INIT(NULL, "usbd", &clk_usbd), -+ CLKDEV_INIT(NULL, "spi", &clk_spi), -+ CLKDEV_INIT(NULL, "hsspi", &clk_hsspi), -+ CLKDEV_INIT(NULL, "pcie", &clk_pcie), -+ CLKDEV_INIT(NULL, "ipsec", &clk_ipsec), -+}; -+ -+static struct clk_lookup bcm6368_clks[] = { -+ /* fixed rate clocks */ -+ CLKDEV_INIT(NULL, "periph", &clk_periph), -+ /* gated clocks */ -+ CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), -+ CLKDEV_INIT(NULL, "usbh", &clk_usbh), -+ CLKDEV_INIT(NULL, "usbd", &clk_usbd), -+ CLKDEV_INIT(NULL, "spi", &clk_spi), -+ CLKDEV_INIT(NULL, "xtm", &clk_xtm), -+ CLKDEV_INIT(NULL, "ipsec", &clk_ipsec), -+}; - - #define HSSPI_PLL_HZ_6328 133333333 - #define HSSPI_PLL_HZ_6362 400000000 -@@ -400,11 +460,31 @@ EXPORT_SYMBOL(clk_put); - static int __init bcm63xx_clk_init(void) - { - switch (bcm63xx_get_cpu_id()) { -+ case BCM3368_CPU_ID: -+ clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks)); -+ break; - case BCM6328_CPU_ID: - clk_hsspi.rate = HSSPI_PLL_HZ_6328; -+ clkdev_add_table(bcm6328_clks, ARRAY_SIZE(bcm6328_clks)); -+ break; -+ case BCM6338_CPU_ID: -+ clkdev_add_table(bcm6338_clks, ARRAY_SIZE(bcm6338_clks)); -+ break; -+ case BCM6345_CPU_ID: -+ clkdev_add_table(bcm6345_clks, ARRAY_SIZE(bcm6345_clks)); -+ break; -+ case BCM6348_CPU_ID: -+ clkdev_add_table(bcm6348_clks, ARRAY_SIZE(bcm6348_clks)); -+ break; -+ case BCM6358_CPU_ID: -+ clkdev_add_table(bcm6358_clks, ARRAY_SIZE(bcm6358_clks)); - break; - case BCM6362_CPU_ID: - clk_hsspi.rate = HSSPI_PLL_HZ_6362; -+ clkdev_add_table(bcm6362_clks, ARRAY_SIZE(bcm6362_clks)); -+ break; -+ case BCM6368_CPU_ID: -+ clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks)); - break; - } - diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch deleted file mode 100644 index 5d4298d89..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-02-MIPS-BCM63XX-provide-periph-clock-as-refclk-for-uart.patch +++ /dev/null @@ -1,84 +0,0 @@ -From d0322bf7bebe87012b4f95c85be6b5ba0cb6f344 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 16 Jul 2017 12:31:44 +0200 -Subject: [PATCH V2 2/8] MIPS: BCM63XX: provide periph clock as refclk for uart - -Add a lookup as "refclk" to describe its function for the uarts. - -Reviewed-by: Florian Fainelli -Signed-off-by: Jonas Gorski ---- - arch/mips/bcm63xx/clk.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - ---- a/arch/mips/bcm63xx/clk.c -+++ b/arch/mips/bcm63xx/clk.c -@@ -359,6 +359,8 @@ EXPORT_SYMBOL_GPL(clk_round_rate); - static struct clk_lookup bcm3368_clks[] = { - /* fixed rate clocks */ - CLKDEV_INIT(NULL, "periph", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), - /* gated clocks */ - CLKDEV_INIT(NULL, "enet0", &clk_enet0), - CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -372,6 +374,8 @@ static struct clk_lookup bcm3368_clks[] - static struct clk_lookup bcm6328_clks[] = { - /* fixed rate clocks */ - CLKDEV_INIT(NULL, "periph", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), - /* gated clocks */ - CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), - CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -383,6 +387,7 @@ static struct clk_lookup bcm6328_clks[] - static struct clk_lookup bcm6338_clks[] = { - /* fixed rate clocks */ - CLKDEV_INIT(NULL, "periph", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), - /* gated clocks */ - CLKDEV_INIT(NULL, "enet0", &clk_enet0), - CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -395,6 +400,7 @@ static struct clk_lookup bcm6338_clks[] - static struct clk_lookup bcm6345_clks[] = { - /* fixed rate clocks */ - CLKDEV_INIT(NULL, "periph", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), - /* gated clocks */ - CLKDEV_INIT(NULL, "enet0", &clk_enet0), - CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -407,6 +413,7 @@ static struct clk_lookup bcm6345_clks[] - static struct clk_lookup bcm6348_clks[] = { - /* fixed rate clocks */ - CLKDEV_INIT(NULL, "periph", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), - /* gated clocks */ - CLKDEV_INIT(NULL, "enet0", &clk_enet0), - CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -419,6 +426,8 @@ static struct clk_lookup bcm6348_clks[] - static struct clk_lookup bcm6358_clks[] = { - /* fixed rate clocks */ - CLKDEV_INIT(NULL, "periph", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), - /* gated clocks */ - CLKDEV_INIT(NULL, "enet0", &clk_enet0), - CLKDEV_INIT(NULL, "enet1", &clk_enet1), -@@ -432,6 +441,8 @@ static struct clk_lookup bcm6358_clks[] - static struct clk_lookup bcm6362_clks[] = { - /* fixed rate clocks */ - CLKDEV_INIT(NULL, "periph", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), - /* gated clocks */ - CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), - CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -445,6 +456,8 @@ static struct clk_lookup bcm6362_clks[] - static struct clk_lookup bcm6368_clks[] = { - /* fixed rate clocks */ - CLKDEV_INIT(NULL, "periph", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), -+ CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), - /* gated clocks */ - CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), - CLKDEV_INIT(NULL, "usbh", &clk_usbh), diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-03-tty-bcm63xx_uart-use-refclk-for-the-expected-clock-n.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-03-tty-bcm63xx_uart-use-refclk-for-the-expected-clock-n.patch deleted file mode 100644 index 5152fbe24..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-03-tty-bcm63xx_uart-use-refclk-for-the-expected-clock-n.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8124706e6040b1cf0d2dd3a05759df6cec4bddfb Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 16 Jul 2017 12:32:37 +0200 -Subject: [PATCH V2 3/8] tty/bcm63xx_uart: use refclk for the expected clock - name - -We now have the clock available under refclk, so use that. - -Acked-by: Greg Kroah-Hartman -Reviewed-by: Florian Fainelli -Signed-off-by: Jonas Gorski ---- - drivers/tty/serial/bcm63xx_uart.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/tty/serial/bcm63xx_uart.c -+++ b/drivers/tty/serial/bcm63xx_uart.c -@@ -842,7 +842,7 @@ static int bcm_uart_probe(struct platfor - return -ENODEV; - - clk = pdev->dev.of_node ? of_clk_get(pdev->dev.of_node, 0) : -- clk_get(&pdev->dev, "periph"); -+ clk_get(&pdev->dev, "refclk"); - if (IS_ERR(clk)) - return -ENODEV; - diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-04-tty-bcm63xx_uart-allow-naming-clock-in-device-tree.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-04-tty-bcm63xx_uart-allow-naming-clock-in-device-tree.patch deleted file mode 100644 index a8fd5afcb..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-04-tty-bcm63xx_uart-allow-naming-clock-in-device-tree.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 317f8659bba01b307cbe4e9902d4e3d333fd7164 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 16 Jul 2017 12:39:17 +0200 -Subject: [PATCH V2 4/8] tty/bcm63xx_uart: allow naming clock in device tree - -Codify using a named clock for the refclk of the uart. This makes it -easier if we might need to add a gating clock (like present on the -BCM6345). - -Acked-by: Rob Herring -Acked-by: Greg Kroah-Hartman -Reviewed-by: Florian Fainelli -Signed-off-by: Jonas Gorski ---- - Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt | 6 ++++++ - drivers/tty/serial/bcm63xx_uart.c | 6 ++++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - ---- a/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt -+++ b/Documentation/devicetree/bindings/serial/brcm,bcm6345-uart.txt -@@ -11,6 +11,11 @@ Required properties: - - clocks: Clock driving the hardware; used to figure out the baud rate - divisor. - -+ -+Optional properties: -+ -+- clock-names: Should be "refclk". -+ - Example: - - uart0: serial@14e00520 { -@@ -19,6 +24,7 @@ Example: - interrupt-parent = <&periph_intc>; - interrupts = <2>; - clocks = <&periph_clk>; -+ clock-names = "refclk"; - }; - - clocks { ---- a/drivers/tty/serial/bcm63xx_uart.c -+++ b/drivers/tty/serial/bcm63xx_uart.c -@@ -841,8 +841,10 @@ static int bcm_uart_probe(struct platfor - if (!res_irq) - return -ENODEV; - -- clk = pdev->dev.of_node ? of_clk_get(pdev->dev.of_node, 0) : -- clk_get(&pdev->dev, "refclk"); -+ clk = clk_get(&pdev->dev, "refclk"); -+ if (IS_ERR(clk) && pdev->dev.of_node) -+ clk = of_clk_get(pdev->dev.of_node, 0); -+ - if (IS_ERR(clk)) - return -ENODEV; - diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch deleted file mode 100644 index 2f6951bc6..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-05-MIPS-BCM63XX-move-the-HSSPI-PLL-HZ-into-its-own-cloc.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cb86630379c8f3432c916d62045b5176f17f4123 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 16 Jul 2017 12:57:21 +0200 -Subject: [PATCH V2 6/8] MIPS: BCM63XX: move the HSSPI PLL HZ into its own - clock - -Split up the HSSPL clock into rate and a gate clock, to more closely -match the actual hardware. - -Reviewed-by: Florian Fainelli -Signed-off-by: Jonas Gorski ---- - arch/mips/bcm63xx/clk.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - ---- a/arch/mips/bcm63xx/clk.c -+++ b/arch/mips/bcm63xx/clk.c -@@ -247,6 +247,10 @@ static struct clk clk_hsspi = { - .set = hsspi_set, - }; - -+/* -+ * HSSPI PLL -+ */ -+static struct clk clk_hsspi_pll; - - /* - * XTM clock -@@ -376,6 +380,7 @@ static struct clk_lookup bcm6328_clks[] - CLKDEV_INIT(NULL, "periph", &clk_periph), - CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), - CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), -+ CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), - /* gated clocks */ - CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), - CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -443,6 +448,7 @@ static struct clk_lookup bcm6362_clks[] - CLKDEV_INIT(NULL, "periph", &clk_periph), - CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), - CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), -+ CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), - /* gated clocks */ - CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), - CLKDEV_INIT(NULL, "usbh", &clk_usbh), -@@ -477,7 +483,7 @@ static int __init bcm63xx_clk_init(void) - clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks)); - break; - case BCM6328_CPU_ID: -- clk_hsspi.rate = HSSPI_PLL_HZ_6328; -+ clk_hsspi_pll.rate = HSSPI_PLL_HZ_6328; - clkdev_add_table(bcm6328_clks, ARRAY_SIZE(bcm6328_clks)); - break; - case BCM6338_CPU_ID: -@@ -493,7 +499,7 @@ static int __init bcm63xx_clk_init(void) - clkdev_add_table(bcm6358_clks, ARRAY_SIZE(bcm6358_clks)); - break; - case BCM6362_CPU_ID: -- clk_hsspi.rate = HSSPI_PLL_HZ_6362; -+ clk_hsspi_pll.rate = HSSPI_PLL_HZ_6362; - clkdev_add_table(bcm6362_clks, ARRAY_SIZE(bcm6362_clks)); - break; - case BCM6368_CPU_ID: diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch deleted file mode 100644 index d631013f1..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-06-MIPS-BCM63XX-provide-enet-clocks-as-enet-to-the-ethe.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 6d43970a2eb1c7ee88caf7328d201f9c001262e9 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 16 Jul 2017 12:48:41 +0200 -Subject: [PATCH V2 7/8] MIPS: BCM63XX: provide enet clocks as "enet" to the - ethernet devices - -Add lookups to provide the appropriate enetX clocks as just "enet" to -the ethernet devices. - -Reviewed-by: Florian Fainelli -Signed-off-by: Jonas Gorski ---- - arch/mips/bcm63xx/clk.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/arch/mips/bcm63xx/clk.c -+++ b/arch/mips/bcm63xx/clk.c -@@ -373,6 +373,8 @@ static struct clk_lookup bcm3368_clks[] - CLKDEV_INIT(NULL, "usbd", &clk_usbd), - CLKDEV_INIT(NULL, "spi", &clk_spi), - CLKDEV_INIT(NULL, "pcm", &clk_pcm), -+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet0), -+ CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1), - }; - - static struct clk_lookup bcm6328_clks[] = { -@@ -400,6 +402,7 @@ static struct clk_lookup bcm6338_clks[] - CLKDEV_INIT(NULL, "usbh", &clk_usbh), - CLKDEV_INIT(NULL, "usbd", &clk_usbd), - CLKDEV_INIT(NULL, "spi", &clk_spi), -+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet_misc), - }; - - static struct clk_lookup bcm6345_clks[] = { -@@ -413,6 +416,7 @@ static struct clk_lookup bcm6345_clks[] - CLKDEV_INIT(NULL, "usbh", &clk_usbh), - CLKDEV_INIT(NULL, "usbd", &clk_usbd), - CLKDEV_INIT(NULL, "spi", &clk_spi), -+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet_misc), - }; - - static struct clk_lookup bcm6348_clks[] = { -@@ -426,6 +430,8 @@ static struct clk_lookup bcm6348_clks[] - CLKDEV_INIT(NULL, "usbh", &clk_usbh), - CLKDEV_INIT(NULL, "usbd", &clk_usbd), - CLKDEV_INIT(NULL, "spi", &clk_spi), -+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet_misc), -+ CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet_misc), - }; - - static struct clk_lookup bcm6358_clks[] = { -@@ -441,6 +447,8 @@ static struct clk_lookup bcm6358_clks[] - CLKDEV_INIT(NULL, "usbd", &clk_usbd), - CLKDEV_INIT(NULL, "spi", &clk_spi), - CLKDEV_INIT(NULL, "pcm", &clk_pcm), -+ CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet0), -+ CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1), - }; - - static struct clk_lookup bcm6362_clks[] = { diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch deleted file mode 100644 index f9698c250..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-07-MIPS-BCM63XX-split-out-swpkt_sar-usb-clocks.patch +++ /dev/null @@ -1,105 +0,0 @@ -From b98027285bd1fa95da0645a4234a5fc1f1a83f92 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 26 Feb 2017 11:59:52 +0100 -Subject: [PATCH V2 8/8] MIPS: BCM63XX: split out swpkt_sar/usb clocks - -Make the secondary switch clocks their own clocks. This allows proper -enable reference counting between SAR/XTM and the main switch clocks, -and controlling them individually from drivers. - -Signed-off-by: Jonas Gorski ---- - arch/mips/bcm63xx/clk.c | 61 +++++++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 51 insertions(+), 10 deletions(-) - ---- a/arch/mips/bcm63xx/clk.c -+++ b/arch/mips/bcm63xx/clk.c -@@ -121,21 +121,56 @@ static struct clk clk_ephy = { - }; - - /* -+ * Ethernet switch SAR clock -+ */ -+static void swpkt_sar_set(struct clk *clk, int enable) -+{ -+ if (BCMCPU_IS_6368()) -+ bcm_hwclock_set(CKCTL_6368_SWPKT_SAR_EN, enable); -+ else -+ return; -+} -+ -+static struct clk clk_swpkt_sar = { -+ .set = swpkt_sar_set, -+}; -+ -+/* -+ * Ethernet switch USB clock -+ */ -+static void swpkt_usb_set(struct clk *clk, int enable) -+{ -+ if (BCMCPU_IS_6368()) -+ bcm_hwclock_set(CKCTL_6368_SWPKT_USB_EN, enable); -+ else -+ return; -+} -+ -+static struct clk clk_swpkt_usb = { -+ .set = swpkt_usb_set, -+}; -+ -+/* - * Ethernet switch clock - */ - static void enetsw_set(struct clk *clk, int enable) - { -- if (BCMCPU_IS_6328()) -+ if (BCMCPU_IS_6328()) { - bcm_hwclock_set(CKCTL_6328_ROBOSW_EN, enable); -- else if (BCMCPU_IS_6362()) -+ } else if (BCMCPU_IS_6362()) { - bcm_hwclock_set(CKCTL_6362_ROBOSW_EN, enable); -- else if (BCMCPU_IS_6368()) -- bcm_hwclock_set(CKCTL_6368_ROBOSW_EN | -- CKCTL_6368_SWPKT_USB_EN | -- CKCTL_6368_SWPKT_SAR_EN, -- enable); -- else -+ } else if (BCMCPU_IS_6368()) { -+ if (enable) { -+ clk_enable_unlocked(&clk_swpkt_sar); -+ clk_enable_unlocked(&clk_swpkt_usb); -+ } else { -+ clk_disable_unlocked(&clk_swpkt_usb); -+ clk_disable_unlocked(&clk_swpkt_sar); -+ } -+ bcm_hwclock_set(CKCTL_6368_ROBOSW_EN, enable); -+ } else { - return; -+ } - - if (enable) { - /* reset switch core afer clock change */ -@@ -260,8 +295,12 @@ static void xtm_set(struct clk *clk, int - if (!BCMCPU_IS_6368()) - return; - -- bcm_hwclock_set(CKCTL_6368_SAR_EN | -- CKCTL_6368_SWPKT_SAR_EN, enable); -+ if (enable) -+ clk_enable_unlocked(&clk_swpkt_sar); -+ else -+ clk_disable_unlocked(&clk_swpkt_sar); -+ -+ bcm_hwclock_set(CKCTL_6368_SAR_EN, enable); - - if (enable) { - /* reset sar core afer clock change */ -@@ -447,6 +486,8 @@ static struct clk_lookup bcm6358_clks[] - CLKDEV_INIT(NULL, "usbd", &clk_usbd), - CLKDEV_INIT(NULL, "spi", &clk_spi), - CLKDEV_INIT(NULL, "pcm", &clk_pcm), -+ CLKDEV_INIT(NULL, "swpkt_sar", &clk_swpkt_sar), -+ CLKDEV_INIT(NULL, "swpkt_usb", &clk_swpkt_usb), - CLKDEV_INIT("bcm63xx_enet.0", "enet", &clk_enet0), - CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1), - }; diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-10-bcm63xx_enet-do-not-rely-on-probe-order.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-10-bcm63xx_enet-do-not-rely-on-probe-order.patch deleted file mode 100644 index e13b32e0f..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-10-bcm63xx_enet-do-not-rely-on-probe-order.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 71710bb6cbc82f411a4e5faafa0c3178e48e7137 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Tue, 30 May 2017 13:31:45 +0200 -Subject: [PATCH 3/6] bcm63xx_enet: do not rely on probe order - -Do not rely on the shared device being probed before the enet(sw) -devices. This makes it easier to eventually move out the shared -device as a dma controller driver (what it should be). - -Signed-off-by: Jonas Gorski ---- - drivers/net/ethernet/broadcom/bcm63xx_enet.c | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1739,10 +1739,8 @@ static int bcm_enet_probe(struct platfor - const char *clk_name; - int i, ret; - -- /* stop if shared driver failed, assume driver->probe will be -- * called in the same order we register devices (correct ?) */ - if (!bcm_enet_shared_base[0]) -- return -ENODEV; -+ return -EPROBE_DEFER; - - res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); - res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1); -@@ -2714,11 +2712,8 @@ static int bcm_enetsw_probe(struct platf - struct resource *res_mem; - int ret, irq_rx, irq_tx; - -- /* stop if shared driver failed, assume driver->probe will be -- * called in the same order we register devices (correct ?) -- */ - if (!bcm_enet_shared_base[0]) -- return -ENODEV; -+ return -EPROBE_DEFER; - - res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - irq_rx = platform_get_irq(pdev, 0); diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-11-bcm63xx_enet-use-managed-functions-for-clock-ioremap.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-11-bcm63xx_enet-use-managed-functions-for-clock-ioremap.patch deleted file mode 100644 index 7d7d18b06..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-11-bcm63xx_enet-use-managed-functions-for-clock-ioremap.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 179a445ae4ef36ec44f4aea18e5f42d21334d186 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sat, 25 Feb 2017 12:39:25 +0100 -Subject: [PATCH 4/6] bcm63xx_enet: use managed functions for clock/ioremap - -Use managed functions where possible to reduce the amount of resource -handling on error and remove paths. - -Signed-off-by: Jonas Gorski ---- - drivers/net/ethernet/broadcom/bcm63xx_enet.c | 54 +++++++--------------------- - 1 file changed, 12 insertions(+), 42 deletions(-) - ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1784,14 +1784,14 @@ static int bcm_enet_probe(struct platfor - clk_name = "enet1"; - } - -- priv->mac_clk = clk_get(&pdev->dev, clk_name); -+ priv->mac_clk = devm_clk_get(&pdev->dev, clk_name); - if (IS_ERR(priv->mac_clk)) { - ret = PTR_ERR(priv->mac_clk); - goto out; - } - ret = clk_prepare_enable(priv->mac_clk); - if (ret) -- goto out_put_clk_mac; -+ goto out; - - /* initialize default and fetch platform data */ - priv->rx_ring_size = BCMENET_DEF_RX_DESC; -@@ -1819,7 +1819,7 @@ static int bcm_enet_probe(struct platfor - - if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) { - /* using internal PHY, enable clock */ -- priv->phy_clk = clk_get(&pdev->dev, "ephy"); -+ priv->phy_clk = devm_clk_get(&pdev->dev, "ephy"); - if (IS_ERR(priv->phy_clk)) { - ret = PTR_ERR(priv->phy_clk); - priv->phy_clk = NULL; -@@ -1827,7 +1827,7 @@ static int bcm_enet_probe(struct platfor - } - ret = clk_prepare_enable(priv->phy_clk); - if (ret) -- goto out_put_clk_phy; -+ goto out_disable_clk_mac; - } - - /* do minimal hardware init to be able to probe mii bus */ -@@ -1921,14 +1921,8 @@ out_uninit_hw: - if (priv->phy_clk) - clk_disable_unprepare(priv->phy_clk); - --out_put_clk_phy: -- if (priv->phy_clk) -- clk_put(priv->phy_clk); -- - out_disable_clk_mac: - clk_disable_unprepare(priv->mac_clk); --out_put_clk_mac: -- clk_put(priv->mac_clk); - out: - free_netdev(dev); - return ret; -@@ -1964,12 +1958,10 @@ static int bcm_enet_remove(struct platfo - } - - /* disable hw block clocks */ -- if (priv->phy_clk) { -+ if (priv->phy_clk) - clk_disable_unprepare(priv->phy_clk); -- clk_put(priv->phy_clk); -- } -+ - clk_disable_unprepare(priv->mac_clk); -- clk_put(priv->mac_clk); - - free_netdev(dev); - return 0; -@@ -2752,26 +2744,20 @@ static int bcm_enetsw_probe(struct platf - if (ret) - goto out; - -- if (!request_mem_region(res_mem->start, resource_size(res_mem), -- "bcm63xx_enetsw")) { -- ret = -EBUSY; -+ priv->base = devm_ioremap_resource(&pdev->dev, res_mem); -+ if (IS_ERR(priv->base)) { -+ ret = PTR_ERR(priv->base); - goto out; - } - -- priv->base = ioremap(res_mem->start, resource_size(res_mem)); -- if (priv->base == NULL) { -- ret = -ENOMEM; -- goto out_release_mem; -- } -- -- priv->mac_clk = clk_get(&pdev->dev, "enetsw"); -+ priv->mac_clk = devm_clk_get(&pdev->dev, "enetsw"); - if (IS_ERR(priv->mac_clk)) { - ret = PTR_ERR(priv->mac_clk); -- goto out_unmap; -+ goto out; - } - ret = clk_prepare_enable(priv->mac_clk); - if (ret) -- goto out_put_clk; -+ goto out; - - priv->rx_chan = 0; - priv->tx_chan = 1; -@@ -2803,15 +2789,6 @@ static int bcm_enetsw_probe(struct platf - - out_disable_clk: - clk_disable_unprepare(priv->mac_clk); -- --out_put_clk: -- clk_put(priv->mac_clk); -- --out_unmap: -- iounmap(priv->base); -- --out_release_mem: -- release_mem_region(res_mem->start, resource_size(res_mem)); - out: - free_netdev(dev); - return ret; -@@ -2823,20 +2800,13 @@ static int bcm_enetsw_remove(struct plat - { - struct bcm_enet_priv *priv; - struct net_device *dev; -- struct resource *res; - - /* stop netdevice */ - dev = platform_get_drvdata(pdev); - priv = netdev_priv(dev); - unregister_netdev(dev); - -- /* release device resources */ -- iounmap(priv->base); -- res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -- release_mem_region(res->start, resource_size(res)); -- - clk_disable_unprepare(priv->mac_clk); -- clk_put(priv->mac_clk); - - free_netdev(dev); - return 0; diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-12-bcm63xx_enet-drop-unneeded-NULL-phy_clk-check.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-12-bcm63xx_enet-drop-unneeded-NULL-phy_clk-check.patch deleted file mode 100644 index b81a94c8a..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-12-bcm63xx_enet-drop-unneeded-NULL-phy_clk-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 555baec974ede81e616ca88ac6d3fca09239368f Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Tue, 18 Jul 2017 13:18:01 +0200 -Subject: [PATCH 5/6] bcm63xx_enet: drop unneeded NULL phy_clk check - -clk_disable and clk_unprepare are NULL-safe, so need to duplicate the -NULL check of the functions. - -Signed-off-by: Jonas Gorski ---- - drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1918,8 +1918,7 @@ out_free_mdio: - out_uninit_hw: - /* turn off mdc clock */ - enet_writel(priv, 0, ENET_MIISC_REG); -- if (priv->phy_clk) -- clk_disable_unprepare(priv->phy_clk); -+ clk_disable_unprepare(priv->phy_clk); - - out_disable_clk_mac: - clk_disable_unprepare(priv->mac_clk); -@@ -1958,9 +1957,7 @@ static int bcm_enet_remove(struct platfo - } - - /* disable hw block clocks */ -- if (priv->phy_clk) -- clk_disable_unprepare(priv->phy_clk); -- -+ clk_disable_unprepare(priv->phy_clk); - clk_disable_unprepare(priv->mac_clk); - - free_netdev(dev); diff --git a/target/linux/brcm63xx/patches-4.9/001-4.15-13-bcm63xx_enet-remove-unneeded-include.patch b/target/linux/brcm63xx/patches-4.9/001-4.15-13-bcm63xx_enet-remove-unneeded-include.patch deleted file mode 100644 index 482bd5892..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.15-13-bcm63xx_enet-remove-unneeded-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 77364ce98037972fb1c57d0ee0418eb1c2b26521 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Mon, 29 May 2017 13:11:14 +0200 -Subject: [PATCH 6/6] bcm63xx_enet: remove unneeded include - -We don't use anyhing from that file, so drop it. - -Signed-off-by: Jonas Gorski ---- - drivers/net/ethernet/broadcom/bcm63xx_enet.h | 1 - - 1 file changed, 1 deletion(-) - ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h -@@ -8,7 +8,6 @@ - #include - - #include --#include - #include - #include - diff --git a/target/linux/brcm63xx/patches-4.9/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch b/target/linux/brcm63xx/patches-4.9/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch deleted file mode 100644 index d453153d4..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 943b0832e0cf3afe5bd40ffb1885d06106122c5d Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 16 Jul 2017 12:49:49 +0200 -Subject: [PATCH 1/4] bcm63xx_enet: just use "enet" as the clock name - -Now that we have the individual clocks available as "enet" we -don't need to rely on the device id for them anymore. - -Signed-off-by: Jonas Gorski ---- - drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1736,7 +1736,6 @@ static int bcm_enet_probe(struct platfor - struct bcm63xx_enet_platform_data *pd; - struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx; - struct mii_bus *bus; -- const char *clk_name; - int i, ret; - - if (!bcm_enet_shared_base[0]) -@@ -1777,14 +1776,12 @@ static int bcm_enet_probe(struct platfor - if (priv->mac_id == 0) { - priv->rx_chan = 0; - priv->tx_chan = 1; -- clk_name = "enet0"; - } else { - priv->rx_chan = 2; - priv->tx_chan = 3; -- clk_name = "enet1"; - } - -- priv->mac_clk = devm_clk_get(&pdev->dev, clk_name); -+ priv->mac_clk = devm_clk_get(&pdev->dev, "enet"); - if (IS_ERR(priv->mac_clk)) { - ret = PTR_ERR(priv->mac_clk); - goto out; diff --git a/target/linux/brcm63xx/patches-4.9/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch b/target/linux/brcm63xx/patches-4.9/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch deleted file mode 100644 index d858b81f4..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b7d1d1f345bb3b25c360c1df812d98866e2ee7fb Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sat, 30 Sep 2017 13:50:03 +0200 -Subject: [PATCH 2/4] bcm63xx_enet: use platform data for dma channel numbers - -To reduce the reliance on device ids, pass the dma channel numbers to -the enet devices as platform data. - -Signed-off-by: Jonas Gorski ---- - arch/mips/bcm63xx/dev-enet.c | 8 ++++++++ - arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h | 4 ++++ - drivers/net/ethernet/broadcom/bcm63xx_enet.c | 11 ++--------- - 3 files changed, 14 insertions(+), 9 deletions(-) - ---- a/arch/mips/bcm63xx/dev-enet.c -+++ b/arch/mips/bcm63xx/dev-enet.c -@@ -265,6 +265,14 @@ int __init bcm63xx_enet_register(int uni - dpd->dma_chan_width = ENETDMA_CHAN_WIDTH; - } - -+ if (unit == 0) { -+ dpd->rx_chan = 0; -+ dpd->tx_chan = 1; -+ } else { -+ dpd->rx_chan = 2; -+ dpd->tx_chan = 3; -+ } -+ - ret = platform_device_register(pdev); - if (ret) - return ret; ---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h -+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h -@@ -54,6 +54,10 @@ struct bcm63xx_enet_platform_data { - - /* DMA descriptor shift */ - unsigned int dma_desc_shift; -+ -+ /* dma channel ids */ -+ int rx_chan; -+ int tx_chan; - }; - - /* ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1772,15 +1772,6 @@ static int bcm_enet_probe(struct platfor - priv->irq_tx = res_irq_tx->start; - priv->mac_id = pdev->id; - -- /* get rx & tx dma channel id for this mac */ -- if (priv->mac_id == 0) { -- priv->rx_chan = 0; -- priv->tx_chan = 1; -- } else { -- priv->rx_chan = 2; -- priv->tx_chan = 3; -- } -- - priv->mac_clk = devm_clk_get(&pdev->dev, "enet"); - if (IS_ERR(priv->mac_clk)) { - ret = PTR_ERR(priv->mac_clk); -@@ -1812,6 +1803,8 @@ static int bcm_enet_probe(struct platfor - priv->dma_chan_width = pd->dma_chan_width; - priv->dma_has_sram = pd->dma_has_sram; - priv->dma_desc_shift = pd->dma_desc_shift; -+ priv->rx_chan = pd->rx_chan; -+ priv->tx_chan = pd->tx_chan; - } - - if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) { diff --git a/target/linux/brcm63xx/patches-4.9/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch b/target/linux/brcm63xx/patches-4.9/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch deleted file mode 100644 index 85f2ca231..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8c61608e5dd2e15575c171ee9cd558ddc3b94962 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 17 Dec 2017 12:54:30 +0100 -Subject: [PATCH 3/4] bcm63xx_enet: remove pointless mac_id check - -Enabling the ephy clock for mac 1 is harmless, and the actual usage of -the ephy is not restricted to mac 0, so we might as well remove the -check. - -Signed-off-by: Jonas Gorski ---- - drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1807,7 +1807,7 @@ static int bcm_enet_probe(struct platfor - priv->tx_chan = pd->tx_chan; - } - -- if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) { -+ if (priv->has_phy && !priv->use_external_mii) { - /* using internal PHY, enable clock */ - priv->phy_clk = devm_clk_get(&pdev->dev, "ephy"); - if (IS_ERR(priv->phy_clk)) { diff --git a/target/linux/brcm63xx/patches-4.9/001-4.16-04-bcm63xx_enet-use-platform-device-id-directly-for-mii.patch b/target/linux/brcm63xx/patches-4.9/001-4.16-04-bcm63xx_enet-use-platform-device-id-directly-for-mii.patch deleted file mode 100644 index f6b7d7dcf..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.16-04-bcm63xx_enet-use-platform-device-id-directly-for-mii.patch +++ /dev/null @@ -1,46 +0,0 @@ -From faea89cd893a1a7af81185f026a64dad603ef72f Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Sun, 17 Dec 2017 12:58:12 +0100 -Subject: [PATCH 4/4] bcm63xx_enet: use platform device id directly for miibus - name - -Directly use the platform device for generating the miibus name. This removes -the last user of bcm_enet_priv::mac_id and we can remove the field. - -Signed-off-by: Jonas Gorski ---- - drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 +-- - drivers/net/ethernet/broadcom/bcm63xx_enet.h | 3 --- - 2 files changed, 1 insertion(+), 5 deletions(-) - ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1770,7 +1770,6 @@ static int bcm_enet_probe(struct platfor - dev->irq = priv->irq = res_irq->start; - priv->irq_rx = res_irq_rx->start; - priv->irq_tx = res_irq_tx->start; -- priv->mac_id = pdev->id; - - priv->mac_clk = devm_clk_get(&pdev->dev, "enet"); - if (IS_ERR(priv->mac_clk)) { -@@ -1838,7 +1837,7 @@ static int bcm_enet_probe(struct platfor - bus->priv = priv; - bus->read = bcm_enet_mdio_read_phylib; - bus->write = bcm_enet_mdio_write_phylib; -- sprintf(bus->id, "%s-%d", pdev->name, priv->mac_id); -+ sprintf(bus->id, "%s-%d", pdev->name, pdev->id); - - /* only probe bus where we think the PHY is, because - * the mdio read operation return 0 instead of 0xffff ---- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h -+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h -@@ -192,9 +192,6 @@ struct bcm_enet_mib_counters { - - struct bcm_enet_priv { - -- /* mac id (from platform device id) */ -- int mac_id; -- - /* base remapped address of device */ - void __iomem *base; - diff --git a/target/linux/brcm63xx/patches-4.9/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch b/target/linux/brcm63xx/patches-4.9/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch deleted file mode 100644 index 307ac7bb2..000000000 --- a/target/linux/brcm63xx/patches-4.9/001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f1af8bb8e0879a3c2d9679a7274c2774335e9876 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Wed, 14 Nov 2018 12:06:41 +0100 -Subject: [PATCH] MIPS: BCM63XX: fix switch core reset on BCM6368 - -The Ethernet Switch core mask was set to 0, causing the switch core to -be not reset on BCM6368 on boot. Provide the proper mask so the switch -core gets reset to a known good state. - -Fixes: 799faa626c71 ("MIPS: BCM63XX: add core reset helper") -Signed-off-by: Jonas Gorski ---- - arch/mips/bcm63xx/reset.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/mips/bcm63xx/reset.c -+++ b/arch/mips/bcm63xx/reset.c -@@ -119,7 +119,7 @@ - #define BCM6368_RESET_DSL 0 - #define BCM6368_RESET_SAR SOFTRESET_6368_SAR_MASK - #define BCM6368_RESET_EPHY SOFTRESET_6368_EPHY_MASK --#define BCM6368_RESET_ENETSW 0 -+#define BCM6368_RESET_ENETSW SOFTRESET_6368_ENETSW_MASK - #define BCM6368_RESET_PCM SOFTRESET_6368_PCM_MASK - #define BCM6368_RESET_MPI SOFTRESET_6368_MPI_MASK - #define BCM6368_RESET_PCIE 0 diff --git a/target/linux/brcm63xx/patches-4.9/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch b/target/linux/brcm63xx/patches-4.9/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch deleted file mode 100644 index bc4394eb3..000000000 --- a/target/linux/brcm63xx/patches-4.9/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch +++ /dev/null @@ -1,48 +0,0 @@ -From patchwork Tue Jul 18 10:17:27 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [6/9] MIPS: BCM63XX: allow NULL clock for clk_get_rate -X-Patchwork-Submitter: Jonas Gorski -X-Patchwork-Id: 16776 -Message-Id: <20170718101730.2541-7-jonas.gorski@gmail.com> -To: unlisted-recipients:; (no To-header on input) -Cc: Ralf Baechle , - Florian Fainelli , - bcm-kernel-feedback-list@broadcom.com, - James Hogan , - linux-mips@linux-mips.org, linux-kernel@vger.kernel.org -Date: Tue, 18 Jul 2017 12:17:27 +0200 -From: Jonas Gorski -List-Id: linux-mips - -Make the behaviour of clk_get_rate consistent with common clk's -clk_get_rate by accepting NULL clocks as parameter. Some device -drivers rely on this, and will cause an OOPS otherwise. - -Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.") -Cc: Ralf Baechle -Cc: Florian Fainelli -Cc: bcm-kernel-feedback-list@broadcom.com -Cc: James Hogan -Cc: linux-mips@linux-mips.org -Cc: linux-kernel@vger.kernel.org -Reported-by: Mathias Kresin -Signed-off-by: Jonas Gorski -Reviewed-by: Florian Fainelli ---- - arch/mips/bcm63xx/clk.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/arch/mips/bcm63xx/clk.c -+++ b/arch/mips/bcm63xx/clk.c -@@ -392,6 +392,9 @@ EXPORT_SYMBOL(clk_disable); - - unsigned long clk_get_rate(struct clk *clk) - { -+ if (!clk) -+ return 0; -+ - return clk->rate; - } - diff --git a/target/linux/brcm63xx/patches-4.9/577-board_VH4032N.patch b/target/linux/brcm63xx/patches-4.9/577-board_VH4032N.patch deleted file mode 100644 index d3482f26e..000000000 --- a/target/linux/brcm63xx/patches-4.9/577-board_VH4032N.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2218,6 +2218,44 @@ static struct board_info __initdata boar - }, - }; - -+static struct board_info __initdata board_VH4032N = { -+ .name = "VH4032N", -+ .expected_cpu_id = 0x6368, -+ -+ .has_pci = 1, -+ .has_ohci0 = 1, -+ .has_ehci0 = 1, -+ .num_usbh_ports = 2, -+ -+ .has_enetsw = 1, -+ .enetsw = { -+ .used_ports = { -+ [0] = { -+ .used = 1, -+ .phy_id = 1, -+ .name = "LAN4", -+ }, -+ [1] = { -+ .used = 1, -+ .phy_id = 2, -+ .name = "LAN3", -+ }, -+ [2] = { -+ .used = 1, -+ .phy_id = 3, -+ .name = "LAN2", -+ }, -+ [3] = { -+ .used = 1, -+ .phy_id = 4, -+ .name = "LAN1", -+ }, -+ }, -+ }, -+ -+ .use_fallback_sprom = 1, -+}; -+ - static struct sprom_fixup __initdata wap5813n_fixups[] = { - { .offset = 97, .value = 0xfeed }, - { .offset = 98, .value = 0x15d1 }, -@@ -2500,6 +2538,7 @@ static const struct board_info __initcon - &board_HG622, - &board_HG655b, - &board_P870HW51A_V2, -+ &board_VH4032N, - &board_VR3025u, - &board_VR3025un, - &board_VR3026e, -@@ -2611,6 +2650,7 @@ static struct of_device_id const bcm963x - { .compatible = "huawei,hg655b", .data = &board_HG655b, }, - { .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, }, - { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, -+ { .compatible = "observa,vh4032n", .data = &board_VH4032N, }, - { .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, }, - #endif - #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/cns3xxx/patches-4.19/080-sata_support.patch b/target/linux/cns3xxx/patches-4.19/080-sata_support.patch index 20871916f..65a5275be 100644 --- a/target/linux/cns3xxx/patches-4.19/080-sata_support.patch +++ b/target/linux/cns3xxx/patches-4.19/080-sata_support.patch @@ -1,6 +1,6 @@ --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -37,12 +37,23 @@ static struct scsi_host_template ahci_pl +@@ -44,11 +44,18 @@ static struct scsi_host_template ahci_pl AHCI_SHT(DRV_NAME), }; @@ -15,12 +15,26 @@ { struct device *dev = &pdev->dev; struct ahci_host_priv *hpriv; -+ const struct ata_port_info *info = &ahci_port_info; +- const struct ata_port_info *port; ++ const struct ata_port_info *port = &ahci_port_info; int rc; -+ if (IS_ENABLED(CONFIG_ARCH_CNS3XXX)) -+ info = &cns3xxx_port_info; -+ hpriv = ahci_platform_get_resources(pdev, - AHCI_PLATFORM_GET_RESETS); - if (IS_ERR(hpriv)) +@@ -66,9 +73,14 @@ static int ahci_probe(struct platform_de + if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci")) + hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ; + +- port = acpi_device_get_match_data(dev); +- if (!port) +- port = &ahci_port_info; ++ if (IS_ENABLED(CONFIG_ARCH_CNS3XXX)) { ++ port = &cns3xxx_port_info; ++ } ++ else { ++ port = acpi_device_get_match_data(dev); ++ if (!port) ++ port = &ahci_port_info; ++ } + + rc = ahci_platform_init_host(pdev, hpriv, port, + &ahci_platform_sht); diff --git a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch index 78b7cc9f3..dcd9b187c 100644 --- a/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +++ b/target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso +MODULE_ALIAS("nf-flow-table-hw"); --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -5471,6 +5471,13 @@ static int nf_tables_flowtable_parse_hoo +@@ -5473,6 +5473,13 @@ static int nf_tables_flowtable_parse_hoo if (err < 0) return err; @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL); if (!ops) return -ENOMEM; -@@ -5602,10 +5609,19 @@ static int nf_tables_newflowtable(struct +@@ -5604,10 +5611,19 @@ static int nf_tables_newflowtable(struct } flowtable->data.type = type; @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK], flowtable); if (err < 0) -@@ -5731,7 +5747,8 @@ static int nf_tables_fill_flowtable_info +@@ -5733,7 +5749,8 @@ static int nf_tables_fill_flowtable_info nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) || nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) || nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle), diff --git a/target/linux/ipq40xx/patches-4.14/073-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch b/target/linux/ipq40xx/patches-4.14/073-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch deleted file mode 100644 index ac128ab9e..000000000 --- a/target/linux/ipq40xx/patches-4.14/073-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d60e006ec0e425877aacc61c7ece3da0434a8fce Mon Sep 17 00:00:00 2001 -From: Christian Lamparter -Date: Mon, 23 Jul 2018 16:34:54 +0200 -Subject: [PATCH 7/8] qcom: ipq4019: fix cpu0's qcom,saw2 reg value - -while compiling an ipq4019 target, dtc will complain: -regulator@b089000 unit address format error, expected "2089000" - -The saw0 regulator reg value seems to be -copied and pasted from qcom-ipq8064.dtsi. - -This patch fixes the reg value to match that of the -unit address which in turn silences the warning. -(There is no driver for qcom,saw2 right now. -So this went unnoticed) - -Signed-off-by: Christian Lamparter -Signed-off-by: John Crispin ---- - arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi -+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -266,7 +266,7 @@ - - saw0: regulator@b089000 { - compatible = "qcom,saw2"; -- reg = <0x02089000 0x1000>, <0x0b009000 0x1000>; -+ reg = <0x0b089000 0x1000>, <0x0b009000 0x1000>; - regulator; - }; - diff --git a/target/linux/ipq40xx/patches-4.19/073-v4.20-ARM-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch b/target/linux/ipq40xx/patches-4.19/073-v4.20-ARM-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch deleted file mode 100644 index cd1370ea5..000000000 --- a/target/linux/ipq40xx/patches-4.19/073-v4.20-ARM-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bd73a3dd257fb838bd456a18eeee0ef0224b7a40 Mon Sep 17 00:00:00 2001 -From: Christian Lamparter -Date: Wed, 25 Jul 2018 10:37:47 +0200 -Subject: [PATCH] ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value - -while compiling an ipq4019 target, dtc will complain: -regulator@b089000 unit address format error, expected "2089000" - -The saw0 regulator reg value seems to be -copied and pasted from qcom-ipq8064.dtsi. - -This patch fixes the reg value to match that of the -unit address which in turn silences the warning. -(There is no driver for qcom,saw2 right now. -So this went unnoticed) - -Signed-off-by: Christian Lamparter -Signed-off-by: John Crispin -Signed-off-by: Andy Gross ---- - arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/qcom-ipq4019.dtsi -+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -325,7 +325,7 @@ - - saw0: regulator@b089000 { - compatible = "qcom,saw2"; -- reg = <0x02089000 0x1000>, <0x0b009000 0x1000>; -+ reg = <0x0b089000 0x1000>, <0x0b009000 0x1000>; - regulator; - }; - diff --git a/target/linux/ipq806x/patches-4.14/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch b/target/linux/ipq806x/patches-4.14/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch index 7c78d444f..cca2fcaa4 100644 --- a/target/linux/ipq806x/patches-4.14/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch +++ b/target/linux/ipq806x/patches-4.14/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch @@ -10,7 +10,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c -@@ -1280,11 +1280,13 @@ struct opp_table *dev_pm_opp_set_regulat +@@ -1292,11 +1292,13 @@ struct opp_table *dev_pm_opp_set_regulat if (!opp_table) return ERR_PTR(-ENOMEM); diff --git a/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch b/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch index ef48e9f01..9f7c8185e 100644 --- a/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch +++ b/target/linux/ipq806x/patches-4.14/0049-PM-OPP-Support-adjusting-OPP-voltages-at-runtime.patch @@ -27,7 +27,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c -@@ -1608,6 +1608,83 @@ put_table: +@@ -1620,6 +1620,83 @@ put_table: } /** diff --git a/target/linux/ipq806x/patches-4.14/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch b/target/linux/ipq806x/patches-4.14/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch index 22ae30980..7819dc0dd 100644 --- a/target/linux/ipq806x/patches-4.14/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch +++ b/target/linux/ipq806x/patches-4.14/0051-PM-OPP-Add-a-helper-to-get-an-opp-regulator-for-devi.patch @@ -12,7 +12,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c -@@ -126,6 +126,27 @@ unsigned long dev_pm_opp_get_freq(struct +@@ -131,6 +131,27 @@ unsigned long dev_pm_opp_get_freq(struct } EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq); diff --git a/target/linux/ipq806x/patches-4.14/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch b/target/linux/ipq806x/patches-4.14/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch index 7cde22be0..3105b4ea1 100644 --- a/target/linux/ipq806x/patches-4.14/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch +++ b/target/linux/ipq806x/patches-4.14/0052-PM-OPP-Update-the-voltage-tolerance-when-adjusting-t.patch @@ -17,7 +17,7 @@ Signed-off-by: Georgi Djakov --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c -@@ -1652,6 +1652,7 @@ int dev_pm_opp_adjust_voltage(struct dev +@@ -1664,6 +1664,7 @@ int dev_pm_opp_adjust_voltage(struct dev struct opp_table *opp_table; struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV); int r = 0; @@ -25,7 +25,7 @@ Signed-off-by: Georgi Djakov /* keep the node allocated */ new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL); -@@ -1688,6 +1689,10 @@ int dev_pm_opp_adjust_voltage(struct dev +@@ -1700,6 +1701,10 @@ int dev_pm_opp_adjust_voltage(struct dev /* plug in new node */ new_opp->supplies[0].u_volt = u_volt; diff --git a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch index 18d4e47e0..e09a39e11 100644 --- a/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/707-dpaa-ethernet-support-layerscape.patch @@ -922,7 +922,7 @@ Signed-off-by: Zhao Qiang * * We must do this before dma_map_single(DMA_TO_DEVICE), because we may * need to write into the skb. -@@ -2036,12 +2091,129 @@ static inline int dpaa_xmit(struct dpaa_ +@@ -2036,6 +2091,121 @@ static inline int dpaa_xmit(struct dpaa_ return 0; } @@ -935,15 +935,15 @@ Signed-off-by: Zhao Qiang + * the buffers + */ + -+#define DPAA_A010022_HEADROOM 256 ++#define DPAA_A010022_HEADROOM 256 +#define CROSS_4K_BOUND(start, size) \ -+ (((start) + (size)) > (((start) + 0x1000) & ~0xFFF)) ++ (((start) + (size)) > (((start) + 0x1000) & ~0xFFF)) + +static bool dpaa_errata_a010022_has_dma_issue(struct sk_buff *skb, + struct dpaa_priv *priv) +{ + int nr_frags, i = 0; -+ skb_frag_t *frag; ++ skb_frag_t *frag; + + /* Transfers that do not start at 16B aligned addresses will be split; + * Transfers that cross a 4K page boundary will also be split @@ -1023,7 +1023,6 @@ Signed-off-by: Zhao Qiang + goto err; + } + copy_skb_header(nskb, skb); -+ + /* We move the headroom when we align it so we have to reset the + * network and transport header offsets relative to the new data + * pointer. The checksum offload relies on these offsets. @@ -1042,9 +1041,10 @@ Signed-off-by: Zhao Qiang +} +#endif + - static int dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev) + static netdev_tx_t + dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev) { - const int queue_mapping = skb_get_queue_mapping(skb); +@@ -2043,6 +2213,7 @@ dpaa_start_xmit(struct sk_buff *skb, str bool nonlinear = skb_is_nonlinear(skb); struct rtnl_link_stats64 *percpu_stats; struct dpaa_percpu_priv *percpu_priv; @@ -1052,7 +1052,7 @@ Signed-off-by: Zhao Qiang struct dpaa_priv *priv; struct qm_fd fd; int offset = 0; -@@ -2069,24 +2241,47 @@ static int dpaa_start_xmit(struct sk_buf +@@ -2070,24 +2241,47 @@ dpaa_start_xmit(struct sk_buff *skb, str /* MAX_SKB_FRAGS is equal or larger than our dpaa_SGT_MAX_ENTRIES; * make sure we don't feed FMan with more fragments than it supports. */ @@ -1108,7 +1108,7 @@ Signed-off-by: Zhao Qiang if (likely(dpaa_xmit(priv, percpu_stats, queue_mapping, &fd) == 0)) return NETDEV_TX_OK; -@@ -2218,14 +2413,8 @@ static enum qman_cb_dqrr_result rx_error +@@ -2219,14 +2413,8 @@ static enum qman_cb_dqrr_result rx_error if (dpaa_eth_napi_schedule(percpu_priv, portal)) return qman_cb_dqrr_stop; @@ -1125,7 +1125,7 @@ Signed-off-by: Zhao Qiang return qman_cb_dqrr_consume; } -@@ -2234,6 +2423,7 @@ static enum qman_cb_dqrr_result rx_defau +@@ -2235,6 +2423,7 @@ static enum qman_cb_dqrr_result rx_defau struct qman_fq *fq, const struct qm_dqrr_entry *dq) { @@ -1133,7 +1133,7 @@ Signed-off-by: Zhao Qiang struct rtnl_link_stats64 *percpu_stats; struct dpaa_percpu_priv *percpu_priv; const struct qm_fd *fd = &dq->fd; -@@ -2247,6 +2437,7 @@ static enum qman_cb_dqrr_result rx_defau +@@ -2248,6 +2437,7 @@ static enum qman_cb_dqrr_result rx_defau struct sk_buff *skb; int *count_ptr; void *vaddr; @@ -1141,7 +1141,7 @@ Signed-off-by: Zhao Qiang fd_status = be32_to_cpu(fd->status); fd_format = qm_fd_get_format(fd); -@@ -2289,12 +2480,12 @@ static enum qman_cb_dqrr_result rx_defau +@@ -2290,12 +2480,12 @@ static enum qman_cb_dqrr_result rx_defau if (!dpaa_bp) return qman_cb_dqrr_consume; @@ -1157,7 +1157,7 @@ Signed-off-by: Zhao Qiang /* The only FD types that we may receive are contig and S/G */ WARN_ON((fd_format != qm_fd_contig) && (fd_format != qm_fd_sg)); -@@ -2305,12 +2496,22 @@ static enum qman_cb_dqrr_result rx_defau +@@ -2306,12 +2496,22 @@ static enum qman_cb_dqrr_result rx_defau (*count_ptr)--; if (likely(fd_format == qm_fd_contig)) @@ -1182,7 +1182,7 @@ Signed-off-by: Zhao Qiang skb->protocol = eth_type_trans(skb, net_dev); if (net_dev->features & NETIF_F_RXHASH && priv->keygen_in_use && -@@ -2439,6 +2640,44 @@ static void dpaa_eth_napi_disable(struct +@@ -2440,6 +2640,44 @@ static void dpaa_eth_napi_disable(struct } } @@ -1227,7 +1227,7 @@ Signed-off-by: Zhao Qiang static int dpaa_open(struct net_device *net_dev) { struct mac_device *mac_dev; -@@ -2449,12 +2688,9 @@ static int dpaa_open(struct net_device * +@@ -2450,12 +2688,9 @@ static int dpaa_open(struct net_device * mac_dev = priv->mac_dev; dpaa_eth_napi_enable(priv); @@ -1242,7 +1242,7 @@ Signed-off-by: Zhao Qiang for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) { err = fman_port_enable(mac_dev->port[i]); -@@ -2495,11 +2731,58 @@ static int dpaa_eth_stop(struct net_devi +@@ -2496,11 +2731,58 @@ static int dpaa_eth_stop(struct net_devi return err; } @@ -1304,7 +1304,7 @@ Signed-off-by: Zhao Qiang } static const struct net_device_ops dpaa_ops = { -@@ -2653,7 +2936,6 @@ static inline u16 dpaa_get_headroom(stru +@@ -2654,7 +2936,6 @@ static inline u16 dpaa_get_headroom(stru static int dpaa_eth_probe(struct platform_device *pdev) { struct dpaa_bp *dpaa_bps[DPAA_BPS_NUM] = {NULL}; @@ -1312,7 +1312,7 @@ Signed-off-by: Zhao Qiang struct net_device *net_dev = NULL; struct dpaa_fq *dpaa_fq, *tmp; struct dpaa_priv *priv = NULL; -@@ -2662,7 +2944,51 @@ static int dpaa_eth_probe(struct platfor +@@ -2663,7 +2944,51 @@ static int dpaa_eth_probe(struct platfor int err = 0, i, channel; struct device *dev; @@ -1365,7 +1365,7 @@ Signed-off-by: Zhao Qiang /* Allocate this early, so we can store relevant information in * the private area -@@ -2670,7 +2996,7 @@ static int dpaa_eth_probe(struct platfor +@@ -2671,7 +2996,7 @@ static int dpaa_eth_probe(struct platfor net_dev = alloc_etherdev_mq(sizeof(*priv), DPAA_ETH_TXQ_NUM); if (!net_dev) { dev_err(dev, "alloc_etherdev_mq() failed\n"); @@ -1374,7 +1374,7 @@ Signed-off-by: Zhao Qiang } /* Do this here, so we can be verbose early */ -@@ -2682,13 +3008,6 @@ static int dpaa_eth_probe(struct platfor +@@ -2683,13 +3008,6 @@ static int dpaa_eth_probe(struct platfor priv->msg_enable = netif_msg_init(debug, DPAA_MSG_DEFAULT); @@ -1388,7 +1388,7 @@ Signed-off-by: Zhao Qiang /* If fsl_fm_max_frm is set to a higher value than the all-common 1500, * we choose conservatively and let the user explicitly set a higher * MTU via ifconfig. Otherwise, the user may end up with different MTUs -@@ -2704,21 +3023,13 @@ static int dpaa_eth_probe(struct platfor +@@ -2705,21 +3023,13 @@ static int dpaa_eth_probe(struct platfor priv->buf_layout[RX].priv_data_size = DPAA_RX_PRIV_DATA_SIZE; /* Rx */ priv->buf_layout[TX].priv_data_size = DPAA_TX_PRIV_DATA_SIZE; /* Tx */ @@ -1414,7 +1414,7 @@ Signed-off-by: Zhao Qiang /* the raw size of the buffers used for reception */ dpaa_bps[i]->raw_size = bpool_buffer_raw_size(i, DPAA_BPS_NUM); /* avoid runtime computations by keeping the usable size here */ -@@ -2726,11 +3037,8 @@ static int dpaa_eth_probe(struct platfor +@@ -2727,11 +3037,8 @@ static int dpaa_eth_probe(struct platfor dpaa_bps[i]->dev = dev; err = dpaa_bp_alloc_pool(dpaa_bps[i]); @@ -1428,7 +1428,7 @@ Signed-off-by: Zhao Qiang priv->dpaa_bps[i] = dpaa_bps[i]; } -@@ -2741,7 +3049,7 @@ static int dpaa_eth_probe(struct platfor +@@ -2742,7 +3049,7 @@ static int dpaa_eth_probe(struct platfor err = dpaa_alloc_all_fqs(dev, &priv->dpaa_fq_list, &port_fqs); if (err < 0) { dev_err(dev, "dpaa_alloc_all_fqs() failed\n"); @@ -1437,7 +1437,7 @@ Signed-off-by: Zhao Qiang } priv->mac_dev = mac_dev; -@@ -2750,12 +3058,12 @@ static int dpaa_eth_probe(struct platfor +@@ -2751,12 +3058,12 @@ static int dpaa_eth_probe(struct platfor if (channel < 0) { dev_err(dev, "dpaa_get_channel() failed\n"); err = channel; @@ -1452,7 +1452,7 @@ Signed-off-by: Zhao Qiang * and add this pool channel to each's dequeue mask. */ dpaa_eth_add_channel(priv->channel); -@@ -2770,20 +3078,20 @@ static int dpaa_eth_probe(struct platfor +@@ -2771,20 +3078,20 @@ static int dpaa_eth_probe(struct platfor err = dpaa_eth_cgr_init(priv); if (err < 0) { dev_err(dev, "Error initializing CGR\n"); @@ -1476,7 +1476,7 @@ Signed-off-by: Zhao Qiang } priv->tx_headroom = dpaa_get_headroom(&priv->buf_layout[TX]); -@@ -2793,7 +3101,7 @@ static int dpaa_eth_probe(struct platfor +@@ -2794,7 +3101,7 @@ static int dpaa_eth_probe(struct platfor err = dpaa_eth_init_ports(mac_dev, dpaa_bps, DPAA_BPS_NUM, &port_fqs, &priv->buf_layout[0], dev); if (err) @@ -1485,7 +1485,7 @@ Signed-off-by: Zhao Qiang /* Rx traffic distribution based on keygen hashing defaults to on */ priv->keygen_in_use = true; -@@ -2802,11 +3110,7 @@ static int dpaa_eth_probe(struct platfor +@@ -2803,11 +3110,7 @@ static int dpaa_eth_probe(struct platfor if (!priv->percpu_priv) { dev_err(dev, "devm_alloc_percpu() failed\n"); err = -ENOMEM; @@ -1498,7 +1498,7 @@ Signed-off-by: Zhao Qiang } priv->num_tc = 1; -@@ -2815,11 +3119,11 @@ static int dpaa_eth_probe(struct platfor +@@ -2816,11 +3119,11 @@ static int dpaa_eth_probe(struct platfor /* Initialize NAPI */ err = dpaa_napi_add(net_dev); if (err < 0) @@ -1512,7 +1512,7 @@ Signed-off-by: Zhao Qiang dpaa_eth_sysfs_init(&net_dev->dev); -@@ -2828,32 +3132,21 @@ static int dpaa_eth_probe(struct platfor +@@ -2829,32 +3132,21 @@ static int dpaa_eth_probe(struct platfor return 0; @@ -1551,7 +1551,7 @@ Signed-off-by: Zhao Qiang return err; } -@@ -2890,6 +3183,23 @@ static int dpaa_remove(struct platform_d +@@ -2891,6 +3183,23 @@ static int dpaa_remove(struct platform_d return err; } @@ -1575,7 +1575,7 @@ Signed-off-by: Zhao Qiang static const struct platform_device_id dpaa_devtype[] = { { .name = "dpaa-ethernet", -@@ -2914,6 +3224,10 @@ static int __init dpaa_load(void) +@@ -2915,6 +3224,10 @@ static int __init dpaa_load(void) pr_debug("FSL DPAA Ethernet driver\n"); diff --git a/target/linux/mediatek/patches-4.14/0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch b/target/linux/mediatek/patches-4.14/0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch index 15c1b29dc..f17da7003 100644 --- a/target/linux/mediatek/patches-4.14/0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch +++ b/target/linux/mediatek/patches-4.14/0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c -@@ -287,12 +287,13 @@ static bool need_bw_sch(struct usb_host_ +@@ -289,12 +289,13 @@ static bool need_bw_sch(struct usb_host_ int xhci_mtk_sch_init(struct xhci_hcd_mtk *mtk) { diff --git a/target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch b/target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch index cdb53954c..009eedb58 100644 --- a/target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch +++ b/target/linux/mediatek/patches-4.19/0101-pci-mediatek-backport-fix-pcie.patch @@ -362,7 +362,7 @@ return err; } -@@ -1125,34 +1126,6 @@ static int mtk_pcie_request_resources(st +@@ -1127,34 +1128,6 @@ static int mtk_pcie_request_resources(st return 0; } @@ -397,7 +397,7 @@ static int mtk_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -1179,7 +1152,14 @@ static int mtk_pcie_probe(struct platfor +@@ -1181,7 +1154,14 @@ static int mtk_pcie_probe(struct platfor if (err) goto put_resources; @@ -413,7 +413,7 @@ if (err) goto put_resources; -@@ -1192,6 +1172,80 @@ put_resources: +@@ -1194,6 +1174,80 @@ put_resources: return err; } @@ -494,7 +494,7 @@ static const struct mtk_pcie_soc mtk_pcie_soc_v1 = { .ops = &mtk_pcie_ops, .startup = mtk_pcie_startup_port, -@@ -1220,10 +1274,13 @@ static const struct of_device_id mtk_pci +@@ -1222,10 +1276,13 @@ static const struct of_device_id mtk_pci static struct platform_driver mtk_pcie_driver = { .probe = mtk_pcie_probe,