From patchwork Sun Feb 3 10:15:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 2086081 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 57B55DF23E for ; Sun, 3 Feb 2013 10:19:47 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U1wda-0004iy-Ib; Sun, 03 Feb 2013 10:17:26 +0000 Received: from mail-da0-f45.google.com ([209.85.210.45]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U1wdV-0004gH-Rx for linux-arm-kernel@lists.infradead.org; Sun, 03 Feb 2013 10:17:23 +0000 Received: by mail-da0-f45.google.com with SMTP id w4so2272340dam.18 for ; Sun, 03 Feb 2013 02:17:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=0MnzLjAXsX2KMXRgc3lIaOK6oQqMFNgqnYWhuHJaU3w=; b=UlvhlTeFajDSduU+bBKSy349PR5IxAG7d4eAcpuYtXVARzdFqgpgPI4Sp4DK9ABwX1 6ZgT7ghgn2M90J7RLkYxbyio5vjXn4+W4gIKDoIZSqXJBUyUqBdYBBPadSMw9wG90Tap tPqPblY9s2xQI3EqyEC8kDKAF7WpIp1ru1b3mw3uluhI0x3dd/34MknuEbGlzLvQnybf BqzJk9AUUeeCafma/AG8uLkac1ciEGtgERkmfSXvZp3tP1v/4PDTpmZBiiknbLMiJc+T jp/6TwHKOB6l3Q5qD74smRMEGYzUExB3o51gaSS/EVCLMAGZKK2rCayUzuAWgI0fH7Pl udhw== X-Received: by 10.66.73.164 with SMTP id m4mr43421418pav.12.1359886640126; Sun, 03 Feb 2013 02:17:20 -0800 (PST) Received: from haojian-E6230.domain ([67.198.145.34]) by mx.google.com with ESMTPS id ov4sm14344348pbb.45.2013.02.03.02.17.11 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 03 Feb 2013 02:17:19 -0800 (PST) From: Haojian Zhuang To: linux@arm.linux.org.uk, marek.vasut@gmail.com, robert.jarzmik@free.fr, daniel@caiaq.de, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, grant.likely@secretlab.ca, cxie4@marvell.com, grinberg@compulab.co.il Subject: [PATCH v2 03/10] gpio: pxa: use platform data for gpio inverted Date: Sun, 3 Feb 2013 18:15:44 +0800 Message-Id: <1359886551-20950-4-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359886551-20950-1-git-send-email-haojian.zhuang@linaro.org> References: <1359886551-20950-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQlJpJE87P4utsHJKu/AHGCDe00a92HDiOMJzUVUtuQRZHV1Q7LEnSC25dY0B7SHK/dqb6uQ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130203_051722_077959_1F76F226 X-CRM114-Status: GOOD ( 16.13 ) X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.45 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Haojian Zhuang , patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Avoid to judge whether gpio is inverted by identifying cpu in gpio driver. Move this into platform data of gpio driver. Signed-off-by: Haojian Zhuang Tested-by: Igor Grinberg --- arch/arm/mach-pxa/pxa25x.c | 3 +++ drivers/gpio/gpio-pxa.c | 40 +++++++++++++++++++++++++--------------- include/linux/gpio-pxa.h | 1 + 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index f4c293a..66dafb7 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -340,6 +340,9 @@ void __init pxa25x_map_io(void) } static struct pxa_gpio_platform_data pxa25x_gpio_info __initdata = { +#ifdef CONFIG_CPU_PXA26x + .inverted = true, +#endif .gpio_set_wake = gpio_set_wake, }; diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 2310665..1f8dfc8 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -71,6 +71,7 @@ struct pxa_gpio_chip { struct gpio_chip chip; void __iomem *regbase; unsigned int irq_base; + bool inverted; char label[10]; unsigned long irq_mask; @@ -126,9 +127,9 @@ static inline int gpio_is_mmp_type(int type) /* GPIO86/87/88/89 on PXA26x have their direction bits in PXA_GPDR(2 inverted, * as well as their Alternate Function value being '1' for GPIO in GAFRx. */ -static inline int __gpio_is_inverted(int gpio) +static inline int __gpio_is_inverted(struct pxa_gpio_chip *chip, int gpio) { - if ((gpio_type == PXA26X_GPIO) && (gpio > 85)) + if ((chip->inverted) && (gpio > 85)) return 1; return 0; } @@ -139,15 +140,13 @@ static inline int __gpio_is_inverted(int gpio) * is attributed as "occupied" here (I know this terminology isn't * accurate, you are welcome to propose a better one :-) */ -static inline int __gpio_is_occupied(unsigned gpio) +static inline int __gpio_is_occupied(struct pxa_gpio_chip *chip, unsigned gpio) { - struct pxa_gpio_chip *pxachip; void __iomem *base; unsigned long gafr = 0, gpdr = 0; int ret, af = 0, dir = 0; - pxachip = gpio_to_pxachip(gpio); - base = gpio_chip_base(&pxachip->chip); + base = gpio_chip_base(&chip->chip); gpdr = readl_relaxed(base + GPDR_OFFSET); switch (gpio_type) { @@ -158,7 +157,7 @@ static inline int __gpio_is_occupied(unsigned gpio) af = (gafr >> ((gpio & 0xf) * 2)) & 0x3; dir = gpdr & GPIO_bit(gpio); - if (__gpio_is_inverted(gpio)) + if (__gpio_is_inverted(chip, gpio)) ret = (af != 1) || (dir == 0); else ret = (af != 0) || (dir != 0); @@ -188,16 +187,19 @@ int pxa_irq_to_gpio(struct irq_data *d) return gpio; } -static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset) +static int pxa_gpio_direction_input(struct gpio_chip *gc, unsigned offset) { - void __iomem *base = gpio_chip_base(chip); + struct pxa_gpio_chip *chip = NULL; + void __iomem *base = gpio_chip_base(gc); uint32_t value, mask = 1 << offset; unsigned long flags; + chip = container_of(gc, struct pxa_gpio_chip, chip); + spin_lock_irqsave(&gpio_lock, flags); value = readl_relaxed(base + GPDR_OFFSET); - if (__gpio_is_inverted(chip->base + offset)) + if (__gpio_is_inverted(chip, gc->base + offset)) value |= mask; else value &= ~mask; @@ -207,19 +209,22 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset) return 0; } -static int pxa_gpio_direction_output(struct gpio_chip *chip, +static int pxa_gpio_direction_output(struct gpio_chip *gc, unsigned offset, int value) { - void __iomem *base = gpio_chip_base(chip); + struct pxa_gpio_chip *chip = NULL; + void __iomem *base = gpio_chip_base(gc); uint32_t tmp, mask = 1 << offset; unsigned long flags; + chip = container_of(gc, struct pxa_gpio_chip, chip); + writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET)); spin_lock_irqsave(&gpio_lock, flags); tmp = readl_relaxed(base + GPDR_OFFSET); - if (__gpio_is_inverted(chip->base + offset)) + if (__gpio_is_inverted(chip, gc->base + offset)) tmp &= ~mask; else tmp |= mask; @@ -288,7 +293,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type) if ((c->irq_edge_rise | c->irq_edge_fall) & GPIO_bit(gpio)) return 0; - if (__gpio_is_occupied(gpio)) + if (__gpio_is_occupied(c, gpio)) return 0; type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING; @@ -296,7 +301,7 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type) gpdr = readl_relaxed(c->regbase + GPDR_OFFSET); - if (__gpio_is_inverted(gpio)) + if (__gpio_is_inverted(c, gpio)) writel_relaxed(gpdr | mask, c->regbase + GPDR_OFFSET); else writel_relaxed(gpdr & ~mask, c->regbase + GPDR_OFFSET); @@ -474,6 +479,9 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev) return -ENOMEM; if (of_find_property(np, "marvell,gpio-ed-mask", NULL)) pdata->ed_mask = true; + /* It's only valid for PXA26x */ + if (of_find_property(np, "marvell,gpio-inverted", NULL)) + pdata->inverted = true; /* set the platform data */ pdev->dev.platform_data = pdata; gpio_type = (int)of_id->data; @@ -616,6 +624,8 @@ static int pxa_gpio_probe(struct platform_device *pdev) /* unmask GPIO edge detect for AP side */ if (info->ed_mask) writel_relaxed(~0, c->regbase + ED_MASK_OFFSET); + /* update for gpio inverted */ + c->inverted = info->inverted; } if (!use_of) { diff --git a/include/linux/gpio-pxa.h b/include/linux/gpio-pxa.h index 49120b8..0c212a1 100644 --- a/include/linux/gpio-pxa.h +++ b/include/linux/gpio-pxa.h @@ -17,6 +17,7 @@ extern int pxa_irq_to_gpio(struct irq_data *d); struct pxa_gpio_platform_data { bool ed_mask; /* true means that ed_mask reg is available */ + bool inverted; /* only valid for PXA26x */ int (*gpio_set_wake)(unsigned int gpio, unsigned int on); };