X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fpatches-5.10%2F0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch;fp=target%2Flinux%2Flantiq%2Fpatches-5.10%2F0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch;h=4265eeca577d07c2ecdc0dcacda9022bd8414b0c;hb=0806f8fc80e602b88ac80a334dccf07e1334d416;hp=9b326c50d1f8e0c210733231a4497eafc6e44838;hpb=e44e454ee65bb0631fbea64ea1e30b40735ed97b;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/lantiq/patches-5.10/0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch b/target/linux/lantiq/patches-5.10/0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch
index 9b326c50d1..4265eeca57 100644
--- a/target/linux/lantiq/patches-5.10/0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch
+++ b/target/linux/lantiq/patches-5.10/0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch
@@ -8,12 +8,34 @@ happy.
 
 Signed-off-by: Mathias Kresin <dev@kresin.me>
 ---
- arch/mips/lantiq/xway/sysctrl.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ arch/mips/lantiq/xway/sysctrl.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 --- a/arch/mips/lantiq/xway/sysctrl.c
 +++ b/arch/mips/lantiq/xway/sysctrl.c
+@@ -469,9 +469,9 @@ void __init ltq_soc_init(void)
+ 
+ 	if (of_machine_is_compatible("lantiq,grx390") ||
+ 	    of_machine_is_compatible("lantiq,ar10")) {
+-		clkdev_add_pmu("1e108000.switch", "gphy0", 0, 0, PMU_GPHY0);
+-		clkdev_add_pmu("1e108000.switch", "gphy1", 0, 0, PMU_GPHY1);
+-		clkdev_add_pmu("1e108000.switch", "gphy2", 0, 0, PMU_GPHY2);
++		clkdev_add_pmu("1f203020.gphy", NULL, 1, 0, PMU_GPHY0);
++		clkdev_add_pmu("1f203068.gphy", NULL, 1, 0, PMU_GPHY1);
++		clkdev_add_pmu("1f2030ac.gphy", NULL, 1, 0, PMU_GPHY2);
+ 		clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 2, PMU_ANALOG_USB0_P);
+ 		clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 2, PMU_ANALOG_USB1_P);
+ 		/* rc 0 */
 @@ -503,7 +503,7 @@ void __init ltq_soc_init(void)
+ 	} else if (of_machine_is_compatible("lantiq,grx390")) {
+ 		clkdev_add_static(ltq_grx390_cpu_hz(), ltq_grx390_fpi_hz(),
+ 				  ltq_grx390_fpi_hz(), ltq_grx390_pp32_hz());
+-		clkdev_add_pmu("1e108000.switch", "gphy3", 0, 0, PMU_GPHY3);
++		clkdev_add_pmu("1f203264.gphy", NULL, 1, 0, PMU_GPHY3);
+ 		clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
+ 		clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1);
+ 		/* rc 2 */
+@@ -511,7 +511,7 @@ void __init ltq_soc_init(void)
  		clkdev_add_pmu("1a800000.pcie", "msi", 1, 1, PMU1_PCIE2_MSI);
  		clkdev_add_pmu("1f106a00.pcie", "pdi", 1, 1, PMU1_PCIE2_PDI);
  		clkdev_add_pmu("1a800000.pcie", "ctl", 1, 1, PMU1_PCIE2_CTL);
@@ -22,7 +44,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
  		clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);
  		clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
  	} else if (of_machine_is_compatible("lantiq,ar10")) {
-@@ -511,11 +511,11 @@ void __init ltq_soc_init(void)
+@@ -519,7 +519,7 @@ void __init ltq_soc_init(void)
  				  ltq_ar10_fpi_hz(), ltq_ar10_pp32_hz());
  		clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
  		clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1);
@@ -30,14 +52,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.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);
- 		clkdev_add_pmu("1e116000.mei", "afe", 1, 2, PMU_ANALOG_DSL_AFE);
- 		clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
-@@ -534,12 +534,12 @@ void __init ltq_soc_init(void)
+@@ -540,12 +540,12 @@ void __init ltq_soc_init(void)
  		clkdev_add_pmu(NULL, "ahb", 1, 0, PMU_AHBM | PMU_AHBS);
  
  		clkdev_add_pmu("1da00000.usif", "NULL", 1, 0, PMU_USIF);