diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 07:08:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-02 07:08:46 +0200 |
| commit | 8afe2cb4d4af5b472adeac9132200dc8c9100821 (patch) | |
| tree | b6164ed60137b82e6e820a329999f4f0f515bd84 /drivers/spi | |
| parent | 12657cb99e1ca670da6a7cace3b238a42003e629 (diff) | |
| parent | fff76d57d2670a8f15c875355fb840665ebf8a3e (diff) | |
| download | barebox-8afe2cb4d4af5b472adeac9132200dc8c9100821.tar.gz barebox-8afe2cb4d4af5b472adeac9132200dc8c9100821.tar.xz | |
Merge branch 'for-next-manual/oftree-linux-sync'
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index f460a7a690..5d4dfd6f02 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -107,22 +107,22 @@ void spi_of_register_slaves(struct spi_master *master, struct device_node *node) struct spi_board_info chip; struct property *reg; - device_node_for_nach_child(node, n) { + for_each_child_of_node(node, n) { memset(&chip, 0, sizeof(chip)); chip.name = xstrdup(n->name); chip.bus_num = master->bus_num; /* Mode (clock phase/polarity/etc.) */ - if (of_find_property(n, "spi-cpha")) + if (of_find_property(n, "spi-cpha", NULL)) chip.mode |= SPI_CPHA; - if (of_find_property(n, "spi-cpol")) + if (of_find_property(n, "spi-cpol", NULL)) chip.mode |= SPI_CPOL; - if (of_find_property(n, "spi-cs-high")) + if (of_find_property(n, "spi-cs-high", NULL)) chip.mode |= SPI_CS_HIGH; - if (of_find_property(n, "spi-3wire")) + if (of_find_property(n, "spi-3wire", NULL)) chip.mode |= SPI_3WIRE; of_property_read_u32(n, "spi-max-frequency", &chip.max_speed_hz); - reg = of_find_property(n, "reg"); + reg = of_find_property(n, "reg", NULL); if (!reg) continue; chip.chip_select = of_read_number(reg->value, 1); |