From patchwork Tue Jun 15 01:14:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 12322785 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,UPPERCASE_50_75, 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 10BAFC48BE5 for ; Tue, 15 Jun 2021 19:35:46 +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 C9C696128B for ; Tue, 15 Jun 2021 19:35:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9C696128B 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=aIUwQjj8axEL+2c3mPIVdqI/dlH5vIiM8YijdjpYnTU=; b=ckqBBe/kIvtkij EWtld/1R0a0GLiO9Uh0ZDmHWb0OjucMftBwcDLo+K6SVxXXBVvdSXw+YLwxIhTIBv4EHXHoG9DT5Q +zXfMIDx11NHfoOYEIuxT5eULmOwu6Sqe/+0V6DNXIkIA6rEaH7+ZwhMace4LAdQJvMtMd+a4ZVnN gGTMdouYVuS/EkLZGL+3Vlomjal4aXgE80e5l4Q0+gmGzA7FDsgrMPu5iJTN4HdeBf2ykDOZToQ5u OPMLVWicnUBGEYjzBJHmkmCxP+zZXZBR2e2lrQ9+clcaNLPppU5JAWas8mws19NjffWUH+XXB5+l2 INxuOcvpkqyi8TUjQp6A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltEoS-002TO3-2e; Tue, 15 Jun 2021 19:33:28 +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 1lt9S3-000DwX-Nl for linux-arm-kernel@bombadil.infradead.org; Tue, 15 Jun 2021 13:50:05 +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=qyeZ5wbq0epRB9PmOLBbUoCk7COIIFombDOT0zU4/ts=; b=BDtxIUn6Voa3PQPu1RuCQ3mHiD ZBTsYfYeHWaaB7zipjBsJk42TXyMJuKJ6HHHeNYj2Re3BFzDrR1CABz7H1npO6HtmNTqcGp2jojGb G0qr3xpNd0opv802j87UswD9oAJSzRTEDoZxKjjLVivI4sHTTMcqo190r7KhQi8192S7Z+eGgEc1g A0FKfdJlCn1HUVe+qVzd0+YnGznizRiV2j5sroJjbqxo755xw1t3ozFPG63pvDdsYJVJ3O+GwmupC Hql2lDn+VLJAIhPOJmT5ALVOdPaE0HW0zYnwYTQaAU6oMw6QZIVbkiCzMN3QMsSsP6VnXAdO0K4DH ZuVTpQzQ==; Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsxg7-007EAM-J4 for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 01:15:52 +0000 Received: by mail-pj1-x102b.google.com with SMTP id z3-20020a17090a3983b029016bc232e40bso1175728pjb.4 for ; Mon, 14 Jun 2021 18:15:49 -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=qyeZ5wbq0epRB9PmOLBbUoCk7COIIFombDOT0zU4/ts=; b=ibOUqMwK5T8rJO3P/LqlvLwKx2oJqZPTYIUO2fV4n1lNvBpxuxJADCsL32epwMQSqM d4OQ6fgJJ8J9YuMGzu5Bmy9XGbEoaqO2K11853Qib5E2CVvTE4Ub0g00GpyYdR5QaP5X bZwbPdI8C4kHAXap+a5jjah1wafEGmsGmOSAXwrmWiZyJhG/dBmOc0GJS14Gjv/RPamU HPehL9OtxEj5Pc36wYn+8M0Y0M2ORf9p+7+Jkoid1VLr8O9smKTzzuBgc/i8nuxkYbMx erAmcL15+dnkri0lVtw4+4JpC551rHSg/ZpTIJMab5jhEX3XbzYpg3MKwDOGJUbpzJAG RJSg== 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=qyeZ5wbq0epRB9PmOLBbUoCk7COIIFombDOT0zU4/ts=; b=lRYKg0Zgdms4R3oQTuGHPqO5Cbm05HmHxxyT4KOC6UK6ipF4iP09I+Q0kIcofvNa0N 0nR5XGRr3mzjLYZiafq5p+sB3Zly2Jc+v9tj8ilyYmBEqE4zQJybLtbChNBa40vRgmmK sK1WekC3eX83pFJLrvR1eCmWby3mcL25Z/lexXMwzJqKf3y8CVprzU5DktliPj9eLQkC kD5l3BOR0Epxk+67FnBrpVqIksrgBSTBLwS/2SdgnPCS8dAxLTxeYrzOObgDvo81mqdO x8G6V60qQqK1qUu31Dl8BNhb+Q/eRhRL3XrGVWI/6jB2YEzR+lUhT2uMLJghu6I6dbdF M0dg== X-Gm-Message-State: AOAM530Y4DzeXaeCb3+t3nr9kYSQLULKIiveueDQ09VjQrhE0Olb5N2s G6BRYxHXE+Vq2KfVk446ddsVuEuqtr4= X-Google-Smtp-Source: ABdhPJw5ZDyxj7GZMx9Ptk/7BdLIK9odnxlK0Y5cJIBVICfxIXGPE4WBT8y3ac2TlNnaOnIGgyzafA== X-Received: by 2002:a17:90b:1215:: with SMTP id gl21mr22460201pjb.33.1623719686560; Mon, 14 Jun 2021 18:14:46 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id r19sm13494042pfh.152.2021.06.14.18.14.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 18:14:45 -0700 (PDT) From: Joel Stanley To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 1/6] ARM: config: multi v7: Drop unavailable options Date: Tue, 15 Jun 2021 10:44:30 +0930 Message-Id: <20210615011435.518115-2-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_021550_548861_43DDA796 X-CRM114-Status: UNSURE ( 9.08 ) X-CRM114-Notice: Please train this message. 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 SIRF was removed in commit f3a732843acc ("ARM: remove sirf prima2/atlas platforms"). This covers ARCH_SIRF, SERIAL_SIRFSOC, SERIAL_SIRFSOC_CONSOLE, I2C_SIRF, SPI_SIRF. EVI_VARS was made x86 only in commit 963fabf37f6a ("efi: efivars: limit availability to X86 builds"). Signed-off-by: Joel Stanley Reviewed-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 52a0400fdd92..88159ebad90d 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -72,7 +72,6 @@ CONFIG_SOC_OMAP5=y CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y CONFIG_SOC_DRA7XX=y -CONFIG_ARCH_SIRF=y CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8X60=y CONFIG_ARCH_MSM8960=y @@ -124,7 +123,6 @@ CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_BCM47XX_NVRAM=y CONFIG_BCM47XX_SPROM=y -CONFIG_EFI_VARS=m CONFIG_EFI_CAPSULE_LOADER=m CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM_NEON=m @@ -352,8 +350,6 @@ CONFIG_SERIAL_MESON=y CONFIG_SERIAL_MESON_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y CONFIG_SERIAL_SAMSUNG_CONSOLE=y -CONFIG_SERIAL_SIRFSOC=y -CONFIG_SERIAL_SIRFSOC_CONSOLE=y CONFIG_SERIAL_TEGRA=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y @@ -408,7 +404,6 @@ CONFIG_I2C_RIIC=y CONFIG_I2C_RK3X=y CONFIG_I2C_S3C2410=y CONFIG_I2C_SH_MOBILE=y -CONFIG_I2C_SIRF=y CONFIG_I2C_ST=y CONFIG_I2C_STM32F7=y CONFIG_I2C_SUN6I_P2WI=y @@ -436,7 +431,6 @@ CONFIG_SPI_RSPI=y CONFIG_SPI_S3C64XX=m CONFIG_SPI_SH_MSIOF=m CONFIG_SPI_SH_HSPI=y -CONFIG_SPI_SIRF=y CONFIG_SPI_STM32=m CONFIG_SPI_STM32_QSPI=y CONFIG_SPI_SUN4I=y @@ -958,7 +952,6 @@ CONFIG_MV_XOR=y CONFIG_MXS_DMA=y CONFIG_OWL_DMA=y CONFIG_PL330_DMA=y -CONFIG_SIRF_DMA=y CONFIG_STE_DMA40=y CONFIG_ST_FDMA=m CONFIG_STM32_DMA=y From patchwork Tue Jun 15 01:14:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 12322791 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,UPPERCASE_50_75, 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 7EC3CC48BDF for ; Tue, 15 Jun 2021 19:37:56 +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 46BFE6128B for ; Tue, 15 Jun 2021 19:37:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46BFE6128B 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=Pb9FaFvf2Us/RSoxVZU/Irca5us0i72cIN5MXVdmupQ=; b=4x0vCBKwUkcgkl 0oK3v5SjO+8a3QSnovyXqkZ0Sa926zqndMxhL4fn1f/0U2lbARA9LnwMcoQCyiJ4dMMpSRKeD0/wD gsstuB/vBfg50e0UCVDpe8MQYeYxv9JpdQNqANmVpbQSNTmo/ELg8hQTNQPGDMrSqPh2JvQzPd+HJ lqnmlBNeJnJLbi6ne9hyFzMgopUblm+oHxC+4vZSd5JtRODHrtpW025HdVN8xuF3htL1JFU74kcq8 U3D4j/Dv30Dh/4Rla67/cHryKHAps+bbw9vlFaBPw28/kGKzWCRlCvIzslbCm8/lcSGW0dyBBD8Fv xG2RBujSI0yMMjn/3ztQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltEqa-002UBB-PA; Tue, 15 Jun 2021 19:35:43 +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 1lt9Rt-000E8e-Tw for linux-arm-kernel@bombadil.infradead.org; Tue, 15 Jun 2021 13:49:53 +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=wBb4QH0heMTO2rmJItFO4vH0WLN/+uEhE2i9+cwCXHo=; b=HHQVOWVzZ4flgJOHQ2RdYrskNf sBGgc3rW8P4CQGD8pmF+1WiT3w9n/iO3IfvrFczYhsCKoufX/IQf8lFEh9+fpMj7gn6B/hVBU1CWT 8P08vNWxHqYKD4hF/KJqqF0v48hkp8xmZE/ZuZp3V+Ku+l6qB+G82pPMEzEg+bO5ljT+QHTIuBtBv CGI8LiQlaZH1KiAKs+a7xZG/2H57rEgY5B/2wJnbCmrg/fRRZAA84rJfx51wo5j2C0/AGTWb20ZNo 1YJP6L4xbHl4Tb0qgn2RrRu8EK4WantQitpOAFuBrMlNe8QH3GGdXIAWRlxGaZThG5u2lFM6otfD1 2wnpFU7Q==; Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsxh5-007ECI-Ng for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 01:16:53 +0000 Received: by mail-pj1-x1029.google.com with SMTP id g6-20020a17090adac6b029015d1a9a6f1aso876907pjx.1 for ; Mon, 14 Jun 2021 18:16:50 -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=wBb4QH0heMTO2rmJItFO4vH0WLN/+uEhE2i9+cwCXHo=; b=eauqohG2Q7VmfL7Vz5QLzXLMbaFeiytYlDMMI4sMLGMUkBJLoo2kP3kKGQp91f/yXj VO287W9W5oUu29/bZ77obiEhKGdsNh2AoQVxXkS2n8zEruihl2NoVucv7Qv9pIDtW7cI nFst8W7Nl1lMXGIWKnLm84ZePgWAQ8ISGGI8IRjusVg9H2GSowWxHN8a1ghVp4ZkBANg Pa2xHK1tqGfrDO0hhyG4dBG3phJnMCt8xLTzyzGAj+v7lfSrVtFnIZVSogViLp+kcTLs 9gkxFz7o+g/+vXvP0ceGdBPp5sioN+UGboKHZNMrxLvSqK+8K+8zJ009kyw1o0vpQSB/ TxeQ== 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=wBb4QH0heMTO2rmJItFO4vH0WLN/+uEhE2i9+cwCXHo=; b=ncauU/WOChdScogLbWfsu2xAnhua9B9dqxMuopXTtZMF0AJJtfm8WJruLHyC79GH6z fc0jekPD4js3Ywv2jND0tZ1EMNeuSL8v5yo93OxY7D6xxMF5/zpAzh4CAfczABfcs51O A0TvPeeKrFuS0cIzhQUlk1lm4819lx3RJm0Pg9pslBWFvKR4nzlGZeT2hCU1FBZDXVdA RZOGox/uGvfX3qguVmdbEKl0z91Feycej2jL/VLvY2RseYihSSfTA5UCtVTZpUdyiT5y b6XFWY5PcvmXgE9GX0JKr3MhQu+YV/hKqd4qWtjARIurNd2M8bcU7ajfPlOvYyyErsgq Rynw== X-Gm-Message-State: AOAM53274D5MDNYi/aTU08hypkZAq48AGoXXwcwSp07wDTuIwIiNphrL oVPZgNceQkcdN2mBfZTJjk4= X-Google-Smtp-Source: ABdhPJyBfvlfRtYit/p5DvI56ugpCtb45pdSXn6ajjDUn9iQ8UbLny3coXORZIGapJxlrZ6V9zGuCA== X-Received: by 2002:a17:90b:4c44:: with SMTP id np4mr22154910pjb.121.1623719689300; Mon, 14 Jun 2021 18:14:49 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id r19sm13494042pfh.152.2021.06.14.18.14.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 18:14:48 -0700 (PDT) From: Joel Stanley To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/6] ARM: config: multi v7: Clean up enabled by default options Date: Tue, 15 Jun 2021 10:44:31 +0930 Message-Id: <20210615011435.518115-3-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_021650_702534_92512089 X-CRM114-Status: GOOD ( 13.28 ) 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 A number of options in the defconfig are enabled by other options; either through selects or defaults. SECCOMP is on by default as of commit 282a181b1a0d ("seccomp: Move config option SECCOMP to arch/Kconfig"). NET_SWITCHDEV is enabled by NET_DSA. I think this is a result of commit 227d72063fcc ("dsa: simplify Kconfig symbols and dependencies"). SIMPLE_PM_BUS is selected ARCH_OMAP2PLUS as of commit 2a39af3870e9 ("ARM: OMAP2+: Fix booting for am335x after moving to simple-pm-bus"). MICREL_PHY is selected by the ks8851 ethernet driver as of f0791b92d2b6 ("net: ks8851: Select PHYLIB and MICREL_PHY in Kconfig"). SMSC_PHY is selected by USB_NET_SMSC95XX as of commit 05b35e7eb9a1 ("smsc95xx: add phylib support"). STMPE_I2C is default y. It was explicitly added to the defconfig in commit d8f0ddc83877 ("ARM: defconfig: add STMPE ADC driver for P4 Note") but it's not required. CLK_ACTIONS and CLK_OWL_S500 was explicitly added in commit 26ba4a474aec ("ARM: multi_v7_defconfig: Enable Actions Semi platform and drivers"), but it defaults on when ARCH_ACTIONS is enabled. Drop them. CROS_EC_CHARDEV defaults to MFD_CROS_EC_DEV, which defaults to CROS_EC since commit 2fa2b980e3fe ("mfd / platform: cros_ec: Rename config to a better name"). TEGRA20_APB_DMA is selected by SOC_TEGRA_FUSE if ARCH_TEGRA_2x_SOC since commit 19d41e5e9c68 ("soc/tegra: fuse: Add APB DMA dependency for Tegra20"). USB_CHIPIDEA_TEGRA is enabled when USB_CHIPIDEA is enabled. It falls out of the defconfig but is enabled, as intended by d50229cee69b ("ARM: multi_v7_defconfig: Stop using deprecated USB_EHCI_TEGRA"). SERIAL_OWL_CONSOLE defaults to on when SERIAL_OWL=y, and has since it was introduced. Commit c6774ee035dc ("media: Kconfig: make filtering devices optional") made MEDIA_PLATFORM_SUPPORT, MEDIA_CAMERA_SUPPORT and MEDIA_CEC_SUPPORT default y if MEDIA_SUPPORT_FILTER is disabled, so they fall out of the defconfig. MEDIA_CONTROLLER is selected by a number of drivers in the config, and additionally defaults to MEDIA_PLATFORM_SUPPORT which is enabled. Signed-off-by: Joel Stanley Reviewed-by: Arnd Bergmann --- v3: - Leave PTP_1588_CLOCK in the config --- arch/arm/configs/multi_v7_defconfig | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 88159ebad90d..f323004ef0b8 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -95,7 +95,6 @@ CONFIG_ARCH_WM8850=y CONFIG_ARCH_ZYNQ=y CONFIG_SMP=y CONFIG_NR_CPUS=16 -CONFIG_SECCOMP=y CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_KEXEC=y @@ -155,7 +154,6 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_NET_SWITCHDEV=y CONFIG_NET_DSA=m CONFIG_CAN=y CONFIG_CAN_AT91=m @@ -194,7 +192,6 @@ CONFIG_PCI_EPF_TEST=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_OMAP_OCP2SCP=y -CONFIG_SIMPLE_PM_BUS=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y @@ -278,12 +275,9 @@ CONFIG_TI_CPTS=y CONFIG_XILINX_EMACLITE=y CONFIG_BROADCOM_PHY=y CONFIG_ICPLUS_PHY=y -CONFIG_DP83867_PHY=y CONFIG_MARVELL_PHY=y -CONFIG_MICREL_PHY=y CONFIG_AT803X_PHY=y CONFIG_ROCKCHIP_PHY=y -CONFIG_SMSC_PHY=y CONFIG_USB_PEGASUS=y CONFIG_USB_RTL8152=m CONFIG_USB_LAN78XX=m @@ -374,7 +368,6 @@ CONFIG_SERIAL_ST_ASC_CONSOLE=y CONFIG_SERIAL_STM32=y CONFIG_SERIAL_STM32_CONSOLE=y CONFIG_SERIAL_OWL=y -CONFIG_SERIAL_OWL_CONSOLE=y CONFIG_SERIAL_DEV_BUS=y CONFIG_VIRTIO_CONSOLE=y CONFIG_ASPEED_KCS_IPMI_BMC=m @@ -568,7 +561,6 @@ CONFIG_MFD_RK808=y CONFIG_MFD_RN5T618=y CONFIG_MFD_SEC_CORE=y CONFIG_MFD_STMPE=y -CONFIG_STMPE_I2C=y CONFIG_MFD_PALMAS=y CONFIG_MFD_TPS65090=y CONFIG_MFD_TPS65217=y @@ -625,10 +617,6 @@ CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_VEXPRESS=y CONFIG_REGULATOR_WM8994=m CONFIG_MEDIA_SUPPORT=m -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_CEC_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y @@ -774,7 +762,6 @@ CONFIG_SND_SOC_AK4642=m CONFIG_SND_SOC_CPCAP=m CONFIG_SND_SOC_CS42L51_I2C=m CONFIG_SND_SOC_SGTL5000=m -CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_STI_SAS=m CONFIG_SND_SOC_WM8978=m CONFIG_SND_AUDIO_GRAPH_CARD=m @@ -810,7 +797,6 @@ CONFIG_USB_DWC2=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_CHIPIDEA_TEGRA=y CONFIG_USB_ISP1760=y CONFIG_USB_HSIC_USB3503=y CONFIG_AB8500_USB=y @@ -957,7 +943,6 @@ CONFIG_ST_FDMA=m CONFIG_STM32_DMA=y CONFIG_STM32_DMAMUX=y CONFIG_STM32_MDMA=y -CONFIG_TEGRA20_APB_DMA=y CONFIG_UNIPHIER_MDMAC=y CONFIG_XILINX_DMA=y CONFIG_QCOM_BAM_DMA=y @@ -973,15 +958,12 @@ CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_NVEC_PAZ00=y CONFIG_STAGING_BOARD=y -CONFIG_MFD_CROS_EC_DEV=m CONFIG_CROS_EC_I2C=m CONFIG_CROS_EC_SPI=m CONFIG_COMMON_CLK_MAX77686=y CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_S2MPS11=m -CONFIG_CLK_ACTIONS=y -CONFIG_CLK_OWL_S500=y CONFIG_CLK_RASPBERRYPI=y CONFIG_COMMON_CLK_QCOM=y CONFIG_QCOM_CLK_RPM=y @@ -1169,4 +1151,3 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y CONFIG_CHROME_PLATFORMS=y CONFIG_CROS_EC=m -CONFIG_CROS_EC_CHARDEV=m 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 From patchwork Tue Jun 15 01:14:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 12322601 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 BAA90C48BDF for ; Tue, 15 Jun 2021 18:14:49 +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 7BDE1611CE for ; Tue, 15 Jun 2021 18:14:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7BDE1611CE 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=5SFyiir42pEmPh9qjDtir7uFcrAPrVD9N9lhKMtuJiE=; b=NKJx5jPneZYwTj c3ttaf+E8MN9SBpXOK7evMyUWvI1PC8St3EjdDokYF0/c5rk6lVc/KSPqzzqUES7TsU61Nh2yOVij 0wXuyWyC/mbSUegFI/DaNwv3hbgrcyzkID+afj4HJNZ4+EuJyV2s/TLwHp0n2r5e3vS3X3wSYgmb4 mIVuNwOPexLcXKnKCcSrCgZcvzF13tRQVD5xvpXlQowcc6Rt2tv+aSAfT3geP0q8L3w1a5hLKG+bJ UPR8Hk11mRDnzeuSJr5QBY2Ua9rYbhOXQe9BT0T7+FfpUsUKM4EL5NgRDhH+AO3Zp2Y4PMNZ8ki6l bVQuxlt6nXtlvjOHFlpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltDYC-0021jc-BM; Tue, 15 Jun 2021 18:12:38 +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 1lt9Rq-000DwX-RI for linux-arm-kernel@bombadil.infradead.org; Tue, 15 Jun 2021 13:49:49 +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=R0/agjnKMpnmkM8aXAg0ZhUtD0fkKbxpT6Fx5hIGS+I=; b=SAkxwmK1XcDXDf9OhfsQ2bQafN DmhYUCYDnVsqrNjRTvcGhbSmPiNyJBlUcIOnzPh2RGF/RTrbMtjOtio4INo46nYpnj+7/Ub/EENHk ikxXyVDF0N0gVkxkz96eUjlHFL3Oyq6U9zBF3oFjqjczxPXCInXk60a8bw+EuOGPVqlw7BrauAUBf HD1jSt58lrumEu7jd7YnQiOCMJGFkchekILJ3Bd1Ltuk4BnOw3pYqKqo5tChd1sch6u0HFNoP3mM/ 84wShXAh/dAxQSJuyc/031Y95WUWlFvaxzdpa4BVSgKrBGTAMZ4ALfRF+N2kYKIEp1nqal6/LxKzH Ht9RZ4qw==; Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsxhB-007EDP-CP for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 01:16:57 +0000 Received: by mail-pj1-x102c.google.com with SMTP id mj8-20020a17090b3688b029016ee34fc1b3so951542pjb.0 for ; Mon, 14 Jun 2021 18:16:55 -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=R0/agjnKMpnmkM8aXAg0ZhUtD0fkKbxpT6Fx5hIGS+I=; b=GYfaNGLyTlP6kMs+G0d66AGCUTbDyEH3i/TrtIDR+KyCxrCTxuAarNVe6e2EUsS9bf 2y3ejV7somuzIfM3cretif54G3FUrHPDddiVuc0IE7+fmT+4rk2KwxEX54dbMqArBxsr 2M/MmhIRfiHVsm2vGOaULW4p62F47k9XdX/W+O/bQj9DEOF/6yMmeJW/iSvbfQMM4Sy3 tX8VcxwzTg3fUOs3NgTrRVMb6pyGoxAPRW45cUGWxHXkGay2FqhD5gX/4L6Jwb/mWTdV OIGqD5rrwqJan8r0xfoaLld265Vs20YcSDnABPbqsTH+9j0ikSS/BM06EGqa1AJ6fs+j 7nRw== 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=R0/agjnKMpnmkM8aXAg0ZhUtD0fkKbxpT6Fx5hIGS+I=; b=GzYLEIEnZF0MqOEXSLO1semdQmQC8nuTjx9JyC+j16BDyGiiBVsIkh1QF2h/IuQg0G qLeX74fgjdkWq8by7eBF8D65SVzKCsdoOW4+IH1SW+HeT/VHHbyp8K3QK4xPtz3pj+tx 6/6wU+jV+6QlYbyi9AVgSUdRa1bGYaKBNtUk424EsZN3vkHpOi+idNENDON5L0HRE3er nvqGmcgW6WAj31M15tapLvHTikm88dKuOZ2u2PgL6PxR5TcC7B54kig8OHs+v5DG/hyI uFEW+3g9PRFHOEGLW7tka2kuXrHJ4iOqsginddh5HNLfd4p9HXL7LC65dQHChfn9Hzd2 JnMw== X-Gm-Message-State: AOAM533etYddDK8r04V+zuY7xHikG4cDHBR3xEjJ4ExN9bKtWojgwaXq P1YBdyeaM0Ke0Q7H86PDnEA= X-Google-Smtp-Source: ABdhPJwWuhrHmVCyH97iQQBfJwUdmaQqDrkslXaiiq+Cgeu3h1zKAiDWsCjEuWXHLdkdqqVzoE7szg== X-Received: by 2002:a17:90a:9a87:: with SMTP id e7mr2044609pjp.162.1623719694815; Mon, 14 Jun 2021 18:14:54 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id r19sm13494042pfh.152.2021.06.14.18.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 18:14:53 -0700 (PDT) From: Joel Stanley To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 4/6] ARM: config: multi v7: Enable dependancies Date: Tue, 15 Jun 2021 10:44:33 +0930 Message-Id: <20210615011435.518115-5-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_021656_312908_8826E231 X-CRM114-Status: GOOD ( 11.54 ) 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 Some drivers have not been built as they gained dependencies in kconfig but those dependencies were not added to the defconfig. The MSM pinctrl drivers fell out of the defconfig as of commit be117ca32261 ("pinctrl: qcom: Kconfig: Rework PINCTRL_MSM to be a depenency rather then a selected config"). Add PINCTRL_MSM so these stay enabled. EDAC depends on RAS, so enable it to ensure the EDAC drivers stay enabled. Signed-off-by: Joel Stanley Reviewed-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 7312413e0594..89dd9501c80f 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -442,6 +442,7 @@ CONFIG_PINCTRL_STMFX=y CONFIG_PINCTRL_PALMAS=y CONFIG_PINCTRL_OWL=y CONFIG_PINCTRL_S500=y +CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_APQ8064=y CONFIG_PINCTRL_APQ8084=y CONFIG_PINCTRL_IPQ8064=y @@ -1088,6 +1089,7 @@ CONFIG_PHY_DM816X_USB=m CONFIG_OMAP_USB2=y CONFIG_TI_PIPE3=y CONFIG_TWL4030_USB=m +CONFIG_RAS=y CONFIG_NVMEM_IMX_OCOTP=y CONFIG_ROCKCHIP_EFUSE=m CONFIG_NVMEM_SUNXI_SID=y From patchwork Tue Jun 15 01:14:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 12322599 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 EB1E2C48BDF for ; Tue, 15 Jun 2021 18:13:26 +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 A7006611CE for ; Tue, 15 Jun 2021 18:13:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7006611CE 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=nuJp95eQKCwccuTJljsHS/OELWR+uu51zOa+7AZLH5s=; b=BrFtXwl/qjkBnj qUvR/MsRf3nV/KLn0R55vENA5BcAublN1pvI8gsXIVLV9oynr6xJuai9teb2mK+nTKT8Pjy0YyV7x RSkkoSSSbUBppGFc8i/xngS1LHg1s+sxEukOl/H9ydwJziE58ZlekGdkdZmVxWfk4XFh5EWT/FXAr VSr17BSlorG/c945cRgj4LAx1ZxkZL1djJ3VtwbxzToeeRsLpExXxxNyM1TKonT89aF0C5tLr9Kqe tQ7G5VwX4IgXSxuJNPiNSzw+71hY4ZXBmc0gvTlFfVSU9Ct+jvOZCPBPBMG1VPWyO9dL/ERaK3k84 lp6MopLmeAPbx63wh4Bg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltDWt-0021Dt-7g; Tue, 15 Jun 2021 18:11:17 +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 1lt9Rq-000E8e-Tm for linux-arm-kernel@bombadil.infradead.org; Tue, 15 Jun 2021 13:49:49 +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=wU4YVbjHbY5SCSUKQgCUNyhy/Tx4bO+uMEe3n9/XcKQ=; b=Odzi8R1F4dcgUVn1SZ20/fzZWS EfxZm/jjQFN3NJxbaAjNyOe7lPKITbchAzt2UiYkD0lBSoEd+qShh58FwWD/R18Qve4g559OWA8A9 V+kJ7L3uO9ccoz4tPeyVhfTjeZNeo4I/RzXSoRxshYDMT27aJk/O2JEa643gP94wipShMEw6KLrdu lXVIqYxg+RYohVmVjGf0C4vyAz7ej3aPIhs5oOB/Mw33lKnLM+qO4+WcTo4JRCizUt3qNsVb+b1Ap YZouOw0Jl+dUd6RLKRebdjAALv/+GwNIeVzWDSzQiwZ/kZOKXh3zIXhgNfwqz6Xz1is5xSd5xiEuz ZLu8x7YA==; Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsxhE-007EDn-Aw for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 01:17:02 +0000 Received: by mail-pl1-x636.google.com with SMTP id u18so6950977plc.0 for ; Mon, 14 Jun 2021 18:16:58 -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=wU4YVbjHbY5SCSUKQgCUNyhy/Tx4bO+uMEe3n9/XcKQ=; b=RdpOHAi/B0VmshUO1DhOw4l2lsHfyEbtl1yHS0my4/44wqcKW9fLDYFOVTXH2n3dWJ kJiBB8b83N1Xacx32UYy9FIei5sJOGe7UPNXn7D1Z7GvbcRBH85Uz+DhuWsfCWqJvuWg Dfc5QKp6om+FLGsP/NL/s62J7dqCngP3S4IOjYkPVPyAEI1NMv9BHg58pWESW/+v9NpY KtSsR2HJC9wbXqIK4nX4iEhZ1W1EyAedV8kUDFiY7fb+vD05mGyWbgh1wOVjbW3FYd4L U+YkJWqMjoGcRtuIr9SQg5YYfACbYkzBlKXodwHRN0mT543da2lj6zrx0+Hyor/dHsOA 9srA== 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=wU4YVbjHbY5SCSUKQgCUNyhy/Tx4bO+uMEe3n9/XcKQ=; b=cnY0TH+cabBMt6iPHrlsKTecXOgxACQnKon62W/8lUDiKQsvyBgF6Eko9hCm14tgzI Hnqr0kIHNu2i9CUMY6moatC7fRxrJ2izhWmD0mXMbxryi6bZTD3aU7eE17ihNnwirqRl Oaxzh67XW2pj76Pv26ZiyIModYzzi6d581X2a1tkETm0ggy0kbiZrywdul8qfxs6zfAX c1tU1/hek/zdM4+7hfO1QI0CTfeo+lzi/RQlVaEjZsPnnXBCE9TX2bYaxzM5kR8mE4MR Qgd8UCekQtI/jxY2p+7nKeQWXtyBqGR047+gDBbZ4XcRxjbFwgz74iiRk7gZWA2kCSsJ oAuA== X-Gm-Message-State: AOAM530gZLRpHPOd1KptorlD+YrInlGt6ha8g38RmY9ZFC7qeTTAh67g R+2tvUlr5Zssl2a10YtXZIY= X-Google-Smtp-Source: ABdhPJw+YZ+hcXnwAI4a//W9ZOZmk6+JpvuiA/2I4lIosrPyWCCf+8x8iNuAq0LRsYZuaYUj8GWQBw== X-Received: by 2002:a17:90a:aa98:: with SMTP id l24mr22146236pjq.156.1623719697468; Mon, 14 Jun 2021 18:14:57 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id r19sm13494042pfh.152.2021.06.14.18.14.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 18:14:56 -0700 (PDT) From: Joel Stanley To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 5/6] ARM: config: mutli v7: Reenable FB dependency Date: Tue, 15 Jun 2021 10:44:34 +0930 Message-Id: <20210615011435.518115-6-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_021659_295651_27C0A1C1 X-CRM114-Status: GOOD ( 10.80 ) 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 DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") the select was replaced with a depends on FB, disabling the drivers that depended on it. Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and VIDEO_VIVID. It must be set to y and not a module as the test driver VIDEO_VIVID requires it to be built in. Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com Signed-off-by: Joel Stanley Reviewed-by: Arnd Bergmann --- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 89dd9501c80f..99138a457a42 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -703,6 +703,7 @@ CONFIG_DRM_PL111=m CONFIG_DRM_LIMA=m CONFIG_DRM_PANFROST=m CONFIG_DRM_ASPEED_GFX=m +CONFIG_FB=y CONFIG_FB_EFI=y CONFIG_FB_WM8505=y CONFIG_FB_SH_MOBILE_LCDC=y From patchwork Tue Jun 15 01:14:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 12322655 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,UPPERCASE_50_75, 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 3A03EC48BE5 for ; Tue, 15 Jun 2021 18:38:08 +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 EF9A56115B for ; Tue, 15 Jun 2021 18:38:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF9A56115B 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=oC2THXKzn9SIeE0zxkflv7sTaWOkh0UeUfzZySA0aDo=; b=XSuS74qkIq3ntI EHtoc28LGylCEqiYyl0471itmQ7pGnYKh3RHCmtiMYpNnTc87jbX9SdibXgrJdER3HGt50I4rLISh kj/30Gfd2vX1FHWO+O7CkAMdM+LcgJrfapnUqKU4Sv+smLzJtAi4ToSC7x1gQ39dlNg11IsMkA4Ul ay3NVNvi4XI5NX7HmPHfKbfYrTskBoQad/C7I6M9kLNt7sDsnrYpsvqD4mjBjVJt6NqSyFerWWCaF SQU+kbGyDW8g9+sVfboynrhgFDP7Iak15Qu/rp9426qkSL8aLmRQtqBZ5Kl2ZqV1gjPJMg7UIXNVx E3jkuTLsnsPRNqz1LgSQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltDum-002Ady-OX; Tue, 15 Jun 2021 18:35:58 +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 1lt9Ro-000DwX-Dd for linux-arm-kernel@bombadil.infradead.org; Tue, 15 Jun 2021 13:49:46 +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=Y2oQpfDnLgd3qckyxyIfndm415jYpQ6DHQ2xlsvIgzI=; b=eSZ8ZM+h0JgMiRGX8oYaLfV9Bf iWYW1PxgpDr5l5SCVeCeEyNOMkapwXOxMCYOFsWBX2rVBKrpO+xJqsr0+EGK+QDg+aKXINVJyfQh5 NcGsDHKsyhRsInWTiffCljMbocCs0n946x/xdOm0Etiru4//iU34xzUeV4bQrfOouUK3ebfI0xw9N 2nOtJoeQZWvdEUBSesU8i1MwEWuD2pUXu6cq6VFxlEWbJZbGXTaE+3UnJh8tfAfRUELqq2m0ahMWC CBjEkoMdFUf0mn0AEcGih9d23OZ+7gqiW2azyRjCfPVW5mwjsfPqReuK0XuFUtvp/5yEJuHjveqyb //ZsybLQ==; Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsxhK-007EEV-3X for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 01:17:07 +0000 Received: by mail-pf1-x42d.google.com with SMTP id h12so11996452pfe.2 for ; Mon, 14 Jun 2021 18:17:04 -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=Y2oQpfDnLgd3qckyxyIfndm415jYpQ6DHQ2xlsvIgzI=; b=YAGrCn81Ox8Tx+jTl+Hr3PSG+VwmRWY+vVBPEc7Fi9J4jzWhgFmseQaLVozb2naXtA HO20Fe7G53KHXqcXJV0yTdOGC/ucgn5Z6KEdBwpHzyhygRZAZvuEwSrvsoPtyG8VWEp0 fbBg4exJXSZ9XdNGwcbjutSGo5aCH4y5Afy2ByAr/VyprS+yPYaA6SBsP/Lr5uueucxg /4HheVj+0cTdVJgFsBIlyc0Yq9xMVK+bgFbBje2vxdmm78aqssjWQT1pmRhtnWwaObKk vvLawA3Y6W9EgVh+j1RrFqPG1094eRnXSnsmXvMcmsPCiod4rPAEDs8hAF11dzm+mCtT YrZg== 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=Y2oQpfDnLgd3qckyxyIfndm415jYpQ6DHQ2xlsvIgzI=; b=gEZtDlelLHTw4Vl3VLjFmny0XxR/BQWeEfQjBrrEoWls8extaog6DSbi7KauLYw6QE cVWyTuJqYk+WiNbGPnM3sNIFOMCWDXEqHtCAQDbHPzOXDZ+865UOVjHdI5GVsIKzf5cK rqxkxiY5PP+RUYmwSyaLqeK3oJZtcBK+ggFMEmgfRiD/VkozFx5rkwCiKreC9NGU3Qbt Z8zXnB0UllOkZuYUriMbQupqaD8eVmIqg7Ha8vFTuPTxVmi5K+GnA3EnwXRNPzlk31kN 4tBviSIV85uXb5RpAR1x229sd6XxViyWpy6kxlEh1cGCe1qvJcDc2kKOGfcLQ5FfEyap 2QQw== X-Gm-Message-State: AOAM533T667MoXlymMy7x+uqAk0soSI1A/Pl5RqOrxgD8KWUa0usKEko 4+lD0vCJ1rnc6236LEl4ThxDhhPanFo= X-Google-Smtp-Source: ABdhPJxQ5Biu3VclB66QSMFQABc6d+LeZDRL5mTJ/6o2ya8ubyru5oQbnLXCX5IsXchNuitCpvCaFA== X-Received: by 2002:a62:15cc:0:b029:2fa:d8e2:e108 with SMTP id 195-20020a6215cc0000b02902fad8e2e108mr1756835pfv.69.1623719700273; Mon, 14 Jun 2021 18:15:00 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id r19sm13494042pfh.152.2021.06.14.18.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jun 2021 18:14:59 -0700 (PDT) From: Joel Stanley To: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 6/6] ARM: config: multi v7: Regenerate defconifg Date: Tue, 15 Jun 2021 10:44:35 +0930 Message-Id: <20210615011435.518115-7-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_021705_693840_1BAF40BA X-CRM114-Status: GOOD ( 12.87 ) 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 have moved around when generating the defconfig. Update them to reduce noise when generating future changes. The exceptions are: - NEW_LEDS and LEDS_TRIGGERS which should drop out as they are selected by SND_CTL_LED. Instead we will improve the logic so SND_CTL_LED doesn't force-enable the subsystem. - The SPI_AX88796C network device. This was enabled in v5.11 for Exynos boards. The driver is not yet merged but there's work being done, so leave it alone for now. - PTP_1588_CLOCK is implied by enabled drivers STMMAC_ETH, IGB, E1000E and FEC, but this may be changed in the future as imply does not do what it was originally intended to do. Signed-off-by: Joel Stanley Reviewed-by: Arnd Bergmann --- v3: Mention why PTP_1588_CLOCK is left in. arch/arm/configs/multi_v7_defconfig | 56 ++++++++++++++--------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 99138a457a42..b8e9ea73bdc1 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -108,8 +108,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPUFREQ_DT=y CONFIG_ARM_IMX6Q_CPUFREQ=y -CONFIG_ARM_SCMI_CPUFREQ=y CONFIG_ARM_RASPBERRYPI_CPUFREQ=y +CONFIG_ARM_SCMI_CPUFREQ=y CONFIG_QORIQ_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y @@ -279,6 +279,7 @@ CONFIG_ICPLUS_PHY=y CONFIG_MARVELL_PHY=y CONFIG_AT803X_PHY=y CONFIG_ROCKCHIP_PHY=y +CONFIG_DP83867_PHY=y CONFIG_USB_PEGASUS=y CONFIG_USB_RTL8152=m CONFIG_USB_LAN78XX=m @@ -437,7 +438,6 @@ CONFIG_SPI_SPIDEV=y CONFIG_SPMI=y CONFIG_PTP_1588_CLOCK=y CONFIG_PINCTRL_AS3722=y -CONFIG_PINCTRL_RZA2=y CONFIG_PINCTRL_STMFX=y CONFIG_PINCTRL_PALMAS=y CONFIG_PINCTRL_OWL=y @@ -452,10 +452,12 @@ CONFIG_PINCTRL_MSM8X74=y CONFIG_PINCTRL_MSM8916=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_QCOM_SSBI_PMIC=y +CONFIG_PINCTRL_RZA2=y CONFIG_GPIO_ASPEED_SGPIO=y CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_DWAPB=y CONFIG_GPIO_EM=y +CONFIG_GPIO_MXC=y CONFIG_GPIO_RCAR=y CONFIG_GPIO_SYSCON=y CONFIG_GPIO_UNIPHIER=y @@ -468,8 +470,6 @@ CONFIG_GPIO_PALMAS=y CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TWL4030=y -CONFIG_GPIO_MXC=y -CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y @@ -508,9 +508,9 @@ CONFIG_ARMADA_THERMAL=y CONFIG_BCM2711_THERMAL=m CONFIG_BCM2835_THERMAL=m CONFIG_BRCMSTB_THERMAL=m -CONFIG_GENERIC_ADC_THERMAL=m CONFIG_ST_THERMAL_MEMMAP=y CONFIG_TEGRA_SOCTHERM=m +CONFIG_GENERIC_ADC_THERMAL=m CONFIG_UNIPHIER_THERMAL=y CONFIG_DA9063_WATCHDOG=m CONFIG_XILINX_WATCHDOG=y @@ -617,6 +617,8 @@ CONFIG_REGULATOR_TPS65910=y CONFIG_REGULATOR_TWL4030=y CONFIG_REGULATOR_VEXPRESS=y CONFIG_REGULATOR_WM8994=m +CONFIG_CEC_SAMSUNG_S5P=m +CONFIG_CEC_STM32=m CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m @@ -644,9 +646,6 @@ CONFIG_VIDEO_RENESAS_JPU=m CONFIG_VIDEO_RENESAS_VSP1=m CONFIG_V4L_TEST_DRIVERS=y CONFIG_VIDEO_VIVID=m -CONFIG_CEC_PLATFORM_DRIVERS=y -CONFIG_CEC_SAMSUNG_S5P=m -CONFIG_CEC_STM32=m CONFIG_VIDEO_ADV7180=m CONFIG_VIDEO_ADV7604=m CONFIG_VIDEO_ADV7604_CEC=y @@ -667,11 +666,6 @@ CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_DW_HDMI=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_INNO_HDMI=y -CONFIG_DRM_IMX=m -CONFIG_DRM_IMX_PARALLEL_DISPLAY=m -CONFIG_DRM_IMX_TVE=m -CONFIG_DRM_IMX_LDB=m -CONFIG_DRM_IMX_HDMI=m CONFIG_DRM_ATMEL_HLCDC=m CONFIG_DRM_RCAR_DU=m CONFIG_DRM_RCAR_LVDS=y @@ -696,6 +690,11 @@ CONFIG_DRM_TOSHIBA_TC358764=m CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_DRM_STI=m +CONFIG_DRM_IMX=m +CONFIG_DRM_IMX_PARALLEL_DISPLAY=m +CONFIG_DRM_IMX_TVE=m +CONFIG_DRM_IMX_LDB=m +CONFIG_DRM_IMX_HDMI=m CONFIG_DRM_VC4=m CONFIG_DRM_ETNAVIV=m CONFIG_DRM_MXSFB=m @@ -960,6 +959,8 @@ CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_NVEC_PAZ00=y CONFIG_STAGING_BOARD=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC=m CONFIG_CROS_EC_I2C=m CONFIG_CROS_EC_SPI=m CONFIG_COMMON_CLK_MAX77686=y @@ -989,24 +990,25 @@ CONFIG_QCOM_GSBI=y CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_WCNSS_CTRL=m CONFIG_ARCH_EMEV2=y +CONFIG_ARCH_R8A7794=y +CONFIG_ARCH_R8A7779=y +CONFIG_ARCH_R8A7790=y +CONFIG_ARCH_R8A7778=y +CONFIG_ARCH_R8A7793=y +CONFIG_ARCH_R8A7791=y +CONFIG_ARCH_R8A7792=y +CONFIG_ARCH_R8A7740=y +CONFIG_ARCH_R8A73A4=y CONFIG_ARCH_R7S72100=y CONFIG_ARCH_R7S9210=y -CONFIG_ARCH_R8A73A4=y -CONFIG_ARCH_R8A7740=y +CONFIG_ARCH_R8A77470=y +CONFIG_ARCH_R8A7745=y CONFIG_ARCH_R8A7742=y CONFIG_ARCH_R8A7743=y CONFIG_ARCH_R8A7744=y -CONFIG_ARCH_R8A7745=y -CONFIG_ARCH_R8A77470=y -CONFIG_ARCH_R8A7778=y -CONFIG_ARCH_R8A7779=y -CONFIG_ARCH_R8A7790=y -CONFIG_ARCH_R8A7791=y -CONFIG_ARCH_R8A7792=y -CONFIG_ARCH_R8A7793=y -CONFIG_ARCH_R8A7794=y CONFIG_ARCH_R9A06G032=y CONFIG_ARCH_SH73A0=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_ARCH_TEGRA_3x_SOC=y @@ -1029,12 +1031,12 @@ CONFIG_AT91_SAMA5D2_ADC=m CONFIG_BERLIN2_ADC=m CONFIG_CPCAP_ADC=m CONFIG_EXYNOS_ADC=m -CONFIG_STMPE_ADC=m CONFIG_MESON_SARADC=m CONFIG_ROCKCHIP_SARADC=m CONFIG_STM32_ADC_CORE=m CONFIG_STM32_ADC=m CONFIG_STM32_DFSDM_ADC=m +CONFIG_STMPE_ADC=m CONFIG_VF610_ADC=m CONFIG_XILINX_XADC=y CONFIG_IIO_CROS_EC_SENSORS_CORE=m @@ -1137,12 +1139,12 @@ CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_FSL_CAAM=m -CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_EXYNOS_RNG=m CONFIG_CRYPTO_DEV_S5P=m CONFIG_CRYPTO_DEV_ATMEL_AES=m CONFIG_CRYPTO_DEV_ATMEL_TDES=m CONFIG_CRYPTO_DEV_ATMEL_SHA=m +CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_CRYPTO_DEV_STM32_CRC=m CONFIG_CRYPTO_DEV_STM32_HASH=m @@ -1151,5 +1153,3 @@ CONFIG_CMA_SIZE_MBYTES=64 CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y -CONFIG_CHROME_PLATFORMS=y -CONFIG_CROS_EC=m