浏览代码

of/spi: Honour "status=disabled" property of device

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>
Alexander Sverdlin 12 年之前
父节点
当前提交
f3b6159e6a
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/spi/spi.c

+ 1 - 1
drivers/spi/spi.c

@@ -819,7 +819,7 @@ static void of_register_spi_devices(struct spi_master *master)
 	if (!master->dev.of_node)
 	if (!master->dev.of_node)
 		return;
 		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 */
 		/* Alloc an spi_device */
 		spi = spi_alloc_device(master);
 		spi = spi_alloc_device(master);
 		if (!spi) {
 		if (!spi) {