Skip to content

L
linux
Commit dac98174 authored by Barry Song's avatar Barry Song Committed by Mike Frysinger
Browse files
Options

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: default avatarBarry Song <barry.song@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 3aa67041
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
arch/blackfin/mach-bf527/boards/cm_bf527.c
View file @ dac98174
...@@ -568,7 +568,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -568,7 +568,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) \ #if defined(CONFIG_SND_BLACKFIN_AD1836) \
|| defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf527/boards/ezkit.c
View file @ dac98174
...@@ -609,7 +609,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -609,7 +609,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) \ #if defined(CONFIG_SND_BLACKFIN_AD1836) \
|| defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf533/boards/H8606.c
View file @ dac98174
...@@ -231,7 +231,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -231,7 +231,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 16, .max_speed_hz = 16,
.bus_num = 1, .bus_num = 1,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf533/boards/cm_bf533.c
View file @ dac98174
...@@ -130,7 +130,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -130,7 +130,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf533/boards/ezkit.c
View file @ dac98174
...@@ -274,7 +274,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -274,7 +274,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf533/boards/stamp.c
View file @ dac98174
...@@ -281,7 +281,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -281,7 +281,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf537/boards/cm_bf537.c
View file @ dac98174
...@@ -135,7 +135,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -135,7 +135,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf537/boards/pnav10.c
View file @ dac98174
...@@ -352,7 +352,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -352,7 +352,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) \ #if defined(CONFIG_SND_BLACKFIN_AD1836) \
|| defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf537/boards/stamp.c
View file @ dac98174
...@@ -870,7 +870,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -870,7 +870,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \ #if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
|| defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE) || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */ .chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */
...@@ -881,7 +881,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -881,7 +881,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BF5XX_SOC_AD1938) || defined(CONFIG_SND_BF5XX_SOC_AD1938_MODULE) #if defined(CONFIG_SND_BF5XX_SOC_AD1938) || defined(CONFIG_SND_BF5XX_SOC_AD1938_MODULE)
{ {
.modalias = "ad1938-spi", .modalias = "ad1938",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = 0,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */ .chip_select = 0,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */
......
arch/blackfin/mach-bf537/boards/tcm_bf537.c
View file @ dac98174
...@@ -135,7 +135,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -135,7 +135,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf548/boards/ezkit.c
View file @ dac98174
...@@ -702,7 +702,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -702,7 +702,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) \ #if defined(CONFIG_SND_BLACKFIN_AD1836) \
|| defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 1, .bus_num = 1,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf561/boards/cm_bf561.c
View file @ dac98174
...@@ -132,7 +132,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -132,7 +132,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
arch/blackfin/mach-bf561/boards/ezkit.c
View file @ dac98174
...@@ -345,7 +345,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -345,7 +345,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#if defined(CONFIG_SND_BLACKFIN_AD1836) \ #if defined(CONFIG_SND_BLACKFIN_AD1836) \
|| defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
{ {
.modalias = "ad1836-spi", .modalias = "ad1836",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0, .bus_num = 0,
.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7