diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-04-02 16:01:58 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-04-03 23:26:45 +0200 |
commit | a74fd570a23f2226afcf63f92f22bcb9df37beee (patch) | |
tree | f0452055d7b540e7424a5c3f70ad2e44ffb6c641 /target/linux/lantiq | |
parent | 9aaa23ec8baa50b63d33466f3f353e43c473952a (diff) | |
download | upstream-a74fd570a23f2226afcf63f92f22bcb9df37beee.tar.gz upstream-a74fd570a23f2226afcf63f92f22bcb9df37beee.tar.bz2 upstream-a74fd570a23f2226afcf63f92f22bcb9df37beee.zip |
kernel: update kernel 4.14 to 4.14.32
The following patches are now included upstream:
* 0052-MIPS-lantiq-fix-usb-clocks.patch
* 0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch
* 0060-lantiq-ase-enable-MFD-SYSCON.patch
Closes: FS#1466
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Tested-by: Stijn Segers <foss@volatilesystems.org>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/lantiq')
4 files changed, 2 insertions, 88 deletions
diff --git a/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch index ecabe81e5d..77351e1791 100644 --- a/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch @@ -41,7 +41,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig -@@ -18,6 +18,7 @@ config SOC_XWAY +@@ -20,6 +20,7 @@ config SOC_XWAY bool "XWAY" select SOC_TYPE_XWAY select HW_HAS_PCI @@ -49,7 +49,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> select MFD_SYSCON select MFD_CORE -@@ -50,6 +51,15 @@ config PCI_LANTIQ +@@ -52,6 +53,15 @@ config PCI_LANTIQ bool "PCI Support" depends on SOC_XWAY && PCI diff --git a/target/linux/lantiq/patches-4.14/0052-MIPS-lantiq-fix-usb-clocks.patch b/target/linux/lantiq/patches-4.14/0052-MIPS-lantiq-fix-usb-clocks.patch deleted file mode 100644 index aa3069ed9d..0000000000 --- a/target/linux/lantiq/patches-4.14/0052-MIPS-lantiq-fix-usb-clocks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 11e84fdfad0331555ca889c4ac6a9d5f37ae83df Mon Sep 17 00:00:00 2001 -From: Mathias Kresin <dev@kresin.me> -Date: Sat, 20 Jan 2018 14:38:40 +0100 -Subject: [PATCH] MIPS: lantiq: fix danube usb clock - -On danube the USB0 registers are at 1e101000 similar to all other lantiq -SoCs. - -Fixes: dea54fbad332 ("phy: Add an USB PHY driver for the Lantiq SoCs using the RCU module") -Signed-off-by: Mathias Kresin <dev@kresin.me> ---- - arch/mips/lantiq/xway/sysctrl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/mips/lantiq/xway/sysctrl.c -+++ b/arch/mips/lantiq/xway/sysctrl.c -@@ -581,7 +581,7 @@ void __init ltq_soc_init(void) - } else { - clkdev_add_static(ltq_danube_cpu_hz(), ltq_danube_fpi_hz(), - ltq_danube_fpi_hz(), ltq_danube_pp32_hz()); -- clkdev_add_pmu("1f203018.usb2-phy", "ctrl", 1, 0, PMU_USB0); -+ clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0); - clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P); - clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO); - clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU); diff --git a/target/linux/lantiq/patches-4.14/0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch b/target/linux/lantiq/patches-4.14/0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch deleted file mode 100644 index 314ec3d8fd..0000000000 --- a/target/linux/lantiq/patches-4.14/0053-MIPS-lantiq-enable-AHB-Bus-for-USB.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2f57c45efb9acb5eea2d8af211ab87b3ccfbf584 Mon Sep 17 00:00:00 2001 -From: Mathias Kresin <dev@kresin.me> -Date: Sat, 20 Jan 2018 14:38:40 +0100 -Subject: [PATCH] MIPS: lantiq: enable AHB Bus for USB - -On Danube and AR9 the USB core is connected to the AHB bus, hence we need -to enable the AHB Bus as well. - -Fixes: dea54fbad332 ("phy: Add an USB PHY driver for the Lantiq SoCs using the RCU module") -Signed-off-by: Mathias Kresin <dev@kresin.me> ---- - arch/mips/lantiq/xway/sysctrl.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/arch/mips/lantiq/xway/sysctrl.c -+++ b/arch/mips/lantiq/xway/sysctrl.c -@@ -570,9 +570,9 @@ void __init ltq_soc_init(void) - clkdev_add_static(ltq_ar9_cpu_hz(), ltq_ar9_fpi_hz(), - ltq_ar9_fpi_hz(), CLOCK_250M); - clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P); -- clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0); -+ clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM); - clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 0, PMU_USB1_P); -- clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1); -+ clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1 | PMU_AHBM); - clkdev_add_pmu("1e180000.etop", "switch", 1, 0, PMU_SWITCH); - clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO); - clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU); -@@ -581,7 +581,7 @@ void __init ltq_soc_init(void) - } else { - clkdev_add_static(ltq_danube_cpu_hz(), ltq_danube_fpi_hz(), - ltq_danube_fpi_hz(), ltq_danube_pp32_hz()); -- clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0); -+ clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM); - clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P); - clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO); - clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU); diff --git a/target/linux/lantiq/patches-4.14/0060-lantiq-ase-enable-MFD-SYSCON.patch b/target/linux/lantiq/patches-4.14/0060-lantiq-ase-enable-MFD-SYSCON.patch deleted file mode 100644 index a74f551898..0000000000 --- a/target/linux/lantiq/patches-4.14/0060-lantiq-ase-enable-MFD-SYSCON.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 24af63c6cce57cf88eda7c863035208fba59ee1c Mon Sep 17 00:00:00 2001 -From: Mathias Kresin <dev@kresin.me> -Date: Tue, 23 Jan 2018 22:14:28 +0100 -Subject: [PATCH] MIPS: lantiq: ase: Enable MFD_SYSCON - -Enable syscon to use it for the RCU MFD on Amazon SE as well. - -Fixes: 2b6639d4c794 ("MIPS: lantiq: Enable MFD_SYSCON to be able to use it for the RCU MFD") -Signed-off-by: Mathias Kresin <dev@kresin.me> ---- - arch/mips/lantiq/Kconfig | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/arch/mips/lantiq/Kconfig -+++ b/arch/mips/lantiq/Kconfig -@@ -13,6 +13,8 @@ choice - config SOC_AMAZON_SE - bool "Amazon SE" - select SOC_TYPE_XWAY -+ select MFD_SYSCON -+ select MFD_CORE - - config SOC_XWAY - bool "XWAY" |