aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-07-09 17:22:35 -0400
committerPetr Štetiar <ynezz@true.cz>2020-07-11 13:33:28 +0200
commit039fd27173236d22736feb0773da5f728f759c79 (patch)
tree01946c84ffc29dd547f59885c05c475d9ebd8fe4 /target/linux/lantiq/patches-5.4
parentf93267bccff672e59ec0d0cf262e6574b00cc3e0 (diff)
downloadupstream-039fd27173236d22736feb0773da5f728f759c79.tar.gz
upstream-039fd27173236d22736feb0773da5f728f759c79.tar.bz2
upstream-039fd27173236d22736feb0773da5f728f759c79.zip
kernel: bump 5.4 to 5.4.51
update via update_kernel.sh -v -u 5.4 Removed upstreamed patches: 350-MIPS-Add-missing-EHB-in-mtc0-mfc0-sequence-for-DSPen.patch Script refreshed patches: 902-debloat_proc.patch 904-debloat_dma_buf.patch Attempted merge conflict in following patches: 0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch Build system: x86_64 Build tested: ipq806x (Netgear R7800) Signed-off-by: John Audia <graysky@archlinux.us> [fixed sha256sum of the tarball] Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/lantiq/patches-5.4')
-rw-r--r--target/linux/lantiq/patches-5.4/0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/lantiq/patches-5.4/0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch b/target/linux/lantiq/patches-5.4/0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch
index a364d6d67b..9b326c50d1 100644
--- a/target/linux/lantiq/patches-5.4/0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch
+++ b/target/linux/lantiq/patches-5.4/0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch
@@ -30,8 +30,8 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
+ clkdev_add_pmu("1e108000.eth", NULL, 0, 0, PMU_SWITCH |
PMU_PPE_DP | PMU_PPE_TC);
clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);
-- clkdev_add_pmu("1e108000.gswip", "gphy0", 0, 0, PMU_GPHY);
-- clkdev_add_pmu("1e108000.gswip", "gphy1", 0, 0, PMU_GPHY);
+- clkdev_add_pmu("1e108000.switch", "gphy0", 0, 0, PMU_GPHY);
+- clkdev_add_pmu("1e108000.switch", "gphy1", 0, 0, PMU_GPHY);
+ clkdev_add_pmu("1f203020.gphy", NULL, 1, 0, PMU_GPHY);
+ clkdev_add_pmu("1f203068.gphy", NULL, 1, 0, PMU_GPHY);
clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
@@ -46,8 +46,8 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
PMU_SWITCH | PMU_PPE_DPLUS | PMU_PPE_DPLUM |
PMU_PPE_EMA | PMU_PPE_TC | PMU_PPE_SLL01 |
PMU_PPE_QSB | PMU_PPE_TOP);
-- clkdev_add_pmu("1e108000.gswip", "gphy0", 0, 0, PMU_GPHY);
-- clkdev_add_pmu("1e108000.gswip", "gphy1", 0, 0, PMU_GPHY);
+- clkdev_add_pmu("1e108000.switch", "gphy0", 0, 0, PMU_GPHY);
+- clkdev_add_pmu("1e108000.switch", "gphy1", 0, 0, PMU_GPHY);
+ clkdev_add_pmu("1f203020.gphy", NULL, 0, 0, PMU_GPHY);
+ clkdev_add_pmu("1f203068.gphy", NULL, 0, 0, PMU_GPHY);
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);