diff options
author | Barry Song <barry.song@analog.com> | 2010-02-22 05:31:06 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-09 00:30:52 -0500 |
commit | d40bd71f88e7be193ce4feb4b92572c70024b9c2 (patch) | |
tree | 7b1cad97fe71134186872411a4e40a290b234f55 /arch/blackfin | |
parent | df6a949b4666780969fd90a2f3ac3db3b62552d6 (diff) |
Blackfin: rename AD1836 to AD183X in board files
The ASoC codec driver was generalized and renamed, so update the board
resources accordingly.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/H8606.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/cm_bf533.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/ezkit.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537e.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537u.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 11 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/tcm_bf537.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/ezkit.c | 8 |
14 files changed, 42 insertions, 41 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index d6efdfa7d4e0..ebe76d1e874a 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -339,8 +339,8 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
339 | }; | 339 | }; |
340 | #endif | 340 | #endif |
341 | 341 | ||
342 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 342 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
343 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 343 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
344 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 344 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
345 | .enable_dma = 0, | 345 | .enable_dma = 0, |
346 | .bits_per_word = 16, | 346 | .bits_per_word = 16, |
@@ -417,8 +417,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
417 | }, | 417 | }, |
418 | #endif | 418 | #endif |
419 | 419 | ||
420 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 420 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
421 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 421 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
422 | { | 422 | { |
423 | .modalias = "ad1836", | 423 | .modalias = "ad1836", |
424 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 424 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 3d32a35427a6..923383386aa1 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -428,8 +428,8 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
428 | }; | 428 | }; |
429 | #endif | 429 | #endif |
430 | 430 | ||
431 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 431 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
432 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 432 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
433 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 433 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
434 | .enable_dma = 0, | 434 | .enable_dma = 0, |
435 | .bits_per_word = 16, | 435 | .bits_per_word = 16, |
@@ -544,8 +544,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
544 | }, | 544 | }, |
545 | #endif | 545 | #endif |
546 | 546 | ||
547 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 547 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
548 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 548 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
549 | { | 549 | { |
550 | .modalias = "ad1836", | 550 | .modalias = "ad1836", |
551 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 551 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c index d10c8e8b69cf..175371af0692 100644 --- a/arch/blackfin/mach-bf533/boards/H8606.c +++ b/arch/blackfin/mach-bf533/boards/H8606.c | |||
@@ -171,7 +171,7 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
171 | }; | 171 | }; |
172 | #endif | 172 | #endif |
173 | 173 | ||
174 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 174 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
175 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 175 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
176 | .enable_dma = 0, | 176 | .enable_dma = 0, |
177 | .bits_per_word = 16, | 177 | .bits_per_word = 16, |
@@ -206,7 +206,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
206 | }, | 206 | }, |
207 | #endif | 207 | #endif |
208 | 208 | ||
209 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 209 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
210 | { | 210 | { |
211 | .modalias = "ad1836", | 211 | .modalias = "ad1836", |
212 | .max_speed_hz = 16, | 212 | .max_speed_hz = 16, |
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index 0592fe0bb8af..fdcde61906dc 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c | |||
@@ -71,7 +71,7 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
71 | }; | 71 | }; |
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 74 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
75 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 75 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
76 | .enable_dma = 0, | 76 | .enable_dma = 0, |
77 | .bits_per_word = 16, | 77 | .bits_per_word = 16, |
@@ -110,7 +110,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
110 | }, | 110 | }, |
111 | #endif | 111 | #endif |
112 | 112 | ||
113 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 113 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
114 | { | 114 | { |
115 | .modalias = "ad1836", | 115 | .modalias = "ad1836", |
116 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 116 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 84efda193847..739773cb7fc6 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
@@ -222,7 +222,7 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
222 | }; | 222 | }; |
223 | #endif | 223 | #endif |
224 | 224 | ||
225 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 225 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
226 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 226 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
227 | .enable_dma = 0, | 227 | .enable_dma = 0, |
228 | .bits_per_word = 16, | 228 | .bits_per_word = 16, |
@@ -261,7 +261,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
261 | }, | 261 | }, |
262 | #endif | 262 | #endif |
263 | 263 | ||
264 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 264 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
265 | { | 265 | { |
266 | .modalias = "ad1836", | 266 | .modalias = "ad1836", |
267 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 267 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index e997d7f9a671..c457eaa60239 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -184,7 +184,7 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
184 | }; | 184 | }; |
185 | #endif | 185 | #endif |
186 | 186 | ||
187 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 187 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
188 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 188 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
189 | .enable_dma = 0, | 189 | .enable_dma = 0, |
190 | .bits_per_word = 16, | 190 | .bits_per_word = 16, |
@@ -251,7 +251,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
251 | }, | 251 | }, |
252 | #endif | 252 | #endif |
253 | 253 | ||
254 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 254 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
255 | { | 255 | { |
256 | .modalias = "ad1836", | 256 | .modalias = "ad1836", |
257 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 257 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c index c54331282baa..d35fc5fe4c2b 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c | |||
@@ -73,7 +73,7 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
73 | }; | 73 | }; |
74 | #endif | 74 | #endif |
75 | 75 | ||
76 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 76 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
77 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 77 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
78 | .enable_dma = 0, | 78 | .enable_dma = 0, |
79 | .bits_per_word = 16, | 79 | .bits_per_word = 16, |
@@ -112,7 +112,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
112 | }, | 112 | }, |
113 | #endif | 113 | #endif |
114 | 114 | ||
115 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 115 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
116 | { | 116 | { |
117 | .modalias = "ad1836", | 117 | .modalias = "ad1836", |
118 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 118 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c index 18daacb00b2c..d464ad5b72b2 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c | |||
@@ -74,7 +74,7 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
74 | }; | 74 | }; |
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 77 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
78 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 78 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
79 | .enable_dma = 0, | 79 | .enable_dma = 0, |
80 | .bits_per_word = 16, | 80 | .bits_per_word = 16, |
@@ -113,7 +113,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
113 | }, | 113 | }, |
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 116 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
117 | { | 117 | { |
118 | .modalias = "ad1836", | 118 | .modalias = "ad1836", |
119 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 119 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index a0f64ff0fb55..812e8f991601 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -175,8 +175,8 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
175 | }; | 175 | }; |
176 | #endif | 176 | #endif |
177 | 177 | ||
178 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 178 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
179 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 179 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
180 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 180 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
181 | .enable_dma = 0, | 181 | .enable_dma = 0, |
182 | .bits_per_word = 16, | 182 | .bits_per_word = 16, |
@@ -238,8 +238,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
238 | }, | 238 | }, |
239 | #endif | 239 | #endif |
240 | 240 | ||
241 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 241 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
242 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 242 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
243 | { | 243 | { |
244 | .modalias = "ad1836", | 244 | .modalias = "ad1836", |
245 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 245 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 283cc66f0220..e0f5663a8acb 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -528,8 +528,8 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
528 | }; | 528 | }; |
529 | #endif | 529 | #endif |
530 | 530 | ||
531 | #if defined(CONFIG_SND_BF5XX_SOC_AD1836) \ | 531 | #if defined(CONFIG_SND_BF5XX_SOC_AD183X) \ |
532 | || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE) | 532 | || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) |
533 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 533 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
534 | .enable_dma = 0, | 534 | .enable_dma = 0, |
535 | .bits_per_word = 16, | 535 | .bits_per_word = 16, |
@@ -953,13 +953,14 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
953 | }, | 953 | }, |
954 | #endif | 954 | #endif |
955 | 955 | ||
956 | #if defined(CONFIG_SND_BF5XX_SOC_AD1836) \ | 956 | #if defined(CONFIG_SND_BF5XX_SOC_AD183X) \ |
957 | || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE) | 957 | || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) |
958 | { | 958 | { |
959 | .modalias = "ad1836", | 959 | .modalias = "ad183x", |
960 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 960 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
961 | .bus_num = 0, | 961 | .bus_num = 0, |
962 | .chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */ | 962 | .chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */ |
963 | .platform_data = "ad1836", /* only includes chip name for the moment */ | ||
963 | .controller_data = &ad1836_spi_chip_info, | 964 | .controller_data = &ad1836_spi_chip_info, |
964 | .mode = SPI_MODE_3, | 965 | .mode = SPI_MODE_3, |
965 | }, | 966 | }, |
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c index 59951cdef588..4f0a2e72ce4c 100644 --- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c | |||
@@ -74,7 +74,7 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
74 | }; | 74 | }; |
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 77 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
78 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 78 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
79 | .enable_dma = 0, | 79 | .enable_dma = 0, |
80 | .bits_per_word = 16, | 80 | .bits_per_word = 16, |
@@ -113,7 +113,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
113 | }, | 113 | }, |
114 | #endif | 114 | #endif |
115 | 115 | ||
116 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 116 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
117 | { | 117 | { |
118 | .modalias = "ad1836", | 118 | .modalias = "ad1836", |
119 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 119 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 5b3929957073..06919db00a74 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -963,8 +963,8 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { | |||
963 | }; | 963 | }; |
964 | #endif | 964 | #endif |
965 | 965 | ||
966 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 966 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
967 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 967 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
968 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 968 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
969 | .enable_dma = 0, | 969 | .enable_dma = 0, |
970 | .bits_per_word = 16, | 970 | .bits_per_word = 16, |
@@ -1020,8 +1020,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
1020 | .mode = SPI_MODE_3, | 1020 | .mode = SPI_MODE_3, |
1021 | }, | 1021 | }, |
1022 | #endif | 1022 | #endif |
1023 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 1023 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
1024 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 1024 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
1025 | { | 1025 | { |
1026 | .modalias = "ad1836", | 1026 | .modalias = "ad1836", |
1027 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 1027 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index 37dd37523adf..e127aedc1d7f 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
@@ -72,7 +72,7 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = { | |||
72 | }; | 72 | }; |
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 75 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
76 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 76 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
77 | .enable_dma = 0, | 77 | .enable_dma = 0, |
78 | .bits_per_word = 16, | 78 | .bits_per_word = 16, |
@@ -111,7 +111,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
111 | }, | 111 | }, |
112 | #endif | 112 | #endif |
113 | 113 | ||
114 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 114 | #if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
115 | { | 115 | { |
116 | .modalias = "ad1836", | 116 | .modalias = "ad1836", |
117 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 117 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index c7a5db79f838..9b93e2f95791 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
@@ -274,8 +274,8 @@ static struct platform_device ezkit_flash_device = { | |||
274 | }; | 274 | }; |
275 | #endif | 275 | #endif |
276 | 276 | ||
277 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 277 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
278 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 278 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
279 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 279 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
280 | .enable_dma = 0, | 280 | .enable_dma = 0, |
281 | .bits_per_word = 16, | 281 | .bits_per_word = 16, |
@@ -328,8 +328,8 @@ static struct platform_device bfin_spi0_device = { | |||
328 | #endif | 328 | #endif |
329 | 329 | ||
330 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | 330 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
331 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 331 | #if defined(CONFIG_SND_BLACKFIN_AD183X) \ |
332 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 332 | || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE) |
333 | { | 333 | { |
334 | .modalias = "ad1836", | 334 | .modalias = "ad1836", |
335 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 335 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |