From patchwork Wed Nov 25 16:06:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7700841 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 893FCBF90C for ; Wed, 25 Nov 2015 16:08:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B8EBD2084C for ; Wed, 25 Nov 2015 16:08:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B702D206FB for ; Wed, 25 Nov 2015 16:08:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752873AbbKYQIA (ORCPT ); Wed, 25 Nov 2015 11:08:00 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:58518 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752834AbbKYQHx (ORCPT ); Wed, 25 Nov 2015 11:07:53 -0500 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0M4Bbn-1aJIAk2yG3-00rp6p; Wed, 25 Nov 2015 17:07:05 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Kukjin Kim , Krzysztof Kozlowski , Mark Brown , Vasily Khoruzhick , Charles Keepax , Tomasz Figa , Ben Dooks , linux-samsung-soc@vger.kernel.org, Arnd Bergmann Subject: [PATCH 03/10] gpio: samsung: move gpio-samsung driver back to platform code Date: Wed, 25 Nov 2015 17:06:48 +0100 Message-Id: <1448467615-447097-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1448467615-447097-1-git-send-email-arnd@arndb.de> References: <1448467615-447097-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:KPEs9hJIVvNXVAuDfsn032o/3m4OHFIOufTh+rdKW5mMIMnsYFN GBIJNVhxna3qUnJg/04vL6O3nhR44eY45o5fCZ+v6FbVYOUgR2PDNEyKe1HVN2W+b3SGYaW Er2PkogWQ9alLjBvaezB3dlRLZLA0J2L8d2Qvda6u4n4hX3Z0hErqf5UTfKKc/t8/X1aeqj 81uE9YEG19mmWaI53tJ+A== X-UI-Out-Filterresults: notjunk:1; V01:K0:jZVybiVaCh0=:jLwfZcAzUDmQKH37rJ9m0f uHh/9/bJajJslZMNDruBkfglCPquyp//4nVxp8LT2U8UknmVqzk4yTZQvZ6+t5Hyq6UsvF1cX cb24BlYTnlOGhlUtO2kmV2YtqCj9ukOqpKv2tNIIGQpydrsa+OEn3+a2jIo4le/KsMRnzOZDr I2LTj7F0NYcsE1lyi7jhjvouDF3HOQBVuJ5zrQoesyNQmYazMABVHQ7O9diFzHu1Bca7xOQut JdDw+xEf8n5IcafiDR/9RelNRPfHKPw0LlXlUWEyMkY9PnBnkGsv6j8HPoFVTSk/48kR7uFDl HOdwP3/2C3yxU+kNtL6hFRhjfq6XZP3E4qII8gTXcXyFPLafNyc4nIHM5JiZcFYoKxcCKV7uX YzzC8UFTzQWOzCtqvIEH3fm4zQGyEsBpg/Gx9s8flCJp8OfDXz0CjnX7P/3LMWxoeXwrWYYdW 5K84gvRjAqrw4cEwi+ZkZQrD5Woc3Df+8lUmbJ+cMkLZk1FaaEGhxZ3uW+0TMWyKFAJ1GB6XG +5fWGciZMbFJPd4Ftx75xAoh/lnyoxmc3SXX274VF128cNw98xO0uLvNttNhtIhoBY3qNK3p+ +lRKbI5jm53W0zBIccd6U9eMx1jOr/1c8nDzYKOm8/YSFQaEgP01q/8/xKBL8bt/zBF4X/fPd kQ76WlZJf+sb3iuvh1c5vnQ+gPIqf+yn57Ma8IZAYc4b8uvzUm7zcF6x+j1FijPeqSx8= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The gpio-samsung driver is special in the sense that it interacts directly in multiple ways with the legacy platform code for the s3c24xx and s3c64xx platforms. In contrast, all devicetree based machines for Samsung, including the ones on those two SoC families use a different driver. The header files that define the interface between the platform code and the gpio driver are not visible when building a kernel for ARCH_MULTIPLATFORM, which prevents us from turning on this option for s3c64xx. To work around this, we now move the driver back into platform code, from where it was originally moved to as part of commit 1b39d5f2cc5c28 ("gpio/samsung: gpio-samsung.c to support Samsung GPIOs"). The long-term plan for this driver would be to remove it entirely, after all Samsung machines have been converted over to boot from DT, but there is currently no timeline for when that might happen. Signed-off-by: Arnd Bergmann Reviewed-by: Krzysztof Kozlowski --- arch/arm/plat-samsung/Kconfig | 3 +++ arch/arm/plat-samsung/Makefile | 2 ++ {drivers/gpio => arch/arm/plat-samsung}/gpio-samsung.c | 0 drivers/gpio/Kconfig | 7 ------- drivers/gpio/Makefile | 1 - 5 files changed, 5 insertions(+), 8 deletions(-) rename {drivers/gpio => arch/arm/plat-samsung}/gpio-samsung.c (100%) diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 57729b915003..83697414bfa0 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -294,6 +294,9 @@ config SAMSUNG_WDT_RESET Compile support for system restart by triggering watchdog reset. Used on SoCs that do not provide dedicated reset control. +config GPIO_SAMSUNG + def_bool SAMSUNG_ATAGS + config DEBUG_S3C_UART depends on PLAT_SAMSUNG int diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 8c911760f55f..aeb19e3288b9 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -21,6 +21,8 @@ obj-$(CONFIG_SAMSUNG_ATAGS) += platformdata.o obj-$(CONFIG_SAMSUNG_ATAGS) += devs.o obj-$(CONFIG_SAMSUNG_ATAGS) += dev-uart.o +obj-$(CONFIG_GPIO_SAMSUNG) += gpio-samsung.o + # PM support obj-$(CONFIG_PM_SLEEP) += pm-common.o diff --git a/drivers/gpio/gpio-samsung.c b/arch/arm/plat-samsung/gpio-samsung.c similarity index 100% rename from drivers/gpio/gpio-samsung.c rename to arch/arm/plat-samsung/gpio-samsung.c diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index b18bea08ff25..5e4e9f5c8a64 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -344,13 +344,6 @@ config GPIO_RCAR help Say yes here to support GPIO on Renesas R-Car SoCs. -config GPIO_SAMSUNG - bool - depends on PLAT_SAMSUNG - help - Legacy GPIO support. Use only for platforms without support for - pinctrl. - config GPIO_SPEAR_SPICS bool "ST SPEAr13xx SPI Chip Select as GPIO support" depends on PLAT_SPEAR diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 986dbd838cea..8555e947372e 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -79,7 +79,6 @@ obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o -obj-$(CONFIG_GPIO_SAMSUNG) += gpio-samsung.o obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o obj-$(CONFIG_GPIO_SCH) += gpio-sch.o obj-$(CONFIG_GPIO_SCH311X) += gpio-sch311x.o