4.14.40 released.
Best Regards, Syrone Wong On Wed, May 9, 2018 at 6:04 PM, Stijn Segers <f...@volatilesystems.org> wrote: > Op di, 8 mei 2018 om 6:42 , schreef Koen Vandeputte > <koen.vandepu...@ncentric.com>: >> >> Refreshed all patches >> >> Dropped upstreamed patches: >> 522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch >> 523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch >> >> 525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch >> 527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch >> >> updated patches: >> 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch >> >> Compile-tested on: cns3xxx, imx6, mvebu, x86_64 >> Runtime-tested on: cns3xxx, imx6, > > > Compile-tested: x86/64, ramips/mt7621 > Run-tested: ramips/mt7621 > >> >> Signed-off-by: Koen Vandeputte <koen.vandepu...@ncentric.com> > > > Tested-by: Stijn Segers <f...@volatilesystems.org> > >> >> --- >> >> note: >> Please apply following patch first: be374d13fef3 "kernel: bump to 4.9.98" >> >> V2: >> - Rebased using the 4.9.98 bump patch from Kevin DB >> - Fully refreshed including patch changes from commit f9dcdc7fefca >> ("kernel: mark source kernel for netfilter backports") >> - Removed bump script from patch .. >> - Recompiled and retested mentioned targets >> >> >> >> include/kernel-version.mk | 4 +- >> ...d-firmware-loader-for-uPD720201-and-uPD72.patch | 6 +- >> .../802-usb-xhci-force-msi-renesas-xhci.patch | 2 +- >> ...1-tty-serial-drop-QCA-pecific-SoC-symbols.patch | 7 +- >> .../0002-watchdog-ath79-fix-maximum-timeout.patch | 7 +- >> ...03-leds-add-reset-controller-based-driver.patch | 16 +- >> .../patches-4.14/0004-phy-add-ath79-usb-phys.patch | 20 +- >> .../0005-usb-add-more-OF-quirk-properties.patch | 7 +- >> .../0006-usb-drop-deprecated-symbols.patch | 9 +- >> ...-ath79-intc-add-irq-cascade-driver-for-QC.patch | 8 - >> ...irqchip-irq-ath79-cpu-drop-OF-init-helper.patch | 5 - >> ...-MIPS-ath79-add-lots-of-missing-registers.patch | 8 +- >> ...0-MIPS-ath79-select-the-PINCTRL-subsystem.patch | 7 +- >> ...fix-register-address-in-ath79_ddr_wb_flus.patch | 5 - >> ...th79-Avoid-using-unitialized-reg-variable.patch | 5 - >> .../0013-MIPS-ath79-fix-system-restart.patch | 11 +- >> .../0014-MIPS-ath79-finetune-cpu-overrides.patch | 5 - >> ...MIPS-ath79-enable-uart-during-early_prink.patch | 7 +- >> ...16-MIPS-ath79-add-support-for-QCA953x-SoC.patch | 27 +-- >> ...17-MIPS-ath79-add-support-for-qca956x-soc.patch | 29 +-- >> ...PS-ath79-get-PCIe-controller-out-of-reset.patch | 9 +- >> ...turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch | 17 +- >> ...turn-pci-ar724x-driver-into-a-pure-OF-dri.patch | 13 +- >> .../patches-4.14/0022-MIPS-ath79-drop-pci.c.patch | 20 +- >> .../0023-MIPS-ath79-drop-mach-files.patch | 32 +-- >> .../0024-MIPS-ath79-drop-pdata-helpers.patch | 41 ---- >> .../patches-4.14/0025-MIPS-ath79-drop-irq.c.patch | 10 - >> .../0026-MIPS-ath79-sanitize-Kconfig-symbols.patch | 24 +- >> ...0027-MIPS-ath79-drop-mips_machine-support.patch | 22 +- >> ...add-helpers-for-setting-clocks-and-expose.patch | 4 +- >> .../004-register_gpio_driver_earlier.patch | 6 +- >> .../405-mtd-tp-link-partition-parser.patch | 12 +- >> .../patches-4.14/420-net-ar71xx_mac_driver.patch | 2 +- >> .../430-drivers-link-spi-before-mtd.patch | 2 +- >> .../461-spi-ath79-add-fast-flash-read.patch | 6 +- >> ...MIPS-ath79-swizzle-pci-address-for-ar71xx.patch | 10 +- >> .../490-usb-ehci-add-quirks-for-qca-socs.patch | 6 +- >> ...tbang-prevent-rescheduling-during-command.patch | 6 +- >> .../902-at803x-add-reset-gpio-pdata.patch | 6 +- >> .../patches-4.14/910-unaligned_access_hacks.patch | 258 >> +++++++-------------- >> ...ycon-initialise-baud-field-of-earlycon-de.patch | 2 +- >> .../brcm47xx/patches-4.14/159-cpu_fixes.patch | 8 +- >> ...b-host-fotg2-restart-hcd-after-port-reset.patch | 7 +- >> ...ts-Fix-bootargs-for-Gemini-D-Link-devices.patch | 7 - >> ...-dts-Add-ethernet-to-a-bunch-of-platforms.patch | 7 - >> ...rm-dts-gemini-dlink-dir-685-add-rtl8366rb.patch | 2 +- >> ...ata-corruption-related-to-cache-coherence.patch | 6 +- >> ..._cmdset_0002-add-buffer-write-cmd-timeout.patch | 2 +- >> .../pending-4.14/630-packet_socket_type.patch | 16 +- >> ...pppoe-support-hardware-flow-table-offload.patch | 2 +- >> ...jecting-with-source-address-failed-policy.patch | 16 +- >> ...in-PCI-configuration-read-write-functions.patch | 66 ------ >> ...IO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch | 53 ----- >> ...t-and-device-to-the-same-MAX-payload-size.patch | 11 +- >> ...tead-of-isr0-interrupt-in-legacy-irq-mode.patch | 143 ------------ >> ...rk-fix-PCIe-max-read-request-size-setting.patch | 63 ----- >> ...td-fix-cfi-cmdset-0002-erase-status-check.patch | 4 +- >> ...0037-mtd-cfi-cmdset-0002-force-word-write.patch | 6 +- >> .../patches-4.14/0043-spi-add-mt7621-support.patch | 16 +- >> 59 files changed, 233 insertions(+), 905 deletions(-) >> mode change 100755 => 100644 >> target/linux/generic/pending-4.14/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch >> delete mode 100644 >> target/linux/mvebu/patches-4.14/522-PCI-aardvark-fix-logic-in-PCI-configuration-read-write-functions.patch >> delete mode 100644 >> target/linux/mvebu/patches-4.14/523-PCI-aardvark-set-PIO_ADDR_LS-correctly-in-advk_pcie_rd_conf.patch >> delete mode 100644 >> target/linux/mvebu/patches-4.14/525-PCI-aardvark-use-isr1-instead-of-isr0-interrupt-in-legacy-irq-mode.patch >> delete mode 100644 >> target/linux/mvebu/patches-4.14/527-PCI-aardvark-fix-PCIe-max-read-request-size-setting.patch >> >> diff --git a/include/kernel-version.mk b/include/kernel-version.mk >> index fc0856554c45..192ee1c2e969 100644 >> --- a/include/kernel-version.mk >> +++ b/include/kernel-version.mk >> @@ -5,12 +5,12 @@ LINUX_RELEASE?=1 >> LINUX_VERSION-3.18 = .71 >> LINUX_VERSION-4.4 = .121 >> LINUX_VERSION-4.9 = .98 >> -LINUX_VERSION-4.14 = .37 >> +LINUX_VERSION-4.14 = .39 >> >> LINUX_KERNEL_HASH-3.18.71 = >> 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 >> LINUX_KERNEL_HASH-4.4.121 = >> 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729 >> LINUX_KERNEL_HASH-4.9.98 = >> 12cd90355adbc946e7e95aa5cdef2dd99b8e166cb64fe53a91c3e1d8f81810ef >> -LINUX_KERNEL_HASH-4.14.37 = >> 8197e7ed3620713e412905430a7bf93e2048384042ffba189a66f0eeb6908e92 >> +LINUX_KERNEL_HASH-4.14.39 = >> 269fc576ab0509e10c3b26e57866aea3f272c17f172f14fd75e2676d38c1b7bd >> >> 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/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch >> b/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch >> index 49304ef8707a..efaf61a5f313 100644 >> --- >> a/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch >> +++ >> b/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch >> @@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter >> <chunk...@googlemail.com> >> >> #include "xhci.h" >> #include "xhci-trace.h" >> -@@ -241,6 +243,458 @@ static void xhci_pme_acpi_rtd3_enable(st >> +@@ -244,6 +246,458 @@ static void xhci_pme_acpi_rtd3_enable(st >> static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } >> #endif /* CONFIG_ACPI */ >> >> @@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter >> <chunk...@googlemail.com> >> /* called during probe() after chip reset completes */ >> static int xhci_pci_setup(struct usb_hcd *hcd) >> { >> -@@ -276,6 +730,22 @@ static int xhci_pci_probe(struct pci_dev >> +@@ -279,6 +733,22 @@ static int xhci_pci_probe(struct pci_dev >> struct hc_driver *driver; >> struct usb_hcd *hcd; >> >> @@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter >> <chunk...@googlemail.com> >> driver = (struct hc_driver *)id->driver_data; >> >> /* For some HW implementation, a XHCI reset is just not enough... >> */ >> -@@ -340,6 +810,16 @@ static void xhci_pci_remove(struct pci_d >> +@@ -343,6 +813,16 @@ static void xhci_pci_remove(struct pci_d >> { >> struct xhci_hcd *xhci; >> >> diff --git >> a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch >> b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch >> index ae05d291f348..b78a7881c124 100644 >> --- >> a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch >> +++ >> b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch >> @@ -13,7 +13,7 @@ produce a noisy warning. >> >> --- a/drivers/usb/host/xhci-pci.c >> +++ b/drivers/usb/host/xhci-pci.c >> -@@ -199,7 +199,7 @@ static void xhci_pci_quirks(struct devic >> +@@ -202,7 +202,7 @@ static void xhci_pci_quirks(struct devic >> xhci->quirks |= XHCI_TRUST_TX_LENGTH; >> if (pdev->vendor == PCI_VENDOR_ID_RENESAS && >> pdev->device == 0x0015) >> diff --git >> a/target/linux/ath79/patches-4.14/0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch >> b/target/linux/ath79/patches-4.14/0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch >> index 0d3f9b51ce65..6c4b907e2201 100644 >> --- >> a/target/linux/ath79/patches-4.14/0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch >> +++ >> b/target/linux/ath79/patches-4.14/0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch >> @@ -8,11 +8,9 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> drivers/tty/serial/Kconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> -diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig >> -index 3682fd3e960c..c92bd969bbf9 100644 >> --- a/drivers/tty/serial/Kconfig >> +++ b/drivers/tty/serial/Kconfig >> -@@ -1469,7 +1469,7 @@ config SERIAL_XILINX_PS_UART_CONSOLE >> +@@ -1463,7 +1463,7 @@ config SERIAL_XILINX_PS_UART_CONSOLE >> >> config SERIAL_AR933X >> tristate "AR933X serial port support" >> @@ -21,6 +19,3 @@ index 3682fd3e960c..c92bd969bbf9 100644 >> select SERIAL_CORE >> help >> If you have an Atheros AR933X SOC based board and want to use >> the >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch >> b/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch >> index 8cf4fb3c942a..36234d8d83ed 100644 >> --- >> a/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch >> +++ >> b/target/linux/ath79/patches-4.14/0002-watchdog-ath79-fix-maximum-timeout.patch >> @@ -11,11 +11,9 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> drivers/watchdog/ath79_wdt.c | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> -diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c >> -index e2209bf5fa8a..c2fc6c3d0092 100644 >> --- a/drivers/watchdog/ath79_wdt.c >> +++ b/drivers/watchdog/ath79_wdt.c >> -@@ -115,10 +115,14 @@ static inline void ath79_wdt_disable(void) >> +@@ -115,10 +115,14 @@ static inline void ath79_wdt_disable(voi >> >> static int ath79_wdt_set_timeout(int val) >> { >> @@ -32,6 +30,3 @@ index e2209bf5fa8a..c2fc6c3d0092 100644 >> ath79_wdt_keepalive(); >> >> return 0; >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0003-leds-add-reset-controller-based-driver.patch >> b/target/linux/ath79/patches-4.14/0003-leds-add-reset-controller-based-driver.patch >> index 358da3b8302c..495d79288b3b 100644 >> --- >> a/target/linux/ath79/patches-4.14/0003-leds-add-reset-controller-based-driver.patch >> +++ >> b/target/linux/ath79/patches-4.14/0003-leds-add-reset-controller-based-driver.patch >> @@ -11,10 +11,8 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> 3 files changed, 149 insertions(+) >> create mode 100644 drivers/leds/leds-reset.c >> >> -Index: linux-4.14.32/drivers/leds/Kconfig >> -=================================================================== >> ---- linux-4.14.32.orig/drivers/leds/Kconfig >> -+++ linux-4.14.32/drivers/leds/Kconfig >> +--- a/drivers/leds/Kconfig >> ++++ b/drivers/leds/Kconfig >> @@ -696,6 +696,17 @@ config LEDS_NIC78BX >> To compile this driver as a module, choose M here: the module >> will be called leds-nic78bx. >> @@ -33,10 +31,8 @@ Index: linux-4.14.32/drivers/leds/Kconfig >> comment "LED Triggers" >> source "drivers/leds/trigger/Kconfig" >> >> -Index: linux-4.14.32/drivers/leds/leds-reset.c >> -=================================================================== >> --- /dev/null >> -+++ linux-4.14.32/drivers/leds/leds-reset.c >> ++++ b/drivers/leds/leds-reset.c >> @@ -0,0 +1,137 @@ >> +/* >> + * Copyright (C) 2018 John Crispin <j...@phrozen.org> >> @@ -175,10 +171,8 @@ Index: linux-4.14.32/drivers/leds/leds-reset.c >> +MODULE_DESCRIPTION("reset controller LED driver"); >> +MODULE_LICENSE("GPL"); >> +MODULE_ALIAS("platform:leds-reset"); >> -Index: linux-4.14.32/drivers/leds/Makefile >> -=================================================================== >> ---- linux-4.14.32.orig/drivers/leds/Makefile >> -+++ linux-4.14.32/drivers/leds/Makefile >> +--- a/drivers/leds/Makefile >> ++++ b/drivers/leds/Makefile >> @@ -73,6 +73,7 @@ obj-$(CONFIG_LEDS_PM8058) += leds-pm805 >> obj-$(CONFIG_LEDS_MLXCPLD) += leds-mlxcpld.o >> obj-$(CONFIG_LEDS_NIC78BX) += leds-nic78bx.o >> diff --git >> a/target/linux/ath79/patches-4.14/0004-phy-add-ath79-usb-phys.patch >> b/target/linux/ath79/patches-4.14/0004-phy-add-ath79-usb-phys.patch >> index 38763d2d743b..6280baf913ff 100644 >> --- a/target/linux/ath79/patches-4.14/0004-phy-add-ath79-usb-phys.patch >> +++ b/target/linux/ath79/patches-4.14/0004-phy-add-ath79-usb-phys.patch >> @@ -13,10 +13,8 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> create mode 100644 drivers/phy/phy-ar7100-usb.c >> create mode 100644 drivers/phy/phy-ar7200-usb.c >> >> -Index: linux-4.14.37/drivers/phy/Kconfig >> -=================================================================== >> ---- linux-4.14.37.orig/drivers/phy/Kconfig >> -+++ linux-4.14.37/drivers/phy/Kconfig >> +--- a/drivers/phy/Kconfig >> ++++ b/drivers/phy/Kconfig >> @@ -15,6 +15,22 @@ config GENERIC_PHY >> phy users can obtain reference to the PHY. All the users of this >> framework should select this config. >> @@ -40,10 +38,8 @@ Index: linux-4.14.37/drivers/phy/Kconfig >> config PHY_LPC18XX_USB_OTG >> tristate "NXP LPC18xx/43xx SoC USB OTG PHY driver" >> depends on OF && (ARCH_LPC18XX || COMPILE_TEST) >> -Index: linux-4.14.37/drivers/phy/Makefile >> -=================================================================== >> ---- linux-4.14.37.orig/drivers/phy/Makefile >> -+++ linux-4.14.37/drivers/phy/Makefile >> +--- a/drivers/phy/Makefile >> ++++ b/drivers/phy/Makefile >> @@ -4,6 +4,8 @@ >> # >> >> @@ -53,10 +49,8 @@ Index: linux-4.14.37/drivers/phy/Makefile >> obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o >> obj-$(CONFIG_PHY_XGENE) += phy-xgene.o >> obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o >> -Index: linux-4.14.37/drivers/phy/phy-ar7100-usb.c >> -=================================================================== >> --- /dev/null >> -+++ linux-4.14.37/drivers/phy/phy-ar7100-usb.c >> ++++ b/drivers/phy/phy-ar7100-usb.c >> @@ -0,0 +1,140 @@ >> +/* >> + * Copyright (C) 2018 John Crispin <j...@phrozen.org> >> @@ -198,10 +192,8 @@ Index: linux-4.14.37/drivers/phy/phy-ar7100-usb.c >> +MODULE_DESCRIPTION("ATH79 USB PHY driver"); >> +MODULE_AUTHOR("Alban Bedel <al...@free.fr>"); >> +MODULE_LICENSE("GPL"); >> -Index: linux-4.14.37/drivers/phy/phy-ar7200-usb.c >> -=================================================================== >> --- /dev/null >> -+++ linux-4.14.37/drivers/phy/phy-ar7200-usb.c >> ++++ b/drivers/phy/phy-ar7200-usb.c >> @@ -0,0 +1,123 @@ >> +/* >> + * Copyright (C) 2015 Alban Bedel <al...@free.fr> >> diff --git >> a/target/linux/ath79/patches-4.14/0005-usb-add-more-OF-quirk-properties.patch >> b/target/linux/ath79/patches-4.14/0005-usb-add-more-OF-quirk-properties.patch >> index a87fd70979ff..ec1bc3f7f706 100644 >> --- >> a/target/linux/ath79/patches-4.14/0005-usb-add-more-OF-quirk-properties.patch >> +++ >> b/target/linux/ath79/patches-4.14/0005-usb-add-more-OF-quirk-properties.patch >> @@ -8,11 +8,9 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> drivers/usb/host/ehci-platform.c | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> -diff --git a/drivers/usb/host/ehci-platform.c >> b/drivers/usb/host/ehci-platform.c >> -index b065a960adc2..b1cc841b5399 100644 >> --- a/drivers/usb/host/ehci-platform.c >> +++ b/drivers/usb/host/ehci-platform.c >> -@@ -185,6 +185,11 @@ static int ehci_platform_probe(struct >> platform_device *dev) >> +@@ -187,6 +187,11 @@ static int ehci_platform_probe(struct pl >> ehci = hcd_to_ehci(hcd); >> >> if (pdata == &ehci_platform_defaults && dev->dev.of_node) { >> @@ -24,6 +22,3 @@ index b065a960adc2..b1cc841b5399 100644 >> if (of_property_read_bool(dev->dev.of_node, >> "big-endian-regs")) >> ehci->big_endian_mmio = 1; >> >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0006-usb-drop-deprecated-symbols.patch >> b/target/linux/ath79/patches-4.14/0006-usb-drop-deprecated-symbols.patch >> index 6821aa74fa1b..a97fab71f49a 100644 >> --- >> a/target/linux/ath79/patches-4.14/0006-usb-drop-deprecated-symbols.patch >> +++ >> b/target/linux/ath79/patches-4.14/0006-usb-drop-deprecated-symbols.patch >> @@ -8,11 +8,9 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> drivers/usb/host/Kconfig | 25 ------------------------- >> 1 file changed, 25 deletions(-) >> >> -diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig >> -index 4fcfb3084b36..55b45dcd7a4b 100644 >> --- a/drivers/usb/host/Kconfig >> +++ b/drivers/usb/host/Kconfig >> -@@ -293,19 +293,6 @@ config USB_CNS3XXX_EHCI >> +@@ -297,19 +297,6 @@ config USB_CNS3XXX_EHCI >> It is needed for high-speed (480Mbit/sec) USB 2.0 device >> support. >> >> @@ -32,7 +30,7 @@ index 4fcfb3084b36..55b45dcd7a4b 100644 >> config USB_EHCI_HCD_PLATFORM >> tristate "Generic EHCI driver for a platform device" >> default n >> -@@ -489,18 +476,6 @@ config USB_OHCI_HCD_DAVINCI >> +@@ -493,18 +480,6 @@ config USB_OHCI_HCD_DAVINCI >> controller. This driver cannot currently be a loadable >> module because it lacks a proper PHY abstraction. >> >> @@ -51,6 +49,3 @@ index 4fcfb3084b36..55b45dcd7a4b 100644 >> config USB_OHCI_HCD_PPC_OF_BE >> bool "OHCI support for OF platform bus (big endian)" >> depends on PPC >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0007-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch >> b/target/linux/ath79/patches-4.14/0007-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch >> index 18c9fd4e1561..72a7a5ee2960 100644 >> --- >> a/target/linux/ath79/patches-4.14/0007-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch >> +++ >> b/target/linux/ath79/patches-4.14/0007-irqchip-irq-ath79-intc-add-irq-cascade-driver-for-QC.patch >> @@ -11,8 +11,6 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> 2 files changed, 105 insertions(+) >> create mode 100644 drivers/irqchip/irq-ath79-intc.c >> >> -diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile >> -index d27e3e3619e0..f63c94a92e25 100644 >> --- a/drivers/irqchip/Makefile >> +++ b/drivers/irqchip/Makefile >> @@ -3,6 +3,7 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o >> @@ -23,9 +21,6 @@ index d27e3e3619e0..f63c94a92e25 100644 >> obj-$(CONFIG_ATH79) += irq-ath79-misc.o >> obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o >> obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2836.o >> -diff --git a/drivers/irqchip/irq-ath79-intc.c >> b/drivers/irqchip/irq-ath79-intc.c >> -new file mode 100644 >> -index 000000000000..a26d3efe6e10 >> --- /dev/null >> +++ b/drivers/irqchip/irq-ath79-intc.c >> @@ -0,0 +1,104 @@ >> @@ -133,6 +128,3 @@ index 000000000000..a26d3efe6e10 >> +} >> +IRQCHIP_DECLARE(qca9556_intc, "qcom,qca9556-intc", >> + qca9556_intc_of_init); >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0008-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch >> b/target/linux/ath79/patches-4.14/0008-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch >> index 8c364cbce6b0..84e066e2a63a 100644 >> --- >> a/target/linux/ath79/patches-4.14/0008-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch >> +++ >> b/target/linux/ath79/patches-4.14/0008-irqchip-irq-ath79-cpu-drop-OF-init-helper.patch >> @@ -8,8 +8,6 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> drivers/irqchip/irq-ath79-cpu.c | 7 ------- >> 1 file changed, 7 deletions(-) >> >> -diff --git a/drivers/irqchip/irq-ath79-cpu.c >> b/drivers/irqchip/irq-ath79-cpu.c >> -index befe93c5a51a..f29cb9c933f5 100644 >> --- a/drivers/irqchip/irq-ath79-cpu.c >> +++ b/drivers/irqchip/irq-ath79-cpu.c >> @@ -88,10 +88,3 @@ static int __init ar79_cpu_intc_of_init( >> @@ -23,6 +21,3 @@ index befe93c5a51a..f29cb9c933f5 100644 >> - irq_wb_chan[3] = irq_wb_chan3; >> - mips_cpu_irq_init(); >> -} >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0009-MIPS-ath79-add-lots-of-missing-registers.patch >> b/target/linux/ath79/patches-4.14/0009-MIPS-ath79-add-lots-of-missing-registers.patch >> index 6b6d934509d6..5963ee8991ea 100644 >> --- >> a/target/linux/ath79/patches-4.14/0009-MIPS-ath79-add-lots-of-missing-registers.patch >> +++ >> b/target/linux/ath79/patches-4.14/0009-MIPS-ath79-add-lots-of-missing-registers.patch >> @@ -8,8 +8,6 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 773 >> ++++++++++++++++++++++++- >> 1 file changed, 771 insertions(+), 2 deletions(-) >> >> -diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h >> b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h >> -index aa3800c82332..284b4fa23e03 100644 >> --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h >> +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h >> @@ -20,6 +20,10 @@ >> @@ -399,7 +397,6 @@ index aa3800c82332..284b4fa23e03 100644 >> #define AR934X_RESET_USB_HOST BIT(5) >> #define AR934X_RESET_USB_PHY BIT(4) >> #define AR934X_RESET_USBSUS_OVERRIDE BIT(3) >> -- >> +#define AR934X_RESET_LUT BIT(2) >> +#define AR934X_RESET_MBOX BIT(1) >> +#define AR934X_RESET_I2S BIT(0) >> @@ -476,7 +473,7 @@ index aa3800c82332..284b4fa23e03 100644 >> +#define QCA956X_RESET_USBSUS_OVERRIDE BIT(3) >> +#define QCA956X_RESET_SWITCH_ANALOG BIT(2) >> +#define QCA956X_RESET_SWITCH BIT(0) >> -+ >> + >> +#define AR933X_BOOTSTRAP_MDIO_GPIO_EN BIT(18) >> +#define AR933X_BOOTSTRAP_EEPBUSY BIT(4) >> #define AR933X_BOOTSTRAP_REF_CLK_40 BIT(0) >> @@ -972,6 +969,3 @@ index aa3800c82332..284b4fa23e03 100644 >> +#define QCA956X_SGMII_CONFIG_MODE_CTRL_MASK 0x7 >> + >> #endif /* __ASM_MACH_AR71XX_REGS_H */ >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0010-MIPS-ath79-select-the-PINCTRL-subsystem.patch >> b/target/linux/ath79/patches-4.14/0010-MIPS-ath79-select-the-PINCTRL-subsystem.patch >> index b6704708a2b1..cd3f96c3f326 100644 >> --- >> a/target/linux/ath79/patches-4.14/0010-MIPS-ath79-select-the-PINCTRL-subsystem.patch >> +++ >> b/target/linux/ath79/patches-4.14/0010-MIPS-ath79-select-the-PINCTRL-subsystem.patch >> @@ -8,11 +8,9 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> arch/mips/Kconfig | 1 + >> 1 file changed, 1 insertion(+) >> >> -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig >> -index 8128c3b68d6b..922a53cb1b3d 100644 >> --- a/arch/mips/Kconfig >> +++ b/arch/mips/Kconfig >> -@@ -188,6 +188,7 @@ config ATH79 >> +@@ -191,6 +191,7 @@ config ATH79 >> select CSRC_R4K >> select DMA_NONCOHERENT >> select GPIOLIB >> @@ -20,6 +18,3 @@ index 8128c3b68d6b..922a53cb1b3d 100644 >> select HAVE_CLK >> select COMMON_CLK >> select CLKDEV_LOOKUP >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0011-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch >> b/target/linux/ath79/patches-4.14/0011-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch >> index c7ad39e1287f..85ee24c208ae 100644 >> --- >> a/target/linux/ath79/patches-4.14/0011-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch >> +++ >> b/target/linux/ath79/patches-4.14/0011-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch >> @@ -14,8 +14,6 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> >> arch/mips/ath79/common.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> -diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c >> -index 10a405d593df..c782b10ddf50 100644 >> --- a/arch/mips/ath79/common.c >> +++ b/arch/mips/ath79/common.c >> @@ -58,7 +58,7 @@ EXPORT_SYMBOL_GPL(ath79_ddr_ctrl_init); >> @@ -27,6 +25,3 @@ index 10a405d593df..c782b10ddf50 100644 >> >> /* Flush the DDR write buffer. */ >> __raw_writel(0x1, flush_reg); >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0012-MIPS-ath79-Avoid-using-unitialized-reg-variable.patch >> b/target/linux/ath79/patches-4.14/0012-MIPS-ath79-Avoid-using-unitialized-reg-variable.patch >> index c622617e524c..2b744ee94f48 100644 >> --- >> a/target/linux/ath79/patches-4.14/0012-MIPS-ath79-Avoid-using-unitialized-reg-variable.patch >> +++ >> b/target/linux/ath79/patches-4.14/0012-MIPS-ath79-Avoid-using-unitialized-reg-variable.patch >> @@ -20,8 +20,6 @@ Acked-by: Gabor Juhos <juh...@openwrt.org> >> arch/mips/ath79/common.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> -diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c >> -index c782b10ddf50..a32a9181a296 100644 >> --- a/arch/mips/ath79/common.c >> +++ b/arch/mips/ath79/common.c >> @@ -106,7 +106,7 @@ void ath79_device_reset_set(u32 mask) >> @@ -42,6 +40,3 @@ index c782b10ddf50..a32a9181a296 100644 >> >> spin_lock_irqsave(&ath79_device_reset_lock, flags); >> t = ath79_reset_rr(reg); >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0013-MIPS-ath79-fix-system-restart.patch >> b/target/linux/ath79/patches-4.14/0013-MIPS-ath79-fix-system-restart.patch >> index ecf275db8213..969636128f5c 100644 >> --- >> a/target/linux/ath79/patches-4.14/0013-MIPS-ath79-fix-system-restart.patch >> +++ >> b/target/linux/ath79/patches-4.14/0013-MIPS-ath79-fix-system-restart.patch >> @@ -10,11 +10,9 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> arch/mips/include/asm/mach-ath79/ath79.h | 1 + >> 2 files changed, 2 insertions(+) >> >> -diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c >> -index f206dafbb0a3..26a058d58d37 100644 >> --- a/arch/mips/ath79/setup.c >> +++ b/arch/mips/ath79/setup.c >> -@@ -40,6 +40,7 @@ static char ath79_sys_type[ATH79_SYS_TYPE_LEN]; >> +@@ -40,6 +40,7 @@ static char ath79_sys_type[ATH79_SYS_TYP >> >> static void ath79_restart(char *command) >> { >> @@ -22,11 +20,9 @@ index f206dafbb0a3..26a058d58d37 100644 >> ath79_device_reset_set(AR71XX_RESET_FULL_CHIP); >> for (;;) >> if (cpu_wait) >> -diff --git a/arch/mips/include/asm/mach-ath79/ath79.h >> b/arch/mips/include/asm/mach-ath79/ath79.h >> -index 441faa92c3cd..6e6c0fead776 100644 >> --- a/arch/mips/include/asm/mach-ath79/ath79.h >> +++ b/arch/mips/include/asm/mach-ath79/ath79.h >> -@@ -134,6 +134,7 @@ static inline u32 ath79_pll_rr(unsigned reg) >> +@@ -134,6 +134,7 @@ static inline u32 ath79_pll_rr(unsigned >> static inline void ath79_reset_wr(unsigned reg, u32 val) >> { >> __raw_writel(val, ath79_reset_base + reg); >> @@ -34,6 +30,3 @@ index 441faa92c3cd..6e6c0fead776 100644 >> } >> >> static inline u32 ath79_reset_rr(unsigned reg) >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0014-MIPS-ath79-finetune-cpu-overrides.patch >> b/target/linux/ath79/patches-4.14/0014-MIPS-ath79-finetune-cpu-overrides.patch >> index d3f98107045f..e390e584f6eb 100644 >> --- >> a/target/linux/ath79/patches-4.14/0014-MIPS-ath79-finetune-cpu-overrides.patch >> +++ >> b/target/linux/ath79/patches-4.14/0014-MIPS-ath79-finetune-cpu-overrides.patch >> @@ -8,8 +8,6 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> >> arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> -diff --git a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h >> b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h >> -index 0089a740e5ae..026ad90c8ac0 100644 >> --- a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h >> +++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h >> @@ -36,6 +36,7 @@ >> @@ -38,6 +36,3 @@ index 0089a740e5ae..026ad90c8ac0 100644 >> +#define cpu_has_pindexed_dcache 0 >> >> #endif /* __ASM_MACH_ATH79_CPU_FEATURE_OVERRIDES_H */ >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0015-MIPS-ath79-enable-uart-during-early_prink.patch >> b/target/linux/ath79/patches-4.14/0015-MIPS-ath79-enable-uart-during-early_prink.patch >> index a46603727574..5826d01764ab 100644 >> --- >> a/target/linux/ath79/patches-4.14/0015-MIPS-ath79-enable-uart-during-early_prink.patch >> +++ >> b/target/linux/ath79/patches-4.14/0015-MIPS-ath79-enable-uart-during-early_prink.patch >> @@ -8,11 +8,9 @@ Signed-off-by: Gabor Juhos <juh...@openwrt.org> >> arch/mips/ath79/early_printk.c | 44 >> +++++++++++++++++++++++++++++++++++++++++- >> 1 file changed, 43 insertions(+), 1 deletion(-) >> >> -diff --git a/arch/mips/ath79/early_printk.c >> b/arch/mips/ath79/early_printk.c >> -index d1adc59af5bf..ec3978678653 100644 >> --- a/arch/mips/ath79/early_printk.c >> +++ b/arch/mips/ath79/early_printk.c >> -@@ -58,6 +58,46 @@ static void prom_putchar_dummy(unsigned char ch) >> +@@ -58,6 +58,46 @@ static void prom_putchar_dummy(unsigned >> /* nothing to do */ >> } >> >> @@ -71,6 +69,3 @@ index d1adc59af5bf..ec3978678653 100644 >> } >> >> void prom_putchar(unsigned char ch) >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0016-MIPS-ath79-add-support-for-QCA953x-SoC.patch >> b/target/linux/ath79/patches-4.14/0016-MIPS-ath79-add-support-for-QCA953x-SoC.patch >> index 0eb1831c5bf9..0432a23d1419 100644 >> --- >> a/target/linux/ath79/patches-4.14/0016-MIPS-ath79-add-support-for-QCA953x-SoC.patch >> +++ >> b/target/linux/ath79/patches-4.14/0016-MIPS-ath79-add-support-for-QCA953x-SoC.patch >> @@ -18,8 +18,6 @@ Signed-off-by: Matthias Schiffer >> <mschif...@universe-factory.net> >> arch/mips/include/asm/mach-ath79/ath79.h | 11 ++++ >> 8 files changed, 162 insertions(+), 6 deletions(-) >> >> -diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig >> -index 9547cf1ea38d..b03f5c8b9d1e 100644 >> --- a/arch/mips/ath79/Kconfig >> +++ b/arch/mips/ath79/Kconfig >> @@ -94,6 +94,10 @@ config SOC_AR934X >> @@ -42,11 +40,9 @@ index 9547cf1ea38d..b03f5c8b9d1e 100644 >> def_bool n >> >> endif >> -diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c >> -index 6b1000b6a6a6..b9595b2d1b65 100644 >> --- a/arch/mips/ath79/clock.c >> +++ b/arch/mips/ath79/clock.c >> -@@ -355,6 +355,91 @@ static void __init ar934x_clocks_init(void) >> +@@ -355,6 +355,91 @@ static void __init ar934x_clocks_init(vo >> iounmap(dpll_base); >> } >> >> @@ -147,8 +143,6 @@ index 6b1000b6a6a6..b9595b2d1b65 100644 >> else if (soc_is_qca955x()) >> qca955x_clocks_init(); >> else >> -diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c >> -index a32a9181a296..a485a7c35b9b 100644 >> --- a/arch/mips/ath79/common.c >> +++ b/arch/mips/ath79/common.c >> @@ -103,6 +103,8 @@ void ath79_device_reset_set(u32 mask) >> @@ -169,8 +163,6 @@ index a32a9181a296..a485a7c35b9b 100644 >> else if (soc_is_qca955x()) >> reg = QCA955X_RESET_REG_RESET_MODULE; >> else >> -diff --git a/arch/mips/ath79/dev-common.c b/arch/mips/ath79/dev-common.c >> -index 9d0172a4dc69..99d8b88f1e6d 100644 >> --- a/arch/mips/ath79/dev-common.c >> +++ b/arch/mips/ath79/dev-common.c >> @@ -85,6 +85,7 @@ void __init ath79_register_uart(void) >> @@ -191,8 +183,6 @@ index 9d0172a4dc69..99d8b88f1e6d 100644 >> } else if (soc_is_qca955x()) { >> ath79_gpio_pdata.ngpios = QCA955X_GPIO_COUNT; >> ath79_gpio_pdata.oe_inverted = 1; >> -diff --git a/arch/mips/ath79/early_printk.c >> b/arch/mips/ath79/early_printk.c >> -index ec3978678653..cc00839b7181 100644 >> --- a/arch/mips/ath79/early_printk.c >> +++ b/arch/mips/ath79/early_printk.c >> @@ -116,6 +116,8 @@ static void prom_putchar_init(void) >> @@ -204,8 +194,6 @@ index ec3978678653..cc00839b7181 100644 >> case REV_ID_MAJOR_QCA9556: >> case REV_ID_MAJOR_QCA9558: >> _prom_putchar = prom_putchar_ar71xx; >> -diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c >> -index 2dfff1f19004..756b5aee3500 100644 >> --- a/arch/mips/ath79/irq.c >> +++ b/arch/mips/ath79/irq.c >> @@ -56,6 +56,34 @@ static void ar934x_ip2_irq_init(void) >> @@ -269,11 +257,9 @@ index 2dfff1f19004..756b5aee3500 100644 >> else if (soc_is_qca955x()) >> qca955x_irq_init(); >> } >> -diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c >> -index 26a058d58d37..f782ae6c77d6 100644 >> --- a/arch/mips/ath79/setup.c >> +++ b/arch/mips/ath79/setup.c >> -@@ -60,6 +60,7 @@ static void __init ath79_detect_sys_type(void) >> +@@ -60,6 +60,7 @@ static void __init ath79_detect_sys_type >> u32 major; >> u32 minor; >> u32 rev = 0; >> @@ -281,7 +267,7 @@ index 26a058d58d37..f782ae6c77d6 100644 >> >> id = ath79_reset_rr(AR71XX_RESET_REG_REV_ID); >> major = id & REV_ID_MAJOR_MASK; >> -@@ -152,6 +153,17 @@ static void __init ath79_detect_sys_type(void) >> +@@ -152,6 +153,17 @@ static void __init ath79_detect_sys_type >> rev = id & AR934X_REV_ID_REVISION_MASK; >> break; >> >> @@ -299,7 +285,7 @@ index 26a058d58d37..f782ae6c77d6 100644 >> case REV_ID_MAJOR_QCA9556: >> ath79_soc = ATH79_SOC_QCA9556; >> chip = "9556"; >> -@@ -168,11 +180,12 @@ static void __init ath79_detect_sys_type(void) >> +@@ -168,11 +180,12 @@ static void __init ath79_detect_sys_type >> panic("ath79: unknown SoC, id:0x%08x", id); >> } >> >> @@ -316,8 +302,6 @@ index 26a058d58d37..f782ae6c77d6 100644 >> else >> sprintf(ath79_sys_type, "Atheros AR%s rev %u", chip, rev); >> pr_info("SoC: %s\n", ath79_sys_type); >> -diff --git a/arch/mips/include/asm/mach-ath79/ath79.h >> b/arch/mips/include/asm/mach-ath79/ath79.h >> -index 6e6c0fead776..98a7ccf3d358 100644 >> --- a/arch/mips/include/asm/mach-ath79/ath79.h >> +++ b/arch/mips/include/asm/mach-ath79/ath79.h >> @@ -32,6 +32,7 @@ enum ath79_soc_type { >> @@ -345,6 +329,3 @@ index 6e6c0fead776..98a7ccf3d358 100644 >> static inline int soc_is_qca9556(void) >> { >> return ath79_soc == ATH79_SOC_QCA9556; >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0017-MIPS-ath79-add-support-for-qca956x-soc.patch >> b/target/linux/ath79/patches-4.14/0017-MIPS-ath79-add-support-for-qca956x-soc.patch >> index 052d23c8ba75..294fb32a1709 100644 >> --- >> a/target/linux/ath79/patches-4.14/0017-MIPS-ath79-add-support-for-qca956x-soc.patch >> +++ >> b/target/linux/ath79/patches-4.14/0017-MIPS-ath79-add-support-for-qca956x-soc.patch >> @@ -22,8 +22,6 @@ Signed-off-by: Weijie Gao <hackpas...@gmail.com> >> arch/mips/include/asm/mach-ath79/ath79.h | 22 ++++++++ >> 9 files changed, 245 insertions(+), 4 deletions(-) >> >> -diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig >> -index b03f5c8b9d1e..ad56cdbc8abd 100644 >> --- a/arch/mips/ath79/Kconfig >> +++ b/arch/mips/ath79/Kconfig >> @@ -119,7 +119,7 @@ config ATH79_DEV_USB >> @@ -35,11 +33,9 @@ index b03f5c8b9d1e..ad56cdbc8abd 100644 >> def_bool n >> >> endif >> -diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c >> -index b9595b2d1b65..65701b45fb1b 100644 >> --- a/arch/mips/ath79/clock.c >> +++ b/arch/mips/ath79/clock.c >> -@@ -525,6 +525,100 @@ static void __init qca955x_clocks_init(void) >> +@@ -525,6 +525,100 @@ static void __init qca955x_clocks_init(v >> clk_add_alias("uart", NULL, "ref", NULL); >> } >> >> @@ -149,8 +145,6 @@ index b9595b2d1b65..65701b45fb1b 100644 >> else >> BUG(); >> } >> -diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c >> -index a485a7c35b9b..fc3438150b3e 100644 >> --- a/arch/mips/ath79/common.c >> +++ b/arch/mips/ath79/common.c >> @@ -107,6 +107,8 @@ void ath79_device_reset_set(u32 mask) >> @@ -171,8 +165,6 @@ index a485a7c35b9b..fc3438150b3e 100644 >> else >> panic("Reset register not defined for this SOC"); >> >> -diff --git a/arch/mips/ath79/dev-common.c b/arch/mips/ath79/dev-common.c >> -index 99d8b88f1e6d..ac8bfe86b656 100644 >> --- a/arch/mips/ath79/dev-common.c >> +++ b/arch/mips/ath79/dev-common.c >> @@ -86,7 +86,9 @@ void __init ath79_register_uart(void) >> @@ -196,8 +188,6 @@ index 99d8b88f1e6d..ac8bfe86b656 100644 >> } else { >> BUG(); >> } >> -diff --git a/arch/mips/ath79/early_printk.c >> b/arch/mips/ath79/early_printk.c >> -index cc00839b7181..2024a0bb9144 100644 >> --- a/arch/mips/ath79/early_printk.c >> +++ b/arch/mips/ath79/early_printk.c >> @@ -120,6 +120,8 @@ static void prom_putchar_init(void) >> @@ -209,8 +199,6 @@ index cc00839b7181..2024a0bb9144 100644 >> _prom_putchar = prom_putchar_ar71xx; >> break; >> >> -diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c >> -index 756b5aee3500..58d17ef6f58f 100644 >> --- a/arch/mips/ath79/irq.c >> +++ b/arch/mips/ath79/irq.c >> @@ -156,6 +156,87 @@ static void qca955x_irq_init(void) >> @@ -319,11 +307,9 @@ index 756b5aee3500..58d17ef6f58f 100644 >> + else if (soc_is_qca956x() || soc_is_tp9343()) >> + qca956x_irq_init(); >> } >> -diff --git a/arch/mips/ath79/pci.c b/arch/mips/ath79/pci.c >> -index b816cb4a25ff..d905a67e1a07 100644 >> --- a/arch/mips/ath79/pci.c >> +++ b/arch/mips/ath79/pci.c >> -@@ -82,6 +82,9 @@ int pcibios_map_irq(const struct pci_dev *dev, uint8_t >> slot, uint8_t pin) >> +@@ -82,6 +82,9 @@ int pcibios_map_irq(const struct pci_dev >> } else if (soc_is_qca955x()) { >> ath79_pci_irq_map = qca955x_pci_irq_map; >> ath79_pci_nr_irqs = >> ARRAY_SIZE(qca955x_pci_irq_map); >> @@ -349,11 +335,9 @@ index b816cb4a25ff..d905a67e1a07 100644 >> } else { >> /* No PCI support */ >> return -ENODEV; >> -diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c >> -index f782ae6c77d6..4c7a93f4039a 100644 >> --- a/arch/mips/ath79/setup.c >> +++ b/arch/mips/ath79/setup.c >> -@@ -176,6 +176,18 @@ static void __init ath79_detect_sys_type(void) >> +@@ -176,6 +176,18 @@ static void __init ath79_detect_sys_type >> rev = id & QCA955X_REV_ID_REVISION_MASK; >> break; >> >> @@ -372,7 +356,7 @@ index f782ae6c77d6..4c7a93f4039a 100644 >> default: >> panic("ath79: unknown SoC, id:0x%08x", id); >> } >> -@@ -183,9 +195,12 @@ static void __init ath79_detect_sys_type(void) >> +@@ -183,9 +195,12 @@ static void __init ath79_detect_sys_type >> if (ver == 1) >> ath79_soc_rev = rev; >> >> @@ -386,8 +370,6 @@ index f782ae6c77d6..4c7a93f4039a 100644 >> else >> sprintf(ath79_sys_type, "Atheros AR%s rev %u", chip, rev); >> pr_info("SoC: %s\n", ath79_sys_type); >> -diff --git a/arch/mips/include/asm/mach-ath79/ath79.h >> b/arch/mips/include/asm/mach-ath79/ath79.h >> -index 98a7ccf3d358..73dcd63b8243 100644 >> --- a/arch/mips/include/asm/mach-ath79/ath79.h >> +++ b/arch/mips/include/asm/mach-ath79/ath79.h >> @@ -35,6 +35,8 @@ enum ath79_soc_type { >> @@ -426,6 +408,3 @@ index 98a7ccf3d358..73dcd63b8243 100644 >> void ath79_ddr_wb_flush(unsigned int reg); >> void ath79_ddr_set_pci_windows(void); >> >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0019-MIPS-ath79-get-PCIe-controller-out-of-reset.patch >> b/target/linux/ath79/patches-4.14/0019-MIPS-ath79-get-PCIe-controller-out-of-reset.patch >> index 2148637f9b8a..f435e9bc1cdd 100644 >> --- >> a/target/linux/ath79/patches-4.14/0019-MIPS-ath79-get-PCIe-controller-out-of-reset.patch >> +++ >> b/target/linux/ath79/patches-4.14/0019-MIPS-ath79-get-PCIe-controller-out-of-reset.patch >> @@ -25,8 +25,6 @@ Signed-off-by: Mathias Kresin <d...@kresin.me> >> arch/mips/pci/pci-ar724x.c | 42 >> ++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 42 insertions(+) >> >> -diff --git a/arch/mips/pci/pci-ar724x.c b/arch/mips/pci/pci-ar724x.c >> -index 1e23c8d587bd..64b58cc48a91 100644 >> --- a/arch/mips/pci/pci-ar724x.c >> +++ b/arch/mips/pci/pci-ar724x.c >> @@ -12,14 +12,18 @@ >> @@ -48,7 +46,7 @@ index 1e23c8d587bd..64b58cc48a91 100644 >> #define AR724X_PCI_RESET_LINK_UP BIT(0) >> >> #define AR724X_PCI_INT_DEV0 BIT(14) >> -@@ -325,6 +329,37 @@ static void ar724x_pci_irq_init(struct >> ar724x_pci_controller *apc, >> +@@ -325,6 +329,37 @@ static void ar724x_pci_irq_init(struct a >> apc); >> } >> >> @@ -86,7 +84,7 @@ index 1e23c8d587bd..64b58cc48a91 100644 >> static int ar724x_pci_probe(struct platform_device *pdev) >> { >> struct ar724x_pci_controller *apc; >> -@@ -383,6 +418,13 @@ static int ar724x_pci_probe(struct platform_device >> *pdev) >> +@@ -383,6 +418,13 @@ static int ar724x_pci_probe(struct platf >> apc->pci_controller.io_resource = &apc->io_res; >> apc->pci_controller.mem_resource = &apc->mem_res; >> >> @@ -100,6 +98,3 @@ index 1e23c8d587bd..64b58cc48a91 100644 >> apc->link_up = ar724x_pci_check_link(apc); >> if (!apc->link_up) >> dev_warn(&pdev->dev, "PCIe link is down\n"); >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch >> b/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch >> index d25f265d8423..2d9ddf4a2c55 100644 >> --- >> a/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch >> +++ >> b/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch >> @@ -9,8 +9,6 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> arch/mips/pci/pci-ar71xx.c | 81 >> +++++++++++++++++++++++----------------------- >> 1 file changed, 40 insertions(+), 41 deletions(-) >> >> -diff --git a/arch/mips/pci/pci-ar71xx.c b/arch/mips/pci/pci-ar71xx.c >> -index bdf87b43633f..1dc9f01a495d 100644 >> --- a/arch/mips/pci/pci-ar71xx.c >> +++ b/arch/mips/pci/pci-ar71xx.c >> @@ -18,8 +18,11 @@ >> @@ -78,7 +76,7 @@ index bdf87b43633f..1dc9f01a495d 100644 >> } >> >> static void ar71xx_pci_irq_unmask(struct irq_data *d) >> -@@ -261,7 +266,7 @@ static void ar71xx_pci_irq_unmask(struct irq_data *d) >> +@@ -261,7 +266,7 @@ static void ar71xx_pci_irq_unmask(struct >> u32 t; >> >> apc = irq_data_get_irq_chip_data(d); >> @@ -87,7 +85,7 @@ index bdf87b43633f..1dc9f01a495d 100644 >> >> t = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE); >> __raw_writel(t | (1 << irq), base + >> AR71XX_RESET_REG_PCI_INT_ENABLE); >> -@@ -278,7 +283,7 @@ static void ar71xx_pci_irq_mask(struct irq_data *d) >> +@@ -278,7 +283,7 @@ static void ar71xx_pci_irq_mask(struct i >> u32 t; >> >> apc = irq_data_get_irq_chip_data(d); >> @@ -96,7 +94,7 @@ index bdf87b43633f..1dc9f01a495d 100644 >> >> t = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE); >> __raw_writel(t & ~(1 << irq), base + >> AR71XX_RESET_REG_PCI_INT_ENABLE); >> -@@ -294,24 +299,30 @@ static struct irq_chip ar71xx_pci_irq_chip = { >> +@@ -294,24 +299,30 @@ static struct irq_chip ar71xx_pci_irq_ch >> .irq_mask_ack = ar71xx_pci_irq_mask, >> }; >> >> @@ -150,7 +148,7 @@ index bdf87b43633f..1dc9f01a495d 100644 >> static int ar71xx_pci_probe(struct platform_device *pdev) >> { >> struct ar71xx_pci_controller *apc; >> -@@ -348,26 +364,6 @@ static int ar71xx_pci_probe(struct platform_device >> *pdev) >> +@@ -348,26 +364,6 @@ static int ar71xx_pci_probe(struct platf >> if (apc->irq < 0) >> return -EINVAL; >> >> @@ -177,7 +175,7 @@ index bdf87b43633f..1dc9f01a495d 100644 >> ar71xx_pci_reset(); >> >> /* setup COMMAND register */ >> -@@ -380,9 +376,11 @@ static int ar71xx_pci_probe(struct platform_device >> *pdev) >> +@@ -380,9 +376,11 @@ static int ar71xx_pci_probe(struct platf >> >> ar71xx_pci_irq_init(apc); >> >> @@ -189,7 +187,7 @@ index bdf87b43633f..1dc9f01a495d 100644 >> >> register_pci_controller(&apc->pci_ctrl); >> >> -@@ -393,6 +391,7 @@ static struct platform_driver ar71xx_pci_driver = { >> +@@ -393,6 +391,7 @@ static struct platform_driver ar71xx_pci >> .probe = ar71xx_pci_probe, >> .driver = { >> .name = "ar71xx-pci", >> @@ -197,6 +195,3 @@ index bdf87b43633f..1dc9f01a495d 100644 >> }, >> }; >> >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0021-MIPS-ath79-turn-pci-ar724x-driver-into-a-pure-OF-dri.patch >> b/target/linux/ath79/patches-4.14/0021-MIPS-ath79-turn-pci-ar724x-driver-into-a-pure-OF-dri.patch >> index e3eba5a5f647..d5ebeb87aec0 100644 >> --- >> a/target/linux/ath79/patches-4.14/0021-MIPS-ath79-turn-pci-ar724x-driver-into-a-pure-OF-dri.patch >> +++ >> b/target/linux/ath79/patches-4.14/0021-MIPS-ath79-turn-pci-ar724x-driver-into-a-pure-OF-dri.patch >> @@ -9,8 +9,6 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> arch/mips/pci/pci-ar724x.c | 86 >> +++++++++++++++++++++------------------------- >> 1 file changed, 40 insertions(+), 46 deletions(-) >> >> -diff --git a/arch/mips/pci/pci-ar724x.c b/arch/mips/pci/pci-ar724x.c >> -index 64b58cc48a91..7eb9b0999c8c 100644 >> --- a/arch/mips/pci/pci-ar724x.c >> +++ b/arch/mips/pci/pci-ar724x.c >> @@ -14,8 +14,11 @@ >> @@ -91,7 +89,7 @@ index 64b58cc48a91..7eb9b0999c8c 100644 >> case 0: >> t = __raw_readl(base + AR724X_PCI_REG_INT_MASK); >> __raw_writel(t | AR724X_PCI_INT_DEV0, >> -@@ -273,14 +275,12 @@ static void ar724x_pci_irq_mask(struct irq_data *d) >> +@@ -273,14 +275,12 @@ static void ar724x_pci_irq_mask(struct i >> { >> struct ar724x_pci_controller *apc; >> void __iomem *base; >> @@ -107,7 +105,7 @@ index 64b58cc48a91..7eb9b0999c8c 100644 >> case 0: >> t = __raw_readl(base + AR724X_PCI_REG_INT_MASK); >> __raw_writel(t & ~AR724X_PCI_INT_DEV0, >> -@@ -305,26 +305,32 @@ static struct irq_chip ar724x_pci_irq_chip = { >> +@@ -305,26 +305,32 @@ static struct irq_chip ar724x_pci_irq_ch >> .irq_mask_ack = ar724x_pci_irq_mask, >> }; >> >> @@ -150,7 +148,7 @@ index 64b58cc48a91..7eb9b0999c8c 100644 >> irq_set_chained_handler_and_data(apc->irq, ar724x_pci_irq_handler, >> apc); >> } >> -@@ -394,29 +400,11 @@ static int ar724x_pci_probe(struct platform_device >> *pdev) >> +@@ -394,29 +400,11 @@ static int ar724x_pci_probe(struct platf >> if (apc->irq < 0) >> return -EINVAL; >> >> @@ -182,7 +180,7 @@ index 64b58cc48a91..7eb9b0999c8c 100644 >> >> /* >> * Do the full PCIE Root Complex Initialization Sequence if the >> PCIe >> -@@ -438,10 +426,16 @@ static int ar724x_pci_probe(struct platform_device >> *pdev) >> +@@ -438,10 +426,16 @@ static int ar724x_pci_probe(struct platf >> return 0; >> } >> >> @@ -199,6 +197,3 @@ index 64b58cc48a91..7eb9b0999c8c 100644 >> }, >> }; >> >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0022-MIPS-ath79-drop-pci.c.patch >> b/target/linux/ath79/patches-4.14/0022-MIPS-ath79-drop-pci.c.patch >> index 036bfc31c75d..58ed122c68d7 100644 >> --- a/target/linux/ath79/patches-4.14/0022-MIPS-ath79-drop-pci.c.patch >> +++ b/target/linux/ath79/patches-4.14/0022-MIPS-ath79-drop-pci.c.patch >> @@ -16,10 +16,8 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> delete mode 100644 arch/mips/ath79/pci.c >> create mode 100644 arch/mips/pci/fixup-ath79.c >> >> -Index: linux-4.14.25/arch/mips/ath79/Makefile >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/ath79/Makefile >> -+++ linux-4.14.25/arch/mips/ath79/Makefile >> +--- a/arch/mips/ath79/Makefile >> ++++ b/arch/mips/ath79/Makefile >> @@ -11,7 +11,6 @@ >> obj-y := prom.o setup.o irq.o common.o clock.o >> >> @@ -28,9 +26,7 @@ Index: linux-4.14.25/arch/mips/ath79/Makefile >> >> # >> # Devices >> -Index: linux-4.14.25/arch/mips/ath79/pci.c >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/ath79/pci.c >> +--- a/arch/mips/ath79/pci.c >> +++ /dev/null >> @@ -1,285 +0,0 @@ >> -/* >> @@ -318,10 +314,8 @@ Index: linux-4.14.25/arch/mips/ath79/pci.c >> - >> - return pdev ? 0 : -ENODEV; >> -} >> -Index: linux-4.14.25/arch/mips/pci/Makefile >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/pci/Makefile >> -+++ linux-4.14.25/arch/mips/pci/Makefile >> +--- a/arch/mips/pci/Makefile >> ++++ b/arch/mips/pci/Makefile >> @@ -29,6 +29,7 @@ obj-$(CONFIG_MIPS_PCI_VIRTIO) += pci-vir >> # >> # These are still pretty much in the old state, watch, go blind. >> @@ -330,10 +324,8 @@ Index: linux-4.14.25/arch/mips/pci/Makefile >> obj-$(CONFIG_LASAT) += pci-lasat.o >> obj-$(CONFIG_MIPS_COBALT) += fixup-cobalt.o >> obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o >> ops-loongson2.o >> -Index: linux-4.14.25/arch/mips/pci/fixup-ath79.c >> -=================================================================== >> --- /dev/null >> -+++ linux-4.14.25/arch/mips/pci/fixup-ath79.c >> ++++ b/arch/mips/pci/fixup-ath79.c >> @@ -0,0 +1,21 @@ >> +/* >> + * Copyright (C) 2018 John Crispin <j...@phrozen.org> >> diff --git >> a/target/linux/ath79/patches-4.14/0023-MIPS-ath79-drop-mach-files.patch >> b/target/linux/ath79/patches-4.14/0023-MIPS-ath79-drop-mach-files.patch >> index b491371e0623..2d9a9bc97118 100644 >> --- >> a/target/linux/ath79/patches-4.14/0023-MIPS-ath79-drop-mach-files.patch >> +++ >> b/target/linux/ath79/patches-4.14/0023-MIPS-ath79-drop-mach-files.patch >> @@ -21,10 +21,8 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> delete mode 100644 arch/mips/ath79/mach-pb44.c >> delete mode 100644 arch/mips/ath79/mach-ubnt-xm.c >> >> -Index: linux-4.14.25/arch/mips/ath79/Kconfig >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/ath79/Kconfig >> -+++ linux-4.14.25/arch/mips/ath79/Kconfig >> +--- a/arch/mips/ath79/Kconfig >> ++++ b/arch/mips/ath79/Kconfig >> @@ -1,79 +1,6 @@ >> # SPDX-License-Identifier: GPL-2.0 >> if ATH79 >> @@ -105,10 +103,8 @@ Index: linux-4.14.25/arch/mips/ath79/Kconfig >> config SOC_AR71XX >> select HW_HAS_PCI >> def_bool n >> -Index: linux-4.14.25/arch/mips/ath79/Makefile >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/ath79/Makefile >> -+++ linux-4.14.25/arch/mips/ath79/Makefile >> +--- a/arch/mips/ath79/Makefile >> ++++ b/arch/mips/ath79/Makefile >> @@ -21,13 +21,3 @@ obj-$(CONFIG_ATH79_DEV_LEDS_GPIO) += dev >> obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o >> obj-$(CONFIG_ATH79_DEV_USB) += dev-usb.o >> @@ -123,9 +119,7 @@ Index: linux-4.14.25/arch/mips/ath79/Makefile >> -obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o >> -obj-$(CONFIG_ATH79_MACH_PB44) += mach-pb44.o >> -obj-$(CONFIG_ATH79_MACH_UBNT_XM) += mach-ubnt-xm.o >> -Index: linux-4.14.25/arch/mips/ath79/mach-ap121.c >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/ath79/mach-ap121.c >> +--- a/arch/mips/ath79/mach-ap121.c >> +++ /dev/null >> @@ -1,92 +0,0 @@ >> -/* >> @@ -220,9 +214,7 @@ Index: linux-4.14.25/arch/mips/ath79/mach-ap121.c >> - >> -MIPS_MACHINE(ATH79_MACH_AP121, "AP121", "Atheros AP121 reference board", >> - ap121_setup); >> -Index: linux-4.14.25/arch/mips/ath79/mach-ap136.c >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/ath79/mach-ap136.c >> +--- a/arch/mips/ath79/mach-ap136.c >> +++ /dev/null >> @@ -1,156 +0,0 @@ >> -/* >> @@ -381,9 +373,7 @@ Index: linux-4.14.25/arch/mips/ath79/mach-ap136.c >> -MIPS_MACHINE(ATH79_MACH_AP136_010, "AP136-010", >> - "Atheros AP136-010 reference board", >> - ap136_setup); >> -Index: linux-4.14.25/arch/mips/ath79/mach-ap81.c >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/ath79/mach-ap81.c >> +--- a/arch/mips/ath79/mach-ap81.c >> +++ /dev/null >> @@ -1,100 +0,0 @@ >> -/* >> @@ -486,9 +476,7 @@ Index: linux-4.14.25/arch/mips/ath79/mach-ap81.c >> - >> -MIPS_MACHINE(ATH79_MACH_AP81, "AP81", "Atheros AP81 reference board", >> - ap81_setup); >> -Index: linux-4.14.25/arch/mips/ath79/mach-db120.c >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/ath79/mach-db120.c >> +--- a/arch/mips/ath79/mach-db120.c >> +++ /dev/null >> @@ -1,136 +0,0 @@ >> -/* >> @@ -627,9 +615,7 @@ Index: linux-4.14.25/arch/mips/ath79/mach-db120.c >> - >> -MIPS_MACHINE(ATH79_MACH_DB120, "DB120", "Atheros DB120 reference board", >> - db120_setup); >> -Index: linux-4.14.25/arch/mips/ath79/mach-pb44.c >> -=================================================================== >> ---- linux-4.14.25.orig/arch/mips/ath79/mach-pb44.c >> +--- a/arch/mips/ath79/mach-pb44.c >> +++ /dev/null >> @@ -1,122 +0,0 @@ >> -/* >> diff --git >> a/target/linux/ath79/patches-4.14/0024-MIPS-ath79-drop-pdata-helpers.patch >> b/target/linux/ath79/patches-4.14/0024-MIPS-ath79-drop-pdata-helpers.patch >> index a5d517093d9c..8c4956ec343b 100644 >> --- >> a/target/linux/ath79/patches-4.14/0024-MIPS-ath79-drop-pdata-helpers.patch >> +++ >> b/target/linux/ath79/patches-4.14/0024-MIPS-ath79-drop-pdata-helpers.patch >> @@ -32,9 +32,6 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> delete mode 100644 arch/mips/ath79/dev-wmac.c >> delete mode 100644 arch/mips/ath79/dev-wmac.h >> >> -diff --git a/arch/mips/ath79/dev-common.c b/arch/mips/ath79/dev-common.c >> -deleted file mode 100644 >> -index ac8bfe86b656..000000000000 >> --- a/arch/mips/ath79/dev-common.c >> +++ /dev/null >> @@ -1,168 +0,0 @@ >> @@ -206,9 +203,6 @@ index ac8bfe86b656..000000000000 >> - >> - platform_device_register(&ath79_gpio_device); >> -} >> -diff --git a/arch/mips/ath79/dev-common.h b/arch/mips/ath79/dev-common.h >> -deleted file mode 100644 >> -index 0f514e1affce..000000000000 >> --- a/arch/mips/ath79/dev-common.h >> +++ /dev/null >> @@ -1,18 +0,0 @@ >> @@ -230,9 +224,6 @@ index 0f514e1affce..000000000000 >> -void ath79_register_wdt(void); >> - >> -#endif /* _ATH79_DEV_COMMON_H */ >> -diff --git a/arch/mips/ath79/dev-gpio-buttons.c >> b/arch/mips/ath79/dev-gpio-buttons.c >> -deleted file mode 100644 >> -index 366b35fb164d..000000000000 >> --- a/arch/mips/ath79/dev-gpio-buttons.c >> +++ /dev/null >> @@ -1,56 +0,0 @@ >> @@ -292,9 +283,6 @@ index 366b35fb164d..000000000000 >> -err_free_buttons: >> - kfree(p); >> -} >> -diff --git a/arch/mips/ath79/dev-gpio-buttons.h >> b/arch/mips/ath79/dev-gpio-buttons.h >> -deleted file mode 100644 >> -index 481847ac1cba..000000000000 >> --- a/arch/mips/ath79/dev-gpio-buttons.h >> +++ /dev/null >> @@ -1,23 +0,0 @@ >> @@ -321,9 +309,6 @@ index 481847ac1cba..000000000000 >> - struct gpio_keys_button *buttons); >> - >> -#endif /* _ATH79_DEV_GPIO_BUTTONS_H */ >> -diff --git a/arch/mips/ath79/dev-leds-gpio.c >> b/arch/mips/ath79/dev-leds-gpio.c >> -deleted file mode 100644 >> -index dcb1debcefb8..000000000000 >> --- a/arch/mips/ath79/dev-leds-gpio.c >> +++ /dev/null >> @@ -1,54 +0,0 @@ >> @@ -381,9 +366,6 @@ index dcb1debcefb8..000000000000 >> -err_free_leds: >> - kfree(p); >> -} >> -diff --git a/arch/mips/ath79/dev-leds-gpio.h >> b/arch/mips/ath79/dev-leds-gpio.h >> -deleted file mode 100644 >> -index 6e5d8851ebcf..000000000000 >> --- a/arch/mips/ath79/dev-leds-gpio.h >> +++ /dev/null >> @@ -1,21 +0,0 @@ >> @@ -408,9 +390,6 @@ index 6e5d8851ebcf..000000000000 >> - struct gpio_led *leds); >> - >> -#endif /* _ATH79_DEV_LEDS_GPIO_H */ >> -diff --git a/arch/mips/ath79/dev-spi.c b/arch/mips/ath79/dev-spi.c >> -deleted file mode 100644 >> -index aa30163efbfd..000000000000 >> --- a/arch/mips/ath79/dev-spi.c >> +++ /dev/null >> @@ -1,38 +0,0 @@ >> @@ -452,9 +431,6 @@ index aa30163efbfd..000000000000 >> - ath79_spi_device.dev.platform_data = pdata; >> - platform_device_register(&ath79_spi_device); >> -} >> -diff --git a/arch/mips/ath79/dev-spi.h b/arch/mips/ath79/dev-spi.h >> -deleted file mode 100644 >> -index d732565ca736..000000000000 >> --- a/arch/mips/ath79/dev-spi.h >> +++ /dev/null >> @@ -1,22 +0,0 @@ >> @@ -480,9 +456,6 @@ index d732565ca736..000000000000 >> - unsigned n); >> - >> -#endif /* _ATH79_DEV_SPI_H */ >> -diff --git a/arch/mips/ath79/dev-usb.c b/arch/mips/ath79/dev-usb.c >> -deleted file mode 100644 >> -index 8227265bcc2d..000000000000 >> --- a/arch/mips/ath79/dev-usb.c >> +++ /dev/null >> @@ -1,242 +0,0 @@ >> @@ -728,9 +701,6 @@ index 8227265bcc2d..000000000000 >> - else >> - BUG(); >> -} >> -diff --git a/arch/mips/ath79/dev-usb.h b/arch/mips/ath79/dev-usb.h >> -deleted file mode 100644 >> -index 4b86a69ca080..000000000000 >> --- a/arch/mips/ath79/dev-usb.h >> +++ /dev/null >> @@ -1,17 +0,0 @@ >> @@ -751,9 +721,6 @@ index 4b86a69ca080..000000000000 >> -void ath79_register_usb(void); >> - >> -#endif /* _ATH79_DEV_USB_H */ >> -diff --git a/arch/mips/ath79/dev-wmac.c b/arch/mips/ath79/dev-wmac.c >> -deleted file mode 100644 >> -index da190b1b87ce..000000000000 >> --- a/arch/mips/ath79/dev-wmac.c >> +++ /dev/null >> @@ -1,155 +0,0 @@ >> @@ -912,9 +879,6 @@ index da190b1b87ce..000000000000 >> - >> - platform_device_register(&ath79_wmac_device); >> -} >> -diff --git a/arch/mips/ath79/dev-wmac.h b/arch/mips/ath79/dev-wmac.h >> -deleted file mode 100644 >> -index c9cd8709f090..000000000000 >> --- a/arch/mips/ath79/dev-wmac.h >> +++ /dev/null >> @@ -1,17 +0,0 @@ >> @@ -935,8 +899,6 @@ index c9cd8709f090..000000000000 >> -void ath79_register_wmac(u8 *cal_data); >> - >> -#endif /* _ATH79_DEV_WMAC_H */ >> -diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c >> -index 4c7a93f4039a..8d7ffa2e8265 100644 >> --- a/arch/mips/ath79/setup.c >> +++ b/arch/mips/ath79/setup.c >> @@ -31,7 +31,6 @@ >> @@ -958,6 +920,3 @@ index 4c7a93f4039a..8d7ffa2e8265 100644 >> mips_machine_setup(); >> >> return 0; >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0025-MIPS-ath79-drop-irq.c.patch >> b/target/linux/ath79/patches-4.14/0025-MIPS-ath79-drop-irq.c.patch >> index 738f239af01d..95b29455f0db 100644 >> --- a/target/linux/ath79/patches-4.14/0025-MIPS-ath79-drop-irq.c.patch >> +++ b/target/linux/ath79/patches-4.14/0025-MIPS-ath79-drop-irq.c.patch >> @@ -13,8 +13,6 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> 3 files changed, 7 insertions(+), 286 deletions(-) >> delete mode 100644 arch/mips/ath79/irq.c >> >> -diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile >> -index 783369bc1c5b..bd0c9b8b1b5b 100644 >> --- a/arch/mips/ath79/Makefile >> +++ b/arch/mips/ath79/Makefile >> @@ -8,7 +8,7 @@ >> @@ -26,9 +24,6 @@ index 783369bc1c5b..bd0c9b8b1b5b 100644 >> >> obj-$(CONFIG_EARLY_PRINTK) += early_printk.o >> >> -diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c >> -deleted file mode 100644 >> -index 58d17ef6f58f..000000000000 >> --- a/arch/mips/ath79/irq.c >> +++ /dev/null >> @@ -1,285 +0,0 @@ >> @@ -317,8 +312,6 @@ index 58d17ef6f58f..000000000000 >> - else if (soc_is_qca956x() || soc_is_tp9343()) >> - qca956x_irq_init(); >> -} >> -diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c >> -index 8d7ffa2e8265..7b089c07d2fa 100644 >> --- a/arch/mips/ath79/setup.c >> +++ b/arch/mips/ath79/setup.c >> @@ -19,6 +19,7 @@ >> @@ -341,6 +334,3 @@ index 8d7ffa2e8265..7b089c07d2fa 100644 >> static int __init ath79_setup(void) >> { >> if (mips_machtype == ATH79_MACH_GENERIC_OF) >> --- >> -2.11.0 >> - >> diff --git >> a/target/linux/ath79/patches-4.14/0026-MIPS-ath79-sanitize-Kconfig-symbols.patch >> b/target/linux/ath79/patches-4.14/0026-MIPS-ath79-sanitize-Kconfig-symbols.patch >> index 5f41656d1bcd..f9906516d9bc 100644 >> --- >> a/target/linux/ath79/patches-4.14/0026-MIPS-ath79-sanitize-Kconfig-symbols.patch >> +++ >> b/target/linux/ath79/patches-4.14/0026-MIPS-ath79-sanitize-Kconfig-symbols.patch >> @@ -11,10 +11,8 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> arch/mips/pci/Makefile | 2 +- >> 4 files changed, 8 insertions(+), 54 deletions(-) >> >> -Index: linux-4.14.18/arch/mips/Kconfig >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/Kconfig >> -+++ linux-4.14.18/arch/mips/Kconfig >> +--- a/arch/mips/Kconfig >> ++++ b/arch/mips/Kconfig >> @@ -203,6 +203,8 @@ config ATH79 >> select SYS_SUPPORTS_BIG_ENDIAN >> select SYS_SUPPORTS_MIPS16 >> @@ -24,10 +22,8 @@ Index: linux-4.14.18/arch/mips/Kconfig >> select USE_OF >> help >> Support for the Atheros AR71XX/AR724X/AR913X SoCs. >> -Index: linux-4.14.18/arch/mips/ath79/Kconfig >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/ath79/Kconfig >> -+++ linux-4.14.18/arch/mips/ath79/Kconfig >> +--- a/arch/mips/ath79/Kconfig >> ++++ b/arch/mips/ath79/Kconfig >> @@ -1,52 +1,14 @@ >> # SPDX-License-Identifier: GPL-2.0 >> if ATH79 >> @@ -86,10 +82,8 @@ Index: linux-4.14.18/arch/mips/ath79/Kconfig >> def_bool n >> >> endif >> -Index: linux-4.14.18/arch/mips/ath79/Makefile >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/ath79/Makefile >> -+++ linux-4.14.18/arch/mips/ath79/Makefile >> +--- a/arch/mips/ath79/Makefile >> ++++ b/arch/mips/ath79/Makefile >> @@ -11,13 +11,3 @@ >> obj-y := prom.o setup.o common.o clock.o >> >> @@ -104,10 +98,8 @@ Index: linux-4.14.18/arch/mips/ath79/Makefile >> -obj-$(CONFIG_ATH79_DEV_SPI) += dev-spi.o >> -obj-$(CONFIG_ATH79_DEV_USB) += dev-usb.o >> -obj-$(CONFIG_ATH79_DEV_WMAC) += dev-wmac.o >> -Index: linux-4.14.18/arch/mips/pci/Makefile >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/pci/Makefile >> -+++ linux-4.14.18/arch/mips/pci/Makefile >> +--- a/arch/mips/pci/Makefile >> ++++ b/arch/mips/pci/Makefile >> @@ -23,7 +23,7 @@ obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o >> ops-bcm63xx.o >> obj-$(CONFIG_MIPS_ALCHEMY) += pci-alchemy.o >> diff --git >> a/target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch >> b/target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch >> index fd47b775f03d..cde3bae67419 100644 >> --- >> a/target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch >> +++ >> b/target/linux/ath79/patches-4.14/0027-MIPS-ath79-drop-mips_machine-support.patch >> @@ -11,10 +11,8 @@ Signed-off-by: John Crispin <j...@phrozen.org> >> 3 files changed, 10 insertions(+), 93 deletions(-) >> delete mode 100644 arch/mips/ath79/machtypes.h >> >> -Index: linux-4.14.18/arch/mips/Kconfig >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/Kconfig >> -+++ linux-4.14.18/arch/mips/Kconfig >> +--- a/arch/mips/Kconfig >> ++++ b/arch/mips/Kconfig >> @@ -196,7 +196,6 @@ config ATH79 >> select COMMON_CLK >> select CLKDEV_LOOKUP >> @@ -23,9 +21,7 @@ Index: linux-4.14.18/arch/mips/Kconfig >> select SYS_HAS_CPU_MIPS32_R2 >> select SYS_HAS_EARLY_PRINTK >> select SYS_SUPPORTS_32BIT_KERNEL >> -Index: linux-4.14.18/arch/mips/ath79/machtypes.h >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/ath79/machtypes.h >> +--- a/arch/mips/ath79/machtypes.h >> +++ /dev/null >> @@ -1,28 +0,0 @@ >> -/* >> @@ -56,10 +52,8 @@ Index: linux-4.14.18/arch/mips/ath79/machtypes.h >> -}; >> - >> -#endif /* _ATH79_MACHTYPE_H */ >> -Index: linux-4.14.18/arch/mips/ath79/setup.c >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/ath79/setup.c >> -+++ linux-4.14.18/arch/mips/ath79/setup.c >> +--- a/arch/mips/ath79/setup.c >> ++++ b/arch/mips/ath79/setup.c >> @@ -32,7 +32,6 @@ >> #include <asm/mach-ath79/ath79.h> >> #include <asm/mach-ath79/ar71xx_regs.h> >> @@ -166,10 +160,8 @@ Index: linux-4.14.18/arch/mips/ath79/setup.c >> - "DTB", >> - "Generic AR71XX/AR724X/AR913X based board (DT)", >> - NULL); >> -Index: linux-4.14.18/arch/mips/ath79/clock.c >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/ath79/clock.c >> -+++ linux-4.14.18/arch/mips/ath79/clock.c >> +--- a/arch/mips/ath79/clock.c >> ++++ b/arch/mips/ath79/clock.c >> @@ -26,7 +26,6 @@ >> #include <asm/mach-ath79/ath79.h> >> #include <asm/mach-ath79/ar71xx_regs.h> >> diff --git >> a/target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch >> b/target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch >> index 4e73c0a7fd24..15f6b1f8cea8 100644 >> --- >> a/target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch >> +++ >> b/target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch >> @@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> >> + clks[type] = clk; >> + clk_register_clkdev(clk, name, NULL); >> +} >> -+ >> + >> +static struct clk * __init ath79_set_clk(int type, unsigned long rate) >> +{ >> + const char *name = ath79_clk_name(type); >> @@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> >> +{ >> + const char *name = ath79_clk_name(type); >> + struct clk *clk; >> - >> ++ >> + clk = clk_register_fixed_factor(NULL, name, parent, 0, mult, div); >> + __ath79_set_clk(type, name, clk); >> return clk; >> diff --git >> a/target/linux/ath79/patches-4.14/004-register_gpio_driver_earlier.patch >> b/target/linux/ath79/patches-4.14/004-register_gpio_driver_earlier.patch >> index 9090491f9f30..cc30e2d91e28 100644 >> --- >> a/target/linux/ath79/patches-4.14/004-register_gpio_driver_earlier.patch >> +++ >> b/target/linux/ath79/patches-4.14/004-register_gpio_driver_earlier.patch >> @@ -1,10 +1,8 @@ >> HACK: register the GPIO driver earlier to ensure that gpio_request calls >> from mach files succeed. >> >> -Index: linux-4.14.18/drivers/gpio/gpio-ath79.c >> -=================================================================== >> ---- linux-4.14.18.orig/drivers/gpio/gpio-ath79.c >> -+++ linux-4.14.18/drivers/gpio/gpio-ath79.c >> +--- a/drivers/gpio/gpio-ath79.c >> ++++ b/drivers/gpio/gpio-ath79.c >> @@ -322,7 +322,11 @@ static struct platform_driver ath79_gpio >> .remove = ath79_gpio_remove, >> }; >> diff --git >> a/target/linux/ath79/patches-4.14/405-mtd-tp-link-partition-parser.patch >> b/target/linux/ath79/patches-4.14/405-mtd-tp-link-partition-parser.patch >> index 3734d3e5c55a..846b7f0a0ccc 100644 >> --- >> a/target/linux/ath79/patches-4.14/405-mtd-tp-link-partition-parser.patch >> +++ >> b/target/linux/ath79/patches-4.14/405-mtd-tp-link-partition-parser.patch >> @@ -1,7 +1,5 @@ >> -Index: linux-4.14.18/drivers/mtd/Kconfig >> -=================================================================== >> ---- linux-4.14.18.orig/drivers/mtd/Kconfig >> -+++ linux-4.14.18/drivers/mtd/Kconfig >> +--- a/drivers/mtd/Kconfig >> ++++ b/drivers/mtd/Kconfig >> @@ -194,6 +194,12 @@ config MTD_MYLOADER_PARTS >> You will still need the parsing functions to be called by the >> driver >> for your particular device. It won't happen automatically. >> @@ -15,10 +13,8 @@ Index: linux-4.14.18/drivers/mtd/Kconfig >> comment "User Modules And Translation Layers" >> >> # >> -Index: linux-4.14.18/drivers/mtd/Makefile >> -=================================================================== >> ---- linux-4.14.18.orig/drivers/mtd/Makefile >> -+++ linux-4.14.18/drivers/mtd/Makefile >> +--- a/drivers/mtd/Makefile >> ++++ b/drivers/mtd/Makefile >> @@ -18,6 +18,7 @@ obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63 >> obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o >> obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o >> diff --git >> a/target/linux/ath79/patches-4.14/420-net-ar71xx_mac_driver.patch >> b/target/linux/ath79/patches-4.14/420-net-ar71xx_mac_driver.patch >> index feb2e6a39387..6377db0ac22b 100644 >> --- a/target/linux/ath79/patches-4.14/420-net-ar71xx_mac_driver.patch >> +++ b/target/linux/ath79/patches-4.14/420-net-ar71xx_mac_driver.patch >> @@ -18,7 +18,7 @@ >> endif # NET_VENDOR_ATHEROS >> --- a/drivers/net/ethernet/atheros/Makefile >> +++ b/drivers/net/ethernet/atheros/Makefile >> -@@ -2,6 +2,7 @@ >> +@@ -3,6 +3,7 @@ >> # Makefile for the Atheros network device drivers. >> # >> >> diff --git >> a/target/linux/ath79/patches-4.14/430-drivers-link-spi-before-mtd.patch >> b/target/linux/ath79/patches-4.14/430-drivers-link-spi-before-mtd.patch >> index a86245459787..2f1549710bc9 100644 >> --- >> a/target/linux/ath79/patches-4.14/430-drivers-link-spi-before-mtd.patch >> +++ >> b/target/linux/ath79/patches-4.14/430-drivers-link-spi-before-mtd.patch >> @@ -1,6 +1,6 @@ >> --- a/drivers/Makefile >> +++ b/drivers/Makefile >> -@@ -77,8 +77,8 @@ obj-$(CONFIG_SCSI) += scsi/ >> +@@ -83,8 +83,8 @@ obj-$(CONFIG_SCSI) += scsi/ >> obj-y += nvme/ >> obj-$(CONFIG_ATA) += ata/ >> obj-$(CONFIG_TARGET_CORE) += target/ >> diff --git >> a/target/linux/ath79/patches-4.14/461-spi-ath79-add-fast-flash-read.patch >> b/target/linux/ath79/patches-4.14/461-spi-ath79-add-fast-flash-read.patch >> index 5c3583f758bb..06da2b34e889 100644 >> --- >> a/target/linux/ath79/patches-4.14/461-spi-ath79-add-fast-flash-read.patch >> +++ >> b/target/linux/ath79/patches-4.14/461-spi-ath79-add-fast-flash-read.patch >> @@ -10,7 +10,7 @@ >> } >> >> static void ath79_spi_disable(struct ath79_spi *sp) >> -@@ -205,6 +202,38 @@ static u32 ath79_spi_txrx_mode0(struct s >> +@@ -204,6 +201,38 @@ static u32 ath79_spi_txrx_mode0(struct s >> return ath79_spi_rr(sp, AR71XX_SPI_REG_RDS); >> } >> >> @@ -49,9 +49,9 @@ >> static int ath79_spi_probe(struct platform_device *pdev) >> { >> struct spi_master *master; >> -@@ -234,6 +263,8 @@ static int ath79_spi_probe(struct platfo >> +@@ -232,6 +261,8 @@ static int ath79_spi_probe(struct platfo >> + master->bus_num = pdata->bus_num; >> master->num_chipselect = pdata->num_chipselect; >> - master->cs_gpios = pdata->cs_gpios; >> } >> + master->spi_flash_read = ath79_spi_read_flash_data; >> + master->flash_read_supported = ath79_spi_flash_read_supported; >> diff --git >> a/target/linux/ath79/patches-4.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch >> b/target/linux/ath79/patches-4.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch >> index c0d30eaefa98..ad8b7b47d110 100644 >> --- >> a/target/linux/ath79/patches-4.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch >> +++ >> b/target/linux/ath79/patches-4.14/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch >> @@ -1,7 +1,5 @@ >> -Index: linux-4.14.18/arch/mips/include/asm/mach-ath79/mangle-port.h >> -=================================================================== >> --- /dev/null >> -+++ linux-4.14.18/arch/mips/include/asm/mach-ath79/mangle-port.h >> ++++ b/arch/mips/include/asm/mach-ath79/mangle-port.h >> @@ -0,0 +1,37 @@ >> +/* >> + * Copyright (C) 2012 Gabor Juhos <juh...@openwrt.org> >> @@ -40,10 +38,8 @@ Index: >> linux-4.14.18/arch/mips/include/asm/mach-ath79/mangle-port.h >> +# define __mem_ioswabq(a, x) cpu_to_le64(x) >> + >> +#endif /* __ASM_MACH_ATH79_MANGLE_PORT_H */ >> -Index: linux-4.14.18/arch/mips/pci/pci-ar71xx.c >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/pci/pci-ar71xx.c >> -+++ linux-4.14.18/arch/mips/pci/pci-ar71xx.c >> +--- a/arch/mips/pci/pci-ar71xx.c >> ++++ b/arch/mips/pci/pci-ar71xx.c >> @@ -73,6 +73,45 @@ static const u32 ar71xx_pci_read_mask[8] >> 0, 0xff, 0xffff, 0, 0xffffffff, 0, 0, 0 >> }; >> diff --git >> a/target/linux/ath79/patches-4.14/490-usb-ehci-add-quirks-for-qca-socs.patch >> b/target/linux/ath79/patches-4.14/490-usb-ehci-add-quirks-for-qca-socs.patch >> index 8a05adb05060..1d1979cd6eb8 100644 >> --- >> a/target/linux/ath79/patches-4.14/490-usb-ehci-add-quirks-for-qca-socs.patch >> +++ >> b/target/linux/ath79/patches-4.14/490-usb-ehci-add-quirks-for-qca-socs.patch >> @@ -40,7 +40,7 @@ >> retval = ehci_handshake(ehci, &ehci->regs->command, >> --- a/drivers/usb/host/ehci.h >> +++ b/drivers/usb/host/ehci.h >> -@@ -231,6 +231,10 @@ struct ehci_hcd { /* one per >> controlle >> +@@ -232,6 +232,10 @@ struct ehci_hcd { /* one per >> controlle >> unsigned need_oc_pp_cycle:1; /* MPC834X port power >> */ >> unsigned imx28_write_fix:1; /* For Freescale i.MX28 >> */ >> unsigned ignore_oc:1; >> @@ -72,7 +72,7 @@ >> #endif /* __USB_CORE_EHCI_PDRIVER_H */ >> --- a/drivers/usb/host/ehci-platform.c >> +++ b/drivers/usb/host/ehci-platform.c >> -@@ -52,6 +52,14 @@ struct ehci_platform_priv { >> +@@ -53,6 +53,14 @@ struct ehci_platform_priv { >> >> static const char hcd_name[] = "ehci-platform"; >> >> @@ -87,7 +87,7 @@ >> static int ehci_platform_reset(struct usb_hcd *hcd) >> { >> struct platform_device *pdev = >> to_platform_device(hcd->self.controller); >> -@@ -261,6 +269,13 @@ static int ehci_platform_probe(struct pl >> +@@ -270,6 +278,13 @@ static int ehci_platform_probe(struct pl >> priv->reset_on_resume = true; >> if (pdata->ignore_oc) >> ehci->ignore_oc = 1; >> diff --git >> a/target/linux/ath79/patches-4.14/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch >> b/target/linux/ath79/patches-4.14/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch >> index 6151cc292a97..a830346a31ef 100644 >> --- >> a/target/linux/ath79/patches-4.14/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch >> +++ >> b/target/linux/ath79/patches-4.14/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch >> @@ -12,10 +12,8 @@ Signed-off-by: Jonas Gorski <j...@openwrt.org> >> drivers/net/phy/mdio-bitbang.c | 9 +++++++++ >> 1 file changed, 9 insertions(+) >> >> -Index: linux-4.14.18/drivers/net/phy/mdio-bitbang.c >> -=================================================================== >> ---- linux-4.14.18.orig/drivers/net/phy/mdio-bitbang.c >> -+++ linux-4.14.18/drivers/net/phy/mdio-bitbang.c >> +--- a/drivers/net/phy/mdio-bitbang.c >> ++++ b/drivers/net/phy/mdio-bitbang.c >> @@ -17,6 +17,7 @@ >> * kind, whether express or implied. >> */ >> diff --git >> a/target/linux/ath79/patches-4.14/902-at803x-add-reset-gpio-pdata.patch >> b/target/linux/ath79/patches-4.14/902-at803x-add-reset-gpio-pdata.patch >> index cb3ed89e985c..7822158cf29a 100644 >> --- >> a/target/linux/ath79/patches-4.14/902-at803x-add-reset-gpio-pdata.patch >> +++ >> b/target/linux/ath79/patches-4.14/902-at803x-add-reset-gpio-pdata.patch >> @@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> >> #endif /* _PHY_AT803X_PDATA_H */ >> --- a/drivers/net/phy/at803x.c >> +++ b/drivers/net/phy/at803x.c >> -@@ -264,6 +264,7 @@ static int at803x_resume(struct phy_devi >> +@@ -261,6 +261,7 @@ static int at803x_resume(struct phy_devi >> >> static int at803x_probe(struct phy_device *phydev) >> { >> @@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> >> struct device *dev = &phydev->mdio.dev; >> struct at803x_priv *priv; >> struct gpio_desc *gpiod_reset; >> -@@ -276,6 +277,12 @@ static int at803x_probe(struct phy_devic >> +@@ -273,6 +274,12 @@ static int at803x_probe(struct phy_devic >> phydev->drv->phy_id != ATH8032_PHY_ID) >> goto does_not_require_reset_workaround; >> >> @@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> >> gpiod_reset = devm_gpiod_get_optional(dev, "reset", >> GPIOD_OUT_LOW); >> if (IS_ERR(gpiod_reset)) >> return PTR_ERR(gpiod_reset); >> -@@ -407,15 +414,23 @@ static void at803x_link_change_notify(st >> +@@ -404,15 +411,23 @@ static void at803x_link_change_notify(st >> * cannot recover from by software. >> */ >> if (phydev->state == PHY_NOLINK) { >> diff --git >> a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch >> b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch >> index 1ac28e67c278..e2ca932af04a 100644 >> --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch >> +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch >> @@ -1,7 +1,5 @@ >> -Index: linux-4.14.18/arch/mips/include/asm/checksum.h >> -=================================================================== >> ---- linux-4.14.18.orig/arch/mips/include/asm/checksum.h >> -+++ linux-4.14.18/arch/mips/include/asm/checksum.h >> +--- a/arch/mips/include/asm/checksum.h >> ++++ b/arch/mips/include/asm/checksum.h >> @@ -134,26 +134,30 @@ static inline __sum16 ip_fast_csum(const >> const unsigned int *stop = word + ihl; >> unsigned int csum; >> @@ -118,10 +116,8 @@ Index: linux-4.14.18/arch/mips/include/asm/checksum.h >> #include <asm-generic/checksum.h> >> #endif /* CONFIG_GENERIC_CSUM */ >> >> -Index: linux-4.14.18/include/uapi/linux/ip.h >> -=================================================================== _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev