diff options
author | Barry Song <barry.song@analog.com> | 2009-08-13 17:07:37 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-09-16 22:10:27 -0400 |
commit | dac981740f4b990eadf523b0900859f189dd2b4e (patch) | |
tree | f6bba8c69c9576071edc6d818475ad20bf8d207a /arch/blackfin/mach-bf537 | |
parent | 3aa670419a02b19a2168894f7edbb5e4b9e4e607 (diff) |
Blackfin: delete '-spi' suffix in ad1836/ad1938 driver name
The ASoC drivers have dropped the redundant "-spi" suffix in the driver
name, 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/mach-bf537')
-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 |
4 files changed, 5 insertions, 5 deletions
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, |