Commit 896ddd60 authored Jan 10, 2015 by Abhilash Kesavan Committed by Olof Johansson Jan 16, 2015

drivers: bus: check cci device tree node status



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>

parent 6fda93b9

drivers/bus/arm-cci.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1312,6 +1312,9 @@ static int cci_probe(void)
	if (!np)		if (!np)
	return -ENODEV;		return -ENODEV;

			if (!of_device_is_available(np))
			return -ENODEV;

	cci_config = of_match_node(arm_cci_matches, np)->data;		cci_config = of_match_node(arm_cci_matches, np)->data;
	if (!cci_config)		if (!cci_config)
	return -ENODEV;		return -ENODEV;