MFC r308640:

  Use the correct OF_getencprop over OF_getprop + fdt32_to_cpu to read
  integer data from the device tree.

4 files changed, 21 insertions, 20 deletions

diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c
index 8121ef5..c23aa24 100644
--- a/sys/arm/ti/am335x/am335x_lcd.c
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -359,13 +359,13 @@ am335x_read_property(device_t dev, phandle_t node, const char *name, uint32_t *v
 {
 	pcell_t cell;
 
-	if ((OF_getprop(node, name, &cell, sizeof(cell))) <= 0) {
+	if ((OF_getencprop(node, name, &cell, sizeof(cell))) <= 0) {
 		device_printf(dev, "missing '%s' attribute in LCD panel info\n",
 		    name);
 		return (ENXIO);
 	}
 
-	*val = fdt32_to_cpu(cell);
+	*val = cell;
 
 	return (0);
 }
diff --git a/sys/arm/ti/am335x/am335x_lcd_syscons.c b/sys/arm/ti/am335x/am335x_lcd_syscons.c
index 2cbf2fc..e8ab873 100644
--- a/sys/arm/ti/am335x/am335x_lcd_syscons.c
+++ b/sys/arm/ti/am335x/am335x_lcd_syscons.c
@@ -383,13 +383,13 @@ am335x_syscons_configure(int flags)
 	root = OF_finddevice("/");
 	if ((root != 0) && 
 	    (display = am335x_syscons_find_panel_node(root))) {
-		if ((OF_getprop(display, "panel_width", 
-		    &cell, sizeof(cell))) > 0)
-			va_sc->width = (int)fdt32_to_cpu(cell);
+		if ((OF_getencprop(display, "panel_width", &cell,
+		    sizeof(cell))) > 0)
+			va_sc->width = cell;
 
-		if ((OF_getprop(display, "panel_height", 
-		    &cell, sizeof(cell))) > 0)
-			va_sc->height = (int)fdt32_to_cpu(cell);
+		if ((OF_getencprop(display, "panel_height", &cell,
+		    sizeof(cell))) > 0)
+			va_sc->height = cell;
 	}
 
 	if (va_sc->width == 0)
diff --git a/sys/arm/ti/ti_adc.c b/sys/arm/ti/ti_adc.c
index 154cd78..2b49789 100644
--- a/sys/arm/ti/ti_adc.c
+++ b/sys/arm/ti/ti_adc.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
@@ -767,14 +766,17 @@ ti_adc_attach(device_t dev)
 	/* Read "tsc" node properties */
 	child = ofw_bus_find_child(node, "tsc");
 	if (child != 0 && OF_hasprop(child, "ti,wires")) {
-		if ((OF_getprop(child, "ti,wires", &cell, sizeof(cell))) > 0)
-			sc->sc_tsc_wires = fdt32_to_cpu(cell);
-		if ((OF_getprop(child, "ti,coordinate-readouts", &cell, sizeof(cell))) > 0)
-			sc->sc_coord_readouts = fdt32_to_cpu(cell);
-		if ((OF_getprop(child, "ti,x-plate-resistance", &cell, sizeof(cell))) > 0)
-			sc->sc_x_plate_resistance = fdt32_to_cpu(cell);
-		if ((OF_getprop(child, "ti,charge-delay", &cell, sizeof(cell))) > 0)
-			sc->sc_charge_delay = fdt32_to_cpu(cell);
+		if ((OF_getencprop(child, "ti,wires", &cell, sizeof(cell))) > 0)
+			sc->sc_tsc_wires = cell;
+		if ((OF_getencprop(child, "ti,coordinate-readouts", &cell,
+		    sizeof(cell))) > 0)
+			sc->sc_coord_readouts = cell;
+		if ((OF_getencprop(child, "ti,x-plate-resistance", &cell,
+		    sizeof(cell))) > 0)
+			sc->sc_x_plate_resistance = cell;
+		if ((OF_getencprop(child, "ti,charge-delay", &cell,
+		    sizeof(cell))) > 0)
+			sc->sc_charge_delay = cell;
 		nwire_configs = OF_getencprop_alloc(child, "ti,wire-config",
 		    sizeof(*wire_configs), (void **)&wire_configs);
 		if (nwire_configs != sc->sc_tsc_wires) {
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c
index a24e693..ed7f1e7 100644
--- a/sys/arm/ti/ti_sdhci.c
+++ b/sys/arm/ti/ti_sdhci.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <machine/intr.h>
 
-#include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
@@ -506,10 +505,10 @@ ti_sdhci_attach(device_t dev)
 	 * See if we've got a GPIO-based write detect pin.  This is not the
 	 * standard documented property for this, we added it in freebsd.
 	 */
-	if ((OF_getprop(node, "mmchs-wp-gpio-pin", &prop, sizeof(prop))) <= 0)
+	if ((OF_getencprop(node, "mmchs-wp-gpio-pin", &prop, sizeof(prop))) <= 0)
 		sc->wp_gpio_pin = 0xffffffff;
 	else
-		sc->wp_gpio_pin = fdt32_to_cpu(prop);
+		sc->wp_gpio_pin = prop;
 
 	if (sc->wp_gpio_pin != 0xffffffff) {
 		sc->gpio_dev = devclass_get_device(devclass_find("gpio"), 0);