CHROMIUM: config: qcom: Enable PINCTRL_MSM explicitly

In commit be117ca ("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 <<EOF | tee -a \ chromeos/config/arm64/chromiumos-arm64.flavour.config \ chromeos/config/arm64/chromiumos-qualcomm.flavour.config CONFIG_PINCTRL_MSM=y EOF on top of a normalized config. BUG=None TEST=emerge-trogdor chromeos-kernel-upstream; Boots on Lazor Change-Id: I81d7c8710d1218bbb5079ebf122ec0c281adabd3 Signed-off-by: Stephen Boyd <swboyd@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3002927 Commit-Queue: Evan Green <evgreen@chromium.org> Reviewed-by: Lukasz Majczak <lmajczak@google.com> Reviewed-by: Evan Green <evgreen@chromium.org>
mariux64 · Jul 20, 2021 · 7e3a2a3 · 7e3a2a3
1 parent 608512d
commit 7e3a2a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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