Tarun Kanti DebBarma <[email protected]> writes:
> OMAP4 has two groups of timers: version 1 timers are 1, 2, 10,
> while the rest of the timers, 3-9, 11 are version 2 timers.
> The version information is required by the driver so that they
> could be handled correctly by it.
>
> Signed-off-by: Tarun Kanti DebBarma <[email protected]>
Minor comment below, also needs an ack from Benoît...
> ---
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +++
> arch/arm/plat-omap/include/plat/dmtimer.h | 2 ++
> 2 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index 79a8601..ee57742 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -25,6 +25,7 @@
> #include <plat/gpio.h>
> #include <plat/dma.h>
> #include <plat/mcspi.h>
> +#include <plat/dmtimer.h>
>
> #include "omap_hwmod_common_data.h"
>
> @@ -3940,6 +3941,7 @@ static struct omap_hwmod_class_sysconfig
> omap44xx_timer_1ms_sysc = {
> static struct omap_hwmod_class omap44xx_timer_1ms_hwmod_class = {
> .name = "timer",
> .sysc = &omap44xx_timer_1ms_sysc,
> + .rev = OMAP_TIMER_IP_VERSION_1,
Please use tab and align '=' with above lines.
> };
>
> static struct omap_hwmod_class_sysconfig omap44xx_timer_sysc = {
> @@ -3955,6 +3957,7 @@ static struct omap_hwmod_class_sysconfig
> omap44xx_timer_sysc = {
> static struct omap_hwmod_class omap44xx_timer_hwmod_class = {
> .name = "timer",
> .sysc = &omap44xx_timer_sysc,
> + .rev = OMAP_TIMER_IP_VERSION_2,
ditto
> };
>
> /* timer1 */
> diff --git a/arch/arm/plat-omap/include/plat/dmtimer.h
> b/arch/arm/plat-omap/include/plat/dmtimer.h
> index d6c70d2..05a967e 100644
> --- a/arch/arm/plat-omap/include/plat/dmtimer.h
> +++ b/arch/arm/plat-omap/include/plat/dmtimer.h
> @@ -55,6 +55,8 @@
> * in OMAP4 can be distinguished.
> */
> #define OMAP_TIMER_IP_VERSION_1 0x1
> +#define OMAP_TIMER_IP_VERSION_2 0x2
> +
> struct omap_dm_timer;
> extern struct omap_dm_timer *gptimer_wakeup;
> extern struct sys_timer omap_timer;
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
