From: Olof Johansson Date: Wed, 18 Jul 2018 15:53:22 +0000 (-0700) Subject: Merge tag 'hisi-defconfig-for-4.19' of git://github.com/hisilicon/linux-hisi into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3de0a6b986d5b71984a3d81e848f375240b83aac;p=linux.git Merge tag 'hisi-defconfig-for-4.19' of git://github.com/hisilicon/linux-hisi into next/defconfig 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 --- 3de0a6b986d5b71984a3d81e848f375240b83aac diff --cc arch/arm64/configs/defconfig index 37c72dbd53da1,be36e61a6b01c..cbc55c4a7ae4a --- a/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