From 22b9f99b87fa1ff991180cabf02dd04d1bddce2b Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Tue, 31 Jul 2018 05:11:07 +0300 Subject: kernel: bump 4.14 to 4.14.59 Drop patch that was superseded upstream: ramips/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch Drop upstreamed patches: - apm821xx/020-0001-crypto-crypto4xx-remove-bad-list_del.patch - apm821xx/020-0011-crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_b.patch - ath79/0011-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch - brcm63xx/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch - brcm63xx/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch - generic/backport/080-net-convert-sock.sk_wmem_alloc-from-atomic_t-to-refc.patch - generic/pending/170-usb-dwc2-Fix-DMA-alignment-to-start-at-allocated-boun.patch - generic/pending/900-gen_stats-fix-netlink-stats-padding.patch In 4.14.55, a patch was introduced that breaks ext4 images in some cases. The newly introduced patch backport-4.14/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch addresses this breakage. Fixes the following CVEs: - CVE-2018-10876 - CVE-2018-10877 - CVE-2018-10879 - CVE-2018-10880 - CVE-2018-10881 - CVE-2018-10882 - CVE-2018-10883 Compile-tested: ath79, octeon, x86/64 Runtime-tested: ath79, octeon, x86/64 Signed-off-by: Stijn Tintel --- .../070-qcom-spm-fix-probe-order.patch | 7 +---- ...om-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch | 7 +---- .../074-ARM-qcom-Add-IPQ4019-SoC-support.patch | 12 +++----- ...-phy-qcom-ipq4019-usb-add-binding-documen.patch | 6 ---- ...m-ipq4019-usb-add-driver-for-QCOM-IPQ4019.patch | 16 ++++------ ...077-qcom-ipq4019-add-USB-devicetree-nodes.patch | 11 ++----- ...RM-dts-ipq4019-Add-a-few-peripheral-nodes.patch | 35 +++++++++------------- .../079-ARM-dts-ipq4019-fix-PCI-range.patch | 4 +-- ...ctrl-msm-fix-gpio-hog-related-boot-issues.patch | 2 +- .../081-clk-fix-apss-cpu-overclocking.patch | 13 +++----- ...-ipq4019-Add-TZ-and-SMEM-reserved-regions.patch | 4 +-- ...ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch | 6 ++-- .../701-dts-ipq4019-add-mdio-node.patch | 6 ++-- .../702-dts-ipq4019-add-PHY-switch-nodes.patch | 6 ++-- ...711-dts-ipq4019-add-ethernet-essedma-node.patch | 8 ++--- .../patches-4.14/900-dts-ipq4019-ap-dk01.1.patch | 12 +++----- 16 files changed, 52 insertions(+), 103 deletions(-) (limited to 'target/linux/ipq40xx/patches-4.14') diff --git a/target/linux/ipq40xx/patches-4.14/070-qcom-spm-fix-probe-order.patch b/target/linux/ipq40xx/patches-4.14/070-qcom-spm-fix-probe-order.patch index 1e1a83220e..ea8dedb5a4 100644 --- a/target/linux/ipq40xx/patches-4.14/070-qcom-spm-fix-probe-order.patch +++ b/target/linux/ipq40xx/patches-4.14/070-qcom-spm-fix-probe-order.patch @@ -12,11 +12,9 @@ Signed-off-by: John Crispin drivers/soc/qcom/spm.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/soc/qcom/spm.c b/drivers/soc/qcom/spm.c -index f9d7a85b2822..53807e839664 100644 --- a/drivers/soc/qcom/spm.c +++ b/drivers/soc/qcom/spm.c -@@ -219,6 +219,9 @@ static int __init qcom_cpuidle_init(struct device_node *cpu_node, int cpu) +@@ -219,6 +219,9 @@ static int __init qcom_cpuidle_init(stru cpumask_t mask; bool use_scm_power_down = false; @@ -26,6 +24,3 @@ index f9d7a85b2822..53807e839664 100644 for (i = 0; ; i++) { state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i); if (!state_node) --- -2.11.0 - 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 index e92ead5ee2..d72e3d3c36 100644 --- 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 @@ -20,11 +20,9 @@ Signed-off-by: John Crispin arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi -index 98b9850ed2a0..3289b3a6c10e 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -316,7 +316,7 @@ +@@ -262,7 +262,7 @@ saw0: regulator@b089000 { compatible = "qcom,saw2"; @@ -33,6 +31,3 @@ index 98b9850ed2a0..3289b3a6c10e 100644 regulator; }; --- -2.11.0 - diff --git a/target/linux/ipq40xx/patches-4.14/074-ARM-qcom-Add-IPQ4019-SoC-support.patch b/target/linux/ipq40xx/patches-4.14/074-ARM-qcom-Add-IPQ4019-SoC-support.patch index cdecd14293..b3a83957ad 100644 --- a/target/linux/ipq40xx/patches-4.14/074-ARM-qcom-Add-IPQ4019-SoC-support.patch +++ b/target/linux/ipq40xx/patches-4.14/074-ARM-qcom-Add-IPQ4019-SoC-support.patch @@ -12,10 +12,8 @@ Signed-off-by: John Crispin arch/arm/mach-qcom/Kconfig | 5 +++++ 2 files changed, 6 insertions(+) -Index: linux-4.14.54/arch/arm/Makefile -=================================================================== ---- linux-4.14.54.orig/arch/arm/Makefile -+++ linux-4.14.54/arch/arm/Makefile +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile @@ -150,6 +150,7 @@ endif textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000 textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 @@ -24,10 +22,8 @@ Index: linux-4.14.54/arch/arm/Makefile # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -Index: linux-4.14.54/arch/arm/mach-qcom/Kconfig -=================================================================== ---- linux-4.14.54.orig/arch/arm/mach-qcom/Kconfig -+++ linux-4.14.54/arch/arm/mach-qcom/Kconfig +--- a/arch/arm/mach-qcom/Kconfig ++++ b/arch/arm/mach-qcom/Kconfig @@ -27,4 +27,9 @@ config ARCH_MDM9615 bool "Enable support for MDM9615" select CLKSRC_QCOM diff --git a/target/linux/ipq40xx/patches-4.14/075-dt-bindings-phy-qcom-ipq4019-usb-add-binding-documen.patch b/target/linux/ipq40xx/patches-4.14/075-dt-bindings-phy-qcom-ipq4019-usb-add-binding-documen.patch index 6710caf657..e7407bcbab 100644 --- a/target/linux/ipq40xx/patches-4.14/075-dt-bindings-phy-qcom-ipq4019-usb-add-binding-documen.patch +++ b/target/linux/ipq40xx/patches-4.14/075-dt-bindings-phy-qcom-ipq4019-usb-add-binding-documen.patch @@ -12,9 +12,6 @@ Signed-off-by: John Crispin 1 file changed, 21 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/phy-qcom-ipq4019-usb.txt -diff --git a/Documentation/devicetree/bindings/phy/phy-qcom-ipq4019-usb.txt b/Documentation/devicetree/bindings/phy/phy-qcom-ipq4019-usb.txt -new file mode 100644 -index 000000000000..362877fcafed --- /dev/null +++ b/Documentation/devicetree/bindings/phy/phy-qcom-ipq4019-usb.txt @@ -0,0 +1,21 @@ @@ -39,6 +36,3 @@ index 000000000000..362877fcafed + <&gcc USB2_HSPHY_S_ARES>; + reset-names = "por_rst", "srif_rst"; +}; --- -2.11.0 - diff --git a/target/linux/ipq40xx/patches-4.14/076-phy-qcom-ipq4019-usb-add-driver-for-QCOM-IPQ4019.patch b/target/linux/ipq40xx/patches-4.14/076-phy-qcom-ipq4019-usb-add-driver-for-QCOM-IPQ4019.patch index 4cab66b677..f93c80f52e 100644 --- a/target/linux/ipq40xx/patches-4.14/076-phy-qcom-ipq4019-usb-add-driver-for-QCOM-IPQ4019.patch +++ b/target/linux/ipq40xx/patches-4.14/076-phy-qcom-ipq4019-usb-add-driver-for-QCOM-IPQ4019.patch @@ -15,10 +15,8 @@ Signed-off-by: John Crispin 3 files changed, 196 insertions(+) create mode 100644 drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c -Index: linux-4.14.54/drivers/phy/qualcomm/Kconfig -=================================================================== ---- linux-4.14.54.orig/drivers/phy/qualcomm/Kconfig -+++ linux-4.14.54/drivers/phy/qualcomm/Kconfig +--- a/drivers/phy/qualcomm/Kconfig ++++ b/drivers/phy/qualcomm/Kconfig @@ -8,6 +8,13 @@ config PHY_QCOM_APQ8064_SATA depends on OF select GENERIC_PHY @@ -33,10 +31,8 @@ Index: linux-4.14.54/drivers/phy/qualcomm/Kconfig config PHY_QCOM_IPQ806X_SATA tristate "Qualcomm IPQ806x SATA SerDes/PHY driver" depends on ARCH_QCOM -Index: linux-4.14.54/drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c -=================================================================== --- /dev/null -+++ linux-4.14.54/drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c ++++ b/drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c @@ -0,0 +1,188 @@ +/* + * Copyright (C) 2018 John Crispin @@ -226,10 +222,8 @@ Index: linux-4.14.54/drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c +MODULE_DESCRIPTION("QCOM/IPQ4019 USB phy driver"); +MODULE_AUTHOR("John Crispin "); +MODULE_LICENSE("GPL v2"); -Index: linux-4.14.54/drivers/phy/qualcomm/Makefile -=================================================================== ---- linux-4.14.54.orig/drivers/phy/qualcomm/Makefile -+++ linux-4.14.54/drivers/phy/qualcomm/Makefile +--- a/drivers/phy/qualcomm/Makefile ++++ b/drivers/phy/qualcomm/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o diff --git a/target/linux/ipq40xx/patches-4.14/077-qcom-ipq4019-add-USB-devicetree-nodes.patch b/target/linux/ipq40xx/patches-4.14/077-qcom-ipq4019-add-USB-devicetree-nodes.patch index 7cc7d9d5f4..94156dce21 100644 --- a/target/linux/ipq40xx/patches-4.14/077-qcom-ipq4019-add-USB-devicetree-nodes.patch +++ b/target/linux/ipq40xx/patches-4.14/077-qcom-ipq4019-add-USB-devicetree-nodes.patch @@ -11,11 +11,9 @@ Signed-off-by: John Crispin arch/arm/boot/dts/qcom-ipq4019.dtsi | 74 +++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi -index 418f9a022336..2ee5f05d5a43 100644 --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi -@@ -109,5 +109,25 @@ +@@ -101,5 +101,25 @@ wifi@a800000 { status = "ok"; }; @@ -41,11 +39,9 @@ index 418f9a022336..2ee5f05d5a43 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi -index e5e52adbd5a3..e6b12129f0e4 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -553,5 +553,79 @@ +@@ -410,5 +410,79 @@ "legacy"; status = "disabled"; }; @@ -125,6 +121,3 @@ index e5e52adbd5a3..e6b12129f0e4 100644 + }; }; }; --- -2.11.0 - diff --git a/target/linux/ipq40xx/patches-4.14/078-ARM-dts-ipq4019-Add-a-few-peripheral-nodes.patch b/target/linux/ipq40xx/patches-4.14/078-ARM-dts-ipq4019-Add-a-few-peripheral-nodes.patch index 6f522ffcad..b761073c12 100644 --- a/target/linux/ipq40xx/patches-4.14/078-ARM-dts-ipq4019-Add-a-few-peripheral-nodes.patch +++ b/target/linux/ipq40xx/patches-4.14/078-ARM-dts-ipq4019-Add-a-few-peripheral-nodes.patch @@ -15,11 +15,9 @@ Signed-off-by: Andy Gross arch/arm/boot/dts/qcom-ipq4019.dtsi | 156 ++++++++++++++++++++++++-- 2 files changed, 146 insertions(+), 12 deletions(-) -diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi -index ef8d8c88ed7b..418f9a022336 100644 --- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi -@@ -69,7 +69,7 @@ +@@ -61,7 +61,7 @@ status = "ok"; }; @@ -28,12 +26,10 @@ index ef8d8c88ed7b..418f9a022336 100644 pinctrl-0 = <&spi_0_pins>; pinctrl-names = "default"; status = "ok"; -diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi -index 2efc8a2d41a7..737097e9fb4f 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -40,8 +40,10 @@ - }; +@@ -24,8 +24,10 @@ + interrupt-parent = <&intc>; aliases { - spi0 = &spi_0; @@ -45,7 +41,7 @@ index 2efc8a2d41a7..737097e9fb4f 100644 }; cpus { -@@ -120,6 +122,12 @@ +@@ -132,6 +134,12 @@ }; }; @@ -58,7 +54,7 @@ index 2efc8a2d41a7..737097e9fb4f 100644 timer { compatible = "arm,armv7-timer"; interrupts = <1 2 0xf08>, -@@ -165,13 +173,13 @@ +@@ -177,13 +185,13 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; @@ -74,7 +70,7 @@ index 2efc8a2d41a7..737097e9fb4f 100644 clocks = <&gcc GCC_BLSP1_AHB_CLK>; clock-names = "bam_clk"; #dma-cells = <1>; -@@ -179,7 +187,7 @@ +@@ -191,7 +199,7 @@ status = "disabled"; }; @@ -83,7 +79,7 @@ index 2efc8a2d41a7..737097e9fb4f 100644 compatible = "qcom,spi-qup-v2.2.1"; reg = <0x78b5000 0x600>; interrupts = ; -@@ -188,10 +196,26 @@ +@@ -200,10 +208,26 @@ clock-names = "core", "iface"; #address-cells = <1>; #size-cells = <0>; @@ -111,7 +107,7 @@ index 2efc8a2d41a7..737097e9fb4f 100644 compatible = "qcom,i2c-qup-v2.2.1"; reg = <0x78b7000 0x600>; interrupts = ; -@@ -200,14 +224,29 @@ +@@ -212,14 +236,29 @@ clock-names = "iface", "core"; #address-cells = <1>; #size-cells = <0>; @@ -142,8 +138,8 @@ index 2efc8a2d41a7..737097e9fb4f 100644 clocks = <&gcc GCC_CRYPTO_AHB_CLK>; clock-names = "bam_clk"; #dma-cells = <1>; -@@ -275,7 +314,7 @@ - blsp1_uart1: serial@78af000 { +@@ -293,7 +332,7 @@ + serial@78af000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x78af000 0x200>; - interrupts = <0 107 0>; @@ -151,7 +147,7 @@ index 2efc8a2d41a7..737097e9fb4f 100644 status = "disabled"; clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; -@@ -287,7 +326,7 @@ +@@ -305,7 +344,7 @@ serial@78b0000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x78b0000 0x200>; @@ -160,7 +156,7 @@ index 2efc8a2d41a7..737097e9fb4f 100644 status = "disabled"; clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; -@@ -309,6 +348,101 @@ +@@ -327,6 +366,101 @@ reg = <0x4ab000 0x4>; }; @@ -262,7 +258,7 @@ index 2efc8a2d41a7..737097e9fb4f 100644 wifi0: wifi@a000000 { compatible = "qcom,ipq4019-wifi"; reg = <0xa000000 0x200000>; -@@ -342,7 +476,7 @@ +@@ -360,7 +494,7 @@ , , , @@ -271,7 +267,7 @@ index 2efc8a2d41a7..737097e9fb4f 100644 interrupt-names = "msi0", "msi1", "msi2", "msi3", "msi4", "msi5", "msi6", "msi7", "msi8", "msi9", "msi10", "msi11", -@@ -384,7 +518,7 @@ +@@ -402,7 +536,7 @@ , , , @@ -280,6 +276,3 @@ index 2efc8a2d41a7..737097e9fb4f 100644 interrupt-names = "msi0", "msi1", "msi2", "msi3", "msi4", "msi5", "msi6", "msi7", "msi8", "msi9", "msi10", "msi11", --- -2.11.0 - diff --git a/target/linux/ipq40xx/patches-4.14/079-ARM-dts-ipq4019-fix-PCI-range.patch b/target/linux/ipq40xx/patches-4.14/079-ARM-dts-ipq4019-fix-PCI-range.patch index eaccb00bb0..253e91480f 100644 --- a/target/linux/ipq40xx/patches-4.14/079-ARM-dts-ipq4019-fix-PCI-range.patch +++ b/target/linux/ipq40xx/patches-4.14/079-ARM-dts-ipq4019-fix-PCI-range.patch @@ -12,12 +12,12 @@ Signed-off-by: Mathias Kresin --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -359,7 +359,7 @@ +@@ -381,7 +381,7 @@ #size-cells = <2>; ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000 - 0x82000000 0 0x48000000 0x48000000 0 0x10000000>; + 0x82000000 0 0x40300000 0x40300000 0 0x400000>; - interrupts = ; + interrupts = ; interrupt-names = "msi"; diff --git a/target/linux/ipq40xx/patches-4.14/080-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch b/target/linux/ipq40xx/patches-4.14/080-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch index 57ed940fd1..f76dd18187 100644 --- a/target/linux/ipq40xx/patches-4.14/080-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch +++ b/target/linux/ipq40xx/patches-4.14/080-pinctrl-msm-fix-gpio-hog-related-boot-issues.patch @@ -61,7 +61,7 @@ Origin: other, https://patchwork.kernel.org/patch/10339127/ --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -166,6 +166,7 @@ +@@ -182,6 +182,7 @@ compatible = "qcom,ipq4019-pinctrl"; reg = <0x01000000 0x300000>; gpio-controller; diff --git a/target/linux/ipq40xx/patches-4.14/081-clk-fix-apss-cpu-overclocking.patch b/target/linux/ipq40xx/patches-4.14/081-clk-fix-apss-cpu-overclocking.patch index dcf17874b3..d71fbbbda2 100644 --- a/target/linux/ipq40xx/patches-4.14/081-clk-fix-apss-cpu-overclocking.patch +++ b/target/linux/ipq40xx/patches-4.14/081-clk-fix-apss-cpu-overclocking.patch @@ -42,11 +42,9 @@ Signed-off-by: John Crispin drivers/clk/qcom/gcc-ipq4019.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) -diff --git a/drivers/clk/qcom/gcc-ipq4019.c b/drivers/clk/qcom/gcc-ipq4019.c -index 46cb256b4aa2..4ec43f7d2e52 100644 --- a/drivers/clk/qcom/gcc-ipq4019.c +++ b/drivers/clk/qcom/gcc-ipq4019.c -@@ -1253,6 +1253,29 @@ static const struct clk_fepll_vco gcc_fepll_vco = { +@@ -1253,6 +1253,29 @@ static const struct clk_fepll_vco gcc_fe .reg = 0x2f020, }; @@ -76,7 +74,7 @@ index 46cb256b4aa2..4ec43f7d2e52 100644 /* * Round rate function for APSS CPU PLL Clock divider. * It looks up the frequency table and returns the next higher frequency -@@ -1265,7 +1288,7 @@ static long clk_cpu_div_round_rate(struct clk_hw *hw, unsigned long rate, +@@ -1265,7 +1288,7 @@ static long clk_cpu_div_round_rate(struc struct clk_hw *p_hw; const struct freq_tbl *f; @@ -85,7 +83,7 @@ index 46cb256b4aa2..4ec43f7d2e52 100644 if (!f) return -EINVAL; -@@ -1288,7 +1311,7 @@ static int clk_cpu_div_set_rate(struct clk_hw *hw, unsigned long rate, +@@ -1288,7 +1311,7 @@ static int clk_cpu_div_set_rate(struct c u32 mask; int ret; @@ -102,7 +100,7 @@ index 46cb256b4aa2..4ec43f7d2e52 100644 struct clk_fepll *pll = to_clk_fepll(hw); u32 cdiv, pre_div; u64 rate; -@@ -1335,7 +1359,11 @@ clk_cpu_div_recalc_rate(struct clk_hw *hw, +@@ -1335,7 +1359,11 @@ clk_cpu_div_recalc_rate(struct clk_hw *h rate = clk_fepll_vco_calc_rate(pll, parent_rate) * 2; do_div(rate, pre_div); @@ -115,6 +113,3 @@ index 46cb256b4aa2..4ec43f7d2e52 100644 }; static const struct clk_ops clk_regmap_cpu_div_ops = { --- -2.11.0 - diff --git a/target/linux/ipq40xx/patches-4.14/082-ARM-dts-ipq4019-Add-TZ-and-SMEM-reserved-regions.patch b/target/linux/ipq40xx/patches-4.14/082-ARM-dts-ipq4019-Add-TZ-and-SMEM-reserved-regions.patch index 56ae66b089..6a595d5ef6 100644 --- a/target/linux/ipq40xx/patches-4.14/082-ARM-dts-ipq4019-Add-TZ-and-SMEM-reserved-regions.patch +++ b/target/linux/ipq40xx/patches-4.14/082-ARM-dts-ipq4019-Add-TZ-and-SMEM-reserved-regions.patch @@ -84,5 +84,5 @@ this change qualifies for a stable@vger.kernel.org submission. + }; + aliases { - spi0 = &spi_0; - spi1 = &spi_1; + spi0 = &blsp1_spi1; + spi1 = &blsp1_spi2; diff --git a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch index 4ee79515c9..6a83d79d8c 100644 --- a/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch +++ b/target/linux/ipq40xx/patches-4.14/400-mtd-ubi-add-quirk-to-autoload-ubi-on-rt-ac58u.patch @@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1184,6 +1184,9 @@ static void __init ubi_auto_attach(void) +@@ -1187,6 +1187,9 @@ static void __init ubi_auto_attach(void) mtd = open_mtd_device("ubi"); if (IS_ERR(mtd)) mtd = open_mtd_device("data"); @@ -25,5 +25,5 @@ Signed-off-by: Christian Lamparter + if (IS_ERR(mtd)) + mtd = open_mtd_device("UBI_DEV"); - if (!IS_ERR(mtd)) { - size_t len; + if (IS_ERR(mtd)) + return; diff --git a/target/linux/ipq40xx/patches-4.14/701-dts-ipq4019-add-mdio-node.patch b/target/linux/ipq40xx/patches-4.14/701-dts-ipq4019-add-mdio-node.patch index 25f596eaff..5c2e19941b 100644 --- a/target/linux/ipq40xx/patches-4.14/701-dts-ipq4019-add-mdio-node.patch +++ b/target/linux/ipq40xx/patches-4.14/701-dts-ipq4019-add-mdio-node.patch @@ -15,7 +15,7 @@ so the info might change. --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -540,6 +540,34 @@ +@@ -562,6 +562,34 @@ status = "disabled"; }; @@ -48,5 +48,5 @@ so the info might change. + }; + usb3_ss_phy: ssphy@9a000 { - compatible = "qca,uni-ssphy"; - reg = <0x9a000 0x800>; + compatible = "qcom,usb-ss-ipq4019-phy"; + #phy-cells = <0>; diff --git a/target/linux/ipq40xx/patches-4.14/702-dts-ipq4019-add-PHY-switch-nodes.patch b/target/linux/ipq40xx/patches-4.14/702-dts-ipq4019-add-PHY-switch-nodes.patch index eb3d9be013..2b7921a616 100644 --- a/target/linux/ipq40xx/patches-4.14/702-dts-ipq4019-add-PHY-switch-nodes.patch +++ b/target/linux/ipq40xx/patches-4.14/702-dts-ipq4019-add-PHY-switch-nodes.patch @@ -14,7 +14,7 @@ Signed-off-by: Christian Lamparter --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -568,6 +568,29 @@ +@@ -590,6 +590,29 @@ }; }; @@ -42,5 +42,5 @@ Signed-off-by: Christian Lamparter + }; + usb3_ss_phy: ssphy@9a000 { - compatible = "qca,uni-ssphy"; - reg = <0x9a000 0x800>; + compatible = "qcom,usb-ss-ipq4019-phy"; + #phy-cells = <0>; diff --git a/target/linux/ipq40xx/patches-4.14/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-4.14/711-dts-ipq4019-add-ethernet-essedma-node.patch index 6e4137073a..db545e6906 100644 --- a/target/linux/ipq40xx/patches-4.14/711-dts-ipq4019-add-ethernet-essedma-node.patch +++ b/target/linux/ipq40xx/patches-4.14/711-dts-ipq4019-add-ethernet-essedma-node.patch @@ -14,10 +14,8 @@ Signed-off-by: Christian Lamparter arch/arm/boot/dts/qcom-ipq4019.dtsi | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) -Index: linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019.dtsi -=================================================================== ---- linux-4.14.54.orig/arch/arm/boot/dts/qcom-ipq4019.dtsi -+++ linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019.dtsi +--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi ++++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi @@ -44,6 +44,8 @@ spi1 = &blsp1_spi2; i2c0 = &blsp1_i2c3; @@ -27,7 +25,7 @@ Index: linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019.dtsi }; cpus { -@@ -606,6 +608,64 @@ +@@ -613,6 +615,64 @@ status = "disabled"; }; diff --git a/target/linux/ipq40xx/patches-4.14/900-dts-ipq4019-ap-dk01.1.patch b/target/linux/ipq40xx/patches-4.14/900-dts-ipq4019-ap-dk01.1.patch index b24d85ba13..25652bb2c9 100644 --- a/target/linux/ipq40xx/patches-4.14/900-dts-ipq4019-ap-dk01.1.patch +++ b/target/linux/ipq40xx/patches-4.14/900-dts-ipq4019-ap-dk01.1.patch @@ -1,7 +1,5 @@ -Index: linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi -=================================================================== ---- linux-4.14.54.orig/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi -+++ linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi +--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi ++++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi @@ -15,12 +15,39 @@ */ @@ -80,10 +78,8 @@ Index: linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi usb3_ss_phy: ssphy@9a000 { status = "ok"; }; -Index: linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts -=================================================================== ---- linux-4.14.54.orig/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts -+++ linux-4.14.54/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts +--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts ++++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts @@ -18,5 +18,73 @@ / { -- cgit v1.2.3