From: Kevin Hilman Date: Tue, 17 Dec 2013 22:12:02 +0000 (-0800) Subject: Merge tag 'omap-for-v3.14/board-removal-safe' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: firefly_0821_release~176^2~4587^2~12 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c38183c8338aea26ad2cd1f922df63fe7f2420d8;p=firefly-linux-kernel-4.4.55.git Merge tag 'omap-for-v3.14/board-removal-safe' of git://git./linux/kernel/git/tmlind/linux-omap into next/boards From Tony Lindgren: Make omap2420 and 2430 boot in device tree only mode and prepare things for removing omap3 legacy booting support. We can make omap2420 and 2430 boot in device tree only mode by keeping board-n8x0.c around until Menelaus has device tree and regulator support so devices still work. For the omap2430-sdp we have omap2430-sdp.dts, and there's also a minimal support for H4 in omap2420-h4.dts. For omap3, let's not drop the legacy platform booting quite yet so people have a little time to update their booting system. With the fixes going into v3.13, thing should behave pretty much the same way for legacy booting and device tree based booting for omap3. So people using omap3 based boards, please update your systems to boot in device tree mode as omap3 is the last SoC in mach-omap2 that boots in the legacy mode. * tag 'omap-for-v3.14/board-removal-safe' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (299 commits) ARM: dts: Add basic devices on am3517-evm ARM: OMAP2+: Use pdata quirks for emac on am3517 ARM: OMAP2+: Add support for legacy auxdata for twl ARM: dts: Fix booting for secure omaps ARM: OMAP2+: Fix the machine entry for am3517 ARM: dts: Fix missing entries for am3517 ARM: OMAP2+: Fix overwriting hwmod data with data from device tree +Linux 3.13-rc3 Signed-off-by: Kevin Hilman --- c38183c8338aea26ad2cd1f922df63fe7f2420d8 diff --cc arch/arm/configs/multi_v7_defconfig index d5a6f3233fa0,c1df4e9db140..cdb85cb6b3b0 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -68,8 -68,8 +68,9 @@@ CONFIG_NET_CALXEDA_XGMAC= CONFIG_KS8851=y CONFIG_SMSC911X=y CONFIG_STMMAC_ETH=y +CONFIG_ICPLUS_PHY=y CONFIG_MDIO_SUN4I=y + CONFIG_TI_CPSW=y CONFIG_KEYBOARD_SPEAR=y CONFIG_SERIO_AMBAKMI=y CONFIG_SERIAL_8250=y