diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2016-11-14 12:03:08 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2016-11-14 12:03:08 +0000 |
| commit | 9783ea5c9f762c43a4a43f344382e90ce2d53fa8 (patch) | |
| tree | 042191ed86eceb5731e1295408b29fc3fc707493 /sys/arm/freescale/imx | |
| parent | 222102cfcad6179aa3d99658453ef68e6bccc1d1 (diff) | |
| download | src-9783ea5c9f762c43a4a43f344382e90ce2d53fa8.tar.gz src-9783ea5c9f762c43a4a43f344382e90ce2d53fa8.zip | |
Use the correct OF_getencprop over OF_getprop + fdt32_to_cpu to read
integer data from the device tree.
Sponsored by: ABT Systems Ltd
Notes
Notes:
svn path=/head/; revision=308640
Diffstat (limited to 'sys/arm/freescale/imx')
| -rw-r--r-- | sys/arm/freescale/imx/imx51_ipuv3.c | 5 | ||||
| -rw-r--r-- | sys/arm/freescale/imx/imx51_ipuv3_fbd.c | 4 | ||||
| -rw-r--r-- | sys/arm/freescale/imx/imx6_ssi.c | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sys/arm/freescale/imx/imx51_ipuv3.c b/sys/arm/freescale/imx/imx51_ipuv3.c index a96b1852eb6a..b88bb3fdb5d3 100644 --- a/sys/arm/freescale/imx/imx51_ipuv3.c +++ b/sys/arm/freescale/imx/imx51_ipuv3.c @@ -61,7 +61,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> @@ -313,10 +312,10 @@ ipu3_fb_attach(device_t dev) * On i.MX53, the offset is 0. */ node = ofw_bus_get_node(dev); - if ((OF_getprop(node, "reg", ®, sizeof(reg))) <= 0) + if ((OF_getencprop(node, "reg", ®, sizeof(reg))) <= 0) base = 0; else - base = fdt32_to_cpu(reg) - IPU_CM_BASE(0); + base = reg - IPU_CM_BASE(0); /* map controller registers */ err = bus_space_map(iot, IPU_CM_BASE(base), IPU_CM_SIZE, 0, &ioh); if (err) diff --git a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c index ea9ca6da730e..ee6833fc3921 100644 --- a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c +++ b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c @@ -221,10 +221,10 @@ ipu3_fb_attach(device_t dev) * On i.MX53, the offset is 0. */ node = ofw_bus_get_node(dev); - if ((OF_getprop(node, "reg", ®, sizeof(reg))) <= 0) + if ((OF_getencprop(node, "reg", ®, sizeof(reg))) <= 0) base = 0; else - base = fdt32_to_cpu(reg) - IPU_CM_BASE(0); + base = reg - IPU_CM_BASE(0); /* map controller registers */ err = bus_space_map(iot, IPU_CM_BASE(base), IPU_CM_SIZE, 0, &ioh); if (err) diff --git a/sys/arm/freescale/imx/imx6_ssi.c b/sys/arm/freescale/imx/imx6_ssi.c index c239b2bc2902..4f4dadb99c81 100644 --- a/sys/arm/freescale/imx/imx6_ssi.c +++ b/sys/arm/freescale/imx/imx6_ssi.c @@ -446,12 +446,12 @@ find_sdma_controller(struct sc_info *sc) if ((len = OF_getproplen(node, "dmas")) <= 0) return (ENXIO); - OF_getprop(node, "dmas", &dts_value, len); + OF_getencprop(node, "dmas", &dts_value, len); - sc->sdma_ev_rx = fdt32_to_cpu(dts_value[1]); - sc->sdma_ev_tx = fdt32_to_cpu(dts_value[5]); + sc->sdma_ev_rx = dts_value[1]; + sc->sdma_ev_tx = dts_value[5]; - sdma_node = OF_node_from_xref(fdt32_to_cpu(dts_value[0])); + sdma_node = OF_node_from_xref(dts_value[0]); sdma_sc = NULL; |