diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-06-19 17:36:15 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-07-03 15:51:08 -0400 |
commit | 27e8461cd5906921f6faac5bcf7a6753600062d5 (patch) | |
tree | cff4b6d5022171f19ce91043e788b4af086ab6c5 /drivers/pinctrl/pinctrl-coh901.c | |
parent | cb0f7d35e385fc242c76bfe7f1d68c1904c6f965 (diff) |
pinctrl/coh901: use clk_prepare_[en|dis]able()
The COH901 GPIO driver did not prepare or unprepare its
clock, so let us fix it to do so.
Acked-by: Pankaj Jangra <jangra.pankaj9@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-coh901.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-coh901.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index 55697a5d7482..cc0f00d73d15 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c | |||
@@ -770,7 +770,7 @@ static int __init u300_gpio_probe(struct platform_device *pdev) | |||
770 | dev_err(gpio->dev, "could not get GPIO clock\n"); | 770 | dev_err(gpio->dev, "could not get GPIO clock\n"); |
771 | goto err_no_clk; | 771 | goto err_no_clk; |
772 | } | 772 | } |
773 | err = clk_enable(gpio->clk); | 773 | err = clk_prepare_enable(gpio->clk); |
774 | if (err) { | 774 | if (err) { |
775 | dev_err(gpio->dev, "could not enable GPIO clock\n"); | 775 | dev_err(gpio->dev, "could not enable GPIO clock\n"); |
776 | goto err_no_clk_enable; | 776 | goto err_no_clk_enable; |
@@ -912,7 +912,7 @@ err_no_ioremap: | |||
912 | release_mem_region(gpio->memres->start, resource_size(gpio->memres)); | 912 | release_mem_region(gpio->memres->start, resource_size(gpio->memres)); |
913 | err_no_ioregion: | 913 | err_no_ioregion: |
914 | err_no_resource: | 914 | err_no_resource: |
915 | clk_disable(gpio->clk); | 915 | clk_disable_unprepare(gpio->clk); |
916 | err_no_clk_enable: | 916 | err_no_clk_enable: |
917 | clk_put(gpio->clk); | 917 | clk_put(gpio->clk); |
918 | err_no_clk: | 918 | err_no_clk: |
@@ -943,7 +943,7 @@ static int __exit u300_gpio_remove(struct platform_device *pdev) | |||
943 | iounmap(gpio->base); | 943 | iounmap(gpio->base); |
944 | release_mem_region(gpio->memres->start, | 944 | release_mem_region(gpio->memres->start, |
945 | resource_size(gpio->memres)); | 945 | resource_size(gpio->memres)); |
946 | clk_disable(gpio->clk); | 946 | clk_disable_unprepare(gpio->clk); |
947 | clk_put(gpio->clk); | 947 | clk_put(gpio->clk); |
948 | platform_set_drvdata(pdev, NULL); | 948 | platform_set_drvdata(pdev, NULL); |
949 | kfree(gpio); | 949 | kfree(gpio); |