From patchwork Wed Dec 17 15:51:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 422300 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 0E8191400B7 for ; Thu, 18 Dec 2014 02:53:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751607AbaLQPxb (ORCPT ); Wed, 17 Dec 2014 10:53:31 -0500 Received: from mail-lb0-f171.google.com ([209.85.217.171]:48517 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751133AbaLQPvV (ORCPT ); Wed, 17 Dec 2014 10:51:21 -0500 Received: by mail-lb0-f171.google.com with SMTP id w7so8762855lbi.30 for ; Wed, 17 Dec 2014 07:51:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N4IB1S/b719PuHMY43sh0+l73IkrI0ZfV/0qEQG0uVQ=; b=cSa4AuNdR1W1V2eBMkh5KhZ9WW4QH6EpJ/LBk1ul9upWP30XqKG2Q2BoRyP+4PJads 32/995Hqzi7fpa1hywM07v64/ahori9gz5bqyKPYYrXpMYN0rWif72IjJFnhkgrO5X8j Dn0gDI7Lo4F+Z9iYnz2vrs4si3hB5xiIzxrpIJZscM4ZQHsQWhhcgDiRG8tXVT3+phtG j9deQOvW4Rk2hDPSxhb/axJ7CHAGr4RXzszRuM7E8aTW5rtus2Ai8xCkYpK8CO83/IE1 nAgyDWtaSLgs4dO71hdKWRXy7DpoZYKhA66Ij/OBb8wlGLvH9MLfIYUlEDxqdmuMGQOC bZNA== X-Received: by 10.152.36.1 with SMTP id m1mr41301394laj.95.1418831480102; Wed, 17 Dec 2014 07:51:20 -0800 (PST) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by mx.google.com with ESMTPSA id n4sm1031577lan.39.2014.12.17.07.51.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Dec 2014 07:51:19 -0800 (PST) From: Ricardo Ribalda Delgado To: Linus Walleij , Alexandre Courbot , Michal Simek , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v5 3/7] gpio/xilinx: Add support for X86 Arch Date: Wed, 17 Dec 2014 16:51:10 +0100 Message-Id: <1418831474-24428-4-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1418831474-24428-1-git-send-email-ricardo.ribalda@gmail.com> References: <1418831474-24428-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Core can be accessed via PCIe on X86 platform. This patch also allows the driver to be used as module. Acked-by: Michal Simek Signed-off-by: Ricardo Ribalda Delgado --- drivers/gpio/Kconfig | 4 ++-- drivers/gpio/gpio-xilinx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 414d055..b17d226 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -366,8 +366,8 @@ config GPIO_XGENE here to enable the GFC GPIO functionality. config GPIO_XILINX - bool "Xilinx GPIO support" - depends on PPC_OF || MICROBLAZE || ARCH_ZYNQ + tristate "Xilinx GPIO support" + depends on OF_GPIO && (PPC_OF || MICROBLAZE || ARCH_ZYNQ || ARCH_X86) help Say yes here to support the Xilinx FPGA GPIO device diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c index c7ed92b..554060a 100644 --- a/drivers/gpio/gpio-xilinx.c +++ b/drivers/gpio/gpio-xilinx.c @@ -30,7 +30,7 @@ #define XGPIO_CHANNEL_OFFSET 0x8 /* Read/Write access to the GPIO registers */ -#ifdef CONFIG_ARCH_ZYNQ +#if defined(CONFIG_ARCH_ZYNQ) || defined(CONFIG_X86) # define xgpio_readreg(offset) readl(offset) # define xgpio_writereg(offset, val) writel(val, offset) #else