On 01.08.2011 08:30, Aneesh V wrote:
Signed-off-by: Aneesh Vaneesh@ti.com
Acked-by: Dirk Behme dirk.behme@googlemail.com
Hi Sandeep, This is an incremental patch to fix the build issues created by "[PATCH 3/5] omap: reuse omap3 gpio support in omap4" in the omap4460 series.
arch/arm/cpu/armv7/omap-common/gpio.c | 2 +- arch/arm/cpu/armv7/omap3/board.c | 2 +- arch/arm/cpu/armv7/omap4/board.c | 2 +- arch/arm/include/asm/arch-omap3/gpio.h | 50 +++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-omap3/omap3.h | 8 ----- arch/arm/include/asm/arch-omap4/gpio.h | 50 +++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-omap4/omap4.h | 8 ----- board/pandora/pandora.c | 1 + 8 files changed, 104 insertions(+), 19 deletions(-) create mode 100644 arch/arm/include/asm/arch-omap3/gpio.h create mode 100644 arch/arm/include/asm/arch-omap4/gpio.h
diff --git a/arch/arm/cpu/armv7/omap-common/gpio.c b/arch/arm/cpu/armv7/omap-common/gpio.c index f4c3479..2fcaf5a 100644 --- a/arch/arm/cpu/armv7/omap-common/gpio.c +++ b/arch/arm/cpu/armv7/omap-common/gpio.c @@ -36,7 +36,7 @@
- published by the Free Software Foundation.
*/ #include<common.h> -#include<asm/omap_gpio.h> +#include<asm/arch/gpio.h> #include<asm/io.h> #include<asm/errno.h>
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index 4aaf97b..bce3ee6 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -38,7 +38,7 @@ #include<asm/arch/mem.h> #include<asm/cache.h> #include<asm/armv7.h> -#include<asm/omap_gpio.h> +#include<asm/arch/gpio.h>
/* Declarations */ extern omap3_sysinfo sysinfo; diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c index 5943d61..8e90545 100644 --- a/arch/arm/cpu/armv7/omap4/board.c +++ b/arch/arm/cpu/armv7/omap4/board.c @@ -33,7 +33,7 @@ #include<asm/arch/sys_proto.h> #include<asm/sizes.h> #include<asm/arch/emif.h> -#include<asm/omap_gpio.h> +#include<asm/arch/gpio.h> #include "omap4_mux_data.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/include/asm/arch-omap3/gpio.h b/arch/arm/include/asm/arch-omap3/gpio.h new file mode 100644 index 0000000..8bba3b0 --- /dev/null +++ b/arch/arm/include/asm/arch-omap3/gpio.h @@ -0,0 +1,50 @@ +/*
- Copyright (c) 2009 Wind River Systems, Inc.
- Tom RixTom.Rix@windriver.com
- 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.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- MA 02111-1307 USA
- This work is derived from the linux 2.6.27 kernel source
- To fetch, use the kernel repository
- git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
- Use the v2.6.27 tag.
- Below is the original's header including its copyright
- linux/arch/arm/plat-omap/gpio.c
- Support functions for OMAP GPIO
- Copyright (C) 2003-2005 Nokia Corporation
- Written by Juha Yrjöläjuha.yrjola@nokia.com
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
- */
+#ifndef _GPIO_OMAP3_H +#define _GPIO_OMAP3_H
+#include<asm/omap_gpio.h>
+#define OMAP34XX_GPIO1_BASE 0x48310000 +#define OMAP34XX_GPIO2_BASE 0x49050000 +#define OMAP34XX_GPIO3_BASE 0x49052000 +#define OMAP34XX_GPIO4_BASE 0x49054000 +#define OMAP34XX_GPIO5_BASE 0x49056000 +#define OMAP34XX_GPIO6_BASE 0x49058000
+#endif /* _GPIO_OMAP3_H */ diff --git a/arch/arm/include/asm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h index d9d49da..230eaad 100644 --- a/arch/arm/include/asm/arch-omap3/omap3.h +++ b/arch/arm/include/asm/arch-omap3/omap3.h @@ -100,14 +100,6 @@ struct s32ktimer {
#endif /* __ASSEMBLY__ */
-/* OMAP3 GPIO registers */ -#define OMAP34XX_GPIO1_BASE 0x48310000 -#define OMAP34XX_GPIO2_BASE 0x49050000 -#define OMAP34XX_GPIO3_BASE 0x49052000 -#define OMAP34XX_GPIO4_BASE 0x49054000 -#define OMAP34XX_GPIO5_BASE 0x49056000 -#define OMAP34XX_GPIO6_BASE 0x49058000
- #ifndef __ASSEMBLY__ struct gpio { unsigned char res1[0x34];
diff --git a/arch/arm/include/asm/arch-omap4/gpio.h b/arch/arm/include/asm/arch-omap4/gpio.h new file mode 100644 index 0000000..26f19d1 --- /dev/null +++ b/arch/arm/include/asm/arch-omap4/gpio.h @@ -0,0 +1,50 @@ +/*
- Copyright (c) 2009 Wind River Systems, Inc.
- Tom RixTom.Rix@windriver.com
- 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.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- MA 02111-1307 USA
- This work is derived from the linux 2.6.27 kernel source
- To fetch, use the kernel repository
- git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
- Use the v2.6.27 tag.
- Below is the original's header including its copyright
- linux/arch/arm/plat-omap/gpio.c
- Support functions for OMAP GPIO
- Copyright (C) 2003-2005 Nokia Corporation
- Written by Juha Yrjöläjuha.yrjola@nokia.com
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
- */
+#ifndef _GPIO_OMAP4_H +#define _GPIO_OMAP4_H
+#include<asm/omap_gpio.h>
+#define OMAP44XX_GPIO1_BASE 0x4A310000 +#define OMAP44XX_GPIO2_BASE 0x48055000 +#define OMAP44XX_GPIO3_BASE 0x48057000 +#define OMAP44XX_GPIO4_BASE 0x48059000 +#define OMAP44XX_GPIO5_BASE 0x4805B000 +#define OMAP44XX_GPIO6_BASE 0x4805D000
+#endif /* _GPIO_OMAP4_H */ diff --git a/arch/arm/include/asm/arch-omap4/omap4.h b/arch/arm/include/asm/arch-omap4/omap4.h index 9aad0e6..7ff46d7 100644 --- a/arch/arm/include/asm/arch-omap4/omap4.h +++ b/arch/arm/include/asm/arch-omap4/omap4.h @@ -153,12 +153,4 @@ struct s32ktimer { #define DEV_DATA_PTR_OFFSET 0x18 #define BOOT_MODE_OFFSET 0x8
-/* GPIO */ -#define OMAP44XX_GPIO1_BASE 0x4A310000 -#define OMAP44XX_GPIO2_BASE 0x48055000 -#define OMAP44XX_GPIO3_BASE 0x48057000 -#define OMAP44XX_GPIO4_BASE 0x48059000 -#define OMAP44XX_GPIO5_BASE 0x4805B000 -#define OMAP44XX_GPIO6_BASE 0x4805D000
- #endif
diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c index 992e9f7..0df4570 100644 --- a/board/pandora/pandora.c +++ b/board/pandora/pandora.c @@ -33,6 +33,7 @@ #include<twl4030.h> #include<asm/io.h> #include<asm/arch/mux.h> +#include<asm/arch/gpio.h> #include<asm/arch/sys_proto.h> #include<asm/mach-types.h> #include "pandora.h"
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot