| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071 |
- From d0ee51bbb7ce9880749a3d4794ec1fbbcda0f381 Mon Sep 17 00:00:00 2001
- From: Mathias Kresin <[email protected]>
- Date: Sun, 7 Jul 2019 21:45:51 +0200
- Subject: [PATCH] MIPS: lantiq revert DSA switch driver PMU/clock changes
- Switch back to the former used names, to make the legacy switch driver
- happy.
- Signed-off-by: Mathias Kresin <[email protected]>
- ---
- 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);
- - clkdev_add_pmu("1e10b308.eth", NULL, 0, 0, PMU_SWITCH | PMU_PPE_DP);
- + clkdev_add_pmu("1e108000.eth", NULL, 0, 0, PMU_SWITCH | PMU_PPE_DP);
- 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")) {
- @@ -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);
- - clkdev_add_pmu("1e10b308.eth", NULL, 0, 0, PMU_SWITCH |
- + 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("1e103100.deu", NULL, 1, 0, PMU_DEU);
- @@ -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);
- - clkdev_add_pmu("1e10b308.eth", NULL, 0, 0,
- + clkdev_add_pmu("1e108000.eth", NULL, 0, 0,
- 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.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);
- clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
- clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
|
