mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Teresa Gamez <tgamez@idefix.phytec.de>
To: Jan Luebbe <jlu@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 2/3] arm: omap: timers: split omap3/4 timer into a separate header
Date: Wed, 12 Dec 2012 10:32:29 +0100	[thread overview]
Message-ID: <20121212093228.GB13171@idefix.phytec.de> (raw)
In-Reply-To: <1355223567-12671-2-git-send-email-jlu@pengutronix.de>

Hello Jan,

I tried to apply this one on master for testing.
But it got rejected.  
Can you check it?

Regards,
Teresa

On Tue, 11. Dec 11:59, Jan Luebbe wrote:
> This prepares for adding the AM33xx timer.
> 
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
> ---
>  arch/arm/mach-omap/include/mach/omap3-timer.h |   56 +++++++++++++++++++++++++
>  arch/arm/mach-omap/include/mach/timers.h      |   56 +++++--------------------
>  2 files changed, 67 insertions(+), 45 deletions(-)
>  create mode 100644 arch/arm/mach-omap/include/mach/omap3-timer.h
> 
> diff --git a/arch/arm/mach-omap/include/mach/omap3-timer.h b/arch/arm/mach-omap/include/mach/omap3-timer.h
> new file mode 100644
> index 0000000..e8dad9a
> --- /dev/null
> +++ b/arch/arm/mach-omap/include/mach/omap3-timer.h
> @@ -0,0 +1,56 @@
> +/**
> + * @file
> + * @brief This defines the Register defines for OMAP GPTimers and Sync32 timers.
> + *
> + * FileName: include/asm-arm/arch-omap/timers.h
> + *
> + * Originally from Linux kernel:
> + * http://linux.omap.com/pub/kernel/3430zoom/linux-ldp-v1.0b.tar.gz
> + *
> + */
> +/*
> + * (C) Copyright 2008
> + * Texas Instruments, <www.ti.com>
> + * Nishanth Menon <x0nishan@ti.com>
> + *
> + * Copyright (C) 2007 Texas Instruments, <www.ti.com>
> + * Copyright (C) 2007 Nokia Corporation.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + */
> +#ifndef __ASM_ARCH_GPT_H
> +#define __ASM_ARCH_GPT_H
> +
> +/** General Purpose timer regs offsets (32 bit regs) */
> +#define TIDR			0x0      /* r */
> +#define TIOCP_CFG		0x10     /* rw */
> +#define TISTAT			0x14     /* r */
> +#define TISR			0x18     /* rw */
> +#define TIER			0x1C     /* rw */
> +#define TWER			0x20     /* rw */
> +#define TCLR			0x24     /* rw */
> +#define TCRR			0x28     /* rw */
> +#define TLDR			0x2C     /* rw */
> +#define TTGR			0x30     /* rw */
> +#define TWPS			0x34     /* r */
> +#define TMAR			0x38     /* rw */
> +#define TCAR1			0x3c     /* r */
> +#define TSICR			0x40     /* rw */
> +#define TCAR2			0x44     /* r */
> +/* Enable sys_clk NO-prescale /1 */
> +#define GPT_EN			((0 << 2) | (0x1 << 1) | (0x1 << 0))
> +
> +/** Sync 32Khz Timer registers */
> +#define S32K_CR			(OMAP_32KTIMER_BASE + 0x10)
> +#define S32K_FREQUENCY		32768
> +
> +#endif /*__ASM_ARCH_GPT_H */
> diff --git a/arch/arm/mach-omap/include/mach/timers.h b/arch/arm/mach-omap/include/mach/timers.h
> index e8dad9a..b7242d1 100644
> --- a/arch/arm/mach-omap/include/mach/timers.h
> +++ b/arch/arm/mach-omap/include/mach/timers.h
> @@ -1,25 +1,10 @@
> -/**
> - * @file
> - * @brief This defines the Register defines for OMAP GPTimers and Sync32 timers.
> - *
> - * FileName: include/asm-arm/arch-omap/timers.h
> - *
> - * Originally from Linux kernel:
> - * http://linux.omap.com/pub/kernel/3430zoom/linux-ldp-v1.0b.tar.gz
> - *
> - */
>  /*
> - * (C) Copyright 2008
> - * Texas Instruments, <www.ti.com>
> - * Nishanth Menon <x0nishan@ti.com>
> - *
> - * Copyright (C) 2007 Texas Instruments, <www.ti.com>
> - * Copyright (C) 2007 Nokia Corporation.
> + * Copyright (C) 2012 Jan Luebbe <j.luebbe@pengutronix.de>
>   *
> - * This program is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
>   *
>   * This program is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> @@ -27,30 +12,11 @@
>   * GNU General Public License for more details.
>   *
>   */
> -#ifndef __ASM_ARCH_GPT_H
> -#define __ASM_ARCH_GPT_H
> -
> -/** General Purpose timer regs offsets (32 bit regs) */
> -#define TIDR			0x0      /* r */
> -#define TIOCP_CFG		0x10     /* rw */
> -#define TISTAT			0x14     /* r */
> -#define TISR			0x18     /* rw */
> -#define TIER			0x1C     /* rw */
> -#define TWER			0x20     /* rw */
> -#define TCLR			0x24     /* rw */
> -#define TCRR			0x28     /* rw */
> -#define TLDR			0x2C     /* rw */
> -#define TTGR			0x30     /* rw */
> -#define TWPS			0x34     /* r */
> -#define TMAR			0x38     /* rw */
> -#define TCAR1			0x3c     /* r */
> -#define TSICR			0x40     /* rw */
> -#define TCAR2			0x44     /* r */
> -/* Enable sys_clk NO-prescale /1 */
> -#define GPT_EN			((0 << 2) | (0x1 << 1) | (0x1 << 0))
> +#ifndef __OMAP_TIMERS_H_
> +#define __OMAP_TIMERS_H_
>  
> -/** Sync 32Khz Timer registers */
> -#define S32K_CR			(OMAP_32KTIMER_BASE + 0x10)
> -#define S32K_FREQUENCY		32768
> +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
> +#include <mach/omap3-timer.h>
> +#endif
>  
> -#endif /*__ASM_ARCH_GPT_H */
> +#endif /* __OMAP_TIMERS_H_ */
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2012-12-12  9:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-11 10:59 [PATCH 1/3] arm: omap: clocks: move CM_REG and PRM_REG macros Jan Luebbe
2012-12-11 10:59 ` [PATCH 2/3] arm: omap: timers: split omap3/4 timer into a separate header Jan Luebbe
2012-12-12  9:32   ` Teresa Gamez [this message]
2012-12-12 18:39   ` Sascha Hauer
2012-12-11 10:59 ` [PATCH 3/3] ARM OMAP AM33XX: create new ARCH for AM33xx Jan Luebbe
2012-12-12 18:58   ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121212093228.GB13171@idefix.phytec.de \
    --to=tgamez@idefix.phytec.de \
    --cc=barebox@lists.infradead.org \
    --cc=jlu@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox