linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Joel Stanley <joel@jms.id.au>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/6] ARM: config: multi v7: Add renamed symbols
Date: Thu, 10 Jun 2021 13:24:09 +0930	[thread overview]
Message-ID: <20210610035412.93682-4-joel@jms.id.au> (raw)
In-Reply-To: <20210610035412.93682-1-joel@jms.id.au>

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(-)

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
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-06-10  3:58 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-10  3:54 [PATCH v2 0/6] ARM: config: Refresh multi v7 Joel Stanley
2021-06-10  3:54 ` [PATCH v2 1/6] ARM: config: multi v7: Drop unavailable options Joel Stanley
2021-06-10  7:49   ` Arnd Bergmann
2021-06-10  3:54 ` [PATCH v2 2/6] ARM: config: multi v7: Clean up enabled by default options Joel Stanley
2021-06-10  7:56   ` Arnd Bergmann
2021-06-11  3:29     ` Joel Stanley
2021-06-11 10:14       ` Arnd Bergmann
2021-06-10  3:54 ` Joel Stanley [this message]
2021-06-10  7:51   ` [PATCH v2 3/6] ARM: config: multi v7: Add renamed symbols Arnd Bergmann
2021-06-10  3:54 ` [PATCH v2 4/6] ARM: config: multi v7: Enable dependancies Joel Stanley
2021-06-10  7:51   ` Arnd Bergmann
2021-06-10  3:54 ` [PATCH v2 5/6] ARM: config: mutli v7: Reenable FB dependency Joel Stanley
2021-06-10  7:52   ` Arnd Bergmann
2021-06-10  3:54 ` [PATCH v2 6/6] ARM: config: multi v7: Regenerate defconifg Joel Stanley
2021-06-10  7:52   ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210610035412.93682-4-joel@jms.id.au \
    --to=joel@jms.id.au \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).