Merge tag 'hisi-defconfig-for-4.19' of git://github.com/hisilicon/linux-hisi into...

ARM64: hisilicon: defconfig updates for 4.18

- Enable uncore pmu for some hisilicon SoCs

* tag 'hisi-defconfig-for-4.19' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: enable HiSilicon PMU driver

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm64/configs/defconfig
index 37c72dbd53da1dcf2d928d0859901a4999778b9b,be36e61a6b01c2da54c01b220c975be8f343f104..cbc55c4a7ae4ac79e8c364dcc70dddc81266a588
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -603,23 -618,25 +603,24 @@@ CONFIG_PWM_RCAR=
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_PWM_SAMSUNG=y
  CONFIG_PWM_TEGRA=m
 +CONFIG_PHY_XGENE=y
 +CONFIG_PHY_SUN4I_USB=y
 +CONFIG_PHY_HI6220_USB=y
  CONFIG_PHY_HISTB_COMBPHY=y
  CONFIG_PHY_HISI_INNO_USB2=y
 -CONFIG_PHY_RCAR_GEN3_USB2=y
 -CONFIG_PHY_RCAR_GEN3_USB3=m
 -CONFIG_PHY_HI6220_USB=y
 -CONFIG_PHY_QCOM_USB_HS=y
 -CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_MVEBU_CP110_COMPHY=y
  CONFIG_PHY_QCOM_QMP=m
 -CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 +CONFIG_PHY_QCOM_USB_HS=y
 +CONFIG_PHY_RCAR_GEN3_USB2=y
 +CONFIG_PHY_RCAR_GEN3_USB3=m
  CONFIG_PHY_ROCKCHIP_EMMC=y
 +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
  CONFIG_PHY_ROCKCHIP_PCIE=m
  CONFIG_PHY_ROCKCHIP_TYPEC=y
 -CONFIG_PHY_XGENE=y
  CONFIG_PHY_TEGRA_XUSB=y
+ CONFIG_HISI_PMU=y
  CONFIG_QCOM_L2_PMU=y
  CONFIG_QCOM_L3_PMU=y
 -CONFIG_MESON_EFUSE=m
  CONFIG_QCOM_QFPROM=y
  CONFIG_ROCKCHIP_EFUSE=y
  CONFIG_UNIPHIER_EFUSE=y