Patchwork [U-Boot] OMAP3: Fix gpio.h usage

login
register
mail settings
Submitter Dirk Behme
Date Aug. 5, 2011, 6:31 p.m.
Message ID <1312569092-21338-1-git-send-email-dirk.behme@gmail.com>
Download mbox | patch
Permalink /patch/108710/
State Rejected
Headers show

Comments

Dirk Behme - Aug. 5, 2011, 6:31 p.m.
From: Dirk Behme <dirk.behme@googlemail.com>

The patch "omap: reuse omap3 gpio support in omap4" moves
arch/arm/include/asm/arch-omap3/gpio.h to
arch/arm/include/asm/omap_gpio.h but misses to touch all
users of arch-omap3/gpio.h. This results in various build
failures like

<vaious OMAP3 files>: error: asm/arch/gpio.h: No such file or directory

Fix this by correcting the now wrong includes.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
CC: Aneesh V <aneesh@ti.com>
CC: Sandeep Paulraj <s-paulraj@ti.com>

---
"omap: reuse omap3 gpio support in omap4" is commit

http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commit;h=25223a68e5f7cc32eebb44313efe8ff15a0f5fd6

 board/cm_t35/leds.c               |    2 +-
 board/comelit/dig297/dig297.c     |    2 +-
 board/isee/igep0020/igep0020.c    |    2 +-
 board/logicpd/zoom2/debug_board.c |    2 +-
 board/logicpd/zoom2/led.c         |    2 +-
 board/logicpd/zoom2/zoom2.c       |    2 +-
 board/overo/overo.c               |    2 +-
 board/ti/beagle/beagle.c          |    2 +-
 board/ti/beagle/led.c             |    2 +-
 board/ti/evm/evm.c                |    2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
Aneesh V - Aug. 8, 2011, 6:02 a.m.
Hi Dirk,

On Saturday 06 August 2011 12:01 AM, Dirk Behme wrote:
> From: Dirk Behme<dirk.behme@googlemail.com>
>
> The patch "omap: reuse omap3 gpio support in omap4" moves
> arch/arm/include/asm/arch-omap3/gpio.h to
> arch/arm/include/asm/omap_gpio.h but misses to touch all
> users of arch-omap3/gpio.h. This results in various build
> failures like
>
> <vaious OMAP3 files>: error: asm/arch/gpio.h: No such file or directory
>
> Fix this by correcting the now wrong includes.

I had submitted a patch to fix this issue as soon as I found it:

http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/103472/focus=104699

This one restores asm/arch/gpio.h

br,
Aneesh
Dirk Behme - Aug. 8, 2011, 2:58 p.m.
On 05.08.2011 20:31, Dirk Behme wrote:
> From: Dirk Behme<dirk.behme@googlemail.com>
>
> The patch "omap: reuse omap3 gpio support in omap4" moves
> arch/arm/include/asm/arch-omap3/gpio.h to
> arch/arm/include/asm/omap_gpio.h but misses to touch all
> users of arch-omap3/gpio.h. This results in various build
> failures like
>
> <vaious OMAP3 files>: error: asm/arch/gpio.h: No such file or directory
>
> Fix this by correcting the now wrong includes.
>
> Signed-off-by: Dirk Behme<dirk.behme@googlemail.com>
> CC: Aneesh V<aneesh@ti.com>
> CC: Sandeep Paulraj<s-paulraj@ti.com>

Please ignore this patch and use

http://patchwork.ozlabs.org/patch/107678/

instead.

Thanks

Dirk

