diff options
author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2014-08-08 06:29:30 +0000 |
---|---|---|
committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2014-08-08 06:29:30 +0000 |
commit | dd715abb936e9627807ec16e31859b621076c6ca (patch) | |
tree | fb0c640f3ca37f59e69a0a333fc837cfcdf39dc3 /sys/arm/samsung | |
parent | 02be90fac3475413e7b462514a95bbc6f12d2369 (diff) | |
download | FreeBSD-src-dd715abb936e9627807ec16e31859b621076c6ca.zip FreeBSD-src-dd715abb936e9627807ec16e31859b621076c6ca.tar.gz |
Use OF_getencprop() in preference to OF_getprop() and manual byte-swapping.
Diffstat (limited to 'sys/arm/samsung')
-rw-r--r-- | sys/arm/samsung/exynos/chrome_kb.c | 14 | ||||
-rw-r--r-- | sys/arm/samsung/exynos/exynos5_fimd.c | 33 | ||||
-rw-r--r-- | sys/arm/samsung/exynos/exynos5_usb_phy.c | 6 |
3 files changed, 24 insertions, 29 deletions
diff --git a/sys/arm/samsung/exynos/chrome_kb.c b/sys/arm/samsung/exynos/chrome_kb.c index d5d55e9..b10a5ac 100644 --- a/sys/arm/samsung/exynos/chrome_kb.c +++ b/sys/arm/samsung/exynos/chrome_kb.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/gpio.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> @@ -57,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kbio.h> #include <machine/bus.h> -#include <machine/fdt.h> #include <machine/cpu.h> #include <machine/intr.h> @@ -741,18 +739,18 @@ parse_dts(struct ckb_softc *sc) if ((len = OF_getproplen(node, "google,key-rows")) <= 0) return (ENXIO); - OF_getprop(node, "google,key-rows", &dts_value, len); - sc->rows = fdt32_to_cpu(dts_value); + OF_getencprop(node, "google,key-rows", &dts_value, len); + sc->rows = dts_value; if ((len = OF_getproplen(node, "google,key-columns")) <= 0) return (ENXIO); - OF_getprop(node, "google,key-columns", &dts_value, len); - sc->cols = fdt32_to_cpu(dts_value); + OF_getencprop(node, "google,key-columns", &dts_value, len); + sc->cols = dts_value; if ((len = OF_getproplen(node, "freebsd,intr-gpio")) <= 0) return (ENXIO); - OF_getprop(node, "freebsd,intr-gpio", &dts_value, len); - sc->gpio = fdt32_to_cpu(dts_value); + OF_getencprop(node, "freebsd,intr-gpio", &dts_value, len); + sc->gpio = dts_value; if (OF_hasprop(node, "freebsd,keymap")) { keymap_prop = "freebsd,keymap"; diff --git a/sys/arm/samsung/exynos/exynos5_fimd.c b/sys/arm/samsung/exynos/exynos5_fimd.c index d7b7330..2a02074 100644 --- a/sys/arm/samsung/exynos/exynos5_fimd.c +++ b/sys/arm/samsung/exynos/exynos5_fimd.c @@ -50,8 +50,8 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/vm_extern.h> #include <vm/vm_kern.h> +#include <vm/pmap.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> @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include "gpio_if.h" #include <machine/bus.h> -#include <machine/fdt.h> #include <machine/cpu.h> #include <machine/intr.h> @@ -213,37 +212,37 @@ get_panel_info(struct fimd_softc *sc, struct panel_info *panel) /* panel size */ if ((len = OF_getproplen(node, "panel-size")) <= 0) return (ENXIO); - OF_getprop(node, "panel-size", &dts_value, len); - panel->width = fdt32_to_cpu(dts_value[0]); - panel->height = fdt32_to_cpu(dts_value[1]); + OF_getencprop(node, "panel-size", dts_value, len); + panel->width = dts_value[0]; + panel->height = dts_value[1]; /* hsync */ if ((len = OF_getproplen(node, "panel-hsync")) <= 0) return (ENXIO); - OF_getprop(node, "panel-hsync", &dts_value, len); - panel->h_back_porch = fdt32_to_cpu(dts_value[0]); - panel->h_pulse_width = fdt32_to_cpu(dts_value[1]); - panel->h_front_porch = fdt32_to_cpu(dts_value[2]); + OF_getencprop(node, "panel-hsync", dts_value, len); + panel->h_back_porch = dts_value[0]; + panel->h_pulse_width = dts_value[1]; + panel->h_front_porch = dts_value[2]; /* vsync */ if ((len = OF_getproplen(node, "panel-vsync")) <= 0) return (ENXIO); - OF_getprop(node, "panel-vsync", &dts_value, len); - panel->v_back_porch = fdt32_to_cpu(dts_value[0]); - panel->v_pulse_width = fdt32_to_cpu(dts_value[1]); - panel->v_front_porch = fdt32_to_cpu(dts_value[2]); + OF_getencprop(node, "panel-vsync", dts_value, len); + panel->v_back_porch = dts_value[0]; + panel->v_pulse_width = dts_value[1]; + panel->v_front_porch = dts_value[2]; /* clk divider */ if ((len = OF_getproplen(node, "panel-clk-div")) <= 0) return (ENXIO); - OF_getprop(node, "panel-clk-div", &dts_value, len); - panel->clk_div = fdt32_to_cpu(dts_value[0]); + OF_getencprop(node, "panel-clk-div", dts_value, len); + panel->clk_div = dts_value[0]; /* backlight pin */ if ((len = OF_getproplen(node, "panel-backlight-pin")) <= 0) return (ENXIO); - OF_getprop(node, "panel-backlight-pin", &dts_value, len); - panel->backlight_pin = fdt32_to_cpu(dts_value[0]); + OF_getencprop(node, "panel-backlight-pin", dts_value, len); + panel->backlight_pin = dts_value[0]; return (0); } diff --git a/sys/arm/samsung/exynos/exynos5_usb_phy.c b/sys/arm/samsung/exynos/exynos5_usb_phy.c index 649cb34..2756efb 100644 --- a/sys/arm/samsung/exynos/exynos5_usb_phy.c +++ b/sys/arm/samsung/exynos/exynos5_usb_phy.c @@ -43,13 +43,11 @@ __FBSDID("$FreeBSD$"); #include <sys/watchdog.h> #include <sys/gpio.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> #include <machine/bus.h> -#include <machine/fdt.h> #include <machine/cpu.h> #include <machine/intr.h> @@ -158,8 +156,8 @@ vbus_on(struct usb_phy_softc *sc) /* Power pin */ if ((len = OF_getproplen(node, "vbus-supply")) <= 0) return (-1); - OF_getprop(node, "vbus-supply", &dts_value, len); - pin = fdt32_to_cpu(dts_value[0]); + OF_getencprop(node, "vbus-supply", dts_value, len); + pin = dts_value[0]; gpio_dev = devclass_get_device(devclass_find("gpio"), 0); if (gpio_dev == NULL) { |