[U-Boot] [PATCH 4/7] at91sam9/at91cap: move common usb host initialisation to cpu

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 board/atmel/at91sam9263ek/at91sam9263ek.c          |   11 +---------
 cpu/arm926ejs/at91/Makefile                        |    1 +
 .../arm926ejs/at91/at91sam9263_usb.c               |   21 +++++++++----------
 include/asm-arm/arch-at91/at91_common.h            |    1 +
 4 files changed, 13 insertions(+), 21 deletions(-)
 copy include/asm-arm/arch-at91/at91_common.h => cpu/arm926ejs/at91/at91sam9263_usb.c (73%)

diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c
index 1a3e39c..59ace17 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -154,15 +154,6 @@ static void at91sam9263ek_macb_hw_init(void)
 }
 #endif
 
-#ifdef CONFIG_USB_OHCI_NEW
-static void at91sam9263ek_uhp_hw_init(void)
-{
-	/* Enable VBus on UHP ports */
-	at91_set_gpio_output(AT91_PIN_PA21, 0);
-	at91_set_gpio_output(AT91_PIN_PA24, 0);
-}
-#endif
-
 #ifdef CONFIG_LCD
 vidinfo_t panel_info = {
 	vl_col:		240,
@@ -273,7 +264,7 @@ int board_init(void)
 	at91sam9263ek_macb_hw_init();
 #endif
 #ifdef CONFIG_USB_OHCI_NEW
-	at91sam9263ek_uhp_hw_init();
+	at91_uhp_hw_init();
 #endif
 #ifdef CONFIG_LCD
 	at91sam9263ek_lcd_hw_init();
diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile
index 95bb59d..1523199 100644
--- a/cpu/arm926ejs/at91/Makefile
+++ b/cpu/arm926ejs/at91/Makefile
@@ -40,6 +40,7 @@ endif
 ifdef CONFIG_AT91SAM9263
 COBJS-y				+= at91sam9263_serial.o
 COBJS-$(CONFIG_HAS_DATAFLASH)	+= at91sam9263_spi.o
+COBJS-$(CONFIG_USB_OHCI_NEW)	+= at91sam9263_usb.o
 endif
 ifdef CONFIG_AT91SAM9RL
 COBJS-y				+= at91sam9rl_serial.o
diff --git a/include/asm-arm/arch-at91/at91_common.h b/cpu/arm926ejs/at91/at91sam9263_usb.c
similarity index 73%
copy from include/asm-arm/arch-at91/at91_common.h
copy to cpu/arm926ejs/at91/at91sam9263_usb.c
index 1432f94..ff5593b 100644
--- a/include/asm-arm/arch-at91/at91_common.h
+++ b/cpu/arm926ejs/at91/at91sam9263_usb.c
@@ -22,15 +22,14 @@
  * MA 02111-1307 USA
  */
 
-#ifndef AT91_COMMON_H
-#define AT91_COMMON_H
+#include <common.h>
+#include <asm/arch/at91_common.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/io.h>
 
-void at91_serial_hw_init(void);
-void at91_serial0_hw_init(void);
-void at91_serial1_hw_init(void);
-void at91_serial2_hw_init(void);
-void at91_serial3_hw_init(void);
-void at91_spi0_hw_init(unsigned long cs_mask);
-void at91_spi1_hw_init(unsigned long cs_mask);
-
-#endif /* AT91_COMMON_H */
+void at91_uhp_hw_init(void)
+{
+	/* Enable VBus on UHP ports */
+	at91_set_gpio_output(AT91_PIN_PA21, 0);
+	at91_set_gpio_output(AT91_PIN_PA24, 0);
+}
diff --git a/include/asm-arm/arch-at91/at91_common.h b/include/asm-arm/arch-at91/at91_common.h
index 1432f94..797854b 100644
--- a/include/asm-arm/arch-at91/at91_common.h
+++ b/include/asm-arm/arch-at91/at91_common.h
@@ -32,5 +32,6 @@ void at91_serial2_hw_init(void);
 void at91_serial3_hw_init(void);
 void at91_spi0_hw_init(unsigned long cs_mask);
 void at91_spi1_hw_init(unsigned long cs_mask);
+void at91_uhp_hw_init(void);
 
 #endif /* AT91_COMMON_H */
-- 
1.5.6.5