diff options
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/boards/ezkit.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/H8606.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/cm_bf533.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/ezkit.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/boards/ezkit.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/boards/ezkit.c | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index fdd518c1b87b..a0f623d07d3f 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -568,7 +568,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
568 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 568 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
569 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 569 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
570 | { | 570 | { |
571 | .modalias = "ad1836-spi", | 571 | .modalias = "ad1836", |
572 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 572 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
573 | .bus_num = 0, | 573 | .bus_num = 0, |
574 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 574 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index 4ab9cfa74fdd..2849b09abe99 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c | |||
@@ -609,7 +609,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
609 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 609 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
610 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 610 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
611 | { | 611 | { |
612 | .modalias = "ad1836-spi", | 612 | .modalias = "ad1836", |
613 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 613 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
614 | .bus_num = 0, | 614 | .bus_num = 0, |
615 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 615 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c index 30ff3c4a3abe..6c2b47fe4fe4 100644 --- a/arch/blackfin/mach-bf533/boards/H8606.c +++ b/arch/blackfin/mach-bf533/boards/H8606.c | |||
@@ -231,7 +231,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
231 | 231 | ||
232 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 232 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
233 | { | 233 | { |
234 | .modalias = "ad1836-spi", | 234 | .modalias = "ad1836", |
235 | .max_speed_hz = 16, | 235 | .max_speed_hz = 16, |
236 | .bus_num = 1, | 236 | .bus_num = 1, |
237 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 237 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index 705256837a0c..ef31bc5fb1c4 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c | |||
@@ -130,7 +130,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
130 | 130 | ||
131 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 131 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
132 | { | 132 | { |
133 | .modalias = "ad1836-spi", | 133 | .modalias = "ad1836", |
134 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 134 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
135 | .bus_num = 0, | 135 | .bus_num = 0, |
136 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 136 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 88b2dfc74d23..fd518e383b79 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
@@ -274,7 +274,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
274 | 274 | ||
275 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 275 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
276 | { | 276 | { |
277 | .modalias = "ad1836-spi", | 277 | .modalias = "ad1836", |
278 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 278 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
279 | .bus_num = 0, | 279 | .bus_num = 0, |
280 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 280 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index 3954baa00c64..729fd7c26336 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -281,7 +281,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
281 | 281 | ||
282 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 282 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
283 | { | 283 | { |
284 | .modalias = "ad1836-spi", | 284 | .modalias = "ad1836", |
285 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 285 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
286 | .bus_num = 0, | 286 | .bus_num = 0, |
287 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 287 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c index 159e5b2f9e6b..220cfda60f04 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c | |||
@@ -135,7 +135,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
135 | 135 | ||
136 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 136 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
137 | { | 137 | { |
138 | .modalias = "ad1836-spi", | 138 | .modalias = "ad1836", |
139 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 139 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
140 | .bus_num = 0, | 140 | .bus_num = 0, |
141 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 141 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 0d93bbe6d275..10b35b838bac 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -352,7 +352,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
352 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 352 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
353 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 353 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
354 | { | 354 | { |
355 | .modalias = "ad1836-spi", | 355 | .modalias = "ad1836", |
356 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 356 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
357 | .bus_num = 0, | 357 | .bus_num = 0, |
358 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 358 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index d5aabeeb81ee..7ce7d943b0cb 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -870,7 +870,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
870 | #if defined(CONFIG_SND_BF5XX_SOC_AD1836) \ | 870 | #if defined(CONFIG_SND_BF5XX_SOC_AD1836) \ |
871 | || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE) | 871 | || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE) |
872 | { | 872 | { |
873 | .modalias = "ad1836-spi", | 873 | .modalias = "ad1836", |
874 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 874 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
875 | .bus_num = 0, | 875 | .bus_num = 0, |
876 | .chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */ | 876 | .chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */ |
@@ -881,7 +881,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
881 | 881 | ||
882 | #if defined(CONFIG_SND_BF5XX_SOC_AD1938) || defined(CONFIG_SND_BF5XX_SOC_AD1938_MODULE) | 882 | #if defined(CONFIG_SND_BF5XX_SOC_AD1938) || defined(CONFIG_SND_BF5XX_SOC_AD1938_MODULE) |
883 | { | 883 | { |
884 | .modalias = "ad1938-spi", | 884 | .modalias = "ad1938", |
885 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 885 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
886 | .bus_num = 0, | 886 | .bus_num = 0, |
887 | .chip_select = 0,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */ | 887 | .chip_select = 0,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */ |
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c index 88eade89842e..dc4f161c4443 100644 --- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c | |||
@@ -135,7 +135,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
135 | 135 | ||
136 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 136 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
137 | { | 137 | { |
138 | .modalias = "ad1836-spi", | 138 | .modalias = "ad1836", |
139 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 139 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
140 | .bus_num = 0, | 140 | .bus_num = 0, |
141 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 141 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 3c06010475a3..e50d136bea70 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -702,7 +702,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
702 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 702 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
703 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 703 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
704 | { | 704 | { |
705 | .modalias = "ad1836-spi", | 705 | .modalias = "ad1836", |
706 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 706 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
707 | .bus_num = 1, | 707 | .bus_num = 1, |
708 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 708 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index cedcc3c6b235..5721620cfae8 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
@@ -132,7 +132,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
132 | 132 | ||
133 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 133 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
134 | { | 134 | { |
135 | .modalias = "ad1836-spi", | 135 | .modalias = "ad1836", |
136 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 136 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
137 | .bus_num = 0, | 137 | .bus_num = 0, |
138 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 138 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index 10edc998bebf..caed96bb957e 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c | |||
@@ -345,7 +345,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
345 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ | 345 | #if defined(CONFIG_SND_BLACKFIN_AD1836) \ |
346 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 346 | || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
347 | { | 347 | { |
348 | .modalias = "ad1836-spi", | 348 | .modalias = "ad1836", |
349 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ | 349 | .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ |
350 | .bus_num = 0, | 350 | .bus_num = 0, |
351 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, | 351 | .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, |