diff options
author | Bo Shen <voice.shen@atmel.com> | 2012-11-06 00:57:51 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 04:13:19 -0500 |
commit | 636036d29a20154b897571e1d5949faac98bfb7c (patch) | |
tree | 4d9516e395ff9952794ad83bfd3e8d8e79930fc0 /arch | |
parent | 90b4d60c6103105a634c495003c2ce931f075f63 (diff) |
ARM: at91: atmel-ssc: add platform device id table
Add platform device id to check whether the SSC controller support
pdc or dam for data transfer
If match "at91rm9200_ssc", which support pdc for data transfer
If match "at91sam9g45_ssc", which support dma for data transfer
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91rm9200_devices.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9rl.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9rl_devices.c | 4 |
12 files changed, 26 insertions, 26 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 5269825194a8..400d1a34683c 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c | |||
@@ -184,9 +184,9 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
184 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), | 184 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), |
185 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), | 185 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), |
186 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), | 186 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), |
187 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), | 187 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc0_clk), |
188 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), | 188 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk), |
189 | CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), | 189 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.2", &ssc2_clk), |
190 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200.0", &twi_clk), | 190 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200.0", &twi_clk), |
191 | /* fake hclk clock */ | 191 | /* fake hclk clock */ |
192 | CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), | 192 | CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), |
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 1e122bcd7845..f40925a552a1 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c | |||
@@ -752,7 +752,7 @@ static struct resource ssc0_resources[] = { | |||
752 | }; | 752 | }; |
753 | 753 | ||
754 | static struct platform_device at91rm9200_ssc0_device = { | 754 | static struct platform_device at91rm9200_ssc0_device = { |
755 | .name = "ssc", | 755 | .name = "at91rm9200_ssc", |
756 | .id = 0, | 756 | .id = 0, |
757 | .dev = { | 757 | .dev = { |
758 | .dma_mask = &ssc0_dmamask, | 758 | .dma_mask = &ssc0_dmamask, |
@@ -794,7 +794,7 @@ static struct resource ssc1_resources[] = { | |||
794 | }; | 794 | }; |
795 | 795 | ||
796 | static struct platform_device at91rm9200_ssc1_device = { | 796 | static struct platform_device at91rm9200_ssc1_device = { |
797 | .name = "ssc", | 797 | .name = "at91rm9200_ssc", |
798 | .id = 1, | 798 | .id = 1, |
799 | .dev = { | 799 | .dev = { |
800 | .dma_mask = &ssc1_dmamask, | 800 | .dma_mask = &ssc1_dmamask, |
@@ -836,7 +836,7 @@ static struct resource ssc2_resources[] = { | |||
836 | }; | 836 | }; |
837 | 837 | ||
838 | static struct platform_device at91rm9200_ssc2_device = { | 838 | static struct platform_device at91rm9200_ssc2_device = { |
839 | .name = "ssc", | 839 | .name = "at91rm9200_ssc", |
840 | .id = 2, | 840 | .id = 2, |
841 | .dev = { | 841 | .dev = { |
842 | .dma_mask = &ssc2_dmamask, | 842 | .dma_mask = &ssc2_dmamask, |
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index f8202615f4a8..d14ab6aea250 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
@@ -210,7 +210,7 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
210 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), | 210 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), |
211 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), | 211 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), |
212 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), | 212 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), |
213 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk), | 213 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc_clk), |
214 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk), | 214 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk), |
215 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi_clk), | 215 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi_clk), |
216 | /* more usart lookup table for DT entries */ | 216 | /* more usart lookup table for DT entries */ |
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 46edfaf275f7..df7bebf07f10 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c | |||
@@ -742,7 +742,7 @@ static struct resource ssc_resources[] = { | |||
742 | }; | 742 | }; |
743 | 743 | ||
744 | static struct platform_device at91sam9260_ssc_device = { | 744 | static struct platform_device at91sam9260_ssc_device = { |
745 | .name = "ssc", | 745 | .name = "at91rm9200_ssc", |
746 | .id = 0, | 746 | .id = 0, |
747 | .dev = { | 747 | .dev = { |
748 | .dma_mask = &ssc_dmamask, | 748 | .dma_mask = &ssc_dmamask, |
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 04295c04b3e0..c7b605796dd4 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c | |||
@@ -174,9 +174,9 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
174 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), | 174 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), |
175 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), | 175 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), |
176 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), | 176 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), |
177 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), | 177 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc0_clk), |
178 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), | 178 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk), |
179 | CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), | 179 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.2", &ssc2_clk), |
180 | CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0), | 180 | CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0), |
181 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261.0", &twi_clk), | 181 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261.0", &twi_clk), |
182 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi_clk), | 182 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi_clk), |
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index b9487696b7be..d8afd2130b79 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c | |||
@@ -706,7 +706,7 @@ static struct resource ssc0_resources[] = { | |||
706 | }; | 706 | }; |
707 | 707 | ||
708 | static struct platform_device at91sam9261_ssc0_device = { | 708 | static struct platform_device at91sam9261_ssc0_device = { |
709 | .name = "ssc", | 709 | .name = "at91rm9200_ssc", |
710 | .id = 0, | 710 | .id = 0, |
711 | .dev = { | 711 | .dev = { |
712 | .dma_mask = &ssc0_dmamask, | 712 | .dma_mask = &ssc0_dmamask, |
@@ -748,7 +748,7 @@ static struct resource ssc1_resources[] = { | |||
748 | }; | 748 | }; |
749 | 749 | ||
750 | static struct platform_device at91sam9261_ssc1_device = { | 750 | static struct platform_device at91sam9261_ssc1_device = { |
751 | .name = "ssc", | 751 | .name = "at91rm9200_ssc", |
752 | .id = 1, | 752 | .id = 1, |
753 | .dev = { | 753 | .dev = { |
754 | .dma_mask = &ssc1_dmamask, | 754 | .dma_mask = &ssc1_dmamask, |
@@ -790,7 +790,7 @@ static struct resource ssc2_resources[] = { | |||
790 | }; | 790 | }; |
791 | 791 | ||
792 | static struct platform_device at91sam9261_ssc2_device = { | 792 | static struct platform_device at91sam9261_ssc2_device = { |
793 | .name = "ssc", | 793 | .name = "at91rm9200_ssc", |
794 | .id = 2, | 794 | .id = 2, |
795 | .dev = { | 795 | .dev = { |
796 | .dma_mask = &ssc2_dmamask, | 796 | .dma_mask = &ssc2_dmamask, |
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index d6f9c23927c4..b87be18f08ae 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
@@ -186,8 +186,8 @@ static struct clk *periph_clocks[] __initdata = { | |||
186 | static struct clk_lookup periph_clocks_lookups[] = { | 186 | static struct clk_lookup periph_clocks_lookups[] = { |
187 | /* One additional fake clock for macb_hclk */ | 187 | /* One additional fake clock for macb_hclk */ |
188 | CLKDEV_CON_ID("hclk", &macb_clk), | 188 | CLKDEV_CON_ID("hclk", &macb_clk), |
189 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), | 189 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc0_clk), |
190 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), | 190 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk), |
191 | CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.0", &mmc0_clk), | 191 | CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.0", &mmc0_clk), |
192 | CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.1", &mmc1_clk), | 192 | CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.1", &mmc1_clk), |
193 | CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), | 193 | CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), |
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index cb85da2eccea..025c9704bfe6 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c | |||
@@ -1199,7 +1199,7 @@ static struct resource ssc0_resources[] = { | |||
1199 | }; | 1199 | }; |
1200 | 1200 | ||
1201 | static struct platform_device at91sam9263_ssc0_device = { | 1201 | static struct platform_device at91sam9263_ssc0_device = { |
1202 | .name = "ssc", | 1202 | .name = "at91rm9200_ssc", |
1203 | .id = 0, | 1203 | .id = 0, |
1204 | .dev = { | 1204 | .dev = { |
1205 | .dma_mask = &ssc0_dmamask, | 1205 | .dma_mask = &ssc0_dmamask, |
@@ -1241,7 +1241,7 @@ static struct resource ssc1_resources[] = { | |||
1241 | }; | 1241 | }; |
1242 | 1242 | ||
1243 | static struct platform_device at91sam9263_ssc1_device = { | 1243 | static struct platform_device at91sam9263_ssc1_device = { |
1244 | .name = "ssc", | 1244 | .name = "at91rm9200_ssc", |
1245 | .id = 1, | 1245 | .id = 1, |
1246 | .dev = { | 1246 | .dev = { |
1247 | .dma_mask = &ssc1_dmamask, | 1247 | .dma_mask = &ssc1_dmamask, |
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 84af1b506d92..f4f96a61e4b8 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c | |||
@@ -239,8 +239,8 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
239 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk), | 239 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk), |
240 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi0_clk), | 240 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi0_clk), |
241 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.1", &twi1_clk), | 241 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.1", &twi1_clk), |
242 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), | 242 | CLKDEV_CON_DEV_ID("pclk", "at91sam9g45_ssc.0", &ssc0_clk), |
243 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), | 243 | CLKDEV_CON_DEV_ID("pclk", "at91sam9g45_ssc.1", &ssc1_clk), |
244 | CLKDEV_CON_DEV_ID(NULL, "atmel-trng", &trng_clk), | 244 | CLKDEV_CON_DEV_ID(NULL, "atmel-trng", &trng_clk), |
245 | CLKDEV_CON_DEV_ID(NULL, "atmel_sha", &aestdessha_clk), | 245 | CLKDEV_CON_DEV_ID(NULL, "atmel_sha", &aestdessha_clk), |
246 | CLKDEV_CON_DEV_ID(NULL, "atmel_tdes", &aestdessha_clk), | 246 | CLKDEV_CON_DEV_ID(NULL, "atmel_tdes", &aestdessha_clk), |
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index b1596072dcc2..27e3bf64a8bc 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
@@ -1459,7 +1459,7 @@ static struct resource ssc0_resources[] = { | |||
1459 | }; | 1459 | }; |
1460 | 1460 | ||
1461 | static struct platform_device at91sam9g45_ssc0_device = { | 1461 | static struct platform_device at91sam9g45_ssc0_device = { |
1462 | .name = "ssc", | 1462 | .name = "at91sam9g45_ssc", |
1463 | .id = 0, | 1463 | .id = 0, |
1464 | .dev = { | 1464 | .dev = { |
1465 | .dma_mask = &ssc0_dmamask, | 1465 | .dma_mask = &ssc0_dmamask, |
@@ -1501,7 +1501,7 @@ static struct resource ssc1_resources[] = { | |||
1501 | }; | 1501 | }; |
1502 | 1502 | ||
1503 | static struct platform_device at91sam9g45_ssc1_device = { | 1503 | static struct platform_device at91sam9g45_ssc1_device = { |
1504 | .name = "ssc", | 1504 | .name = "at91sam9g45_ssc", |
1505 | .id = 1, | 1505 | .id = 1, |
1506 | .dev = { | 1506 | .dev = { |
1507 | .dma_mask = &ssc1_dmamask, | 1507 | .dma_mask = &ssc1_dmamask, |
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index 72e908412222..4110b5480d49 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c | |||
@@ -184,8 +184,8 @@ static struct clk_lookup periph_clocks_lookups[] = { | |||
184 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), | 184 | CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), |
185 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), | 185 | CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), |
186 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), | 186 | CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), |
187 | CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), | 187 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc0_clk), |
188 | CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), | 188 | CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk), |
189 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi0_clk), | 189 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi0_clk), |
190 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.1", &twi1_clk), | 190 | CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.1", &twi1_clk), |
191 | CLKDEV_CON_ID("pioA", &pioA_clk), | 191 | CLKDEV_CON_ID("pioA", &pioA_clk), |
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c index 5047bdc92adf..b656110e8afe 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c | |||
@@ -832,7 +832,7 @@ static struct resource ssc0_resources[] = { | |||
832 | }; | 832 | }; |
833 | 833 | ||
834 | static struct platform_device at91sam9rl_ssc0_device = { | 834 | static struct platform_device at91sam9rl_ssc0_device = { |
835 | .name = "ssc", | 835 | .name = "at91rm9200_ssc", |
836 | .id = 0, | 836 | .id = 0, |
837 | .dev = { | 837 | .dev = { |
838 | .dma_mask = &ssc0_dmamask, | 838 | .dma_mask = &ssc0_dmamask, |
@@ -874,7 +874,7 @@ static struct resource ssc1_resources[] = { | |||
874 | }; | 874 | }; |
875 | 875 | ||
876 | static struct platform_device at91sam9rl_ssc1_device = { | 876 | static struct platform_device at91sam9rl_ssc1_device = { |
877 | .name = "ssc", | 877 | .name = "at91rm9200_ssc", |
878 | .id = 1, | 878 | .id = 1, |
879 | .dev = { | 879 | .dev = { |
880 | .dma_mask = &ssc1_dmamask, | 880 | .dma_mask = &ssc1_dmamask, |