diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 10:38:07 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 10:38:07 +0100 |
| commit | 5068d8710026f7db6ad36201fd650ae2f93144b3 (patch) | |
| tree | 58d2f315a747830ece0ea40c197f5d6d035f1a63 /arch/arm64/configs | |
| parent | 17a8045ba32b48c69ff82336e556c344c05ed012 (diff) | |
| parent | f5bdfbe66ae7c64ef3bd64c742e34111eb0e3164 (diff) | |
| download | linux-5068d8710026f7db6ad36201fd650ae2f93144b3.tar.bz2 | |
Merge tag 'mvebu-arm64-4.15-1' of git://git.infradead.org/linux-mvebu into next/soc
Pull "mvebu arm64 for 4.15 (part 1)" from Gregory CLEMENT:
For Armada 7K/8K, enable NAND, RTC, comphy and 10G PHY in the
defconfig
* tag 'mvebu-arm64-4.15-1' of git://git.infradead.org/linux-mvebu:
arm64: defconfig: enable RTC on Armada 7K/8K SoCs
arm64: defconfig: enable NAND on Armada 7K/8K SoCs
arm64: defconfig: enable Marvell CP110 comphy
arm64: defconfig: enable the Marvell 10G PHY as a module
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7824e8d71315..1825ce7e7f6c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -161,6 +161,7 @@ CONFIG_MTD_BLOCK=y CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_DENALI_DT=y +CONFIG_MTD_NAND_PXA3xx=y CONFIG_MTD_SPI_NOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=m @@ -210,6 +211,7 @@ CONFIG_STMMAC_ETH=m CONFIG_MDIO_BUS_MUX_MMIOREG=y CONFIG_AT803X_PHY=m CONFIG_MARVELL_PHY=m +CONFIG_MARVELL_10G_PHY=m CONFIG_MESON_GXL_PHY=m CONFIG_MICREL_PHY=y CONFIG_REALTEK_PHY=m @@ -480,6 +482,7 @@ CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_S3C=y CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_SUN6I=y +CONFIG_RTC_DRV_ARMADA38X=y CONFIG_RTC_DRV_TEGRA=y CONFIG_RTC_DRV_XGENE=y CONFIG_DMADEVICES=y @@ -546,6 +549,7 @@ CONFIG_PHY_RCAR_GEN3_USB2=y CONFIG_PHY_HI6220_USB=y CONFIG_PHY_QCOM_USB_HS=y CONFIG_PHY_SUN4I_USB=y +CONFIG_PHY_MVEBU_CP110_COMPHY=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_EMMC=y CONFIG_PHY_ROCKCHIP_PCIE=m |