From patchwork Tue Jun 15 01:14:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 12322173 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,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 2C79AC48BDF for ; Tue, 15 Jun 2021 15:30:02 +0000 (UTC) Received: from bombadil.infradead.org (unknown [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 CFD2A610A0 for ; Tue, 15 Jun 2021 15:30:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CFD2A610A0 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=ZTLGdOpF73DkgYvthYB9g1FM58LTXfoSp+qak2rauzs=; b=J1N9a7WCZx8yE9 TwxX7PFtUFvicJa0f/D+szNqlgjmKaNBshBxBOFUzsnklxjTfVlSTstQNv0LhLeWjz7eIjUBt3G8B F11nOJmha0vRWVorFXbfKmoqPEQMg6o/N41jYR/sioV/jL+VgA9agqrUPa2yKteag/8mV6MSPNrGm 7wuS1eBhcQE1ZlFYM9z+e/S8kK7s7O/jUbVQAb7mHvCjyfvWDL5DE+D7DTb7MWL5ia4OKzIBlSGQl 3MkLd8mvwVtDJmq4V1hVbzNxWvchZSTSSgagwC5kl4Y1lYKrY4/x4koDLeyn34058VAHvhqFHpu0T uSbR4aJ591STdYnGIUzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltAuG-000vzg-CY; Tue, 15 Jun 2021 15:23:13 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lt9Ry-000DwX-Hd for linux-arm-kernel@bombadil.infradead.org; Tue, 15 Jun 2021 13:49:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=9LENEPJnsbEOZ4phKpYDvkHpnghybcvbD6F54VIyiro=; b=PtFGs1iI/OI43NKCo1revaJfc/ eF7UtcOuOMs5hm11L7OVGGeCZvWn70GOn+UZj/bhSFf4UJ9vaqZ8U/1EOvNcp+hAj20Xi14uRn/h0 v20plR60GhTtpr01DgjL0wu6FQBzkDHthnWxfkDXiGQnFQFTw3+0AnJzIUI2rq+m9yhfLGELo21rn RiJvHooHOmzh9TXaNy368BfU5FyEplGa9KLoayHmR2SeVMvnDKqcBjgSkhbuN6WKj7fQ7pZwhYwD8 1UlIonfyNI+641SwDRIzLGy8U5p8GrSzeX9mkDHP62nPRXMOcShBMRVT8ANKDu5VP3kwRbUWjF9HR TooNlLPw==; Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsxgD-007EAf-Nr for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 01:15:58 +0000 Received: by mail-pg1-x536.google.com with SMTP id m2so3379176pgk.7 for ; Mon, 14 Jun 2021 18:15:56 -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=9LENEPJnsbEOZ4phKpYDvkHpnghybcvbD6F54VIyiro=; b=W33R60+ISXhFSPY8it6YqFMm4iyDSmBBQhOLL7VY9OZs49J/FXiP9K4icCjsgvdks/ 4y9Iz282vF07GZNu/UT4THGTbE/GmLfxdwYGjS+nYnb2OM6FfU01PQ9e+qRHnafQeshd oVjSvUY7l4QxZooSieAR5SMKAjRL/nCQNxgaWz2TOJcBNDxg2y8qoF0BJQrnGbyHmp8+ W0siHuQWXHo31dDMfwFot8NdY0CxCmFxQsJnV9FrsN0/KVdVt579NrGQaWAOYprubXg1 cNO62FmwCRqwJRbf/ottPfXCB4GdZRjCcbBZsJOhwYsmTjKNcio4mWqj3F7rg83jYFEv 8zdw== 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=9LENEPJnsbEOZ4phKpYDvkHpnghybcvbD6F54VIyiro=; b=ThuuvX6Fcj32HTerLEaoJKCpXi+emHmob45kSWqQld913J0ZeVj/Apdrp62KPEYZPE x+A8q7w3VNAOoPP9eRoLk3pJILncv5gTlxTyBVQtDIZFEIlz3JcOpajtdt0fvCATc2Gh khKlR8Soij5MEJpSLt5DnAvsJv1OYgD8U56Zx3q1UnFOvFhKq7Xwwqv0LgFTkDhN6Ki+ 741i6Rl2Ch5OrBm2CE51ayVIvMES6fjpVBBLl0c19OFcvcjs8rxq0jyaVytciW9N5L5s KcPD7xGugFZqJOTukLgbMtUF+G1q1truz1uRRCnYS0W41dQ6exLIFw3VYewD93+UQbyy HulQ== X-Gm-Message-State: AOAM532mAkvxu4ZXnSk55sj4iv0jnFJM0t0bQ60wLvCPMvnvaNmm4bAf 0IfeauhGteGFqA5wfXJ47as= X-Google-Smtp-Source: ABdhPJzxBdGKyH07UwQRw8HE0hYEDWXyDcS0IfPir/BERNG9HZsInKalK1RjaEH/xTLZhxt+SlXf4Q== X-Received: by 2002:a63:4719:: with SMTP id u25mr20289285pga.193.1623719691965; Mon, 14 Jun 2021 18:14:51 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id r19sm13494042pfh.152.2021.06.14.18.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 18:14:51 -0700 (PDT) From: Joel Stanley To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 3/6] ARM: config: multi v7: Add renamed symbols Date: Tue, 15 Jun 2021 10:44:32 +0930 Message-Id: <20210615011435.518115-4-joel@jms.id.au> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210615011435.518115-1-joel@jms.id.au> References: <20210615011435.518115-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-20210615_021556_709331_49750EB6 X-CRM114-Status: GOOD ( 12.49 ) 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 f323004ef0b8..7312413e0594 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 @@ -467,7 +468,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 @@ -726,8 +726,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 @@ -984,7 +984,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