Blackfin: boards: update AD183x resources

Make sure we use the right Kconfig names and platform strings. Signed-off-by: Barry Song <barry.song@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
author: Barry Song <barry.song@analog.com> 2010-01-28 04:37:21 -0500
committer: Mike Frysinger <vapier@gentoo.org> 2010-10-22 03:48:43 -0400
commit: 7ba80063e90302287625a105c546c2fc318fcfbf (patch)
tree: 49bf493e91254c69b5cf8b5e3c87146ea5806884 /arch/blackfin/mach-bf537
parent: f9f0e3b1f7ac4e9fa822e87dd4bbb38f8c389487 (diff)
5 files changed, 19 insertions, 19 deletions
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index d35fc5fe4c2b..8a89df4c870b 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 = {
 };
 #endif
-#if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
 static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
        .enable_dma = 0,
        .bits_per_word = 16,
@@ -112,12 +112,12 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
        },
 #endif
-#if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
        {
-                .modalias = "ad1836",
+                .modalias = "ad183x",
                .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 0,
-                .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
+                .chip_select = 4,
                .controller_data = &ad1836_spi_chip_info,
        },
 #endif
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
index d464ad5b72b2..9db587e634d3 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 = {
 };
 #endif
-#if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
 static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
        .enable_dma = 0,
        .bits_per_word = 16,
@@ -113,12 +113,12 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
        },
 #endif
-#if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
        {
-                .modalias = "ad1836",
+                .modalias = "ad183x",
                .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 0,
-                .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
+                .chip_select = 4,
                .controller_data = &ad1836_spi_chip_info,
        },
 #endif
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 812e8f991601..6b03808800a6 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 = {
 };
 #endif
-#if defined(CONFIG_SND_BLACKFIN_AD183X) \
+#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
-        || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)
+        || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
 static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
        .enable_dma = 0,
        .bits_per_word = 16,
@@ -238,13 +238,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
        },
 #endif
-#if defined(CONFIG_SND_BLACKFIN_AD183X) \
+#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
-        || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)
+        || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
        {
-                .modalias = "ad1836",
+                .modalias = "ad183x",
                .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 0,
-                .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
+                .chip_select = 4,
                .controller_data = &ad1836_spi_chip_info,
        },
 #endif
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index a3f172fdda99..126a40756b50 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -980,7 +980,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                .modalias = "ad183x",
                .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 0,
-                .chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */
+                .chip_select = 4,
                .platform_data = "ad1836", /* only includes chip name for the moment */
                .controller_data = &ad1836_spi_chip_info,
                .mode = SPI_MODE_3,
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index 4f0a2e72ce4c..bc221fd77b29 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 = {
 };
 #endif
-#if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
 static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
        .enable_dma = 0,
        .bits_per_word = 16,
@@ -113,12 +113,12 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
        },
 #endif
-#if defined(CONFIG_SND_BLACKFIN_AD183X) || defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
        {
-                .modalias = "ad1836",
+                .modalias = "ad183x",
                .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 0,
-                .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
+                .chip_select = 4,
                .controller_data = &ad1836_spi_chip_info,
        },
 #endif
author	Barry Song <barry.song@analog.com>	2010-01-28 04:37:21 -0500
committer	Mike Frysinger <vapier@gentoo.org>	2010-10-22 03:48:43 -0400
commit	7ba80063e90302287625a105c546c2fc318fcfbf (patch)
tree	49bf493e91254c69b5cf8b5e3c87146ea5806884 /arch/blackfin/mach-bf537
parent	f9f0e3b1f7ac4e9fa822e87dd4bbb38f8c389487 (diff)

diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c index d35fc5fe4c2b..8a89df4c870b 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_AD183X) \|\| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)	76	#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \|\| defined(CONFIG_SND_BF5XX_SOC_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,12 +112,12 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
112	},	112	},
113	#endif	113	#endif
114		114
115	#if defined(CONFIG_SND_BLACKFIN_AD183X) \|\| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)	115	#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \|\| defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
116	{	116	{
117	.modalias = "ad1836",	117	.modalias = "ad183x",
118	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */	118	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
119	.bus_num = 0,	119	.bus_num = 0,
120	.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,	120	.chip_select = 4,
121	.controller_data = &ad1836_spi_chip_info,	121	.controller_data = &ad1836_spi_chip_info,
122	},	122	},
123	#endif	123	#endif


diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c index d464ad5b72b2..9db587e634d3 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_AD183X) \|\| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)	77	#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \|\| defined(CONFIG_SND_BF5XX_SOC_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,12 +113,12 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
113	},	113	},
114	#endif	114	#endif
115		115
116	#if defined(CONFIG_SND_BLACKFIN_AD183X) \|\| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)	116	#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \|\| defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
117	{	117	{
118	.modalias = "ad1836",	118	.modalias = "ad183x",
119	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */	119	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
120	.bus_num = 0,	120	.bus_num = 0,
121	.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,	121	.chip_select = 4,
122	.controller_data = &ad1836_spi_chip_info,	122	.controller_data = &ad1836_spi_chip_info,
123	},	123	},
124	#endif	124	#endif


diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 812e8f991601..6b03808800a6 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_AD183X) \	178	#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
179	\|\| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)	179	\|\| defined(CONFIG_SND_BF5XX_SOC_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,13 +238,13 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
238	},	238	},
239	#endif	239	#endif
240		240
241	#if defined(CONFIG_SND_BLACKFIN_AD183X) \	241	#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \
242	\|\| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)	242	\|\| defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
243	{	243	{
244	.modalias = "ad1836",	244	.modalias = "ad183x",
245	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */	245	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
246	.bus_num = 0,	246	.bus_num = 0,
247	.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,	247	.chip_select = 4,
248	.controller_data = &ad1836_spi_chip_info,	248	.controller_data = &ad1836_spi_chip_info,
249	},	249	},
250	#endif	250	#endif


diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index a3f172fdda99..126a40756b50 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -980,7 +980,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
980	.modalias = "ad183x",	980	.modalias = "ad183x",
981	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */	981	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
982	.bus_num = 0,	982	.bus_num = 0,
983	.chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */	983	.chip_select = 4,
984	.platform_data = "ad1836", /* only includes chip name for the moment */	984	.platform_data = "ad1836", /* only includes chip name for the moment */
985	.controller_data = &ad1836_spi_chip_info,	985	.controller_data = &ad1836_spi_chip_info,
986	.mode = SPI_MODE_3,	986	.mode = SPI_MODE_3,


diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c index 4f0a2e72ce4c..bc221fd77b29 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_AD183X) \|\| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)	77	#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \|\| defined(CONFIG_SND_BF5XX_SOC_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,12 +113,12 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
113	},	113	},
114	#endif	114	#endif
115		115
116	#if defined(CONFIG_SND_BLACKFIN_AD183X) \|\| defined(CONFIG_SND_BLACKFIN_AD183X_MODULE)	116	#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \|\| defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
117	{	117	{
118	.modalias = "ad1836",	118	.modalias = "ad183x",
119	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */	119	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
120	.bus_num = 0,	120	.bus_num = 0,
121	.chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,	121	.chip_select = 4,
122	.controller_data = &ad1836_spi_chip_info,	122	.controller_data = &ad1836_spi_chip_info,
123	},	123	},
124	#endif	124	#endif