3 files changed, 9 insertions, 6 deletions

diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 558e5f8589cb..68c3f0799d5b 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -375,6 +375,8 @@ static struct imx_ssi_platform_data mx31_3ds_ssi_pdata = {
 
 /* SPI */
 static int spi0_internal_chipselect[] = {
+        MXC_SPI_CS(0),
+        MXC_SPI_CS(1),
         MXC_SPI_CS(2),
 };
 
@@ -385,6 +387,7 @@ static const struct spi_imx_master spi0_pdata __initconst = {
 
 static int spi1_internal_chipselect[] = {
         MXC_SPI_CS(0),
+        MXC_SPI_CS(1),
         MXC_SPI_CS(2),
 };
 
@@ -398,7 +401,7 @@ static struct spi_board_info mx31_3ds_spi_devs[] __initdata = {
                 .modalias       = "mc13783",
                 .max_speed_hz   = 1000000,
                 .bus_num        = 1,
-                .chip_select    = 1, /* SS2 */
+                .chip_select    = 2, /* SS2 */
                 .platform_data  = &mc13783_pdata,
                 /* irq number is run-time assigned */
                 .mode = SPI_CS_HIGH,
@@ -406,7 +409,7 @@ static struct spi_board_info mx31_3ds_spi_devs[] __initdata = {
                 .modalias       = "l4f00242t03",
                 .max_speed_hz   = 5000000,
                 .bus_num        = 0,
-                .chip_select    = 0, /* SS2 */
+                .chip_select    = 2, /* SS2 */
                 .platform_data  = &mx31_3ds_l4f00242t03_pdata,
         },
 };
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index cc867682520e..bde9a9af6714 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -296,14 +296,14 @@ static struct spi_board_info moboard_spi_board_info[] __initdata = {
                 /* irq number is run-time assigned */
                 .max_speed_hz = 300000,
                 .bus_num = 1,
-                .chip_select = 0,
+                .chip_select = 1,
                 .platform_data = &moboard_pmic,
                 .mode = SPI_CS_HIGH,
         },
 };
 
 static int moboard_spi2_cs[] = {
-        MXC_SPI_CS(1),
+        MXC_SPI_CS(0), MXC_SPI_CS(1),
 };
 
 static const struct spi_imx_master moboard_spi2_pdata __initconst = {
diff --git a/arch/arm/mach-imx/mach-pcm037_eet.c b/arch/arm/mach-imx/mach-pcm037_eet.c
index 8fd8255068ee..95bd97710494 100644
--- a/arch/arm/mach-imx/mach-pcm037_eet.c
+++ b/arch/arm/mach-imx/mach-pcm037_eet.c
@@ -50,13 +50,13 @@ static struct spi_board_info pcm037_spi_dev[] = {
                 .modalias       = "dac124s085",
                 .max_speed_hz   = 400000,
                 .bus_num        = 0,
-                .chip_select    = 0,            /* Index in pcm037_spi1_cs[] */
+                .chip_select    = 1,            /* Index in pcm037_spi1_cs[] */
                 .mode           = SPI_CPHA,
         },
 };
 
 /* Platform Data for MXC CSPI */
-static int pcm037_spi1_cs[] = {MXC_SPI_CS(1), IOMUX_TO_GPIO(MX31_PIN_KEY_COL7)};
+static int pcm037_spi1_cs[] = { MXC_SPI_CS(0), MXC_SPI_CS(1), };
 
 static const struct spi_imx_master pcm037_spi1_pdata __initconst = {
         .chipselect = pcm037_spi1_cs,