> ---
> "omap: reuse omap3 gpio support in omap4" is commit
>
> http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commit;h=25223a68e5f7cc32eebb44313efe8ff15a0f5fd6
>
>   board/cm_t35/leds.c               |    2 +-
>   board/comelit/dig297/dig297.c     |    2 +-
>   board/isee/igep0020/igep0020.c    |    2 +-
>   board/logicpd/zoom2/debug_board.c |    2 +-
>   board/logicpd/zoom2/led.c         |    2 +-
>   board/logicpd/zoom2/zoom2.c       |    2 +-
>   board/overo/overo.c               |    2 +-
>   board/ti/beagle/beagle.c          |    2 +-
>   board/ti/beagle/led.c             |    2 +-
>   board/ti/evm/evm.c                |    2 +-
>   10 files changed, 10 insertions(+), 10 deletions(-)
>
> Index: u-boot.git/board/cm_t35/leds.c
> ===================================================================
> --- u-boot.git.orig/board/cm_t35/leds.c
> +++ u-boot.git/board/cm_t35/leds.c
> @@ -20,7 +20,7 @@
>    */
>   #include<common.h>
>   #include<status_led.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>
>   static unsigned int leds[] = { GREEN_LED_GPIO };
>
> Index: u-boot.git/board/comelit/dig297/dig297.c
> ===================================================================
> --- u-boot.git.orig/board/comelit/dig297/dig297.c
> +++ u-boot.git/board/comelit/dig297/dig297.c
> @@ -41,7 +41,7 @@
>   #include<asm/arch/mux.h>
>   #include<asm/arch/mem.h>
>   #include<asm/arch/sys_proto.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>   #include<asm/mach-types.h>
>   #include "dig297.h"
>
> Index: u-boot.git/board/isee/igep0020/igep0020.c
> ===================================================================
> --- u-boot.git.orig/board/isee/igep0020/igep0020.c
> +++ u-boot.git/board/isee/igep0020/igep0020.c
> @@ -24,7 +24,7 @@
>   #include<netdev.h>
>   #include<twl4030.h>
>   #include<asm/io.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>   #include<asm/arch/mem.h>
>   #include<asm/arch/mmc_host_def.h>
>   #include<asm/arch/mux.h>
> Index: u-boot.git/board/logicpd/zoom2/debug_board.c
> ===================================================================
> --- u-boot.git.orig/board/logicpd/zoom2/debug_board.c
> +++ u-boot.git/board/logicpd/zoom2/debug_board.c
> @@ -22,7 +22,7 @@
>   #include<asm/arch/cpu.h>
>   #include<asm/io.h>
>   #include<asm/arch/mux.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>
>   #define DEBUG_BOARD_CONNECTED		1
>   #define DEBUG_BOARD_NOT_CONNECTED	0
> Index: u-boot.git/board/logicpd/zoom2/led.c
> ===================================================================
> --- u-boot.git.orig/board/logicpd/zoom2/led.c
> +++ u-boot.git/board/logicpd/zoom2/led.c
> @@ -22,7 +22,7 @@
>   #include<asm/arch/cpu.h>
>   #include<asm/io.h>
>   #include<asm/arch/sys_proto.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>
>   static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
>
> Index: u-boot.git/board/logicpd/zoom2/zoom2.c
> ===================================================================
> --- u-boot.git.orig/board/logicpd/zoom2/zoom2.c
> +++ u-boot.git/board/logicpd/zoom2/zoom2.c
> @@ -35,7 +35,7 @@
>   #endif
>   #include<twl4030.h>
>   #include<asm/io.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>   #include<asm/arch/mem.h>
>   #include<asm/arch/mux.h>
>   #include<asm/arch/sys_proto.h>
> Index: u-boot.git/board/overo/overo.c
> ===================================================================
> --- u-boot.git.orig/board/overo/overo.c
> +++ u-boot.git/board/overo/overo.c
> @@ -36,7 +36,7 @@
>   #include<asm/arch/mux.h>
>   #include<asm/arch/mem.h>
>   #include<asm/arch/sys_proto.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>   #include<asm/mach-types.h>
>   #include "overo.h"
>
> Index: u-boot.git/board/ti/beagle/beagle.c
> ===================================================================
> --- u-boot.git.orig/board/ti/beagle/beagle.c
> +++ u-boot.git/board/ti/beagle/beagle.c
> @@ -38,7 +38,7 @@
>   #include<asm/arch/mmc_host_def.h>
>   #include<asm/arch/mux.h>
>   #include<asm/arch/sys_proto.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>   #include<asm/mach-types.h>
>   #ifdef CONFIG_USB_EHCI
>   #include<usb.h>
> Index: u-boot.git/board/ti/beagle/led.c
> ===================================================================
> --- u-boot.git.orig/board/ti/beagle/led.c
> +++ u-boot.git/board/ti/beagle/led.c
> @@ -22,7 +22,7 @@
>   #include<asm/arch/cpu.h>
>   #include<asm/io.h>
>   #include<asm/arch/sys_proto.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>
>   static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
>
> Index: u-boot.git/board/ti/evm/evm.c
> ===================================================================
> --- u-boot.git.orig/board/ti/evm/evm.c
> +++ u-boot.git/board/ti/evm/evm.c
> @@ -33,7 +33,7 @@
>   #include<asm/arch/mem.h>
>   #include<asm/arch/mux.h>
>   #include<asm/arch/sys_proto.h>
> -#include<asm/arch/gpio.h>
> +#include<asm/omap_gpio.h>
>   #include<i2c.h>
>   #include<asm/mach-types.h>
>   #include "evm.h"
>

