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

Commit af2a5f09 authored by Nikolaus Voss's avatar Nikolaus Voss Committed by Wolfram Sang
Browse files

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: default avatarNikolaus Voss <n.voss@weinmann.de>
Tested-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Reviewed-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent e89cec7f

arch/arm/mach-at91/at91rm9200.c

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),

	CLKDEV_CON_DEV_ID(NULL, "at91_i2c", &twi_clk),

	/* fake hclk clock */

	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),

	CLKDEV_CON_ID("pioA", &pioA_clk),

arch/arm/mach-at91/at91sam9260.c

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),

	CLKDEV_CON_DEV_ID(NULL, "at91_i2c", &twi_clk),

	/* more usart lookup table for DT entries */

	CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),

	CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk),

arch/arm/mach-at91/at91sam9261.c

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),

	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),

	CLKDEV_CON_DEV_ID(NULL, "at91_i2c", &twi_clk),

	CLKDEV_CON_ID("pioA", &pioA_clk),

	CLKDEV_CON_ID("pioB", &pioB_clk),

	CLKDEV_CON_ID("pioC", &pioC_clk),

arch/arm/mach-at91/at91sam9263.c

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	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", &tcb_clk),

	CLKDEV_CON_DEV_ID(NULL, "at91_i2c", &twi_clk),

	/* fake hclk clock */

	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),

	CLKDEV_CON_ID("pioA", &pioA_clk),

arch/arm/mach-at91/at91sam9g45.c

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb0_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_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("pclk", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID(NULL, "atmel-trng", &trng_clk),