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

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

[Jan Luebbe]

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

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/configs/multi_v5_defconfig | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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
-- 
2.1.4

[PATCH 2/2] ARM: multi_v5_defconfig: Enable recommended options for systemd

[Jan Luebbe]

Enable FHANDLE, CGROUPS, BLK_DEV_BSG and DEVTMPFS as recommended by
systemd (which also matches the multi_v7 defconfig). Also enable IPV6,
which defaults to 'y' by now.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/configs/multi_v5_defconfig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index bb8d609..a822dd3 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -1,14 +1,15 @@
 CONFIG_SYSVIPC=y
+CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=19
+CONFIG_CGROUPS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
 CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
@@ -65,13 +66,14 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_NET_DSA=y
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_PKTGEN=m
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_IMX_WEIM=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
-- 
2.1.4

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

[Arnd Bergmann]

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 <jlu@pengutronix.de>
> 

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

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

[Sascha Hauer]

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 <jlu@pengutronix.de>

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Shawn, can you take this one?

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

[Shawn Guo]

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 <jlu@pengutronix.de>
> 
> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> 
> Shawn, can you take this one?

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

Shawn

[PATCH 2/2] ARM: multi_v5_defconfig: Enable recommended options for systemd

[Jan Lübbe]

On Sa, 2016-03-26 at 12:28 +0100, Jan Luebbe wrote:
> Enable FHANDLE, CGROUPS, BLK_DEV_BSG and DEVTMPFS as recommended by
> systemd (which also matches the multi_v7 defconfig). Also enable IPV6,
> which defaults to 'y' by now.
> 
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>

Shawn, you've already applied 1/2. Do you have any concerns or comments
regarding this one?

Regards,
Jan
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 2/2] ARM: multi_v5_defconfig: Enable recommended options for systemd

[Shawn Guo]

On Tue, Apr 12, 2016 at 01:57:48PM +0200, Jan L?bbe wrote:
> On Sa, 2016-03-26 at 12:28 +0100, Jan Luebbe wrote:
> > Enable FHANDLE, CGROUPS, BLK_DEV_BSG and DEVTMPFS as recommended by
> > systemd (which also matches the multi_v7 defconfig). Also enable IPV6,
> > which defaults to 'y' by now.
> > 
> > Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
> 
> Shawn, you've already applied 1/2. Do you have any concerns or comments
> regarding this one?

I thought that Arnd's request and Sascha's ACK only applies to 1/2.
Just applied 2/2 as well.  @Arnd, let me know if I shouldn't.

Shawn

[PATCH 2/2] ARM: multi_v5_defconfig: Enable recommended options for systemd

[Arnd Bergmann]

On Tuesday 12 April 2016 22:26:54 Shawn Guo wrote:
> On Tue, Apr 12, 2016 at 01:57:48PM +0200, Jan L?bbe wrote:
> > On Sa, 2016-03-26 at 12:28 +0100, Jan Luebbe wrote:
> > > Enable FHANDLE, CGROUPS, BLK_DEV_BSG and DEVTMPFS as recommended by
> > > systemd (which also matches the multi_v7 defconfig). Also enable IPV6,
> > > which defaults to 'y' by now.
> > > 
> > > Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
> > 
> > Shawn, you've already applied 1/2. Do you have any concerns or comments
> > regarding this one?
> 
> I thought that Arnd's request and Sascha's ACK only applies to 1/2.
> Just applied 2/2 as well.  @Arnd, let me know if I shouldn't.
> 
> 

I'd like to see both get picked up into the same branch if the changes are
for the same platform, sorry if that wasn't clear enough.

I guess in this case you can argue that the actual changes of 2/2 are
not imx specific at all, and I'd be fine with picking them up directly,
but I tend to prefer the defconfig changes to come from one of the subarch
maintainers just so I don't have to watch too carefully for patches
on the mailing list.

	Arnd