2013-03-14 18:42:29 +00:00
|
|
|
From 51d5029bd9cd0ff85e1df87a4df57e544c52dc34 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: John Crispin <blogic@openwrt.org>
|
|
|
|
|
Date: Wed, 30 Jan 2013 20:16:22 +0100
|
|
|
|
|
Subject: [PATCH 14/40] PINCTRL: lantiq: fix pin availability check
|
|
|
|
|
|
|
|
|
|
The clock needs to be activated for the check to work. In order to be compatible
|
|
|
|
|
with future silicon make sure that at least 1 pin is available before probing
|
|
|
|
|
the pad controller.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
|
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/pinctrl/pinctrl-falcon.c | 11 ++++++++---
|
|
|
|
|
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/pinctrl/pinctrl-falcon.c
|
|
|
|
|
+++ b/drivers/pinctrl/pinctrl-falcon.c
|
2013-03-15 14:39:51 +00:00
|
|
|
@@ -455,12 +455,17 @@ static int pinctrl_falcon_probe(struct p
|
2013-03-14 18:42:29 +00:00
|
|
|
*bank);
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
}
|
|
|
|
|
+ clk_activate(falcon_info.clk[*bank]);
|
|
|
|
|
avail = pad_r32(falcon_info.membase[*bank],
|
|
|
|
|
LTQ_PADC_AVAIL);
|
|
|
|
|
pins = fls(avail);
|
|
|
|
|
- lantiq_load_pin_desc(&falcon_pads[pad_count], *bank, pins);
|
|
|
|
|
- pad_count += pins;
|
|
|
|
|
- clk_enable(falcon_info.clk[*bank]);
|
|
|
|
|
+ if (pins) {
|
|
|
|
|
+ lantiq_load_pin_desc(&falcon_pads[pad_count],
|
|
|
|
|
+ *bank, pins);
|
|
|
|
|
+ pad_count += pins;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ clk_deactivate(falcon_info.clk[*bank]);
|
|
|
|
|
+ }
|
|
|
|
|
dev_dbg(&pdev->dev, "found %s with %d pads\n",
|
|
|
|
|
res.name, pins);
|
|
|
|
|
}
|
