commit d3b4aa7f787e57d0a049f520c7083c6954803681
author Antoine Tenart <antoine.tenart@free-electrons.com> Wed Oct 14 16:02:50 2015 +0200
committer Olof Johansson <olof@lixom.net> Thu Oct 22 09:38:15 2015 -0700
tree bbc887b18741a11549ad564891b7d65d283cefe9
parent fb40c67769100dd2b95d52f447ba0bc19387ca60

ARM: multi_v7_defconfig: improve multi_v7_defconfig support for Berlin

Some drivers used on a Marvell Berlin kernel were missing from
multi_v7_defconfig. This series add them:

  * The pxa168 Ethernet driver is added as a loadable module.
  * The Berlin ADC driver is added as a loadable module.
  * Both the Berlin USB PHY and SATA PHY drivers are added,
    built-in, as they are required for the already available USB
    and SATA functionalities in multi_v7_defconfig.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/configs/multi_v7_defconfig

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index c2bd549..73f7d76 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -207,6 +207,7 @@
 CONFIG_IGB=y
 CONFIG_MV643XX_ETH=y
 CONFIG_MVNETA=y
+CONFIG_PXA168_ETH=m
 CONFIG_KS8851=y
 CONFIG_R8169=y
 CONFIG_SH_ETH=y
@@ -656,6 +657,7 @@
 CONFIG_TI_AEMIF=y
 CONFIG_IIO=y
 CONFIG_AT91_ADC=m
+CONFIG_BERLIN2_ADC=m
 CONFIG_EXYNOS_ADC=m
 CONFIG_XILINX_XADC=y
 CONFIG_AK8975=y
@@ -672,6 +674,8 @@
 CONFIG_PWM_STI=m
 CONFIG_OMAP_USB2=y
 CONFIG_TI_PIPE3=y
+CONFIG_PHY_BERLIN_USB=y
+CONFIG_PHY_BERLIN_SATA=y
 CONFIG_PHY_ROCKCHIP_USB=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_MIPHY28LP=y