From patchwork Wed Dec 10 15:24:59 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: 419705 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 75BEA1400D5 for ; Thu, 11 Dec 2014 02:26:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757986AbaLJPZe (ORCPT ); Wed, 10 Dec 2014 10:25:34 -0500 Received: from mail-la0-f53.google.com ([209.85.215.53]:62184 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757946AbaLJPZI (ORCPT ); Wed, 10 Dec 2014 10:25:08 -0500 Received: by mail-la0-f53.google.com with SMTP id gm9so2559646lab.26 for ; Wed, 10 Dec 2014 07:25:06 -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=tuBadarmt3jP3DdhcoF250gTeXBIf57rrom+J3VaUg4=; b=kBd5JsFJ77Wq76ozkYfOfkus87oh0NM6OSEsAGeJ1n3ckC76BspVAd6ixPy1HySz9a Jmff1DgjWVi6NfndB+lktZRSEZVegLCp6O0soEup2/kJjnbhAlM1S6zj0FSyqe/8pGRd 1XbaCdfYq8kUlRoCEYF+0HKQSVNW+LvaZc38I68jcsIwxyYQ5omR3yWl0KHDokld1oTf TSr0UO9VaW1MVoNWljXyXt9pYe3Tf/G4sdb8SCIgc0x96Bfx+Rd/2F7uOhl99jxXUklD 9dcj1lUC7zLdxVySoOjF2X3ypevZpqJNBpTnZaAS/FRsN5gcDvz81DMhj2vKxWXlAtp9 D6qw== X-Received: by 10.152.120.42 with SMTP id kz10mr4706860lab.92.1418225106746; Wed, 10 Dec 2014 07:25:06 -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 s16sm816324lal.5.2014.12.10.07.25.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Dec 2014 07:25:06 -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 v3 3/4] gpio/xilinx: Add support for X86 Arch Date: Wed, 10 Dec 2014 16:24:59 +0100 Message-Id: <1418225100-2949-4-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1418225100-2949-1-git-send-email-ricardo.ribalda@gmail.com> References: <1418225100-2949-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. Signed-off-by: Ricardo Ribalda Delgado --- v3: Fix log message 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 0959ca9..7f8ba83 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -343,8 +343,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 9a81c82..0607d97 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