diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-21 16:39:38 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-21 16:39:38 -0800 |
| commit | 51271cecc925ceac3ea6d8ebf63884226eb13c50 (patch) | |
| tree | ef49386155695801c3e52137514ecde687e9ce91 /arch/arm/configs | |
| parent | 6b6c4a854a3790c5ab760d6129680e97f09fa1b1 (diff) | |
| parent | 89ae11c41e16460d5b259e8059e73f1785f23880 (diff) | |
Merge tag 'sti-defconfig-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/defconfig
Merge "STi defconfig for v3.20, round 1" from Maxime Coquelin:
Highlights:
-----------
- Enable STiH407 USB PicoPHY in multi_v7_defconfig
- Enable MiPHY28lp driver in multi_v7_defconfig
* tag 'sti-defconfig-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti:
ARM: multi_v7_defconfig: Enable MiPHY28lp - ST's Generic (SATA, PCIe & USB3) PHY
ARM: multi_v7_defconfig: Enable stih407 usb picophy
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index bc525e3459cc..b8122efb24f3 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -467,8 +467,10 @@ CONFIG_PWM_VT8500=y CONFIG_PHY_HIX5HD2_SATA=y CONFIG_OMAP_USB2=y CONFIG_TI_PIPE3=y +CONFIG_PHY_MIPHY28LP=y CONFIG_PHY_MIPHY365X=y CONFIG_PHY_STIH41X_USB=y +CONFIG_PHY_STIH407_USB=y CONFIG_PHY_SUN4I_USB=y CONFIG_EXT4_FS=y CONFIG_AUTOFS4_FS=y |