From patchwork Thu Jun 2 12:14:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 69161 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp84459qgf; Thu, 2 Jun 2016 05:16:12 -0700 (PDT) X-Received: by 10.98.57.85 with SMTP id g82mr3918478pfa.130.1464869772352; Thu, 02 Jun 2016 05:16:12 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id z6si17381788paa.60.2016.06.02.05.16.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jun 2016 05:16:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b8RWh-0008R5-6v; Thu, 02 Jun 2016 12:15:03 +0000 Received: from mail-lf0-x232.google.com ([2a00:1450:4010:c07::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b8RWd-0008MM-LW for linux-arm-kernel@lists.infradead.org; Thu, 02 Jun 2016 12:15:00 +0000 Received: by mail-lf0-x232.google.com with SMTP id s64so32625252lfe.0 for ; Thu, 02 Jun 2016 05:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RULg6zBvg9T/r1TlmFI8VPXnm/9IrNJgO4THRj/+fF8=; b=TqHLSSnqzIjMU22cbx7tD1UnzBkK0HI+erAlqgmFwZTjeexy9x4e5jrvuxagEcAwYm gIY3BgQWRkpNo1C0Ysj0+mFvL6ahJ0n3efIYeTValMwfKCE9kimia0tYX+/fVcuf/nuH 4lC2NBVEHS6kcrpbj+UCPbfIF5d92iAR+imr4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RULg6zBvg9T/r1TlmFI8VPXnm/9IrNJgO4THRj/+fF8=; b=OhPyG5TdSGBBXhION0wN2Qa4YhLvQyKomOkWWWMofFza13IOS6PbWf/tM12OkWF81E 6NuY2cXSb4OpSBpMb5dZ8Ptho9VycIKgC+oBpoVzUT5EQs2Q8M9hv5FiNCXJsseiyasi 3iY1l7/4wGGNo1EeUWVNVMLbvuU1jcLQMN6AVZXQAAWUYs8w23CjXkjaLWijtBG94y31 w5hrMrQUgiQ/rQSBSW2qZpPa94vNWm8L5bU/BCX0wLpJPKaNF7dJivuGIVGzLTCqKoQY lDl/DTbxt/HTX1dB5r5weIf4Hg2zRIoBhAW6X/u4xVgIiMUN61X5Ad27pvIPHaH7FF7s 7snQ== X-Gm-Message-State: ALyK8tLCi10GZNnB1fmKV3QgkwlYAU42p6R1qjFbF5L/UWF+S7sJIlvQL4kzyPsEHfYaK9/6 X-Received: by 10.25.142.16 with SMTP id q16mr3224003lfd.53.1464869676830; Thu, 02 Jun 2016 05:14:36 -0700 (PDT) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id f6sm22402lbt.31.2016.06.02.05.14.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jun 2016 05:14:35 -0700 (PDT) From: Linus Walleij To: Catalin Marinas , Will Deacon Subject: [PATCH] arm64: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB Date: Thu, 2 Jun 2016 14:14:30 +0200 Message-Id: <1464869670-7208-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.11 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160602_051500_052407_2439B3C5 X-CRM114-Status: GOOD ( 12.81 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:232 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , =?UTF-8?q?Michael=20B=C3=BCsch?= , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org This replaces: - "select ARCH_REQUIRE_GPIOLIB" with "select GPIOLIB" as this can now be selected directly. - "select ARCH_WANT_OPTIONAL_GPIOLIB" with no dependency: GPIOLIB is now selectable by everyone, so we need not declare our intent to select it. Cc: Michael Büsch Signed-off-by: Linus Walleij --- ARM64/AArch64 maintainers: Please apply this patch directly for cleanups. --- arch/arm64/Kconfig | 1 - arch/arm64/Kconfig.platforms | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 76747d92bc72..2cfbf83b2498 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -12,7 +12,6 @@ config ARM64 select ARCH_USE_CMPXCHG_LOCKREF select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_SUPPORTS_NUMA_BALANCING - select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_COMPAT_IPC_PARSE_VERSION select ARCH_WANT_FRAME_POINTERS select ARCH_HAS_UBSAN_SANITIZE_ALL diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 7ef1d05859ae..fe66708e9a20 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -16,15 +16,15 @@ config ARCH_ALPINE config ARCH_BCM_IPROC bool "Broadcom iProc SoC Family" select COMMON_CLK_IPROC + select GPIOLIB select PINCTRL - select ARCH_REQUIRE_GPIOLIB help This enables support for Broadcom iProc based SoCs config ARCH_BERLIN bool "Marvell Berlin SoC Family" - select ARCH_REQUIRE_GPIOLIB select DW_APB_ICTL + select GPIOLIB select PINCTRL help This enables support for Marvell Berlin SoC Family @@ -89,7 +89,7 @@ config ARCH_QCOM config ARCH_ROCKCHIP bool "Rockchip Platforms" select ARCH_HAS_RESET_CONTROLLER - select ARCH_REQUIRE_GPIOLIB + select GPIOLIB select PINCTRL select PINCTRL_ROCKCHIP select ROCKCHIP_TIMER @@ -129,11 +129,11 @@ config ARCH_STRATIX10 config ARCH_TEGRA bool "NVIDIA Tegra SoC Family" select ARCH_HAS_RESET_CONTROLLER - select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO select CLKSRC_OF select GENERIC_CLOCKEVENTS + select GPIOLIB select HAVE_CLK select PINCTRL select RESET_CONTROLLER @@ -158,8 +158,8 @@ config ARCH_UNIPHIER config ARCH_VEXPRESS bool "ARMv8 software model (Versatile Express)" - select ARCH_REQUIRE_GPIOLIB select COMMON_CLK_VERSATILE + select GPIOLIB select POWER_RESET_VEXPRESS select VEXPRESS_CONFIG help