From patchwork Wed Dec 10 13:21:50 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: 419656 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 164451400DE for ; Thu, 11 Dec 2014 00:22:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756530AbaLJNWU (ORCPT ); Wed, 10 Dec 2014 08:22:20 -0500 Received: from mail-la0-f51.google.com ([209.85.215.51]:43134 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756277AbaLJNV6 (ORCPT ); Wed, 10 Dec 2014 08:21:58 -0500 Received: by mail-la0-f51.google.com with SMTP id ms9so2370294lab.10 for ; Wed, 10 Dec 2014 05:21:57 -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=2zdL2VfDTjmGWLhUf5xnj9HXiWLmis1TThUgc2GZkGE=; b=qO3Tyh8pcDt5YpOUZRYs0llWiCLAoeJI7PtTe86Kp+zQ2hBz+xLar4ONbdShGavBw3 nwmiDvQkH6YlFpitNUPhNE5y4Q1KcPbOOGi+yRFZZ5edIqJHmxEGLgiHVn3pwGON7QVq Iiv82x38yTajJgytMzD4R5DNRvOuNzOBNiNkd38QfobcBe38unGEUNNnsfb0joF0OM9E 9FupY2PSGXOtHLgsYw9vVG2+wJSSThHFWbjFqPeUl5bK4y3g4NWcpo0hICpJWG0CZVVb uSWG4OpiI0hWxe4l4IOaGwDDfhwpFUyFYfGHIus7c0I+NAuDMqwR1+F4gSfYrdjSJ/1G FwRw== X-Received: by 10.152.219.3 with SMTP id pk3mr4037330lac.19.1418217717058; Wed, 10 Dec 2014 05:21:57 -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 xs6sm1239210lbb.13.2014.12.10.05.21.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Dec 2014 05:21:56 -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 v2 3/3] gpio/xilinx: Add support for X86 Arch Date: Wed, 10 Dec 2014 14:21:50 +0100 Message-Id: <1418217710-11987-4-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1418217710-11987-1-git-send-email-ricardo.ribalda@gmail.com> References: <1418217710-11987-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. Signed-off-by: Ricardo Ribalda Delgado --- v2: Minor change on title 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 f946d96..5463540 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