arm64: configs: switch to mainline implementation of QCOM SMSM and SMP2P

The current release branch include both the old and the upstream implementation
of these drivers, let's switch to mainline.

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 67c52b9bda906fb3667fd8ed58259dc3e4340905..9f3814df880305bc71dada959270f2bef3c5969c 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -156,8 +156,6 @@ CONFIG_SPMI=y
 CONFIG_PINCTRL_MSM8916=y
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 CONFIG_GPIO_PL061=y
-CONFIG_GPIO_QCOM_SMSM=y
-CONFIG_GPIO_QCOM_SMP2P=y
 CONFIG_GPIO_XGENE=y
 CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_RESET_XGENE=y
@@ -260,6 +258,8 @@ CONFIG_QCOM_GSBI=y
 CONFIG_QCOM_SMEM=y
 CONFIG_QCOM_SMD=y
 CONFIG_QCOM_SMD_RPM=y
+CONFIG_QCOM_SMP2P=y
+CONFIG_QCOM_SMSM=y
 CONFIG_QCOM_WCNSS_CTRL=y
 CONFIG_MSM_BUS_SCALING=y
 CONFIG_QTI_LNX_GPS_PROXY=y