[PATCH] GPIO PL061: Adding Clk framework support

[Baruch Siach]

Hi Viresh,

On Mon, Jun 21, 2010 at 11:09:13AM +0530, Viresh KUMAR wrote:
> From: Viresh KUMAR <viresh.kumar at st.com>
> 
> Signed-off-by: Viresh Kumar <viresh.kumar at st.com>

Please add a commit log explaining the need for this change.

baruch

> ---
>  drivers/gpio/pl061.c |   44 +++++++++++++++++++++++++++++++++++++++++---
>  1 files changed, 41 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
> index 105701a..5848237 100644
> --- a/drivers/gpio/pl061.c
> +++ b/drivers/gpio/pl061.c
> @@ -11,7 +11,10 @@
>   *
>   * Data sheet: ARM DDI 0190B, September 2000
>   */
> +
> +#include <linux/clk.h>
>  #include <linux/spinlock.h>
> +#include <linux/err.h>
>  #include <linux/errno.h>
>  #include <linux/module.h>
>  #include <linux/list.h>
> @@ -56,8 +59,33 @@ struct pl061_gpio {
>  	void __iomem		*base;
>  	unsigned		irq_base;
>  	struct gpio_chip	gc;
> +	unsigned		usage_count;
> +	struct clk		*clk;
>  };
>  
> +static int pl061_request(struct gpio_chip *gc, unsigned offset)
> +{
> +	struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
> +
> +	if (offset >= gc->ngpio)
> +		return -EINVAL;
> +
> +	if (!chip->usage_count)
> +		clk_enable(chip->clk);
> +
> +	chip->usage_count++;
> +	return 0;
> +}
> +
> +static void pl061_free(struct gpio_chip *gc, unsigned offset)
> +{
> +	struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
> +
> +	chip->usage_count--;
> +	if (!chip->usage_count)
> +		clk_disable(chip->clk);
> +}
> +
>  static int pl061_direction_input(struct gpio_chip *gc, unsigned offset)
>  {
>  	struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
> @@ -260,10 +288,18 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
>  		goto release_region;
>  	}
>  
> +	chip->clk = clk_get(&dev->dev, NULL);
> +	if (IS_ERR(chip->clk)) {
> +		ret = PTR_ERR(chip->clk);
> +		goto iounmap;
> +	}
> +
>  	spin_lock_init(&chip->lock);
>  	spin_lock_init(&chip->irq_lock);
>  	INIT_LIST_HEAD(&chip->list);
>  
> +	chip->gc.request = pl061_request;
> +	chip->gc.free = pl061_free;
>  	chip->gc.direction_input = pl061_direction_input;
>  	chip->gc.direction_output = pl061_direction_output;
>  	chip->gc.get = pl061_get_value;
> @@ -279,7 +315,7 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
>  
>  	ret = gpiochip_add(&chip->gc);
>  	if (ret)
> -		goto iounmap;
> +		goto free_clk;
>  
>  	/*
>  	 * irq_chip support
> @@ -292,7 +328,7 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
>  	irq = dev->irq[0];
>  	if (irq < 0) {
>  		ret = -ENODEV;
> -		goto iounmap;
> +		goto free_clk;
>  	}
>  	set_irq_chained_handler(irq, pl061_irq_handler);
>  	if (!test_and_set_bit(irq, init_irq)) { /* list initialized? */
> @@ -300,7 +336,7 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
>  		if (chip_list == NULL) {
>  			clear_bit(irq, init_irq);
>  			ret = -ENOMEM;
> -			goto iounmap;
> +			goto free_clk;
>  		}
>  		INIT_LIST_HEAD(chip_list);
>  		set_irq_data(irq, chip_list);
> @@ -323,6 +359,8 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
>  
>  	return 0;
>  
> +free_clk:
> +	clk_put(chip->clk);
>  iounmap:
>  	iounmap(chip->base);
>  release_region:
> -- 
> 1.6.0.2
> 

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -