[PATCH v3] ARM: imx: Fix the removal of CONFIG_SPI option

[Fabio Estevam]

Since 64546e9fe3a5b8c ("ARM: imx_v6_v7_defconfig updates") and commit 
0650f855d2e4b0b9 ("ARM: imx_v4_v5_defconfig: Select CONFIG_IMX_WEIM") CONFIG_SPI
selection was dropped by savedefconfig for imx_v4_v5_defconfig and 
imx_v6_v7_defconfig.

The reason for savedefconfig dropping CONFIG_SPI=y is well explained
by Uwe Kleine-König:

"on top of 64546e9fe3a5b8c doing

        make imx_v6_v7_defconfig

resulted in CONFIG_SPI=y. That's because MEDIA_SUBDRV_AUTOSELECT selects
SPI and has default y.

So the commit that really broke imx_v6_v7_defconfig is 7d24c514e8e0
([media] Kconfig: do not select SPI bus on sub-driver auto-select)."

In order to keep the same behaviour as previous kernel versions and avoid 
regressions, let's add CONFIG_SPI option back.

Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
---
Changes since v2:
- Add an explanation as to why savedefconfig dropped CONFIG_SPI
Changes since v1:
- Add commit id's that caused the issue.

Shawn,

If possible, please apply this as a bug fix for 3.18.

 arch/arm/configs/imx_v4_v5_defconfig | 1 +
 arch/arm/configs/imx_v6_v7_defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index e688741..e6b0007 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -97,6 +97,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_IMX=y
+CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_GPIO_SYSFS=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 8fca6e2..6790f1b 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -158,6 +158,7 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_ALGOPCF=m
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_IMX=y
+CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MC9S08DZ60=y
-- 
1.9.1