From 7e3a2a3007cc170b68c488a4c02d63f602a6c386 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Thu, 1 Jul 2021 20:08:15 -0700 Subject: [PATCH] CHROMIUM: config: qcom: Enable PINCTRL_MSM explicitly In commit be117ca32261 ("pinctrl: qcom: Kconfig: Rework PINCTRL_MSM to be a depenency rather then a selected config") it's now important to manually specify that we want PINCTRL_MSM--it's not auto-selected. Set it. This is cat < Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3002927 Commit-Queue: Evan Green Reviewed-by: Lukasz Majczak Reviewed-by: Evan Green --- chromeos/config/arm64/chromiumos-arm64.flavour.config | 1 + chromeos/config/arm64/chromiumos-qualcomm.flavour.config | 1 + 2 files changed, 2 insertions(+) diff --git a/chromeos/config/arm64/chromiumos-arm64.flavour.config b/chromeos/config/arm64/chromiumos-arm64.flavour.config index bf51db865d5e0..63cae208fb55b 100644 --- a/chromeos/config/arm64/chromiumos-arm64.flavour.config +++ b/chromeos/config/arm64/chromiumos-arm64.flavour.config @@ -119,6 +119,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_PCIE=y CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_PHY_ROCKCHIP_USB=y +CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_MSM8916=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_SC7180=y diff --git a/chromeos/config/arm64/chromiumos-qualcomm.flavour.config b/chromeos/config/arm64/chromiumos-qualcomm.flavour.config index 524a5da82923e..8d1cdceb86dc5 100644 --- a/chromeos/config/arm64/chromiumos-qualcomm.flavour.config +++ b/chromeos/config/arm64/chromiumos-qualcomm.flavour.config @@ -54,6 +54,7 @@ CONFIG_MMC_SDHCI_MSM=y CONFIG_MSM_GCC_8916=y CONFIG_PHY_QCOM_QMP=y CONFIG_PHY_QCOM_QUSB2=y +CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_SC7180=y CONFIG_PINCTRL_SDM845=y