From patchwork Sun Feb 3 10:15:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 14438 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D3DE623E2E for ; Sun, 3 Feb 2013 10:17:46 +0000 (UTC) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by fiordland.canonical.com (Postfix) with ESMTP id 7D788A18412 for ; Sun, 3 Feb 2013 10:17:46 +0000 (UTC) Received: by mail-ve0-f179.google.com with SMTP id da11so2949536veb.10 for ; Sun, 03 Feb 2013 02:17:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=LIASTZ0Y3MLd/ulvLobdN3s+knXL7AUGSlnt1kTwKJM=; b=WaZ/5eX+fVzFBndvg1SzCoeO53BM1/UnWMAL7YMboLsOwnRuG4KvpvDCnjyPNnJ34S mz6Ae+rPyZ6Q/4Wzlb8P4t4kAYgRl22PR6sxBI49iazPtNOV0Gwv9703bGfjkObmkLU0 MS2xJ9E9XM2kD/emOCxbDirmVRsW9hrRUouWkDIfym3UtOXd/Ucm14/QVQBcY910jbfd Wqw+PVaETPfX98j3VSeW+sqUZ7tMdh6S5czI5/67soT5dIhWk2qBDI5uejkJQPYefqDi VTundLPOvg/uc30nBugogJREVi1XPU/0pcTosZ1oRAnp4kfVQ7e1mTO4E+4TFiROyiXk WiLg== X-Received: by 10.58.231.196 with SMTP id ti4mr13486697vec.25.1359886664268; Sun, 03 Feb 2013 02:17:44 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.252.8 with SMTP id zo8csp40397vec; Sun, 3 Feb 2013 02:17:43 -0800 (PST) X-Received: by 10.68.193.199 with SMTP id hq7mr45970212pbc.3.1359886663352; Sun, 03 Feb 2013 02:17:43 -0800 (PST) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by mx.google.com with ESMTPS id yf4si12830365pbc.111.2013.02.03.02.17.43 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 03 Feb 2013 02:17:43 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) client-ip=209.85.220.42; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) smtp.mail=haojian.zhuang@linaro.org Received: by mail-pa0-f42.google.com with SMTP id kq12so29646pab.15 for ; Sun, 03 Feb 2013 02:17:43 -0800 (PST) X-Received: by 10.68.241.65 with SMTP id wg1mr46824653pbc.141.1359886662968; Sun, 03 Feb 2013 02:17:42 -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.34 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 03 Feb 2013 02:17:42 -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 Cc: patches@linaro.org, Haojian Zhuang Subject: [PATCH v2 05/10] gpio: pxa: define nr gpios in platform data Date: Sun, 3 Feb 2013 18:15:46 +0800 Message-Id: <1359886551-20950-6-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: ALoCoQn4ZjJGMNbAz1tK0gF7oxKMSotJi1ASgCYfOp5nK6dpiX6KmZqG2O5rGHueGme2wTANg4Dl Avoid to define gpio numbers in gpio driver. Define it in platform data instead. Signed-off-by: Haojian Zhuang --- arch/arm/mach-mmp/aspenite.c | 1 + arch/arm/mach-mmp/avengers_lite.c | 1 + arch/arm/mach-mmp/brownstone.c | 1 + arch/arm/mach-mmp/flint.c | 1 + arch/arm/mach-mmp/gplugd.c | 1 + arch/arm/mach-mmp/tavorevb.c | 1 + arch/arm/mach-mmp/teton_bga.c | 1 + arch/arm/mach-mmp/ttc_dkb.c | 1 + arch/arm/mach-pxa/pxa25x.c | 3 +++ arch/arm/mach-pxa/pxa27x.c | 1 + arch/arm/mach-pxa/pxa3xx.c | 15 +++++++++++- drivers/gpio/gpio-pxa.c | 48 +++++++------------------------------ include/linux/gpio-pxa.h | 1 + 13 files changed, 35 insertions(+), 41 deletions(-) diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c index 36f5781..a3e42dc 100644 --- a/arch/arm/mach-mmp/aspenite.c +++ b/arch/arm/mach-mmp/aspenite.c @@ -112,6 +112,7 @@ static unsigned long common_pin_config[] __initdata = { }; static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .nr_gpios = 128, .ed_mask = true, }; diff --git a/arch/arm/mach-mmp/avengers_lite.c b/arch/arm/mach-mmp/avengers_lite.c index b8fe447..1ea6502 100644 --- a/arch/arm/mach-mmp/avengers_lite.c +++ b/arch/arm/mach-mmp/avengers_lite.c @@ -34,6 +34,7 @@ static unsigned long avengers_lite_pin_config_V16F[] __initdata = { }; static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .nr_gpios = 128, .ed_mask = true, }; diff --git a/arch/arm/mach-mmp/brownstone.c b/arch/arm/mach-mmp/brownstone.c index d6ea5c4..a32156f 100644 --- a/arch/arm/mach-mmp/brownstone.c +++ b/arch/arm/mach-mmp/brownstone.c @@ -106,6 +106,7 @@ static unsigned long brownstone_pin_config[] __initdata = { }; static struct pxa_gpio_platform_data mmp2_gpio_pdata = { + .nr_gpios = 192, .ed_mask = true, }; diff --git a/arch/arm/mach-mmp/flint.c b/arch/arm/mach-mmp/flint.c index 0955f44..3f301b5 100644 --- a/arch/arm/mach-mmp/flint.c +++ b/arch/arm/mach-mmp/flint.c @@ -79,6 +79,7 @@ static unsigned long flint_pin_config[] __initdata = { }; static struct pxa_gpio_platform_data mmp2_gpio_pdata = { + .nr_gpios = 192, .ed_mask = true, }; diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c index 2315cce..019b178 100644 --- a/arch/arm/mach-mmp/gplugd.c +++ b/arch/arm/mach-mmp/gplugd.c @@ -129,6 +129,7 @@ static unsigned long gplugd_pin_config[] __initdata = { }; static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .nr_gpios = 128, .ed_mask = true, }; diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c index eaec649..6e8cf80 100644 --- a/arch/arm/mach-mmp/tavorevb.c +++ b/arch/arm/mach-mmp/tavorevb.c @@ -62,6 +62,7 @@ static unsigned long tavorevb_pin_config[] __initdata = { }; static struct pxa_gpio_platform_data ttc_dkb_gpio_pdata = { + .nr_gpios = 128, .ed_mask = true, }; diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c index 6682100..b5146bb 100644 --- a/arch/arm/mach-mmp/teton_bga.c +++ b/arch/arm/mach-mmp/teton_bga.c @@ -51,6 +51,7 @@ static unsigned long teton_bga_pin_config[] __initdata = { }; static struct pxa_gpio_platform_data pxa168_gpio_pdata = { + .nr_gpios = 128, .ed_mask = true, }; diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c index 984d902..123a0bf 100644 --- a/arch/arm/mach-mmp/ttc_dkb.c +++ b/arch/arm/mach-mmp/ttc_dkb.c @@ -75,6 +75,7 @@ static unsigned long ttc_dkb_pin_config[] __initdata = { }; static struct pxa_gpio_platform_data ttc_dkb_gpio_pdata = { + .nr_gpios = 128, .ed_mask = true, }; diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 3460de1..ff91660 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -342,6 +342,9 @@ void __init pxa25x_map_io(void) static struct pxa_gpio_platform_data pxa25x_gpio_info __initdata = { #ifdef CONFIG_CPU_PXA26x .inverted = true, + .nr_gpios = 90, +#else + .nr_gpios = 85, #endif .gafr = true, .gpio_set_wake = gpio_set_wake, diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 999d681..4de9572 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -431,6 +431,7 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info) static struct pxa_gpio_platform_data pxa27x_gpio_info __initdata = { .gafr = true, + .nr_gpios = 121, .gpio_set_wake = gpio_set_wake, }; diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 656a1bb..a0cc797 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -435,6 +435,10 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info) pxa_register_device(&pxa3xx_device_i2c_power, info); } +static struct pxa_gpio_platform_data pxa3xx_gpio_info __initdata = { + .nr_gpios = 128, +}; + static struct platform_device *devices[] __initdata = { &pxa_device_gpio, &pxa27x_device_udc, @@ -482,8 +486,17 @@ static int __init pxa3xx_init(void) register_syscore_ops(&pxa3xx_mfp_syscore_ops); register_syscore_ops(&pxa3xx_clock_syscore_ops); - if (!of_have_populated_dt()) + if (!of_have_populated_dt()) { + if (cpu_is_pxa93x()) + pxa3xx_gpio_info.nr_gpios = 192; + ret = platform_device_add_data(&pxa_device_gpio, + &pxa3xx_gpio_info, + sizeof(struct pxa_gpio_platform_data); + if (ret < 0) + break; + ret = platform_add_devices(devices, ARRAY_SIZE(devices)); + } } return ret; diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 6c6e21c..8fbf4c6 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -380,36 +380,6 @@ static struct irq_chip pxa_muxed_gpio_chip = { .irq_set_wake = pxa_gpio_set_wake, }; -static int pxa_gpio_nums(void) -{ - int count = 0; - -#ifdef CONFIG_ARCH_PXA - if (cpu_is_pxa25x()) { -#ifdef CONFIG_CPU_PXA26x - count = 89; -#elif defined(CONFIG_PXA25x) - count = 84; -#endif /* CONFIG_CPU_PXA26x */ - } else if (cpu_is_pxa27x()) { - count = 120; - } else if (cpu_is_pxa93x()) { - count = 191; - } else if (cpu_is_pxa3xx()) { - count = 127; - } -#endif /* CONFIG_ARCH_PXA */ - -#ifdef CONFIG_ARCH_MMP - if (cpu_is_pxa168() || cpu_is_pxa910()) { - count = 127; - } else if (cpu_is_mmp2()) { - count = 191; - } -#endif /* CONFIG_ARCH_MMP */ - return count; -} - static int pxa_irq_domain_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) { @@ -433,7 +403,7 @@ static struct of_device_id pxa_gpio_dt_ids[] = { static int pxa_gpio_probe_dt(struct platform_device *pdev) { - int ret, nr_banks, nr_gpios; + int ret, nr_banks; struct pxa_gpio_platform_data *pdata; struct device_node *prev, *next, *np = pdev->dev.of_node; const struct of_device_id *of_id = @@ -451,6 +421,11 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev) /* It's only valid for PXA26x */ if (of_find_property(np, "marvell,gpio-inverted", NULL)) pdata->inverted = true; + ret = of_property_read_u32(np, "marvell,nr-gpios", &pdata->nr_gpios); + if (ret < 0) { + dev_err(&pdev->dev, "nr-gpios isn't specified\n"); + return -ENOTSUPP; + } /* set the platform data */ pdev->dev.platform_data = pdata; @@ -468,8 +443,6 @@ static int pxa_gpio_probe_dt(struct platform_device *pdev) prev = next; } of_node_put(prev); - nr_gpios = nr_banks << 5; - pxa_last_gpio = nr_gpios - 1; return 0; err: @@ -540,14 +513,8 @@ static int pxa_gpio_probe(struct platform_device *pdev) int irq0 = 0, irq1 = 0, irq_mux, gpio_offset = 0; ret = pxa_gpio_probe_dt(pdev); - if (ret < 0) { - pxa_last_gpio = pxa_gpio_nums(); - } else { + if (!ret) use_of = 1; - } - - if (!pxa_last_gpio) - return -EINVAL; irq0 = platform_get_irq_byname(pdev, "gpio0"); irq1 = platform_get_irq_byname(pdev, "gpio1"); @@ -581,6 +548,7 @@ static int pxa_gpio_probe(struct platform_device *pdev) /* Initialize GPIO chips */ info = dev_get_platdata(&pdev->dev); + pxa_last_gpio = info->nr_gpios - 1; pxa_init_gpio_chip(pdev, pxa_last_gpio, info ? info->gpio_set_wake : NULL); diff --git a/include/linux/gpio-pxa.h b/include/linux/gpio-pxa.h index 80e0322..b357fdc 100644 --- a/include/linux/gpio-pxa.h +++ b/include/linux/gpio-pxa.h @@ -19,6 +19,7 @@ struct pxa_gpio_platform_data { bool ed_mask; /* true means that ed_mask reg is available */ bool inverted; /* only valid for PXA26x */ bool gafr; /* only valid for PXA25x/PXA26x/PXA27x */ + unsigned nr_gpios; int (*gpio_set_wake)(unsigned int gpio, unsigned int on); };