From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Oct 2017 09:38:07 +0000 (+0100)
Subject: Merge tag 'mvebu-arm64-4.15-1' of git://git.infradead.org/linux-mvebu into next/soc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5068d8710026f7db6ad36201fd650ae2f93144b3;p=linux.git

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
---

5068d8710026f7db6ad36201fd650ae2f93144b3
diff --cc arch/arm64/configs/defconfig
index 7824e8d713155,53cc94028b40e..1825ce7e7f6c1
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -544,8 -536,8 +547,9 @@@ CONFIG_PWM_SAMSUNG=
  CONFIG_PWM_TEGRA=m
  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