28c28
< __FBSDID("$FreeBSD: head/sys/dev/ofw/ofw_cpu.c 275815 2014-12-15 22:20:14Z emaste $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ofw/ofw_cpu.c 276162 2014-12-24 01:19:11Z ian $");
174c174
< if (strcmp(type, "cpu") != 0)
---
> if (type == NULL || strcmp(type, "cpu") != 0)
184a185
> phandle_t node;
188c189,193
< OF_getprop(ofw_bus_get_node(dev), "reg", &cell, sizeof(cell));
---
> node = ofw_bus_get_node(dev);
> if (OF_getencprop(node, "reg", &cell, sizeof(cell)) < 0) {
> cell = device_get_unit(dev);
> device_printf(dev, "missing 'reg' property, using %u\n", cell);
> }
190c195,198
< OF_getprop(ofw_bus_get_node(dev), "clock-frequency", &cell, sizeof(cell));
---
> if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) < 0) {
> device_printf(dev, "missing 'clock-frequency' property\n");
> return (ENXIO);
> }
< __FBSDID("$FreeBSD: head/sys/dev/ofw/ofw_cpu.c 275815 2014-12-15 22:20:14Z emaste $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ofw/ofw_cpu.c 276162 2014-12-24 01:19:11Z ian $");
174c174
< if (strcmp(type, "cpu") != 0)
---
> if (type == NULL || strcmp(type, "cpu") != 0)
184a185
> phandle_t node;
188c189,193
< OF_getprop(ofw_bus_get_node(dev), "reg", &cell, sizeof(cell));
---
> node = ofw_bus_get_node(dev);
> if (OF_getencprop(node, "reg", &cell, sizeof(cell)) < 0) {
> cell = device_get_unit(dev);
> device_printf(dev, "missing 'reg' property, using %u\n", cell);
> }
190c195,198
< OF_getprop(ofw_bus_get_node(dev), "clock-frequency", &cell, sizeof(cell));
---
> if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) < 0) {
> device_printf(dev, "missing 'clock-frequency' property\n");
> return (ENXIO);
> }