From patchwork Mon Aug 29 10:26:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 663560 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 3sN79M0Zhnz9s9x for ; Mon, 29 Aug 2016 20:26:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=CnGD65rF; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757136AbcH2K00 (ORCPT ); Mon, 29 Aug 2016 06:26:26 -0400 Received: from pandora.armlinux.org.uk ([78.32.30.218]:56311 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757039AbcH2K0Z (ORCPT ); Mon, 29 Aug 2016 06:26:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=zAi1s1PfUnwz0Aqy7De4d1OQkE04O4Wi//L+mcJhSD8=; b=CnGD65rFpLBDNqImUVSqbhEJTP8GEiPp558EDh+tdZxiMEXQ+r97DJIFGkn1YpPMt/c9fDPFWN8M3Vm6eGJdX+FZP/rFYgSLgnWhoHewGI0Qtpn9gVsIqkG3Tc+yWSsLuz/sKNUKNM8ef6giqxNb8Yno4hZ7Tsmi7f3r9Gg1FHE=; Received: from e0022681537dd.dyn.armlinux.org.uk ([2001:4d48:ad52:3201:222:68ff:fe15:37dd]:50806 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1beJll-0003fy-8b; Mon, 29 Aug 2016 11:26:21 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1beJli-0000oF-Q0; Mon, 29 Aug 2016 11:26:18 +0100 In-Reply-To: <20160829102328.GA28796@n2100.armlinux.org.uk> References: <20160829102328.GA28796@n2100.armlinux.org.uk> From: Russell King To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-pcmcia@lists.infradead.org Cc: Alexandre Courbot , Daniel Mack , Haojian Zhuang , Kristoffer Ericson , Linus Walleij , Robert Jarzmik Subject: [PATCH 26/33] ARM: sa1100/shannon: switch shannon PCMCIA to use gpiod APIs MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 29 Aug 2016 11:26:18 +0100 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Switch shannon's PCMCIA implementation to use the gpiod APIs. Signed-off-by: Russell King --- arch/arm/mach-sa1100/shannon.c | 13 +++++++++++++ drivers/pcmcia/sa1100_shannon.c | 25 ++++++------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index c8866bce7386..f2cc896e582f 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -71,8 +72,20 @@ static struct sa1100fb_mach_info shannon_lcd_info = { .lccr3 = LCCR3_ACBsDiv(512), }; +static struct gpiod_lookup_table shannon_pcmcia_gpio_table = { + .dev_id = "sa11x0-pcmcia", + .table = { + GPIO_LOOKUP("gpio", 24, "pcmcia0-detect", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("gpio", 25, "pcmcia1-detect", GPIO_ACTIVE_LOW), + GPIO_LOOKUP("gpio", 26, "pcmcia0-ready", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("gpio", 27, "pcmcia1-ready", GPIO_ACTIVE_HIGH), + { }, + }, +}; + static void __init shannon_init(void) { + gpiod_add_lookup_table(&shannon_pcmcia_gpio_table); sa11x0_ppc_configure_mcp(); sa11x0_register_lcd(&shannon_lcd_info); sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1); diff --git a/drivers/pcmcia/sa1100_shannon.c b/drivers/pcmcia/sa1100_shannon.c index b07a2dc3296e..51985c8ba830 100644 --- a/drivers/pcmcia/sa1100_shannon.c +++ b/drivers/pcmcia/sa1100_shannon.c @@ -8,35 +8,22 @@ #include #include #include -#include -#include #include -#include -#include + #include "sa1100_generic.h" static int shannon_pcmcia_hw_init(struct soc_pcmcia_socket *skt) { - /* All those are inputs */ - GAFR &= ~(GPIO_GPIO(SHANNON_GPIO_EJECT_0) | - GPIO_GPIO(SHANNON_GPIO_EJECT_1) | - GPIO_GPIO(SHANNON_GPIO_RDY_0) | - GPIO_GPIO(SHANNON_GPIO_RDY_1)); - if (skt->nr == 0) { - skt->stat[SOC_STAT_CD].gpio = SHANNON_GPIO_EJECT_0; - skt->stat[SOC_STAT_CD].name = "PCMCIA_CD_0"; - skt->stat[SOC_STAT_RDY].gpio = SHANNON_GPIO_RDY_0; - skt->stat[SOC_STAT_RDY].name = "PCMCIA_RDY_0"; + skt->stat[SOC_STAT_CD].name = "pcmcia0-detect"; + skt->stat[SOC_STAT_RDY].name = "pcmcia0-ready"; } else { - skt->stat[SOC_STAT_CD].gpio = SHANNON_GPIO_EJECT_1; - skt->stat[SOC_STAT_CD].name = "PCMCIA_CD_1"; - skt->stat[SOC_STAT_RDY].gpio = SHANNON_GPIO_RDY_1; - skt->stat[SOC_STAT_RDY].name = "PCMCIA_RDY_1"; + skt->stat[SOC_STAT_CD].name = "pcmcia1-detect"; + skt->stat[SOC_STAT_RDY].name = "pcmcia1-ready"; } - return 0; + return soc_pcmcia_request_gpiods(skt); } static void