From patchwork Thu Mar 26 02:34:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 454846 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F09EC140119 for ; Thu, 26 Mar 2015 13:36:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751118AbbCZCge (ORCPT ); Wed, 25 Mar 2015 22:36:34 -0400 Received: from smtpbg303.qq.com ([184.105.206.26]:36304 "EHLO smtpbg303.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750910AbbCZCgd (ORCPT ); Wed, 25 Mar 2015 22:36:33 -0400 X-QQ-mid: bizesmtp8t1427337384t270t206 Received: from localhost.localdomain (unknown [222.92.8.142]) by esmtp4.qq.com (ESMTP) with id ; Thu, 26 Mar 2015 10:36:23 +0800 (CST) X-QQ-SSF: 01100000002000F0FJ52B00A0000000 X-QQ-FEAT: c1sy7WzK7UDcdIQHo1JN+M3cPrf6UZPuzoTinaVfks1jERVJG7bo7mXGeJUi1 B5TBDkoXxJieLmwslr0eGkoxZml/V45XdVMm8IKpixNLjqc4BDWnWMELbTiNlWTaESSolWZ ETWiYzP0jragZF1qAqOK4Fh2rMoFavURn0tiO5sOYyEveaOzNSna2EaZtok11jXp4psT7yv ntyblgNSj45FyxrznbP+s899obrcvJcK93NscYYQoZw== X-QQ-GoodBg: 0 From: Huacai Chen To: Linus Walleij Cc: Alexandre Courbot , linux-gpio@vger.kernel.org, Fuxin Zhang , Zhangjin Wu , Huacai Chen Subject: [PATCH 2/3] MIPS: Move Loongson GPIO driver to drivers/gpio Date: Thu, 26 Mar 2015 10:34:47 +0800 Message-Id: <1427337288-8411-2-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1427337288-8411-1-git-send-email-chenhc@lemote.com> References: <1427337288-8411-1-git-send-email-chenhc@lemote.com> X-QQ-SENDSIZE: 520 X-QQ-FName: 9F7F0832A65D4DF9B8A26FDD2F087E32 X-QQ-LocalIP: 58.250.132.20 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Move Loongson-2's GPIO driver to drivers/gpio and add Kconfig options. Acked-by: Ralf Baechle Signed-off-by: Huacai Chen --- arch/mips/configs/lemote2f_defconfig | 1 + arch/mips/loongson/common/Makefile | 1 - drivers/gpio/Kconfig | 6 ++++++ drivers/gpio/Makefile | 1 + .../common/gpio.c => drivers/gpio/gpio-loongson.c | 0 5 files changed, 8 insertions(+), 1 deletions(-) rename arch/mips/loongson/common/gpio.c => drivers/gpio/gpio-loongson.c (100%) diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig index e51aad9..0cbc986 100644 --- a/arch/mips/configs/lemote2f_defconfig +++ b/arch/mips/configs/lemote2f_defconfig @@ -171,6 +171,7 @@ CONFIG_SERIAL_8250_FOURPORT=y CONFIG_LEGACY_PTY_COUNT=16 CONFIG_HW_RANDOM=y CONFIG_RTC=y +CONFIG_GPIO_LOONGSON=y CONFIG_THERMAL=y CONFIG_MEDIA_SUPPORT=m CONFIG_VIDEO_DEV=m diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile index d87e033..e70c33f 100644 --- a/arch/mips/loongson/common/Makefile +++ b/arch/mips/loongson/common/Makefile @@ -4,7 +4,6 @@ obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \ bonito-irq.o mem.o machtype.o platform.o -obj-$(CONFIG_GPIOLIB) += gpio.o obj-$(CONFIG_PCI) += pci.o # diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index c1e2ca3..6454160 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -499,6 +499,12 @@ config GPIO_GRGPIO Select this to support Aeroflex Gaisler GRGPIO cores from the GRLIB VHDL IP core library. +config GPIO_LOONGSON + tristate "Loongson-2 GPIO support" + depends on CPU_LOONGSON2 + help + driver for GPIO functionality on Loongson-2F processors. + config GPIO_TB10X bool select GENERIC_IRQ_CHIP diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index bdda6a9..1b5be76 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -41,6 +41,7 @@ obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o obj-$(CONFIG_ARCH_KS8695) += gpio-ks8695.o obj-$(CONFIG_GPIO_INTEL_MID) += gpio-intel-mid.o +obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o obj-$(CONFIG_GPIO_LP3943) += gpio-lp3943.o obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o obj-$(CONFIG_GPIO_LYNXPOINT) += gpio-lynxpoint.o diff --git a/arch/mips/loongson/common/gpio.c b/drivers/gpio/gpio-loongson.c similarity index 100% rename from arch/mips/loongson/common/gpio.c rename to drivers/gpio/gpio-loongson.c