From patchwork Thu Jun 10 03:54:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 12311695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AF9BC47094 for ; Thu, 10 Jun 2021 03:58:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C499613FF for ; Thu, 10 Jun 2021 03:58:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C499613FF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DhGkclynz4PQrTdVTWJepjZXYbh4cuSyyEs2qwgILVY=; b=ez/i3c6UgnR2rv sUGU9EcvLgM+JZFodyC9Vz4RrV5X2XmZb/7qgjqUOqiitB9cpdwJUzEXaTu7b7OVRFVO2k6Z3dR1p ESgqdPADQa0GCHwLQrB8TYIFfIqf6Gs9HfmGHUVn8Q6oQVWF5PdK/T0WkvhfxTqZ17XQBttuc5IfF 6yHxj9cDWe4/WJpiLXgmMmn2h2EBtduOh6+g2hebQR38ZMOi0KN/V6XdqQZWsf5DF/TW24m5cN5W/ e0Y5dw5e4pHR22lHWfHR11sRbDGR3v2Q0uEimq5djXm7hsMFbuS8IDGIIGvrY5DgMUqzuyrX5ZyyS 0t63bpnf0osmQ6dAxa1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrBoW-00Gix6-Mh; Thu, 10 Jun 2021 03:57:05 +0000 Received: from mail-pf1-f180.google.com ([209.85.210.180]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrBn5-00GiOK-JY for linux-arm-kernel@lists.infradead.org; Thu, 10 Jun 2021 03:55:36 +0000 Received: by mail-pf1-f180.google.com with SMTP id d16so461888pfn.12 for ; Wed, 09 Jun 2021 20:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yLn7dl+DUObMnxaAOUOGTayB9zjJADSGorulWysT+LQ=; b=oE8+lFczLinE7lDPrVE96v8Tjb0Af2ju3GHeUq+I8V4BVho0n/GnDZ9TFyxoJBYm0s UQREzFsrsb6vcTe7vlOzkd0JFfo5nPqhl273D76oUjLoKcU8nSr6UTyDNs0xSCXrvqoP JBROIlTU1YABZr4WAhNBPdLDSjIynchUtqGwDO3YbE+B2zI1BVudxIjHCemCmdkJ3MXq AH3Z+AEAfhucU1pxAqXPGOnKzaVdB0iXjzlyjN6sO6qx0+qt+PJfKL3p17DZYEk3Z9Ps 9D5lNkhxzSLzmYB/YS/S+TwPdWq4DQUexxDTGUyurHWKy1r5U/l3pMSZ3QWqPB7TKSJo UMOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=yLn7dl+DUObMnxaAOUOGTayB9zjJADSGorulWysT+LQ=; b=n2sh17fGcytVBi2bG4+ADxZ1/T7h91HsXXJn/XWq9ighZ1/7cfd2TO86W+vij70uLc k1VBnaMrNARSy67s/gF0VBF1go9UuN4XTjtuaf7iqA/+LLUYBqQzupVL24BlPkAAT3KX N5mWr8T66OJbQ9WbVuBDGWyhHcAsreqkCWJ0Zu14rwNFKT1/8RulkJPK1Tcge8xQ5WR9 C0CrtokeENoGRaLok+3zrXbGSZmgTyR5lqPlfnr+eMGsMfC6i+anzRxFCxnk0QSBgbUq 42KPiNfkCNSKXCoeZoyQ7aAZVNQigLRM7PzVIMOxZr+EOLHdSobxLEPc/5Y83rSX/fJr WJlg== X-Gm-Message-State: AOAM532yxFUUAqjDXZsv7Qo72aYUmFbudpOqZJbGmv2fs2ZICfz6s5Qr Y/kScVQi45PR3g1lPl8ikBQTU3k7I7M= X-Google-Smtp-Source: ABdhPJy1Hxobhzp42Dlgtw5SQJh5/qiVbeKSf5/skPp+0kH4KxXILXoAFqLhhgXbStEEzPZriyC+Mg== X-Received: by 2002:a63:1c6:: with SMTP id 189mr2975652pgb.144.1623297275062; Wed, 09 Jun 2021 20:54:35 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id k136sm879686pfd.87.2021.06.09.20.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 20:54:34 -0700 (PDT) From: Joel Stanley To: Arnd Bergmann 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 Message-Id: <20210610035412.93682-4-joel@jms.id.au> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210610035412.93682-1-joel@jms.id.au> References: <20210610035412.93682-1-joel@jms.id.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_205535_690718_12851983 X-CRM114-Status: GOOD ( 12.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Arnd Bergmann --- 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