3.18-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 896ddd600ba4a3426aeb11710ae9c28dd7ce68ce ]
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 a.kesavan@samsung.com Acked-by: Sudeep Holla sudeep.holla@arm.com Acked-by: Nicolas Pitre nico@linaro.org Tested-by: Sudeep Holla sudeep.holla@arm.com Tested-by: Kevin Hilman khilman@linaro.org Signed-off-by: Olof Johansson olof@lixom.net Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/bus/arm-cci.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index 7af78df241f2..99cad3ac38f2 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -976,6 +976,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;