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