aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf537
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-08-13 00:27:31 -0400
committerMike Frysinger <vapier@gentoo.org>2009-09-16 22:10:24 -0400
commit0198b3bcaed1374f454e56e46f0e1ca1fc24e0a1 (patch)
tree883a78de3ff7c1b560ebf18cc6c78e9a7065431f /arch/blackfin/mach-bf537
parentc4baebf2683d16f24a84a99268ef5f7318905337 (diff)
Blackfin: drop board resources for dead devices (pbx/ad9960)
These hardware devices are dead and the drivers never cleaned up/merged, so punt the useless board resource info. 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.c17
-rw-r--r--arch/blackfin/mach-bf537/boards/pnav10.c16
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c44
-rw-r--r--arch/blackfin/mach-bf537/boards/tcm_bf537.c17
4 files changed, 0 insertions, 94 deletions
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 3681d2cb40b3..159e5b2f9e6b 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -101,13 +101,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
101}; 101};
102#endif 102#endif
103 103
104#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
105static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
106 .enable_dma = 0,
107 .bits_per_word = 16,
108};
109#endif
110
111#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 104#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
112static struct bfin5xx_spi_chip mmc_spi_chip_info = { 105static struct bfin5xx_spi_chip mmc_spi_chip_info = {
113 .enable_dma = 0, 106 .enable_dma = 0,
@@ -150,16 +143,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
150 }, 143 },
151#endif 144#endif
152 145
153#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
154 {
155 .modalias = "ad9960-spi",
156 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
157 .bus_num = 0,
158 .chip_select = 1,
159 .controller_data = &ad9960_spi_chip_info,
160 },
161#endif
162
163#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 146#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
164 { 147 {
165 .modalias = "mmc_spi", 148 .modalias = "mmc_spi",
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 3bbe10227bfb..0d93bbe6d275 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -293,13 +293,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
293}; 293};
294#endif 294#endif
295 295
296#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
297static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
298 .enable_dma = 0,
299 .bits_per_word = 16,
300};
301#endif
302
303#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 296#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
304static struct bfin5xx_spi_chip mmc_spi_chip_info = { 297static struct bfin5xx_spi_chip mmc_spi_chip_info = {
305 .enable_dma = 0, 298 .enable_dma = 0,
@@ -366,15 +359,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
366 .controller_data = &ad1836_spi_chip_info, 359 .controller_data = &ad1836_spi_chip_info,
367 }, 360 },
368#endif 361#endif
369#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
370 {
371 .modalias = "ad9960-spi",
372 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
373 .bus_num = 0,
374 .chip_select = 1,
375 .controller_data = &ad9960_spi_chip_info,
376 },
377#endif
378#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 362#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
379 { 363 {
380 .modalias = "mmc_spi", 364 .modalias = "mmc_spi",
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index d438ca40bc12..d5aabeeb81ee 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -549,13 +549,6 @@ static struct bfin5xx_spi_chip ad1938_spi_chip_info = {
549}; 549};
550#endif 550#endif
551 551
552#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
553static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
554 .enable_dma = 0,
555 .bits_per_word = 16,
556};
557#endif
558
559#if defined(CONFIG_INPUT_EVAL_AD7147EBZ) 552#if defined(CONFIG_INPUT_EVAL_AD7147EBZ)
560#include <linux/input.h> 553#include <linux/input.h>
561#include <linux/input/ad714x.h> 554#include <linux/input/ad714x.h>
@@ -698,15 +691,6 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
698}; 691};
699#endif 692#endif
700 693
701#if defined(CONFIG_PBX)
702static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
703 .ctl_reg = 0x4, /* send zero */
704 .enable_dma = 0,
705 .bits_per_word = 8,
706 .cs_change_per_word = 1,
707};
708#endif
709
710#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 694#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
711#include <linux/spi/ad7877.h> 695#include <linux/spi/ad7877.h>
712static struct bfin5xx_spi_chip spi_ad7877_chip_info = { 696static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
@@ -906,16 +890,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
906 }, 890 },
907#endif 891#endif
908 892
909#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
910 {
911 .modalias = "ad9960-spi",
912 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
913 .bus_num = 0,
914 .chip_select = 1,
915 .controller_data = &ad9960_spi_chip_info,
916 },
917#endif
918
919#if defined(CONFIG_INPUT_EVAL_AD7147EBZ) 893#if defined(CONFIG_INPUT_EVAL_AD7147EBZ)
920 { 894 {
921 .modalias = "ad714x_captouch", 895 .modalias = "ad714x_captouch",
@@ -940,24 +914,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
940 .mode = SPI_MODE_3, 914 .mode = SPI_MODE_3,
941 }, 915 },
942#endif 916#endif
943#if defined(CONFIG_PBX)
944 {
945 .modalias = "fxs-spi",
946 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
947 .bus_num = 0,
948 .chip_select = 8 - CONFIG_J11_JUMPER,
949 .controller_data = &spi_si3xxx_chip_info,
950 .mode = SPI_MODE_3,
951 },
952 {
953 .modalias = "fxo-spi",
954 .max_speed_hz = 12500000, /* max spi clock (SCK) speed in HZ */
955 .bus_num = 0,
956 .chip_select = 8 - CONFIG_J19_JUMPER,
957 .controller_data = &spi_si3xxx_chip_info,
958 .mode = SPI_MODE_3,
959 },
960#endif
961#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE) 917#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
962 { 918 {
963 .modalias = "ad7877", 919 .modalias = "ad7877",
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index 97a86b4ce96d..88eade89842e 100644
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -101,13 +101,6 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
101}; 101};
102#endif 102#endif
103 103
104#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
105static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
106 .enable_dma = 0,
107 .bits_per_word = 16,
108};
109#endif
110
111#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 104#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
112static struct bfin5xx_spi_chip mmc_spi_chip_info = { 105static struct bfin5xx_spi_chip mmc_spi_chip_info = {
113 .enable_dma = 0, 106 .enable_dma = 0,
@@ -150,16 +143,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
150 }, 143 },
151#endif 144#endif
152 145
153#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
154 {
155 .modalias = "ad9960-spi",
156 .max_speed_hz = 10000000, /* max spi clock (SCK) speed in HZ */
157 .bus_num = 0,
158 .chip_select = 1,
159 .controller_data = &ad9960_spi_chip_info,
160 },
161#endif
162
163#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE) 146#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
164 { 147 {
165 .modalias = "mmc_spi", 148 .modalias = "mmc_spi",