redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

gpio: dwapb: Add support for a bus clock

Browse source 
Enable an optional bus clock provided by DT.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Phil Edworthy 2018-03-12 18:30:56 +00:00 committed by Linus Walleij
parent 13b5319e92
commit e6bf37736f
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/gpio/gpio-dwapb.c
View file

@ -8,8 +8,9 @@
* All enquiries to support@picochip.com * All enquiries to support@picochip.com
*/ */
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/gpio/driver.h> #include <linux/clk.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio/driver.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
@ -98,6 +99,7 @@ struct dwapb_gpio {
struct irq_domain *domain; struct irq_domain *domain;
unsigned int flags; unsigned int flags;
struct reset_control *rst; struct reset_control *rst;
struct clk *clk;
}; };
static inline u32 gpio_reg_v2_convert(unsigned int offset) static inline u32 gpio_reg_v2_convert(unsigned int offset)
@ -670,6 +672,16 @@ static int dwapb_gpio_probe(struct platform_device *pdev)
if (IS_ERR(gpio->regs)) if (IS_ERR(gpio->regs))
return PTR_ERR(gpio->regs); return PTR_ERR(gpio->regs);
/* Optional bus clock */
gpio->clk = devm_clk_get(&pdev->dev, "bus");
if (!IS_ERR(gpio->clk)) {
err = clk_prepare_enable(gpio->clk);
if (err) {
dev_info(&pdev->dev, "Cannot enable clock\n");
return err;
}
}
gpio->flags = 0; gpio->flags = 0;
if (dev->of_node) { if (dev->of_node) {
const struct of_device_id *of_devid; const struct of_device_id *of_devid;
@ -712,6 +724,7 @@ static int dwapb_gpio_remove(struct platform_device *pdev)
dwapb_gpio_unregister(gpio); dwapb_gpio_unregister(gpio);
dwapb_irq_teardown(gpio); dwapb_irq_teardown(gpio);
reset_control_assert(gpio->rst); reset_control_assert(gpio->rst);
clk_disable_unprepare(gpio->clk);
return 0; return 0;
} }
@ -757,6 +770,8 @@ static int dwapb_gpio_suspend(struct device *dev)
} }
spin_unlock_irqrestore(&gc->bgpio_lock, flags); spin_unlock_irqrestore(&gc->bgpio_lock, flags);
clk_disable_unprepare(gpio->clk);
return 0; return 0;
} }
@ -768,6 +783,9 @@ static int dwapb_gpio_resume(struct device *dev)
unsigned long flags; unsigned long flags;
int i; int i;
if (!IS_ERR(gpio->clk))
clk_prepare_enable(gpio->clk);
spin_lock_irqsave(&gc->bgpio_lock, flags); spin_lock_irqsave(&gc->bgpio_lock, flags);
for (i = 0; i < gpio->nr_ports; i++) { for (i = 0; i < gpio->nr_ports; i++) {
unsigned int offset; unsigned int offset;