From: Paolo Pisati Date: Fri, 30 Mar 2018 09:28:38 +0000 (+0000) Subject: UBUNTU: [Config] arm64: snapdragon: SPMI=y, SPMI_MSM_PMIC_ARB=y X-Git-Tag: Ubuntu-4.15.0-16.17~234 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a61046b26dfee2ef816df7ddc808aa39725bbfce;p=mirror_ubuntu-bionic-kernel.git UBUNTU: [Config] arm64: snapdragon: SPMI=y, SPMI_MSM_PMIC_ARB=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/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index ae86175a3b95..5e89dccefbe8 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -468,7 +468,6 @@ CONFIG_SOUND=m CONFIG_SPI=y CONFIG_SPI_PXA2XX_PCI=m CONFIG_SPI_ROCKCHIP=m -CONFIG_SPMI=m CONFIG_SRAM=y CONFIG_SSB=m CONFIG_STAGING=y diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic index 814ca8290289..50c41b426eb7 100644 --- a/debian.master/config/arm64/config.flavour.generic +++ b/debian.master/config/arm64/config.flavour.generic @@ -6,3 +6,5 @@ CONFIG_HWSPINLOCK_QCOM=m CONFIG_MSM_GCC_8916=m CONFIG_PINCTRL_MSM8916=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 8a54e4aa45d8..08881d293466 100644 --- a/debian.master/config/arm64/config.flavour.snapdragon +++ b/debian.master/config/arm64/config.flavour.snapdragon @@ -6,3 +6,5 @@ CONFIG_HWSPINLOCK_QCOM=y CONFIG_MSM_GCC_8916=y CONFIG_PINCTRL_MSM8916=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 318672f5124c..5b53588ea521 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -443,6 +443,7 @@ CONFIG_SPI=y CONFIG_SPI_PXA2XX_PCI=m CONFIG_SPI_ROCKCHIP=m CONFIG_SPMI=m +CONFIG_SPMI_MSM_PMIC_ARB=m CONFIG_SRAM=y CONFIG_SSB=m CONFIG_STAGING=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 035cd85e8c94..1dc58a67e909 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -8851,7 +8851,6 @@ CONFIG_SPI_XCOMM=m CONFIG_SPI_XLP=m CONFIG_SPI_ZYNQMP_GQSPI=m CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_SPMI_MSM_PMIC_ARB=m CONFIG_SPRD_DMA=m CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set