diff options
author | Joachim Eastwood <manabian@gmail.com> | 2011-06-01 19:36:09 -0400 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-06-25 02:37:28 -0400 |
commit | c5efefac659870744f6e203e28abd095ac0f590b (patch) | |
tree | 01e15a3222aceb2b31be19c25126c230154d0e8d /arch/arm | |
parent | 9d87159e571d73ccf87adf1ee3691b861253d900 (diff) |
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: Joachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-at91/at91cap9.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index 5e6f8a7958a4..f1013d08bb57 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c | |||
@@ -230,8 +230,8 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
230 | CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), | 230 | CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), |
231 | CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), | 231 | CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), |
232 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), | 232 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), |
233 | CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk), | 233 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), |
234 | CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk), | 234 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), |
235 | }; | 235 | }; |
236 | 236 | ||
237 | static struct clk_lookup usart_clocks_lookups[] = { | 237 | static struct clk_lookup usart_clocks_lookups[] = { |
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index b228ce9e21a1..83a1a3fee554 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c | |||
@@ -199,9 +199,9 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
199 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), | 199 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), |
200 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), | 200 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), |
201 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), | 201 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), |
202 | CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk), | 202 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), |
203 | CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk), | 203 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), |
204 | CLKDEV_CON_DEV_ID("ssc", "ssc.2", &ssc2_clk), | 204 | CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), |
205 | }; | 205 | }; |
206 | 206 | ||
207 | static struct clk_lookup usart_clocks_lookups[] = { | 207 | static struct clk_lookup usart_clocks_lookups[] = { |