Skip to content

Commit 89fbec5

Browse files
Fabio Estevamshawnguo2
authored andcommitted
ARM: imx: Fix the removal of CONFIG_SPI option
Since 64546e9 ("ARM: imx_v6_v7_defconfig updates") and commit 0650f85 ("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. 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 <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent c72c553 commit 89fbec5

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/arm/configs/imx_v4_v5_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y
9797
# CONFIG_HW_RANDOM is not set
9898
CONFIG_I2C_CHARDEV=y
9999
CONFIG_I2C_IMX=y
100+
CONFIG_SPI=y
100101
CONFIG_SPI_IMX=y
101102
CONFIG_SPI_SPIDEV=y
102103
CONFIG_GPIO_SYSFS=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ CONFIG_I2C_CHARDEV=y
158158
CONFIG_I2C_ALGOPCF=m
159159
CONFIG_I2C_ALGOPCA=m
160160
CONFIG_I2C_IMX=y
161+
CONFIG_SPI=y
161162
CONFIG_SPI_IMX=y
162163
CONFIG_GPIO_SYSFS=y
163164
CONFIG_GPIO_MC9S08DZ60=y

0 commit comments

Comments
 (0)