at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
PATCH 1/1 at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc Nicolas Ferre <[email protected]>
--- arch/arm/mach-at91/at91cap9.c | 4 ++-- arch/arm/mach-at91/at91sam9g45.c | 10 +++++----- arch/arm/mach-at91/at91sam9rl.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/mach-at91/at91cap9.c +2 -2
@@ -219,8 +219,8 @@ static struct clk *periph_clocks[] __initdata = { };static struct clk_lookup periph_clocks_lookups[] = { -CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc.0" , &utmi_clk), -CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc.0" , &udphs_clk), +CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc" , &utmi_clk), +CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc" , &udphs_clk),CLKDEV_CON_DEV_ID ("mci_clk" ,"at91_mci.0" , &mmc0_clk),CLKDEV_CON_DEV_ID ("mci_clk" ,"at91_mci.1" , &mmc1_clk),CLKDEV_CON_DEV_ID ("spi_clk" ,"atmel_spi.0" , &spi0_clk),
arch/arm/mach-at91/at91sam9g45.c +5 -5
@@ -213,11 +213,11 @@ static struct clk *periph_clocks[] __initdata = {static struct clk_lookup periph_clocks_lookups[] = {/* One additional fake clock for ohci */ CLKDEV_CON_ID ("ohci_clk" , &uhphs_clk), -CLKDEV_CON_DEV_ID ("ehci_clk" ,"atmel-ehci.0" , &uhphs_clk), -CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc.0" , &utmi_clk), -CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc.0" , &udphs_clk), -CLKDEV_CON_DEV_ID ("mci_clk" ,"at91_mci.0" , &mmc0_clk), -CLKDEV_CON_DEV_ID ("mci_clk" ,"at91_mci.1" , &mmc1_clk), +CLKDEV_CON_DEV_ID ("ehci_clk" ,"atmel-ehci" , &uhphs_clk), +CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc" , &utmi_clk), +CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc" , &udphs_clk), +CLKDEV_CON_DEV_ID ("mci_clk" ,"atmel_mci.0" , &mmc0_clk), +CLKDEV_CON_DEV_ID ("mci_clk" ,"atmel_mci.1" , &mmc1_clk),CLKDEV_CON_DEV_ID ("spi_clk" ,"atmel_spi.0" , &spi0_clk),CLKDEV_CON_DEV_ID ("spi_clk" ,"atmel_spi.1" , &spi1_clk),CLKDEV_CON_DEV_ID ("t0_clk" ,"atmel_tcb.0" , &tcb0_clk),
arch/arm/mach-at91/at91sam9rl.c +2 -2
@@ -183,8 +183,8 @@ static struct clk *periph_clocks[] __initdata = { };static struct clk_lookup periph_clocks_lookups[] = { -CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc.0" , &utmi_clk), -CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc.0" , &udphs_clk), +CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc" , &utmi_clk), +CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc" , &udphs_clk),CLKDEV_CON_DEV_ID ("t0_clk" ,"atmel_tcb.0" , &tc0_clk),CLKDEV_CON_DEV_ID ("t1_clk" ,"atmel_tcb.0" , &tc1_clk),CLKDEV_CON_DEV_ID ("t2_clk" ,"atmel_tcb.0" , &tc2_clk),
Signature · 1 line
1.7.4.1
PATCH 1/1 at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl
Le 23/06/2011 23:48, Jean-Christophe PLAGNIOL-VILLARD :
Quoted 2 lines
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Nicolas Ferre <[email protected]>
Acked-by Nicolas Ferre <[email protected]>
We absolutely have to queue this one for 3.0-final.
Thanks,
Quoted 57 lines
--- arch/arm/mach-at91/at91cap9.c | 4 ++-- arch/arm/mach-at91/at91sam9g45.c | 10 +++++----- arch/arm/mach-at91/at91sam9rl.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)arch/arm/mach-at91/at91cap9.c +2
-2@@ -219,8 +219,8 @@ static struct clk *periph_clocks[] __initdata = { };static struct clk_lookup periph_clocks_lookups[] = { -CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc.0" , &utmi_clk), -CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc.0" , &udphs_clk), +CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc" , &utmi_clk), +CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc" , &udphs_clk),CLKDEV_CON_DEV_ID ("mci_clk" ,"at91_mci.0" , &mmc0_clk),CLKDEV_CON_DEV_ID ("mci_clk" ,"at91_mci.1" , &mmc1_clk),CLKDEV_CON_DEV_ID ("spi_clk" ,"atmel_spi.0" , &spi0_clk),arch/arm/mach-at91/at91sam9g45.c +5
-5@@ -213,11 +213,11 @@ static struct clk *periph_clocks[] __initdata = {static struct clk_lookup periph_clocks_lookups[] = {/* One additional fake clock for ohci */ CLKDEV_CON_ID ("ohci_clk" , &uhphs_clk), -CLKDEV_CON_DEV_ID ("ehci_clk" ,"atmel-ehci.0" , &uhphs_clk), -CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc.0" , &utmi_clk), -CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc.0" , &udphs_clk), -CLKDEV_CON_DEV_ID ("mci_clk" ,"at91_mci.0" , &mmc0_clk), -CLKDEV_CON_DEV_ID ("mci_clk" ,"at91_mci.1" , &mmc1_clk), +CLKDEV_CON_DEV_ID ("ehci_clk" ,"atmel-ehci" , &uhphs_clk), +CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc" , &utmi_clk), +CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc" , &udphs_clk), +CLKDEV_CON_DEV_ID ("mci_clk" ,"atmel_mci.0" , &mmc0_clk), +CLKDEV_CON_DEV_ID ("mci_clk" ,"atmel_mci.1" , &mmc1_clk),CLKDEV_CON_DEV_ID ("spi_clk" ,"atmel_spi.0" , &spi0_clk),CLKDEV_CON_DEV_ID ("spi_clk" ,"atmel_spi.1" , &spi1_clk),CLKDEV_CON_DEV_ID ("t0_clk" ,"atmel_tcb.0" , &tcb0_clk),arch/arm/mach-at91/at91sam9rl.c +2
-2@@ -183,8 +183,8 @@ static struct clk *periph_clocks[] __initdata = { };static struct clk_lookup periph_clocks_lookups[] = { -CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc.0" , &utmi_clk), -CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc.0" , &udphs_clk), +CLKDEV_CON_DEV_ID ("hclk" ,"atmel_usba_udc" , &utmi_clk), +CLKDEV_CON_DEV_ID ("pclk" ,"atmel_usba_udc" , &udphs_clk),CLKDEV_CON_DEV_ID ("t0_clk" ,"atmel_tcb.0" , &tc0_clk),CLKDEV_CON_DEV_ID ("t1_clk" ,"atmel_tcb.0" , &tc1_clk),CLKDEV_CON_DEV_ID ("t2_clk" ,"atmel_tcb.0" , &tc2_clk),
Signature · 1 line
Nicolas Ferre