diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2007-10-29 05:31:18 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-10-29 05:31:18 -0400 |
commit | a15c2dcff2766edb92d9433e3de8ae7d7c081be5 (patch) | |
tree | 08226f82724bec528b5960e94443fc0b5c3ef91e /arch/blackfin/mach-bf533 | |
parent | 8ecc73687b560698e63ef78614ac8aba7f565594 (diff) |
Blackfin arch: Apply Bluetchnix vendor patch provided by Harald Krapfenbauer
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin/mach-bf533')
-rw-r--r-- | arch/blackfin/mach-bf533/boards/cm_bf533.c | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index 1c5a86adfab..a863522a446 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c | |||
@@ -46,7 +46,7 @@ const char bfin_board_name[] = "Bluetechnix CM BF533"; | |||
46 | 46 | ||
47 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 47 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
48 | /* all SPI peripherals info goes here */ | 48 | /* all SPI peripherals info goes here */ |
49 | 49 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | |
50 | static struct mtd_partition bfin_spi_flash_partitions[] = { | 50 | static struct mtd_partition bfin_spi_flash_partitions[] = { |
51 | { | 51 | { |
52 | .name = "bootloader", | 52 | .name = "bootloader", |
@@ -76,12 +76,15 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { | |||
76 | .enable_dma = 0, /* use dma transfer with this chip*/ | 76 | .enable_dma = 0, /* use dma transfer with this chip*/ |
77 | .bits_per_word = 8, | 77 | .bits_per_word = 8, |
78 | }; | 78 | }; |
79 | #endif | ||
79 | 80 | ||
80 | /* SPI ADC chip */ | 81 | /* SPI ADC chip */ |
82 | #if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE) | ||
81 | static struct bfin5xx_spi_chip spi_adc_chip_info = { | 83 | static struct bfin5xx_spi_chip spi_adc_chip_info = { |
82 | .enable_dma = 1, /* use dma transfer with this chip*/ | 84 | .enable_dma = 1, /* use dma transfer with this chip*/ |
83 | .bits_per_word = 16, | 85 | .bits_per_word = 16, |
84 | }; | 86 | }; |
87 | #endif | ||
85 | 88 | ||
86 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 89 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
87 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | 90 | static struct bfin5xx_spi_chip ad1836_spi_chip_info = { |
@@ -90,7 +93,15 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = { | |||
90 | }; | 93 | }; |
91 | #endif | 94 | #endif |
92 | 95 | ||
96 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | ||
97 | static struct bfin5xx_spi_chip spi_mmc_chip_info = { | ||
98 | .enable_dma = 1, | ||
99 | .bits_per_word = 8, | ||
100 | }; | ||
101 | #endif | ||
102 | |||
93 | static struct spi_board_info bfin_spi_board_info[] __initdata = { | 103 | static struct spi_board_info bfin_spi_board_info[] __initdata = { |
104 | #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) | ||
94 | { | 105 | { |
95 | /* the modalias must be the same as spi device driver name */ | 106 | /* the modalias must be the same as spi device driver name */ |
96 | .modalias = "m25p80", /* Name of spi_driver for this device */ | 107 | .modalias = "m25p80", /* Name of spi_driver for this device */ |
@@ -100,7 +111,11 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
100 | .platform_data = &bfin_spi_flash_data, | 111 | .platform_data = &bfin_spi_flash_data, |
101 | .controller_data = &spi_flash_chip_info, | 112 | .controller_data = &spi_flash_chip_info, |
102 | .mode = SPI_MODE_3, | 113 | .mode = SPI_MODE_3, |
103 | }, { | 114 | }, |
115 | #endif | ||
116 | |||
117 | #if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE) | ||
118 | { | ||
104 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ | 119 | .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */ |
105 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ | 120 | .max_speed_hz = 6250000, /* max spi clock (SCK) speed in HZ */ |
106 | .bus_num = 0, /* Framework bus number */ | 121 | .bus_num = 0, /* Framework bus number */ |
@@ -108,6 +123,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
108 | .platform_data = NULL, /* No spi_driver specific config */ | 123 | .platform_data = NULL, /* No spi_driver specific config */ |
109 | .controller_data = &spi_adc_chip_info, | 124 | .controller_data = &spi_adc_chip_info, |
110 | }, | 125 | }, |
126 | #endif | ||
127 | |||
111 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) | 128 | #if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) |
112 | { | 129 | { |
113 | .modalias = "ad1836-spi", | 130 | .modalias = "ad1836-spi", |
@@ -117,6 +134,27 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
117 | .controller_data = &ad1836_spi_chip_info, | 134 | .controller_data = &ad1836_spi_chip_info, |
118 | }, | 135 | }, |
119 | #endif | 136 | #endif |
137 | |||
138 | #if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE) | ||
139 | { | ||
140 | .modalias = "spi_mmc_dummy", | ||
141 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | ||
142 | .bus_num = 0, | ||
143 | .chip_select = 0, | ||
144 | .platform_data = NULL, | ||
145 | .controller_data = &spi_mmc_chip_info, | ||
146 | .mode = SPI_MODE_3, | ||
147 | }, | ||
148 | { | ||
149 | .modalias = "spi_mmc", | ||
150 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | ||
151 | .bus_num = 0, | ||
152 | .chip_select = CONFIG_SPI_MMC_CS_CHAN, | ||
153 | .platform_data = NULL, | ||
154 | .controller_data = &spi_mmc_chip_info, | ||
155 | .mode = SPI_MODE_3, | ||
156 | }, | ||
157 | #endif | ||
120 | }; | 158 | }; |
121 | 159 | ||
122 | /* SPI (0) */ | 160 | /* SPI (0) */ |