28c28
< __FBSDID("$FreeBSD: head/sys/arm/allwinner/timer.c 247463 2013-02-28 13:46:03Z mav $");
---
> __FBSDID("$FreeBSD: head/sys/arm/allwinner/timer.c 254056 2013-08-07 11:07:56Z ganbold $");
54a55,56
> #include "a20/a20_cpu_cfg.h"
>
86a89
> uint8_t sc_timer_type; /* 0 for A10, 1 for A20 */
128a132,135
> /* In case of A20 get appropriate counter info */
> if (a10_timer_sc->sc_timer_type)
> return (a20_read_counter64());
>
142a150
> struct a10_timer_softc *sc;
144c152,158
< if (!ofw_bus_is_compatible(dev, "allwinner,sun4i-timer"))
---
> sc = device_get_softc(dev);
>
> if (ofw_bus_is_compatible(dev, "allwinner,sun4i-timer"))
> sc->sc_timer_type = 0;
> else if (ofw_bus_is_compatible(dev, "allwinner,sun7i-timer"))
> sc->sc_timer_type = 1;
> else
147c161
< device_set_desc(dev, "Allwinner A10 timer");
---
> device_set_desc(dev, "Allwinner A10/A20 timer");