ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific

Signed-off-by: Stefan Roese <sr@denx.de>
14 years ago · 0988776288
parent b36df56115
commit 0988776288
23 changed files with 22 additions and 22 deletions
--- a/arch/powerpc/cpu/ppc4xx/cpu_init.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu_init.c
@ -25,7 +25,7 @@
 #include <watchdog.h>
 #include <asm/ppc4xx-emac.h>
 #include <asm/processor.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/ppc4xx.h>

 #if defined(CONFIG_405GP)  || defined(CONFIG_405EP)
--- a/arch/powerpc/cpu/ppc4xx/gpio.c
+++ b/arch/powerpc/cpu/ppc4xx/gpio.c
@ -24,7 +24,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

 #if defined(CONFIG_SYS_4xx_GPIO_TABLE)
 gpio_param_s const gpio_tab[GPIO_GROUP_MAX][GPIO_MAX] = CONFIG_SYS_4xx_GPIO_TABLE;
--- a/arch/powerpc/include/asm/ppc4xx-gpio.h
+++ b/arch/powerpc/include/asm/ppc4xx-gpio.h
--- a/board/amcc/acadia/memory.c
+++ b/board/amcc/acadia/memory.c
@ -29,7 +29,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

 extern void board_pll_init_f(void);

--- a/board/amcc/bamboo/bamboo.c
+++ b/board/amcc/bamboo/bamboo.c
@ -23,7 +23,7 @@

 #include <common.h>
 #include <asm/processor.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <spd_sdram.h>
 #include <asm/ppc440.h>
 #include "bamboo.h"
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/board/amcc/canyonlands/canyonlands.c
@ -27,7 +27,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <asm/4xx_pcie.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/errno.h>

 extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
--- a/board/amcc/katmai/katmai.c
+++ b/board/amcc/katmai/katmai.c
@ -30,7 +30,7 @@
 #include <netdev.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/4xx_pcie.h>
 #include <asm/errno.h>

--- a/board/amcc/makalu/makalu.c
+++ b/board/amcc/makalu/makalu.c
@ -26,7 +26,7 @@
 #include <asm/ppc405.h>
 #include <libfdt.h>
 #include <asm/processor.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/io.h>
 #include <fdt_support.h>
 #include <asm/errno.h>
--- a/board/amcc/sequoia/sequoia.c
+++ b/board/amcc/sequoia/sequoia.c
@ -26,7 +26,7 @@
 #include <libfdt.h>
 #include <fdt_support.h>
 #include <asm/ppc4xx.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
--- a/board/amcc/taihu/lcd.c
+++ b/board/amcc/taihu/lcd.c
@ -22,7 +22,7 @@
 #include <common.h>
 #include <command.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

 #define LCD_CMD_ADDR	0x50100002
 #define LCD_DATA_ADDR	0x50100003
--- a/board/amcc/taihu/taihu.c
+++ b/board/amcc/taihu/taihu.c
@ -29,7 +29,7 @@
 #include <asm/io.h>
 #include <spi.h>
 #include <netdev.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

 extern int lcd_init(void);

--- a/board/esd/pmc405de/pmc405de.c
+++ b/board/esd/pmc405de/pmc405de.c
@ -26,7 +26,7 @@
 #include <fdt_support.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/4xx_pci.h>
 #include <command.h>
 #include <malloc.h>
--- a/board/gdsys/dlvision/dlvision.c
+++ b/board/gdsys/dlvision/dlvision.c
@ -25,7 +25,7 @@
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

 enum {
 	HWTYPE_DLVISION_CPU = 0,
--- a/board/gdsys/intip/intip.c
+++ b/board/gdsys/intip/intip.c
@ -31,7 +31,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <asm/4xx_pcie.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

 extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];

--- a/board/korat/korat.c
+++ b/board/korat/korat.c
@ -31,7 +31,7 @@
 #include <libfdt.h>
 #include <asm/ppc440.h>
 #include <asm/bitops.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/io.h>
 #include <asm/ppc4xx-uic.h>
 #include <asm/processor.h>
--- a/board/lwmon5/lwmon5.c
+++ b/board/lwmon5/lwmon5.c
@ -22,7 +22,7 @@
 #include <command.h>
 #include <asm/ppc440.h>
 #include <asm/processor.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/io.h>

 DECLARE_GLOBAL_DATA_PTR;
--- a/board/mosaixtech/icon/icon.c
+++ b/board/mosaixtech/icon/icon.c
@ -30,7 +30,7 @@
 #include <netdev.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/4xx_pcie.h>
 #include <asm/errno.h>
 #include <asm/mmu.h>
--- a/board/quad100hd/nand.c
+++ b/board/quad100hd/nand.c
@ -24,7 +24,7 @@
 #include <common.h>
 #include <config.h>
 #if defined(CONFIG_CMD_NAND)
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/io.h>
 #include <nand.h>

--- a/board/quad100hd/quad100hd.c
+++ b/board/quad100hd/quad100hd.c
@ -33,7 +33,7 @@

 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/board/t3corp/t3corp.c
+++ b/board/t3corp/t3corp.c
@ -27,7 +27,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <asm/4xx_pcie.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

 int board_early_init_f(void)
 {
--- a/board/zeus/update.c
+++ b/board/zeus/update.c
@ -26,7 +26,7 @@
 #include <command.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <i2c.h>

 #if defined(CONFIG_ZEUS)
--- a/board/zeus/zeus.c
+++ b/board/zeus/zeus.c
@ -30,7 +30,7 @@

 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

 DECLARE_GLOBAL_DATA_PTR;

--- a/post/board/lwmon5/watchdog.c
+++ b/post/board/lwmon5/watchdog.c
@ -34,7 +34,7 @@
 #if CONFIG_POST & CONFIG_SYS_POST_WATCHDOG

 #include <watchdog.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
 #include <asm/io.h>

 static uint watchdog_magic_read(void)