From patchwork Fri Jan 16 11:00:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Jarzmik X-Patchwork-Id: 5647241 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 465A8C058D for ; Fri, 16 Jan 2015 11:03:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 26DCC20142 for ; Fri, 16 Jan 2015 11:03:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0369520165 for ; Fri, 16 Jan 2015 11:03:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YC4ew-0000PR-J7; Fri, 16 Jan 2015 11:01:46 +0000 Received: from smtp05.smtpout.orange.fr ([80.12.242.127] helo=smtp.smtpout.orange.fr) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YC4e7-0008H9-Cf for linux-arm-kernel@lists.infradead.org; Fri, 16 Jan 2015 11:00:57 +0000 Received: from beldin.home ([109.214.23.205]) by mwinf5d28 with ME id gb0N1p00W4RW3Bh03b0XQC; Fri, 16 Jan 2015 12:00:32 +0100 X-ME-Helo: beldin.home X-ME-Date: Fri, 16 Jan 2015 12:00:32 +0100 X-ME-IP: 109.214.23.205 From: Robert Jarzmik To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Samuel Ortiz , Lee Jones , Arnd Bergmann , Dmitry Eremin-Solenikov Subject: [PATCH v3 2/3] mfd: lubbock_io: add lubbock_io board Date: Fri, 16 Jan 2015 12:00:09 +0100 Message-Id: <1421406010-14851-2-git-send-email-robert.jarzmik@free.fr> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1421406010-14851-1-git-send-email-robert.jarzmik@free.fr> References: <1421406010-14851-1-git-send-email-robert.jarzmik@free.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150116_030055_931503_74B4B659 X-CRM114-Status: GOOD ( 19.48 ) X-Spam-Score: 0.0 (/) Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Lubbock () board is the IO motherboard of the Intel PXA25x Development Platform, which supports the Lubbock pxa25x soc board. Historically, this support was in arch/arm/mach-pxa/lubbock.c. When gpio-pxa was moved to drivers/pxa, it became a driver, and its initialization and probing happened at postcore initcall. The lubbock code used to install the chained lubbock interrupt handler at init_irq() time. The consequence of the gpio-pxa change is that the installed chained irq handler lubbock_irq_handler() was overwritten in pxa_gpio_probe(_dt)(), removing : - the handler - the falling edge detection setting of GPIO0, which revealed the interrupt request from the lubbock IO board. As a fix, move the gpio0 chained handler setup to a place where we have the guarantee that pxa_gpio_probe() was called before, so that lubbock handler becomes the true IRQ chained handler of GPIO0, demuxing the lubbock IO board interrupts. This patch moves all that handling to a mfd driver. It's only purpose for the time being is the interrupt handling, but in the future it should encompass all the motherboard CPLDs handling : - leds - switches - hexleds Signed-off-by: Robert Jarzmik --- Since v1: change the name from cottula to lubbock_io Dmitry pointed out the Cottula was the pxa25x family name, lubbock was the pxa25x development board name. Therefore the name was changed to lubbock_io (lubbock IO board) change the resources to bi-irq ioresource Discussion between Arnd and Robert to change the gpio request by a irq request. Since v2: take into account Mark's review Use irq flags from resources (DT case and pdata case). Change of name from lubbock_io to lubbock-io --- drivers/mfd/Kconfig | 10 +++ drivers/mfd/Makefile | 1 + drivers/mfd/lubbock.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+) create mode 100644 drivers/mfd/lubbock.c diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 2e6b731..4d8939f 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -91,6 +91,16 @@ config MFD_AXP20X components like regulators or the PEK (Power Enable Key) under the corresponding menus. +config MFD_LUBBOCK + bool "Lubbock Motherboard" + def_bool ARCH_LUBBOCK + select MFD_CORE + help + This driver supports the Lubbock multifunction chip found on the + pxa25x development platform system (named Lubbock). This IO board + supports the interrupts handling, ethernet controller, flash chips, + etc ... + config MFD_CROS_EC tristate "ChromeOS Embedded Controller" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 53467e2..aff1f4f 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_MFD_88PM805) += 88pm805.o 88pm80x.o obj-$(CONFIG_MFD_SM501) += sm501.o obj-$(CONFIG_MFD_ASIC3) += asic3.o tmio_core.o obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o +obj-$(CONFIG_MFD_LUBBOCK) += lubbock.o obj-$(CONFIG_MFD_CROS_EC) += cros_ec.o obj-$(CONFIG_MFD_CROS_EC_I2C) += cros_ec_i2c.o obj-$(CONFIG_MFD_CROS_EC_SPI) += cros_ec_spi.o diff --git a/drivers/mfd/lubbock.c b/drivers/mfd/lubbock.c new file mode 100644 index 0000000..6025135 --- /dev/null +++ b/drivers/mfd/lubbock.c @@ -0,0 +1,196 @@ +/* + * Intel Cotulla MFD - lubbock motherboard + * + * Copyright (C) 2014 Robert Jarzmik + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Lubbock motherboard driver, supporting lubbock (aka. pxa25x) soc board. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define COT_IRQ_MASK_EN 0xc0 +#define COT_IRQ_SET_CLR 0xd0 + +#define LUBBOCK_NB_IRQ 8 + +struct lubbock { + void __iomem *base; + int irq; + unsigned int irq_mask; + struct gpio_desc *gpio0; + struct irq_domain *irqdomain; +}; + +static irqreturn_t lubbock_irq_handler(int in_irq, void *d) +{ + struct lubbock *cot = d; + unsigned long pending; + unsigned int bit; + + pending = readl(cot->base + COT_IRQ_SET_CLR) & cot->irq_mask; + for_each_set_bit(bit, &pending, LUBBOCK_NB_IRQ) + generic_handle_irq(irq_find_mapping(cot->irqdomain, bit)); + return IRQ_HANDLED; +} + +static void lubbock_irq_mask_ack(struct irq_data *d) +{ + struct lubbock *cot = irq_data_get_irq_chip_data(d); + unsigned int lubbock_irq = irqd_to_hwirq(d); + unsigned int set, bit = BIT(lubbock_irq); + + cot->irq_mask &= ~bit; + writel(cot->irq_mask, cot->base + COT_IRQ_MASK_EN); + set = readl(cot->base + COT_IRQ_SET_CLR); + writel(set & ~bit, cot->base + COT_IRQ_SET_CLR); +} + +static void lubbock_irq_unmask(struct irq_data *d) +{ + struct lubbock *cot = irq_data_get_irq_chip_data(d); + unsigned int lubbock_irq = irqd_to_hwirq(d); + unsigned int bit = BIT(lubbock_irq); + + cot->irq_mask |= bit; + writel(cot->irq_mask, cot->base + COT_IRQ_MASK_EN); +} + +static struct irq_chip lubbock_irq_chip = { + .name = "lubbock", + .irq_mask_ack = lubbock_irq_mask_ack, + .irq_unmask = lubbock_irq_unmask, + .flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE, +}; + +static int lubbock_irq_domain_map(struct irq_domain *d, unsigned int irq, + irq_hw_number_t hwirq) +{ + struct lubbock *cot = d->host_data; + + irq_set_chip_and_handler(irq, &lubbock_irq_chip, handle_level_irq); + irq_set_chip_data(irq, cot); + return 0; +} + +static const struct irq_domain_ops lubbock_irq_domain_ops = { + .xlate = irq_domain_xlate_twocell, + .map = lubbock_irq_domain_map, +}; + +static int lubbock_resume(struct platform_device *pdev) +{ + struct lubbock *cot = platform_get_drvdata(pdev); + + writel(cot->irq_mask, cot->base + COT_IRQ_MASK_EN); + return 0; +} + +static int lubbock_probe(struct platform_device *pdev) +{ + struct resource *res; + struct lubbock *cot; + int ret; + unsigned int base_irq = 0; + unsigned long irqflags; + + cot = devm_kzalloc(&pdev->dev, sizeof(*cot), GFP_KERNEL); + if (!cot) + return -ENOMEM; + res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (res) { + cot->irq = (unsigned int)res->start; + irqflags = res->flags; + } + if (!cot->irq) + return -ENODEV; + + res = platform_get_resource(pdev, IORESOURCE_IRQ, 1); + if (res) + base_irq = (unsigned int)res->start; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + cot->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(cot->base)) + return PTR_ERR(cot->base); + + platform_set_drvdata(pdev, cot); + + writel(cot->irq_mask, cot->base + COT_IRQ_MASK_EN); + writel(0, cot->base + COT_IRQ_SET_CLR); + ret = devm_request_irq(&pdev->dev, cot->irq, lubbock_irq_handler, + irqflags, dev_name(&pdev->dev), cot); + if (ret == -ENOSYS) + return -EPROBE_DEFER; + if (ret) { + dev_err(&pdev->dev, "Couldn't request main irq : ret = %d\n", + ret); + return ret; + } + irq_set_irq_wake(cot->irq, 1); + + cot->irqdomain = + irq_domain_add_linear(pdev->dev.of_node, LUBBOCK_NB_IRQ, + &lubbock_irq_domain_ops, cot); + if (!cot->irqdomain) + return -ENODEV; + + ret = 0; + if (base_irq) + ret = irq_create_strict_mappings(cot->irqdomain, base_irq, 0, + LUBBOCK_NB_IRQ); + if (ret) { + dev_err(&pdev->dev, "Couldn't create the irq mapping %d..%d\n", + base_irq, base_irq + LUBBOCK_NB_IRQ); + return ret; + } + + dev_info(&pdev->dev, "base=%p, irq=%d, base_irq=%d\n", + cot->base, cot->irq, base_irq); + + return 0; +} + +static int lubbock_remove(struct platform_device *pdev) +{ + struct lubbock *cot = platform_get_drvdata(pdev); + + irq_set_chip_and_handler(cot->irq, NULL, NULL); + return 0; +} + +static const struct of_device_id lubbock_id_table[] = { + { .compatible = "intel,lubbock-io", }, + { } +}; +MODULE_DEVICE_TABLE(of, lubbock_id_table); + +static struct platform_driver lubbock_driver = { + .driver = { + .name = "lubbock_io", + .of_match_table = of_match_ptr(lubbock_id_table), + }, + .probe = lubbock_probe, + .remove = lubbock_remove, + .resume = lubbock_resume, +}; + +module_platform_driver(lubbock_driver); + +MODULE_DESCRIPTION("Lubbock driver"); +MODULE_AUTHOR("Robert Jarzmik"); +MODULE_LICENSE("GPL");