diff options
| author | Joel Stanley <joel@jms.id.au> | 2021-06-15 10:44:32 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2021-09-16 17:05:45 +0930 |
| commit | 95fff5840584569a4c1857445bfc2f2500b8ddf6 (patch) | |
| tree | c834b7e0f2fb25a02315c5837eeaf8f5d55f1647 /arch | |
| parent | e07ecee5b139ef18214723afc1372950250de55c (diff) | |
| download | linux-stable-95fff5840584569a4c1857445bfc2f2500b8ddf6.tar.gz linux-stable-95fff5840584569a4c1857445bfc2f2500b8ddf6.tar.bz2 linux-stable-95fff5840584569a4c1857445bfc2f2500b8ddf6.zip | |
ARM: config: multi v7: Add renamed symbols
These options were renamed in recent times. Add the new name so the
driver is built again, and drop the old name.
POWER_AVS was renamed POWER_AVS_OMAP in commit bca815d62054 ("PM: AVS:
smartreflex Move driver to soc specific drivers"). Add the new symbol.
QCOM_PM became ARM_QCOM_SPM_CPUIDLE in commit a871be6b8eee ("cpuidle: Convert
Qualcomm SPM driver to a generic CPUidle driver").
SND_MMP_SOC became CONFIG_SND_MMP_SOC_SSPA in commit a97e384ba78f ("ASoC:
mmp-sspa: Add Device Tree support"). Enable that instead.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20210615011435.518115-4-joel@jms.id.au
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index b39087c52436..3d83e3fd6bfe 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -117,6 +117,7 @@ CONFIG_ARM_CPUIDLE=y CONFIG_ARM_ZYNQ_CPUIDLE=y CONFIG_ARM_EXYNOS_CPUIDLE=y CONFIG_ARM_TEGRA_CPUIDLE=y +CONFIG_ARM_QCOM_SPM_CPUIDLE=y CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_RASPBERRYPI_FIRMWARE=y @@ -469,7 +470,6 @@ CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TWL4030=y CONFIG_GPIO_MXC=y -CONFIG_POWER_AVS=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_GPIO=y @@ -731,8 +731,8 @@ CONFIG_SND_ATMEL_SOC_PDMIC=m CONFIG_SND_ATMEL_SOC_I2S=m CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_SOC_FSL_SAI=m -CONFIG_SND_MMP_SOC=y CONFIG_SND_PXA_SOC_SSP=m +CONFIG_SND_MMP_SOC_SSPA=m CONFIG_SND_PXA910_SOC=m CONFIG_SND_SOC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m @@ -992,7 +992,6 @@ CONFIG_ASPEED_LPC_SNOOP=m CONFIG_ASPEED_P2A_CTRL=m CONFIG_RASPBERRYPI_POWER=y CONFIG_QCOM_GSBI=y -CONFIG_QCOM_PM=y CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_WCNSS_CTRL=m CONFIG_ARCH_EMEV2=y |