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

Commit c5efefac authored by Joachim Eastwood's avatar Joachim Eastwood Committed by Jean-Christophe PLAGNIOL-VILLARD
Browse files

at91: Use "pclk" as con_id on at91cap9 and at91rm9200 



Hello,

I am not 100% sure this is the right thing to do, but it makes the
atmel-ssc driver happy on my at91rm9200 board.

This unifies the con_id across all at91 machines.

The atmel-ssc driver expects the con_id to be "pclk" or it will fail probing.

Signed-off-by: default avatarJoachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
parent 9d87159e

arch/arm/mach-at91/at91cap9.c

+2 −2
Original line number Diff line number Diff line
@@ -230,8 +230,8 @@ 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("ssc", "ssc.0", &ssc0_clk),

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

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

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

};



static struct clk_lookup usart_clocks_lookups[] = {

arch/arm/mach-at91/at91rm9200.c

+3 −3
Original line number Diff line number Diff line
@@ -199,9 +199,9 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk),

	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("ssc", "ssc.0", &ssc0_clk),

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

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

	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),

};



static struct clk_lookup usart_clocks_lookups[] = {