Patch

Index: u-boot.git/board/cm_t35/leds.c
===================================================================
--- u-boot.git.orig/board/cm_t35/leds.c
+++ u-boot.git/board/cm_t35/leds.c
@@ -20,7 +20,7 @@ 
  */
 #include <common.h>
 #include <status_led.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 
 static unsigned int leds[] = { GREEN_LED_GPIO };
 
Index: u-boot.git/board/comelit/dig297/dig297.c
===================================================================
--- u-boot.git.orig/board/comelit/dig297/dig297.c
+++ u-boot.git/board/comelit/dig297/dig297.c
@@ -41,7 +41,7 @@ 
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/mach-types.h>
 #include "dig297.h"
 
Index: u-boot.git/board/isee/igep0020/igep0020.c
===================================================================
--- u-boot.git.orig/board/isee/igep0020/igep0020.c
+++ u-boot.git/board/isee/igep0020/igep0020.c
@@ -24,7 +24,7 @@ 
 #include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
Index: u-boot.git/board/logicpd/zoom2/debug_board.c
===================================================================
--- u-boot.git.orig/board/logicpd/zoom2/debug_board.c
+++ u-boot.git/board/logicpd/zoom2/debug_board.c
@@ -22,7 +22,7 @@ 
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 
 #define DEBUG_BOARD_CONNECTED		1
 #define DEBUG_BOARD_NOT_CONNECTED	0
Index: u-boot.git/board/logicpd/zoom2/led.c
===================================================================
--- u-boot.git.orig/board/logicpd/zoom2/led.c
+++ u-boot.git/board/logicpd/zoom2/led.c
@@ -22,7 +22,7 @@ 
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 
 static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
 
Index: u-boot.git/board/logicpd/zoom2/zoom2.c
===================================================================
--- u-boot.git.orig/board/logicpd/zoom2/zoom2.c
+++ u-boot.git/board/logicpd/zoom2/zoom2.c
@@ -35,7 +35,7 @@ 
 #endif
 #include <twl4030.h>
 #include <asm/io.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
Index: u-boot.git/board/overo/overo.c
===================================================================
--- u-boot.git.orig/board/overo/overo.c
+++ u-boot.git/board/overo/overo.c
@@ -36,7 +36,7 @@ 
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/mach-types.h>
 #include "overo.h"
 
Index: u-boot.git/board/ti/beagle/beagle.c
===================================================================
--- u-boot.git.orig/board/ti/beagle/beagle.c
+++ u-boot.git/board/ti/beagle/beagle.c
@@ -38,7 +38,7 @@ 
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/mach-types.h>
 #ifdef CONFIG_USB_EHCI
 #include <usb.h>
Index: u-boot.git/board/ti/beagle/led.c
===================================================================
--- u-boot.git.orig/board/ti/beagle/led.c
+++ u-boot.git/board/ti/beagle/led.c
@@ -22,7 +22,7 @@ 
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 
 static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
 
Index: u-boot.git/board/ti/evm/evm.c
===================================================================
--- u-boot.git.orig/board/ti/evm/evm.c
+++ u-boot.git/board/ti/evm/evm.c
@@ -33,7 +33,7 @@ 
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <i2c.h>
 #include <asm/mach-types.h>
 #include "evm.h"