tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by Joachim Eastwood and committed by Jean-Christophe PLAGNIOL-VILLARD c5efefac 9d87159e

options
unified split
Changed files
+5 -5
arch
arm
mach-at91
at91cap9.c
at91rm9200.c
+2 -2
arch/arm/mach-at91/at91cap9.c
··· 230 230 CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), 231 231 CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk), 232 232 CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk), 233 - CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk), 234 - CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk), 233 + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), 234 + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), 235 235 }; 236 236 237 237 static struct clk_lookup usart_clocks_lookups[] = {
+3 -3
arch/arm/mach-at91/at91rm9200.c
··· 199 199 CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), 200 200 CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), 201 201 CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), 202 - CLKDEV_CON_DEV_ID("ssc", "ssc.0", &ssc0_clk), 203 - CLKDEV_CON_DEV_ID("ssc", "ssc.1", &ssc1_clk), 204 - CLKDEV_CON_DEV_ID("ssc", "ssc.2", &ssc2_clk), 202 + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), 203 + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), 204 + CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), 205 205 }; 206 206 207 207 static struct clk_lookup usart_clocks_lookups[] = {