@@ -469,8 +469,8 @@ void __init ltq_soc_init(void)
469469
470470 if (of_machine_is_compatible ("lantiq,grx390" ) ||
471471 of_machine_is_compatible ("lantiq,ar10" )) {
472- clkdev_add_pmu ("1e101000.usb " , "phy" , 1 , 2 , PMU_ANALOG_USB0_P );
473- clkdev_add_pmu ("1e106000.usb " , "phy" , 1 , 2 , PMU_ANALOG_USB1_P );
472+ clkdev_add_pmu ("1f203018.usb2-phy " , "phy" , 1 , 2 , PMU_ANALOG_USB0_P );
473+ clkdev_add_pmu ("1f203034.usb2-phy " , "phy" , 1 , 2 , PMU_ANALOG_USB1_P );
474474 /* rc 0 */
475475 clkdev_add_pmu ("1d900000.pcie" , "phy" , 1 , 2 , PMU_ANALOG_PCIE0_P );
476476 clkdev_add_pmu ("1d900000.pcie" , "msi" , 1 , 1 , PMU1_PCIE_MSI );
@@ -490,8 +490,8 @@ void __init ltq_soc_init(void)
490490 else
491491 clkdev_add_static (CLOCK_133M , CLOCK_133M ,
492492 CLOCK_133M , CLOCK_133M );
493- clkdev_add_pmu ("1e101000.usb" , "ctl " , 1 , 0 , PMU_USB0 );
494- clkdev_add_pmu ("1e101000.usb " , "phy" , 1 , 0 , PMU_USB0_P );
493+ clkdev_add_pmu ("1e101000.usb" , "otg " , 1 , 0 , PMU_USB0 );
494+ clkdev_add_pmu ("1f203018.usb2-phy " , "phy" , 1 , 0 , PMU_USB0_P );
495495 clkdev_add_pmu ("1e180000.etop" , "ppe" , 1 , 0 , PMU_PPE );
496496 clkdev_add_cgu ("1e180000.etop" , "ephycgu" , CGU_EPHY );
497497 clkdev_add_pmu ("1e180000.etop" , "ephy" , 1 , 0 , PMU_EPHY );
@@ -500,8 +500,8 @@ void __init ltq_soc_init(void)
500500 } else if (of_machine_is_compatible ("lantiq,grx390" )) {
501501 clkdev_add_static (ltq_grx390_cpu_hz (), ltq_grx390_fpi_hz (),
502502 ltq_grx390_fpi_hz (), ltq_grx390_pp32_hz ());
503- clkdev_add_pmu ("1e101000.usb" , "ctl " , 1 , 0 , PMU_USB0 );
504- clkdev_add_pmu ("1e106000.usb" , "ctl " , 1 , 0 , PMU_USB1 );
503+ clkdev_add_pmu ("1e101000.usb" , "otg " , 1 , 0 , PMU_USB0 );
504+ clkdev_add_pmu ("1e106000.usb" , "otg " , 1 , 0 , PMU_USB1 );
505505 /* rc 2 */
506506 clkdev_add_pmu ("1a800000.pcie" , "phy" , 1 , 2 , PMU_ANALOG_PCIE2_P );
507507 clkdev_add_pmu ("1a800000.pcie" , "msi" , 1 , 1 , PMU1_PCIE2_MSI );
@@ -513,8 +513,8 @@ void __init ltq_soc_init(void)
513513 } else if (of_machine_is_compatible ("lantiq,ar10" )) {
514514 clkdev_add_static (ltq_ar10_cpu_hz (), ltq_ar10_fpi_hz (),
515515 ltq_ar10_fpi_hz (), ltq_ar10_pp32_hz ());
516- clkdev_add_pmu ("1e101000.usb" , "ctl " , 1 , 0 , PMU_USB0 );
517- clkdev_add_pmu ("1e106000.usb" , "ctl " , 1 , 0 , PMU_USB1 );
516+ clkdev_add_pmu ("1e101000.usb" , "otg " , 1 , 0 , PMU_USB0 );
517+ clkdev_add_pmu ("1e106000.usb" , "otg " , 1 , 0 , PMU_USB1 );
518518 clkdev_add_pmu ("1e108000.eth" , NULL , 0 , 0 , PMU_SWITCH |
519519 PMU_PPE_DP | PMU_PPE_TC );
520520 clkdev_add_pmu ("1da00000.usif" , "NULL" , 1 , 0 , PMU_USIF );
@@ -526,10 +526,10 @@ void __init ltq_soc_init(void)
526526 } else if (of_machine_is_compatible ("lantiq,vr9" )) {
527527 clkdev_add_static (ltq_vr9_cpu_hz (), ltq_vr9_fpi_hz (),
528528 ltq_vr9_fpi_hz (), ltq_vr9_pp32_hz ());
529- clkdev_add_pmu ("1e101000.usb " , "phy" , 1 , 0 , PMU_USB0_P );
530- clkdev_add_pmu ("1e101000.usb" , "ctl " , 1 , 0 , PMU_USB0 | PMU_AHBM );
531- clkdev_add_pmu ("1e106000.usb " , "phy" , 1 , 0 , PMU_USB1_P );
532- clkdev_add_pmu ("1e106000.usb" , "ctl " , 1 , 0 , PMU_USB1 | PMU_AHBM );
529+ clkdev_add_pmu ("1f203018.usb2-phy " , "phy" , 1 , 0 , PMU_USB0_P );
530+ clkdev_add_pmu ("1e101000.usb" , "otg " , 1 , 0 , PMU_USB0 | PMU_AHBM );
531+ clkdev_add_pmu ("1f203034.usb2-phy " , "phy" , 1 , 0 , PMU_USB1_P );
532+ clkdev_add_pmu ("1e106000.usb" , "otg " , 1 , 0 , PMU_USB1 | PMU_AHBM );
533533 clkdev_add_pmu ("1d900000.pcie" , "phy" , 1 , 1 , PMU1_PCIE_PHY );
534534 clkdev_add_pmu ("1d900000.pcie" , "bus" , 1 , 0 , PMU_PCIE_CLK );
535535 clkdev_add_pmu ("1d900000.pcie" , "msi" , 1 , 1 , PMU1_PCIE_MSI );
@@ -550,10 +550,10 @@ void __init ltq_soc_init(void)
550550 } else if (of_machine_is_compatible ("lantiq,ar9" )) {
551551 clkdev_add_static (ltq_ar9_cpu_hz (), ltq_ar9_fpi_hz (),
552552 ltq_ar9_fpi_hz (), CLOCK_250M );
553- clkdev_add_pmu ("1e101000.usb " , "ctl " , 1 , 0 , PMU_USB0 );
554- clkdev_add_pmu ("1e101000.usb" , "phy " , 1 , 0 , PMU_USB0_P );
555- clkdev_add_pmu ("1e106000.usb " , "ctl " , 1 , 0 , PMU_USB1 );
556- clkdev_add_pmu ("1e106000.usb" , "phy " , 1 , 0 , PMU_USB1_P );
553+ clkdev_add_pmu ("1f203018.usb2-phy " , "phy " , 1 , 0 , PMU_USB0_P );
554+ clkdev_add_pmu ("1e101000.usb" , "otg " , 1 , 0 , PMU_USB0 );
555+ clkdev_add_pmu ("1f203034.usb2-phy " , "phy " , 1 , 0 , PMU_USB1_P );
556+ clkdev_add_pmu ("1e106000.usb" , "otg " , 1 , 0 , PMU_USB1 );
557557 clkdev_add_pmu ("1e180000.etop" , "switch" , 1 , 0 , PMU_SWITCH );
558558 clkdev_add_pmu ("1e103000.sdio" , NULL , 1 , 0 , PMU_SDIO );
559559 clkdev_add_pmu ("1e103100.deu" , NULL , 1 , 0 , PMU_DEU );
@@ -562,8 +562,8 @@ void __init ltq_soc_init(void)
562562 } else {
563563 clkdev_add_static (ltq_danube_cpu_hz (), ltq_danube_fpi_hz (),
564564 ltq_danube_fpi_hz (), ltq_danube_pp32_hz ());
565- clkdev_add_pmu ("1e101000.usb " , "ctl " , 1 , 0 , PMU_USB0 );
566- clkdev_add_pmu ("1e101000.usb " , "phy" , 1 , 0 , PMU_USB0_P );
565+ clkdev_add_pmu ("1f203018.usb2-phy " , "ctrl " , 1 , 0 , PMU_USB0 );
566+ clkdev_add_pmu ("1f203018.usb2-phy " , "phy" , 1 , 0 , PMU_USB0_P );
567567 clkdev_add_pmu ("1e103000.sdio" , NULL , 1 , 0 , PMU_SDIO );
568568 clkdev_add_pmu ("1e103100.deu" , NULL , 1 , 0 , PMU_DEU );
569569 clkdev_add_pmu ("1e116000.mei" , "dfe" , 1 , 0 , PMU_DFE );
0 commit comments