[1/2] ARM: multi_v5_defconfig: Enable support for MX21/MX27

Commit Message

Jan Lübbe March 26, 2016, 11:28 a.m. UTC

Although the SoC support was already enabled, the drivers and machines
were missing.

Signed-off-by: Jan Luebbe <[e-mail]>
---
 arch/arm/configs/multi_v5_defconfig | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

Comments

Arnd Bergmann March 29, 2016, 10:28 p.m. UTC | #1

On Saturday 26 March 2016 12:28:25 Jan Luebbe wrote:
> Although the SoC support was already enabled, the drivers and machines
> were missing.
> 
> Signed-off-by: Jan Luebbe <[e-mail]>
> 

I thought about applying this to the bug fix branch for 4.6, but
it doesn't seem urgent enough for that. Unless there is something
I'm missing about why we need it now, please have these merged
by the i.MX maintainers and sent to our next/defconfig branch for 4.7.

	Arnd

Sascha Hauer April 1, 2016, 11:53 a.m. UTC | #2

On Sat, Mar 26, 2016 at 12:28:25PM +0100, Jan Luebbe wrote:
> Although the SoC support was already enabled, the drivers and machines
> were missing.
> 
> Signed-off-by: Jan Luebbe <[e-mail]>

Acked-by: Sascha Hauer <[e-mail]>

Shawn, can you take this one?

Sascha

Shawn Guo April 6, 2016, 2:44 p.m. UTC | #3

On Fri, Apr 01, 2016 at 01:53:16PM +0200, Sascha Hauer wrote:
> On Sat, Mar 26, 2016 at 12:28:25PM +0100, Jan Luebbe wrote:
> > Although the SoC support was already enabled, the drivers and machines
> > were missing.
> > 
> > Signed-off-by: Jan Luebbe <[e-mail]>
> 
> Acked-by: Sascha Hauer <[e-mail]>
> 
> Shawn, can you take this one?

I applied this one (but not 2/2).

Shawn

Patch

diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index e11d99d..bb8d609 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -13,6 +13,11 @@  CONFIG_MODULE_UNLOAD=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
 CONFIG_ARCH_MXC=y
+CONFIG_MACH_MX21ADS=y
+CONFIG_MACH_MX27ADS=y
+CONFIG_MACH_MX27_3DS=y
+CONFIG_MACH_IMX27_VISSTRIM_M10=y
+CONFIG_MACH_PCA100=y
 CONFIG_MACH_IMX27_DT=y
 CONFIG_SOC_IMX25=y
 CONFIG_ARCH_ORION5X=y
@@ -67,6 +72,7 @@  CONFIG_NET_PKTGEN=m
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_IMX_WEIM=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
@@ -110,13 +116,17 @@  CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_IMX=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_NOMADIK=y
 CONFIG_SPI=y
+CONFIG_SPI_IMX=y
 CONFIG_SPI_ORION=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_RESET=y
@@ -131,10 +141,12 @@  CONFIG_THERMAL=y
 CONFIG_KIRKWOOD_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
+CONFIG_IMX2_WDT=y
 # CONFIG_ABX500_CORE is not set
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_FB=y
+CONFIG_FB_IMX=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
@@ -158,7 +170,6 @@  CONFIG_HID_ZEROPLUS=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=y
 CONFIG_USB_STORAGE_DATAFAB=y
@@ -166,6 +177,8 @@  CONFIG_USB_STORAGE_FREECOM=y
 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_MMC=y
 CONFIG_SDIO_UART=y
 CONFIG_MMC_MVSDIO=y