Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f7d19b9065569268dd13307213c40d168fb0be82

Authored by Ludovic Desroches
Committed by Wolfram Sang
1 parent 70d46a241e
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ARM: at91: add clocks for I2C DT entries 

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>

Showing 5 changed files with 9 additions and 3 deletions Side-by-side Diff

arch/arm/mach-at91/at91sam9260.c
Diff comments   View file @ f7d19b9
... ... @@ -221,6 +221,7 @@
221 221 CLKDEV_CON_DEV_ID("usart", "fffd0000.serial", &usart3_clk),
222 222 CLKDEV_CON_DEV_ID("usart", "fffd4000.serial", &usart4_clk),
223 223 CLKDEV_CON_DEV_ID("usart", "fffd8000.serial", &usart5_clk),
  224 + CLKDEV_CON_DEV_ID(NULL, "fffac000.i2c", &twi_clk),
224 225 /* more tc lookup table for DT entries */
225 226 CLKDEV_CON_DEV_ID("t0_clk", "fffa0000.timer", &tc0_clk),
226 227 CLKDEV_CON_DEV_ID("t1_clk", "fffa0000.timer", &tc1_clk),
arch/arm/mach-at91/at91sam9263.c
Diff comments   View file @ f7d19b9
... ... @@ -211,6 +211,7 @@
211 211 CLKDEV_CON_DEV_ID("hclk", "a00000.ohci", &ohci_clk),
212 212 CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk),
213 213 CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk),
  214 + CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi_clk),
214 215 };
215 216  
216 217 static struct clk_lookup usart_clocks_lookups[] = {
arch/arm/mach-at91/at91sam9g45.c
Diff comments   View file @ f7d19b9
... ... @@ -256,6 +256,8 @@
256 256 CLKDEV_CON_DEV_ID("t0_clk", "fffd4000.timer", &tcb0_clk),
257 257 CLKDEV_CON_DEV_ID("hclk", "700000.ohci", &uhphs_clk),
258 258 CLKDEV_CON_DEV_ID("ehci_clk", "800000.ehci", &uhphs_clk),
  259 + CLKDEV_CON_DEV_ID(NULL, "fff84000.i2c", &twi0_clk),
  260 + CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi1_clk),
259 261 /* fake hclk clock */
260 262 CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
261 263 CLKDEV_CON_ID("pioA", &pioA_clk),
arch/arm/mach-at91/at91sam9n12.c
Diff comments   View file @ f7d19b9
... ... @@ -169,6 +169,8 @@
169 169 CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb_clk),
170 170 CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb_clk),
171 171 CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma_clk),
  172 + CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
  173 + CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
172 174 CLKDEV_CON_ID("pioA", &pioAB_clk),
173 175 CLKDEV_CON_ID("pioB", &pioAB_clk),
174 176 CLKDEV_CON_ID("pioC", &pioCD_clk),
arch/arm/mach-at91/at91sam9x5.c
Diff comments   View file @ f7d19b9
... ... @@ -231,9 +231,9 @@
231 231 CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk),
232 232 CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk),
233 233 CLKDEV_CON_DEV_ID("dma_clk", "ffffee00.dma-controller", &dma1_clk),
234   - CLKDEV_CON_DEV_ID(NULL, "at91_i2c.0", &twi0_clk),
235   - CLKDEV_CON_DEV_ID(NULL, "at91_i2c.1", &twi1_clk),
236   - CLKDEV_CON_DEV_ID(NULL, "at91_i2c.2", &twi2_clk),
  234 + CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
  235 + CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
  236 + CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk),
237 237 CLKDEV_CON_ID("pioA", &pioAB_clk),
238 238 CLKDEV_CON_ID("pioB", &pioAB_clk),
239 239 CLKDEV_CON_ID("pioC", &pioCD_clk),