From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom <Tom.Rix@windriver.com>
Date: Sun, 28 Mar 2010 12:30:01 -0500
Subject: [U-Boot] [PATCH 1/8] Nomadik: move timer code to drivers/misc
In-Reply-To: <1268886061-6382-2-git-send-email-rabin.vincent@stericsson.com>
References: <1268886061-6382-1-git-send-email-rabin.vincent@stericsson.com>
	<1268886061-6382-2-git-send-email-rabin.vincent@stericsson.com>
Message-ID: <4BAF9219.3090609@windriver.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Rabin Vincent wrote:
> The Nomadik MTU driver will also be used on the U8500 SoC, so move it
> out of platform-specific code.
> 
> Acked-by: Alessandro Rubini <rubini@unipv.it>
> Acked-by: Michael Brandt <michael.brandt@stericsson.com>
> Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
> ---
>  cpu/arm926ejs/nomadik/Makefile                     |    2 +-
>  drivers/misc/Makefile                              |    1 +
>  .../nomadik/timer.c => drivers/misc/nomadik_mtu.c  |    2 +-
>  include/configs/nhk8815.h                          |    1 +
>  .../{asm-arm/arch-nomadik/mtu.h => nomadik_mtu.h}  |    0

Move the nomadik_gpio.h and nomadik_mtu.h into nomadik.h
Just to have 1 nomadik *.h

Tom


>  5 files changed, 4 insertions(+), 2 deletions(-)
>  rename cpu/arm926ejs/nomadik/timer.c => drivers/misc/nomadik_mtu.c (98%)
>  rename include/{asm-arm/arch-nomadik/mtu.h => nomadik_mtu.h} (100%)
> 
> diff --git a/cpu/arm926ejs/nomadik/Makefile b/cpu/arm926ejs/nomadik/Makefile
> index 0fc9f2a..180db8b 100644
> --- a/cpu/arm926ejs/nomadik/Makefile
> +++ b/cpu/arm926ejs/nomadik/Makefile
> @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
>  
>  LIB	= $(obj)lib$(SOC).a
>  
> -COBJS	= timer.o gpio.o
> +COBJS	= gpio.o
>  SOBJS	= reset.o
>  
>  SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
> diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
> index f6df60f..5c0c6f3 100644
> --- a/drivers/misc/Makefile
> +++ b/drivers/misc/Makefile
> @@ -28,6 +28,7 @@ LIB	:= $(obj)libmisc.a
>  COBJS-$(CONFIG_ALI152X) += ali512x.o
>  COBJS-$(CONFIG_DS4510)  += ds4510.o
>  COBJS-$(CONFIG_FSL_LAW) += fsl_law.o
> +COBJS-$(CONFIG_NOMADIK_MTU) += nomadik_mtu.o
>  COBJS-$(CONFIG_NS87308) += ns87308.o
>  COBJS-$(CONFIG_STATUS_LED) += status_led.o
>  COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o
> diff --git a/cpu/arm926ejs/nomadik/timer.c b/drivers/misc/nomadik_mtu.c
> similarity index 98%
> rename from cpu/arm926ejs/nomadik/timer.c
> rename to drivers/misc/nomadik_mtu.c
> index 1d98ef3..b9c0fb1 100644
> --- a/cpu/arm926ejs/nomadik/timer.c
> +++ b/drivers/misc/nomadik_mtu.c
> @@ -22,7 +22,7 @@
>  
>  #include <common.h>
>  #include <asm/io.h>
> -#include <asm/arch/mtu.h>
> +#include <nomadik_mtu.h>
>  
>  /*
>   * The timer is a decrementer, we'll left it free running at 2.4MHz.
> diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
> index 2b640dc..4dd391e 100644
> --- a/include/configs/nhk8815.h
> +++ b/include/configs/nhk8815.h
> @@ -97,6 +97,7 @@
>  /* timing informazion */
>  #define CONFIG_SYS_HZ		1000 /* Mandatory... */
>  #define CONFIG_SYS_TIMERBASE	0x101E2000
> +#define CONFIG_NOMADIK_MTU
>  
>  /* serial port (PL011) configuration */
>  #define CONFIG_PL011_SERIAL
> diff --git a/include/asm-arm/arch-nomadik/mtu.h b/include/nomadik_mtu.h
> similarity index 100%
> rename from include/asm-arm/arch-nomadik/mtu.h
> rename to include/nomadik_mtu.h