Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d87159e authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl 



Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent deba1a0d

arch/arm/mach-at91/at91cap9.c

+2 −2
Original line number Diff line number Diff line
@@ -223,8 +223,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
Original line number Diff line number Diff line
@@ -217,11 +217,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
Original line number Diff line number Diff line
@@ -191,8 +191,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),