ARM: at91: add clocks for I2C DT entries
authorLudovic Desroches <ludovic.desroches@atmel.com>
Wed, 12 Sep 2012 06:42:15 +0000 (08:42 +0200)
committerWolfram Sang <w.sang@pengutronix.de>
Wed, 12 Sep 2012 12:49:15 +0000 (14:49 +0200)
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Nikolaus Voss <n.voss@weinmann.de>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9n12.c
arch/arm/mach-at91/at91sam9x5.c

index 5bd19a442365ec41e93665e6b8cc2d741d63d797..ad29f93f20cab175555cd2a8c2974deff0fe31fd 100644 (file)
@@ -221,6 +221,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
        CLKDEV_CON_DEV_ID("usart", "fffd0000.serial", &usart3_clk),
        CLKDEV_CON_DEV_ID("usart", "fffd4000.serial", &usart4_clk),
        CLKDEV_CON_DEV_ID("usart", "fffd8000.serial", &usart5_clk),
+       CLKDEV_CON_DEV_ID(NULL, "fffac000.i2c", &twi_clk),
        /* more tc lookup table for DT entries */
        CLKDEV_CON_DEV_ID("t0_clk", "fffa0000.timer", &tc0_clk),
        CLKDEV_CON_DEV_ID("t1_clk", "fffa0000.timer", &tc1_clk),
index e6b595658e758c6f1fd179bc9bf5d66af9b1c224..200d5a7baac25a2815ff593fcbd8706e49aa037a 100644 (file)
@@ -211,6 +211,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
        CLKDEV_CON_DEV_ID("hclk", "a00000.ohci", &ohci_clk),
        CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk),
        CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk),
+       CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
index 858f032e510297f9b5f4210665f83726ed4756d0..84af1b506d92a0b1e9e88c885b1d57be95fbf40b 100644 (file)
@@ -256,6 +256,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
        CLKDEV_CON_DEV_ID("t0_clk", "fffd4000.timer", &tcb0_clk),
        CLKDEV_CON_DEV_ID("hclk", "700000.ohci", &uhphs_clk),
        CLKDEV_CON_DEV_ID("ehci_clk", "800000.ehci", &uhphs_clk),
+       CLKDEV_CON_DEV_ID(NULL, "fff84000.i2c", &twi0_clk),
+       CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi1_clk),
        /* fake hclk clock */
        CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
        CLKDEV_CON_ID("pioA", &pioA_clk),
index 08494664ab78d362fcc3b62878cff83ce2cd3921..732d3d3f4ec5f7f93430839330d0e473a8063c20 100644 (file)
@@ -169,6 +169,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
        CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb_clk),
        CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb_clk),
        CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma_clk),
+       CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
+       CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
        CLKDEV_CON_ID("pioA", &pioAB_clk),
        CLKDEV_CON_ID("pioB", &pioAB_clk),
        CLKDEV_CON_ID("pioC", &pioCD_clk),
index 4bad4a288c87819d4e76221a37fdadcc01d519ee..e5035380dcbce16e806fb460625fd73d9a3c1153 100644 (file)
@@ -231,9 +231,9 @@ static struct clk_lookup periph_clocks_lookups[] = {
        CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk),
        CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk),
        CLKDEV_CON_DEV_ID("dma_clk", "ffffee00.dma-controller", &dma1_clk),
-       CLKDEV_CON_DEV_ID(NULL, "at91_i2c.0", &twi0_clk),
-       CLKDEV_CON_DEV_ID(NULL, "at91_i2c.1", &twi1_clk),
-       CLKDEV_CON_DEV_ID(NULL, "at91_i2c.2", &twi2_clk),
+       CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
+       CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
+       CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk),
        CLKDEV_CON_ID("pioA", &pioAB_clk),
        CLKDEV_CON_ID("pioB", &pioAB_clk),
        CLKDEV_CON_ID("pioC", &pioCD_clk),