From: Paolo Pisati Date: Fri, 30 Mar 2018 09:30:34 +0000 (+0000) Subject: UBUNTU: [Config] arm64: snapdragon: REGMAP_SPMI=y, PINCTRL_QCOM_SPMI_PMIC=y X-Git-Tag: Ubuntu-4.15.0-16.17~233 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=a499db2b6c18a047c6ad05534f0b1d826883c2ab;p=mirror_ubuntu-bionic-kernel.git UBUNTU: [Config] arm64: snapdragon: REGMAP_SPMI=y, PINCTRL_QCOM_SPMI_PMIC=y BugLink: http://bugs.launchpad.net/bugs/1763040 Signed-off-by: Paolo Pisati Acked-by: Seth Forshee Acked-by: Thadeu Lima de Souza Cascardo Signed-off-by: Thadeu Lima de Souza Cascardo --- diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 060c58900b6a..d10285bf50bb 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -346,6 +346,7 @@ CONFIG_RAW_DRIVER=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_REED_SOLOMON=m # CONFIG_REFCOUNT_FULL is not set +CONFIG_REGMAP_SPMI=m CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REGULATOR_TWL4030=m diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic index 50c41b426eb7..3836920bc5ba 100644 --- a/debian.master/config/arm64/config.flavour.generic +++ b/debian.master/config/arm64/config.flavour.generic @@ -5,6 +5,8 @@ CONFIG_COMMON_CLK_QCOM=m CONFIG_HWSPINLOCK_QCOM=m CONFIG_MSM_GCC_8916=m CONFIG_PINCTRL_MSM8916=m +CONFIG_PINCTRL_QCOM_SPMI_PMIC=m +CONFIG_REGMAP_SPMI=m CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_SPMI=m CONFIG_SPMI_MSM_PMIC_ARB=m diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon index 08881d293466..85890b4dd22e 100644 --- a/debian.master/config/arm64/config.flavour.snapdragon +++ b/debian.master/config/arm64/config.flavour.snapdragon @@ -5,6 +5,8 @@ CONFIG_COMMON_CLK_QCOM=y CONFIG_HWSPINLOCK_QCOM=y CONFIG_MSM_GCC_8916=y CONFIG_PINCTRL_MSM8916=y +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y +CONFIG_REGMAP_SPMI=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_SPMI=y CONFIG_SPMI_MSM_PMIC_ARB=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 5b53588ea521..73401dc3a03a 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -320,6 +320,7 @@ CONFIG_PINCTRL_BERLIN_BG2=y CONFIG_PINCTRL_BERLIN_BG2CD=y CONFIG_PINCTRL_BERLIN_BG2Q=y CONFIG_PINCTRL_MSM8916=m +CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_PM_DEBUG=y CONFIG_PM_DEVFREQ=y CONFIG_POWERCAP=y @@ -344,6 +345,7 @@ CONFIG_RAW_DRIVER=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_REED_SOLOMON=y # CONFIG_REFCOUNT_FULL is not set +CONFIG_REGMAP_SPMI=m CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_TPS65217=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 1dc58a67e909..78df35e188a1 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6725,7 +6725,6 @@ CONFIG_PINCTRL_PFC_R8A7795=y CONFIG_PINCTRL_PFC_R8A7796=y CONFIG_PINCTRL_PFC_R8A77995=y CONFIG_PINCTRL_PFC_SH73A0=y -CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_PINCTRL_QCOM_SSBI_PMIC=m CONFIG_PINCTRL_QDF2XXX=m CONFIG_PINCTRL_RK805=m @@ -7213,7 +7212,6 @@ CONFIG_REGMAP_I2C=y CONFIG_REGMAP_IRQ=y CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_SPMI=m CONFIG_REGMAP_W1=m CONFIG_REGULATOR_88PM800=m CONFIG_REGULATOR_88PM8607=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 0863dd187428..715f0aa1e7a7 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -338,6 +338,7 @@ CONFIG_RAW_DRIVER=m CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_REED_SOLOMON=m # CONFIG_REFCOUNT_FULL is not set +CONFIG_REGMAP_SPMI=m CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REGULATOR_TWL4030=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index af118c0a7c91..7a71d3f3307b 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -344,6 +344,7 @@ CONFIG_RAW_DRIVER=m CONFIG_RCU_CPU_STALL_TIMEOUT=21 CONFIG_REED_SOLOMON=m # CONFIG_REFCOUNT_FULL is not set +CONFIG_REGMAP_SPMI=m CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REGULATOR_TWL4030=m