summaryrefslogtreecommitdiffstats
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-07-18 08:53:22 -0700
committerOlof Johansson <olof@lixom.net>2018-07-18 08:53:22 -0700
commit3de0a6b986d5b71984a3d81e848f375240b83aac (patch)
treeac745707ec956d3cd577ecfb1535c87f5c7575f8 /arch/arm64/configs
parent28f6f7295fe14d5fb8a204881bd382edeb06401e (diff)
parentcc4493faf494bb8af2324b1b7cabd1f1457a76ca (diff)
downloadlinux-3de0a6b986d5b71984a3d81e848f375240b83aac.tar.bz2
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 <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 37c72dbd53da..cbc55c4a7ae4 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -618,6 +618,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y
CONFIG_PHY_ROCKCHIP_PCIE=m
CONFIG_PHY_ROCKCHIP_TYPEC=y
CONFIG_PHY_TEGRA_XUSB=y
+CONFIG_HISI_PMU=y
CONFIG_QCOM_L2_PMU=y
CONFIG_QCOM_L3_PMU=y
CONFIG_QCOM_QFPROM=y