From patchwork Tue Aug 2 07:46:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 73146 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp11162qga; Tue, 2 Aug 2016 00:47:50 -0700 (PDT) X-Received: by 10.66.21.137 with SMTP id v9mr22910125pae.58.1470124070394; Tue, 02 Aug 2016 00:47:50 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id l5si1793789pfa.134.2016.08.02.00.47.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Aug 2016 00:47:50 -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.85_2 #1 (Red Hat Linux)) id 1bUUPc-0002ew-Ob; Tue, 02 Aug 2016 07:46:52 +0000 Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bUUPZ-0002Xt-09 for linux-arm-kernel@lists.infradead.org; Tue, 02 Aug 2016 07:46:50 +0000 Received: by mail-lf0-x233.google.com with SMTP id f93so132108680lfi.2 for ; Tue, 02 Aug 2016 00:46:28 -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=0UeXlTG+9OIKqTCicOnRy/lzvjRPnrNa6mDrIgD7QmU=; b=RqR1J14F9BRIoN1wE1qJTzHS14P/zD/LUkhtwYbdAG56vYyNRABIddzZOTBpY+6rbn 0vE6q4OT7FvjfK22w9uwGQ0hymG/IF4amdpgu2wPGDEIgofVyOqMsHfzcPuiLMLCgFWq qqGZ5sUf6EMQPd2Fgvuz8e/mJNrYEx1gYTtS4= 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=0UeXlTG+9OIKqTCicOnRy/lzvjRPnrNa6mDrIgD7QmU=; b=SW8HUd+CxDMplUMMt+bdcX6bqAFUVbjiNmeL84lX9fiG2rAvTVTQ+QyXBmO1p783uO rqRfZfUtxFzlq/WjDmLCxVhcBfhSLGHNGpipu6Pqdp44+IKnWpDD/Y0wggCgqvX4lTPL eR3xK/5vcKtfyfNY0VHgLr7I6SJu296vJrsUMiLiyySQ4i8/l9BND6WYDCfmaZBUIUG0 oPWNTo+PRJH3sC+z5deKdqhYAcFEHyED4aM2kvE3k7bVkBxdIHTkmwkbbJYK+qgrEfun i866xqrHHuvTZp4NpOD5XkTVGj40mXcd7oYJlWJZJ0Q6Le9eswoJ1XPIWwF5SWQDlYTt iWmQ== X-Gm-Message-State: AEkooutbMDJe947DVmpjhHmLbfU/S73ZNTZHvdSnxTl4MXgBL6VbYXie1zW7RQoWJjkx6aBQ X-Received: by 10.25.91.132 with SMTP id p126mr20020119lfb.15.1470123986459; Tue, 02 Aug 2016 00:46:26 -0700 (PDT) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id r196sm232760lfd.41.2016.08.02.00.46.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Aug 2016 00:46:25 -0700 (PDT) From: Linus Walleij To: Catalin Marinas , Will Deacon Subject: [PATCH] arm64: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB Date: Tue, 2 Aug 2016 09:46:21 +0200 Message-Id: <1470123981-9800-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160802_004649_248929_C419E9E5 X-CRM114-Status: GOOD ( 12.00 ) 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:233 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 Acked-by: Will Deacon --- ARM64/AArch64 maintainers: I see you must have missed this patch. Please ACK this rebased version so I can send it upstream in this (v4.8) merge window. --- arch/arm64/Kconfig | 1 - arch/arm64/Kconfig.platforms | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 9f8b99e20557..227a6171fce4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -14,7 +14,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 bb2616b16157..4fb0bef0f094 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -15,8 +15,8 @@ config ARCH_ALPINE config ARCH_BCM2835 bool "Broadcom BCM2835 family" - select ARCH_REQUIRE_GPIOLIB select CLKSRC_OF + select GPIOLIB select PINCTRL select PINCTRL_BCM2835 select ARM_AMBA @@ -29,15 +29,15 @@ config ARCH_BCM2835 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 @@ -108,7 +108,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 @@ -154,11 +154,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 @@ -183,8 +183,8 @@ config ARCH_UNIPHIER config ARCH_VEXPRESS bool "ARMv8 software model (Versatile Express)" - select ARCH_REQUIRE_GPIOLIB select COMMON_CLK_VERSATILE + select GPIOLIB select PM select PM_GENERIC_DOMAINS select POWER_RESET_VEXPRESS