diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-17 21:26:55 +0800 |
|---|---|---|
| committer | Haojian Zhuang <hzhuang1@hexinfolabs.org> | 2011-11-15 19:09:36 +0800 |
| commit | 389eda15e0f41112d7c44213b3c4f8bd1c9398bc (patch) | |
| tree | d35d07f3d5f1104d6f0ed3dc95a6ded7de72a270 /drivers | |
| parent | be24168f144122b3730beab257fa058745d14cb4 (diff) | |
| download | linux-3.10-389eda15e0f41112d7c44213b3c4f8bd1c9398bc.tar.gz linux-3.10-389eda15e0f41112d7c44213b3c4f8bd1c9398bc.tar.bz2 linux-3.10-389eda15e0f41112d7c44213b3c4f8bd1c9398bc.zip | |
ARM: pxa: add clk support in gpio driver
Support clk in gpio driver. There's no gpio clock in PXA25x and PXA27x.
So use dummy clk instead. And move the gpio edge initialization into
gpio driver for arch-mmp.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpio-pxa.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index bfd755531f7..b2d3ee1d183 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c @@ -11,6 +11,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ +#include <linux/clk.h> +#include <linux/err.h> #include <linux/gpio.h> #include <linux/gpio-pxa.h> #include <linux/init.h> @@ -466,7 +468,8 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev) { struct pxa_gpio_chip *c; struct resource *res; - int gpio, irq; + struct clk *clk; + int gpio, irq, ret; int irq0 = 0, irq1 = 0, irq_mux, gpio_offset = 0; pxa_last_gpio = pxa_gpio_nums(); @@ -489,6 +492,27 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev) if (irq0 > 0) gpio_offset = 2; + clk = clk_get(&pdev->dev, NULL); + if (IS_ERR(clk)) { + dev_err(&pdev->dev, "Error %ld to get gpio clock\n", + PTR_ERR(clk)); + iounmap(gpio_reg_base); + return PTR_ERR(clk); + } + ret = clk_prepare(clk); + if (ret) { + clk_put(clk); + iounmap(gpio_reg_base); + return ret; + } + ret = clk_enable(clk); + if (ret) { + clk_unprepare(clk); + clk_put(clk); + iounmap(gpio_reg_base); + return ret; + } + /* Initialize GPIO chips */ pxa_init_gpio_chip(pxa_last_gpio); |