Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966417AbbDQO1r (ORCPT ); Fri, 17 Apr 2015 10:27:47 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:31108 "EHLO smtp2-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966401AbbDQO1m (ORCPT ); Fri, 17 Apr 2015 10:27:42 -0400 From: Alban Bedel To: linux-mips@linux-mips.org Cc: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Thomas Gleixner , Jason Cooper , Ralf Baechle , Alban Bedel , Andrew Bresticker , Qais Yousef , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/14] MIPS: ath79: Add OF support to the GPIO driver Date: Fri, 17 Apr 2015 16:24:26 +0200 Message-Id: <1429280669-2986-12-git-send-email-albeu@free.fr> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1429280669-2986-1-git-send-email-albeu@free.fr> References: <1429280669-2986-1-git-send-email-albeu@free.fr> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3959 Lines: 148 Replace the simple GPIO chip registration by a platform driver and make ath79_gpio_init() just register the device. Signed-off-by: Alban Bedel --- arch/mips/ath79/dev-common.c | 13 ++++++++ arch/mips/ath79/gpio.c | 73 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/arch/mips/ath79/dev-common.c b/arch/mips/ath79/dev-common.c index 516225d..4f397cb 100644 --- a/arch/mips/ath79/dev-common.c +++ b/arch/mips/ath79/dev-common.c @@ -106,3 +106,16 @@ void __init ath79_register_wdt(void) platform_device_register_simple("ath79-wdt", -1, &res, 1); } + +void __init ath79_gpio_init(void) +{ + struct resource res; + + memset(&res, 0, sizeof(res)); + + res.flags = IORESOURCE_MEM; + res.start = AR71XX_GPIO_BASE; + res.end = res.start + AR71XX_GPIO_SIZE - 1; + + platform_device_register_simple("ath79-gpio", -1, &res, 1); +} diff --git a/arch/mips/ath79/gpio.c b/arch/mips/ath79/gpio.c index 8d025b0..ce1a61d 100644 --- a/arch/mips/ath79/gpio.c +++ b/arch/mips/ath79/gpio.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -178,11 +179,52 @@ void ath79_gpio_function_disable(u32 mask) ath79_gpio_function_setup(0, mask); } -void __init ath79_gpio_init(void) +static const struct of_device_id ath79_gpio_of_match[] = { + { + .compatible = "qca,ar7100-gpio", + .data = (void *)AR71XX_GPIO_COUNT, + }, + { + .compatible = "qca,ar7240-gpio", + .data = (void *)AR7240_GPIO_COUNT, + }, + { + .compatible = "qca,ar7241-gpio", + .data = (void *)AR7241_GPIO_COUNT, + }, + { + .compatible = "qca,ar9130-gpio", + .data = (void *)AR913X_GPIO_COUNT, + }, + { + .compatible = "qca,ar9330-gpio", + .data = (void *)AR933X_GPIO_COUNT, + }, + { + .compatible = "qca,ar9340-gpio", + .data = (void *)AR934X_GPIO_COUNT, + }, + { + .compatible = "qca,qca9550-gpio", + .data = (void *)QCA955X_GPIO_COUNT, + }, + {}, +}; + +static int ath79_gpio_probe(struct platform_device *pdev) { + struct resource *res; int err; - if (soc_is_ar71xx()) + if (pdev->dev.of_node) { + const struct of_device_id *of_id = + of_match_device(ath79_gpio_of_match, &pdev->dev); + if (!of_id) { + dev_err(&pdev->dev, "Error: No device match found\n"); + return -ENODEV; + } + ath79_gpio_count = (unsigned long)of_id->data; + } else if (soc_is_ar71xx()) ath79_gpio_count = AR71XX_GPIO_COUNT; else if (soc_is_ar7240()) ath79_gpio_count = AR7240_GPIO_COUNT; @@ -199,7 +241,13 @@ void __init ath79_gpio_init(void) else BUG(); - ath79_gpio_base = ioremap_nocache(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ath79_gpio_base = devm_ioremap_nocache( + &pdev->dev, res->start, resource_size(res)); + if (!ath79_gpio_base) + return -ENOMEM; + + ath79_gpio_chip.dev = &pdev->dev; ath79_gpio_chip.ngpio = ath79_gpio_count; if (soc_is_ar934x() || soc_is_qca955x()) { ath79_gpio_chip.direction_input = ar934x_gpio_direction_input; @@ -207,10 +255,25 @@ void __init ath79_gpio_init(void) } err = gpiochip_add(&ath79_gpio_chip); - if (err) - panic("cannot add AR71xx GPIO chip, error=%d", err); + if (err) { + dev_err(&pdev->dev, + "cannot add AR71xx GPIO chip, error=%d", err); + return err; + } + + return 0; } +static struct platform_driver ath79_gpio_driver = { + .driver = { + .name = "ath79-gpio", + .of_match_table = ath79_gpio_of_match, + }, + .probe = ath79_gpio_probe, +}; + +module_platform_driver(ath79_gpio_driver); + int gpio_get_value(unsigned gpio) { if (gpio < ath79_gpio_count) -- 2.0.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/