| Message ID | 20210610035412.93682-4-joel@jms.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: config: Refresh multi v7 | expand |
On Thu, Jun 10, 2021 at 5:54 AM Joel Stanley <joel@jms.id.au> wrote: > > 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>
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index de7cfb54cc63..82b0061f38ba 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -116,6 +116,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 @@ -466,7 +467,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 @@ -725,8 +725,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 @@ -983,7 +983,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
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> --- arch/arm/configs/multi_v7_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)