Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362994
b: refs/heads/master
c: 950707c
h: refs/heads/master
v: v3
  • Loading branch information
Emilio López authored and Linus Walleij committed Apr 3, 2013
1 parent ac864a2 commit cdb37b9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2afe8229687ec24cbc07e78449a588bb8b68f858
refs/heads/master: 950707c0eb5c7aeaa2c446a04c824f4be686d2f6
8 changes: 8 additions & 0 deletions trunk/drivers/pinctrl/pinctrl-sunxi.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*/

#include <linux/io.h>
#include <linux/clk.h>
#include <linux/gpio.h>
#include <linux/module.h>
#include <linux/of.h>
Expand Down Expand Up @@ -1917,6 +1918,7 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)
struct pinctrl_pin_desc *pins;
struct sunxi_pinctrl *pctl;
int i, ret, last_pin;
struct clk *clk;

pctl = devm_kzalloc(&pdev->dev, sizeof(*pctl), GFP_KERNEL);
if (!pctl)
Expand Down Expand Up @@ -1987,6 +1989,12 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)
goto gpiochip_error;
}

clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(clk))
goto gpiochip_error;

clk_prepare_enable(clk);

dev_info(&pdev->dev, "initialized sunXi PIO driver\n");

return 0;
Expand Down

0 comments on commit cdb37b9

Please sign in to comment.