Skip to content

Commit af2a5f0

Browse files
Nikolaus VossWolfram Sang
authored andcommitted
Replace clk_lookup.con_id with clk_lookup.dev_id entries for twi clk
The old driver used con_id clock entries. Convert to use dev_id for clock lookup via standard method. Signed-off-by: Nikolaus Voss <n.voss@weinmann.de> Tested-by: Ludovic Desroches <ludovic.desroches@atmel.com> Reviewed-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
1 parent e89cec7 commit af2a5f0

File tree

7 files changed

+11
-0
lines changed

7 files changed

+11
-0
lines changed

arch/arm/mach-at91/at91rm9200.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
187187
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
188188
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
189189
CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
190+
CLKDEV_CON_DEV_ID(NULL, "at91_i2c", &twi_clk),
190191
/* fake hclk clock */
191192
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
192193
CLKDEV_CON_ID("pioA", &pioA_clk),

arch/arm/mach-at91/at91sam9260.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
211211
CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),
212212
CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),
213213
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),
214+
CLKDEV_CON_DEV_ID(NULL, "at91_i2c", &twi_clk),
214215
/* more usart lookup table for DT entries */
215216
CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),
216217
CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk),

arch/arm/mach-at91/at91sam9261.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
178178
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
179179
CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
180180
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
181+
CLKDEV_CON_DEV_ID(NULL, "at91_i2c", &twi_clk),
181182
CLKDEV_CON_ID("pioA", &pioA_clk),
182183
CLKDEV_CON_ID("pioB", &pioB_clk),
183184
CLKDEV_CON_ID("pioC", &pioC_clk),

arch/arm/mach-at91/at91sam9263.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
193193
CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
194194
CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
195195
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
196+
CLKDEV_CON_DEV_ID(NULL, "at91_i2c", &twi_clk),
196197
/* fake hclk clock */
197198
CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
198199
CLKDEV_CON_ID("pioA", &pioA_clk),

arch/arm/mach-at91/at91sam9g45.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
237237
CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
238238
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb0_clk),
239239
CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk),
240+
CLKDEV_CON_DEV_ID(NULL, "at91_i2c.0", &twi0_clk),
241+
CLKDEV_CON_DEV_ID(NULL, "at91_i2c.1", &twi1_clk),
240242
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
241243
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
242244
CLKDEV_CON_DEV_ID(NULL, "atmel-trng", &trng_clk),

arch/arm/mach-at91/at91sam9rl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
186186
CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
187187
CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
188188
CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
189+
CLKDEV_CON_DEV_ID(NULL, "at91_i2c.0", &twi0_clk),
190+
CLKDEV_CON_DEV_ID(NULL, "at91_i2c.1", &twi1_clk),
189191
CLKDEV_CON_ID("pioA", &pioA_clk),
190192
CLKDEV_CON_ID("pioB", &pioB_clk),
191193
CLKDEV_CON_ID("pioC", &pioC_clk),

arch/arm/mach-at91/at91sam9x5.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@ static struct clk_lookup periph_clocks_lookups[] = {
231231
CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk),
232232
CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk),
233233
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),
234237
CLKDEV_CON_ID("pioA", &pioAB_clk),
235238
CLKDEV_CON_ID("pioB", &pioAB_clk),
236239
CLKDEV_CON_ID("pioC", &pioCD_clk),

0 commit comments

Comments
 (0)