projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6fda93b
)
drivers: bus: check cci device tree node status
author
Abhilash Kesavan
<
[email protected]
>
Sat, 10 Jan 2015 03:11:35 +0000
(08:41 +0530)
committer
Olof Johansson
<
[email protected]
>
Sat, 17 Jan 2015 03:10:41 +0000
(19:10 -0800)
The arm-cci driver completes the probe sequence even if the cci node is
marked as disabled. Add a check in the driver to honour the cci status
in the device tree.
Signed-off-by: Abhilash Kesavan <
[email protected]
>
Acked-by: Sudeep Holla <
[email protected]
>
Acked-by: Nicolas Pitre <
[email protected]
>
Tested-by: Sudeep Holla <
[email protected]
>
Tested-by: Kevin Hilman <
[email protected]
>
Signed-off-by: Olof Johansson <
[email protected]
>
drivers/bus/arm-cci.c
patch
|
blob
|
history
diff --git
a/drivers/bus/arm-cci.c
b/drivers/bus/arm-cci.c
index 860da40b78effb96b16a779f84f9ea21d05aba95..0ce5e2d65a06b5d4e6ecbdf3390554f08751d9e2 100644
(file)
--- a/
drivers/bus/arm-cci.c
+++ b/
drivers/bus/arm-cci.c
@@
-1312,6
+1312,9
@@
static int cci_probe(void)
if (!np)
return -ENODEV;
+ if (!of_device_is_available(np))
+ return -ENODEV;
+
cci_config = of_match_node(arm_cci_matches, np)->data;
if (!cci_config)
return -ENODEV;