aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Tenart <antoine.tenart@free-electrons.com>2015-10-14 10:02:50 -0400
committerOlof Johansson <olof@lixom.net>2015-10-22 12:38:15 -0400
commitd3b4aa7f787e57d0a049f520c7083c6954803681 (patch)
treebbc887b18741a11549ad564891b7d65d283cefe9
parentfb40c67769100dd2b95d52f447ba0bc19387ca60 (diff)
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>
-rw-r--r--arch/arm/configs/multi_v7_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index c2bd549cc281..73f7d762704e 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -207,6 +207,7 @@ CONFIG_NET_CALXEDA_XGMAC=y
207CONFIG_IGB=y 207CONFIG_IGB=y
208CONFIG_MV643XX_ETH=y 208CONFIG_MV643XX_ETH=y
209CONFIG_MVNETA=y 209CONFIG_MVNETA=y
210CONFIG_PXA168_ETH=m
210CONFIG_KS8851=y 211CONFIG_KS8851=y
211CONFIG_R8169=y 212CONFIG_R8169=y
212CONFIG_SH_ETH=y 213CONFIG_SH_ETH=y
@@ -656,6 +657,7 @@ CONFIG_EXTCON=y
656CONFIG_TI_AEMIF=y 657CONFIG_TI_AEMIF=y
657CONFIG_IIO=y 658CONFIG_IIO=y
658CONFIG_AT91_ADC=m 659CONFIG_AT91_ADC=m
660CONFIG_BERLIN2_ADC=m
659CONFIG_EXYNOS_ADC=m 661CONFIG_EXYNOS_ADC=m
660CONFIG_XILINX_XADC=y 662CONFIG_XILINX_XADC=y
661CONFIG_AK8975=y 663CONFIG_AK8975=y
@@ -672,6 +674,8 @@ CONFIG_PHY_HIX5HD2_SATA=y
672CONFIG_PWM_STI=m 674CONFIG_PWM_STI=m
673CONFIG_OMAP_USB2=y 675CONFIG_OMAP_USB2=y
674CONFIG_TI_PIPE3=y 676CONFIG_TI_PIPE3=y
677CONFIG_PHY_BERLIN_USB=y
678CONFIG_PHY_BERLIN_SATA=y
675CONFIG_PHY_ROCKCHIP_USB=m 679CONFIG_PHY_ROCKCHIP_USB=m
676CONFIG_PHY_QCOM_APQ8064_SATA=m 680CONFIG_PHY_QCOM_APQ8064_SATA=m
677CONFIG_PHY_MIPHY28LP=y 681CONFIG_PHY_MIPHY28LP=y