diff options
| -rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-n8x0.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom-display.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/common-board-devices.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mcspi.h | 3 |
6 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index e921e3be24a4..d839c0506d8e 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
| @@ -280,7 +280,6 @@ static struct omap_dss_board_info cm_t35_dss_data = { | |||
| 280 | 280 | ||
| 281 | static struct omap2_mcspi_device_config tdo24m_mcspi_config = { | 281 | static struct omap2_mcspi_device_config tdo24m_mcspi_config = { |
| 282 | .turbo_mode = 0, | 282 | .turbo_mode = 0, |
| 283 | .single_channel = 1, /* 0: slave, 1: master */ | ||
| 284 | }; | 283 | }; |
| 285 | 284 | ||
| 286 | static struct tdo24m_platform_data tdo24m_config = { | 285 | static struct tdo24m_platform_data tdo24m_config = { |
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index 42a4d11fad23..a9e983e01199 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c | |||
| @@ -137,7 +137,6 @@ static void __init n8x0_usb_init(void) {} | |||
| 137 | 137 | ||
| 138 | static struct omap2_mcspi_device_config p54spi_mcspi_config = { | 138 | static struct omap2_mcspi_device_config p54spi_mcspi_config = { |
| 139 | .turbo_mode = 0, | 139 | .turbo_mode = 0, |
| 140 | .single_channel = 1, | ||
| 141 | }; | 140 | }; |
| 142 | 141 | ||
| 143 | static struct spi_board_info n800_spi_board_info[] __initdata = { | 142 | static struct spi_board_info n800_spi_board_info[] __initdata = { |
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index acb4e77b39ef..0a668916e3c1 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
| @@ -138,17 +138,14 @@ static struct lp5523_platform_data rx51_lp5523_platform_data = { | |||
| 138 | 138 | ||
| 139 | static struct omap2_mcspi_device_config wl1251_mcspi_config = { | 139 | static struct omap2_mcspi_device_config wl1251_mcspi_config = { |
| 140 | .turbo_mode = 0, | 140 | .turbo_mode = 0, |
| 141 | .single_channel = 1, | ||
| 142 | }; | 141 | }; |
| 143 | 142 | ||
| 144 | static struct omap2_mcspi_device_config mipid_mcspi_config = { | 143 | static struct omap2_mcspi_device_config mipid_mcspi_config = { |
| 145 | .turbo_mode = 0, | 144 | .turbo_mode = 0, |
| 146 | .single_channel = 1, | ||
| 147 | }; | 145 | }; |
| 148 | 146 | ||
| 149 | static struct omap2_mcspi_device_config tsc2005_mcspi_config = { | 147 | static struct omap2_mcspi_device_config tsc2005_mcspi_config = { |
| 150 | .turbo_mode = 0, | 148 | .turbo_mode = 0, |
| 151 | .single_channel = 1, | ||
| 152 | }; | 149 | }; |
| 153 | 150 | ||
| 154 | static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = { | 151 | static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = { |
diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c index d4683ba5f721..281829036758 100644 --- a/arch/arm/mach-omap2/board-zoom-display.c +++ b/arch/arm/mach-omap2/board-zoom-display.c | |||
| @@ -117,7 +117,6 @@ static struct omap_dss_board_info zoom_dss_data = { | |||
| 117 | 117 | ||
| 118 | static struct omap2_mcspi_device_config dss_lcd_mcspi_config = { | 118 | static struct omap2_mcspi_device_config dss_lcd_mcspi_config = { |
| 119 | .turbo_mode = 1, | 119 | .turbo_mode = 1, |
| 120 | .single_channel = 1, /* 0: slave, 1: master */ | ||
| 121 | }; | 120 | }; |
| 122 | 121 | ||
| 123 | static struct spi_board_info nec_8048_spi_board_info[] __initdata = { | 122 | static struct spi_board_info nec_8048_spi_board_info[] __initdata = { |
diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c index bcb0c5817167..2d1d775f2c3e 100644 --- a/arch/arm/mach-omap2/common-board-devices.c +++ b/arch/arm/mach-omap2/common-board-devices.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) | 33 | defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) |
| 34 | static struct omap2_mcspi_device_config ads7846_mcspi_config = { | 34 | static struct omap2_mcspi_device_config ads7846_mcspi_config = { |
| 35 | .turbo_mode = 0, | 35 | .turbo_mode = 0, |
| 36 | .single_channel = 1, /* 0: slave, 1: master */ | ||
| 37 | }; | 36 | }; |
| 38 | 37 | ||
| 39 | static struct ads7846_platform_data ads7846_config = { | 38 | static struct ads7846_platform_data ads7846_config = { |
diff --git a/arch/arm/plat-omap/include/plat/mcspi.h b/arch/arm/plat-omap/include/plat/mcspi.h index 3d51b18131cc..a357eb26bd25 100644 --- a/arch/arm/plat-omap/include/plat/mcspi.h +++ b/arch/arm/plat-omap/include/plat/mcspi.h | |||
| @@ -18,9 +18,6 @@ struct omap2_mcspi_dev_attr { | |||
| 18 | 18 | ||
| 19 | struct omap2_mcspi_device_config { | 19 | struct omap2_mcspi_device_config { |
| 20 | unsigned turbo_mode:1; | 20 | unsigned turbo_mode:1; |
| 21 | |||
| 22 | /* Do we want one channel enabled at the same time? */ | ||
| 23 | unsigned single_channel:1; | ||
| 24 | }; | 21 | }; |
| 25 | 22 | ||
| 26 | #endif | 23 | #endif |
