of/spi: Honour "status=disabled" property of device
authorAlexander Sverdlin <alexander.sverdlin@sysgo.com>
Thu, 29 Nov 2012 07:59:29 +0000 (08:59 +0100)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 29 Nov 2012 17:36:57 +0000 (17:36 +0000)
Currently of_register_spi_devices() function registers all SPI devices,
independetly from their status property in device tree. According to
"ePAPR 1.1" spec, device should only be registered if there is no
"status" property, or it has "ok" (or "okay") value (see
of_device_is_available()). In case of "platform devices",
of_platform_device_create_pdata() checks for "status" and ensures
that disabled devices are not pupulated. But such check for SPI buses
was missing until now. Fix it.

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@sysgo.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
drivers/spi/spi.c

index 84c2861d6f4dde2a602e44f292c6efbd248c602b..d3e64080c4099f431039668d97fe7265a2083ed4 100644 (file)
@@ -819,7 +819,7 @@ static void of_register_spi_devices(struct spi_master *master)
        if (!master->dev.of_node)
                return;
 
-       for_each_child_of_node(master->dev.of_node, nc) {
+       for_each_available_child_of_node(master->dev.of_node, nc) {
                /* Alloc an spi_device */
                spi = spi_alloc_device(master);
                if (!spi) {