[U-Boot] [PATCH 3/5] ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific

Stefan Roese
2010-09-13T08:34:00Z

Signed-off-by: Stefan Roese <sr@denx.de>
---
arch/blackfin/cpu/cmd_gpio.c | 2 +-
arch/blackfin/cpu/gpio.c | 2 +-
arch/powerpc/cpu/ppc4xx/cpu_init.c | 2 +-
arch/powerpc/cpu/ppc4xx/gpio.c | 2 +-
arch/powerpc/include/asm/{gpio.h => ppc4xx-gpio.h} | 0
board/amcc/acadia/memory.c | 2 +-
board/amcc/bamboo/bamboo.c | 2 +-
board/amcc/canyonlands/canyonlands.c | 2 +-
board/amcc/katmai/katmai.c | 2 +-
board/amcc/makalu/makalu.c | 2 +-
board/amcc/sequoia/sequoia.c | 2 +-
board/amcc/taihu/lcd.c | 2 +-
board/amcc/taihu/taihu.c | 2 +-
board/bf527-ezkit/bf527-ezkit.c | 2 +-
board/bf533-stamp/bf533-stamp.c | 2 +-
board/bf548-ezkit/bf548-ezkit.c | 2 +-
board/bf548-ezkit/video.c | 2 +-
board/blackstamp/blackstamp.c | 2 +-
board/cm-bf527/gpio_cfi_flash.c | 2 +-
board/cm-bf537e/gpio_cfi_flash.c | 2 +-
board/cm-bf537u/gpio_cfi_flash.c | 2 +-
board/cm-bf548/video.c | 2 +-
board/esd/pmc405de/pmc405de.c | 2 +-
board/gdsys/dlvision/dlvision.c | 2 +-
board/gdsys/intip/intip.c | 2 +-
board/korat/korat.c | 2 +-
board/lwmon5/lwmon5.c | 2 +-
board/mosaixtech/icon/icon.c | 2 +-
board/quad100hd/nand.c | 2 +-
board/quad100hd/quad100hd.c | 2 +-
board/t3corp/t3corp.c | 2 +-
board/tcm-bf537/gpio_cfi_flash.c | 2 +-
board/zeus/update.c | 2 +-
board/zeus/zeus.c | 2 +-
drivers/i2c/soft_i2c.c | 2 +-
drivers/misc/gpio_led.c | 2 +-
drivers/mtd/nand/nand_plat.c | 2 +-
drivers/spi/bfin_spi.c | 2 +-
post/board/lwmon5/watchdog.c | 2 +-
39 files changed, 38 insertions(+), 38 deletions(-)
rename arch/powerpc/include/asm/{gpio.h => ppc4xx-gpio.h} (100%)

diff --git a/arch/blackfin/cpu/cmd_gpio.c b/arch/blackfin/cpu/cmd_gpio.c
index 4430c90..5e87e2b 100644
--- a/arch/blackfin/cpu/cmd_gpio.c
+++ b/arch/blackfin/cpu/cmd_gpio.c
@@ -10,7 +10,7 @@
#include <command.h>

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

enum {
GPIO_INPUT,
diff --git a/arch/blackfin/cpu/gpio.c b/arch/blackfin/cpu/gpio.c
index 488ca11..5473cbf 100644
--- a/arch/blackfin/cpu/gpio.c
+++ b/arch/blackfin/cpu/gpio.c
@@ -8,7 +8,7 @@

#include <common.h>
#include <asm/errno.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/portmux.h>

#if ANOMALY_05000311 || ANOMALY_05000323
diff --git a/arch/powerpc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c
index 7a7954d..6456dc7 100644
--- 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)
diff --git a/arch/powerpc/cpu/ppc4xx/gpio.c b/arch/powerpc/cpu/ppc4xx/gpio.c
index c0d351a..1f9f93a 100644
--- 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;
diff --git a/arch/powerpc/include/asm/gpio.h b/arch/powerpc/include/asm/ppc4xx-gpio.h
similarity index 100%
rename from arch/powerpc/include/asm/gpio.h
rename to arch/powerpc/include/asm/ppc4xx-gpio.h
diff --git a/board/amcc/acadia/memory.c b/board/amcc/acadia/memory.c
index 8c2addc..703a668 100644
--- 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);

diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c
index 99497b2..41957c9 100644
--- 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"
diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c
index ccc44f4..b26cadb 100644
--- 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 */
diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c
index 15cf703..7301cd5 100644
--- 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>

diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c
index 3e3fccd..483df66 100644
--- 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>
diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c
index 1a6dfc1..4338e6b 100644
--- 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>
diff --git a/board/amcc/taihu/lcd.c b/board/amcc/taihu/lcd.c
index 9b2afda..15cfcb0 100644
--- 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
diff --git a/board/amcc/taihu/taihu.c b/board/amcc/taihu/taihu.c
index dd2aba5..87c9403 100644
--- 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);

diff --git a/board/bf527-ezkit/bf527-ezkit.c b/board/bf527-ezkit/bf527-ezkit.c
index 211cf24..e526bd2 100644
--- a/board/bf527-ezkit/bf527-ezkit.c
+++ b/board/bf527-ezkit/bf527-ezkit.c
@@ -12,7 +12,7 @@
#include <net.h>
#include <netdev.h>
#include <asm/blackfin.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/net.h>
#include <asm/mach-common/bits/otp.h>

diff --git a/board/bf533-stamp/bf533-stamp.c b/board/bf533-stamp/bf533-stamp.c
index 935aad2..e79de83 100644
--- a/board/bf533-stamp/bf533-stamp.c
+++ b/board/bf533-stamp/bf533-stamp.c
@@ -27,7 +27,7 @@

#include <common.h>
#include <netdev.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/bf548-ezkit/bf548-ezkit.c b/board/bf548-ezkit/bf548-ezkit.c
index cb9ee86..6e74ef3 100644
--- a/board/bf548-ezkit/bf548-ezkit.c
+++ b/board/bf548-ezkit/bf548-ezkit.c
@@ -11,7 +11,7 @@
#include <command.h>
#include <netdev.h>
#include <asm/blackfin.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/portmux.h>
#include <asm/sdh.h>

diff --git a/board/bf548-ezkit/video.c b/board/bf548-ezkit/video.c
index cde877a..cbd97f1 100644
--- a/board/bf548-ezkit/video.c
+++ b/board/bf548-ezkit/video.c
@@ -11,7 +11,7 @@
#include <config.h>
#include <malloc.h>
#include <asm/blackfin.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/portmux.h>
#include <asm/mach-common/bits/dma.h>
#include <i2c.h>
diff --git a/board/blackstamp/blackstamp.c b/board/blackstamp/blackstamp.c
index 06d004a..9726f6c 100644
--- a/board/blackstamp/blackstamp.c
+++ b/board/blackstamp/blackstamp.c
@@ -13,7 +13,7 @@

#include <common.h>
#include <netdev.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

DECLARE_GLOBAL_DATA_PTR;

diff --git a/board/cm-bf527/gpio_cfi_flash.c b/board/cm-bf527/gpio_cfi_flash.c
index f8ccc07..e999ad0 100644
--- a/board/cm-bf527/gpio_cfi_flash.c
+++ b/board/cm-bf527/gpio_cfi_flash.c
@@ -8,7 +8,7 @@

#include <common.h>
#include <asm/blackfin.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/io.h>
#include "gpio_cfi_flash.h"

diff --git a/board/cm-bf537e/gpio_cfi_flash.c b/board/cm-bf537e/gpio_cfi_flash.c
index 79ee844..f0fc57e 100644
--- a/board/cm-bf537e/gpio_cfi_flash.c
+++ b/board/cm-bf537e/gpio_cfi_flash.c
@@ -8,7 +8,7 @@

#include <common.h>
#include <asm/blackfin.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/io.h>
#include "gpio_cfi_flash.h"

diff --git a/board/cm-bf537u/gpio_cfi_flash.c b/board/cm-bf537u/gpio_cfi_flash.c
index 416c689..ecbbc8f 100644
--- a/board/cm-bf537u/gpio_cfi_flash.c
+++ b/board/cm-bf537u/gpio_cfi_flash.c
@@ -8,7 +8,7 @@

#include <common.h>
#include <asm/blackfin.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/io.h>
#include "gpio_cfi_flash.h"

diff --git a/board/cm-bf548/video.c b/board/cm-bf548/video.c
index c501697..a90f923 100644
--- a/board/cm-bf548/video.c
+++ b/board/cm-bf548/video.c
@@ -11,7 +11,7 @@
#include <config.h>
#include <malloc.h>
#include <asm/blackfin.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/portmux.h>
#include <asm/mach-common/bits/dma.h>
#include <i2c.h>
diff --git a/board/esd/pmc405de/pmc405de.c b/board/esd/pmc405de/pmc405de.c
index b84e08a..c266ebe 100644
--- 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>
diff --git a/board/gdsys/dlvision/dlvision.c b/board/gdsys/dlvision/dlvision.c
index ff5f183..3499bdc 100644
--- 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,
diff --git a/board/gdsys/intip/intip.c b/board/gdsys/intip/intip.c
index 8d83198..aa85ea4 100644
--- 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];

diff --git a/board/korat/korat.c b/board/korat/korat.c
index cdcd8c9..afa36d6 100644
--- 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>
diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c
index aec0263..0c6f4e5 100644
--- 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;
diff --git a/board/mosaixtech/icon/icon.c b/board/mosaixtech/icon/icon.c
index 70b03dc..e09dbc3 100644
--- 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>
diff --git a/board/quad100hd/nand.c b/board/quad100hd/nand.c
index 35525bc..a222099 100644
--- 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>

diff --git a/board/quad100hd/quad100hd.c b/board/quad100hd/quad100hd.c
index f878c49..2f72d2b 100644
--- 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;

diff --git a/board/t3corp/t3corp.c b/board/t3corp/t3corp.c
index 26568e2..04d6a2e 100644
--- 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)
{
diff --git a/board/tcm-bf537/gpio_cfi_flash.c b/board/tcm-bf537/gpio_cfi_flash.c
index 08ea7af..771b305 100644
--- a/board/tcm-bf537/gpio_cfi_flash.c
+++ b/board/tcm-bf537/gpio_cfi_flash.c
@@ -8,7 +8,7 @@

#include <common.h>
#include <asm/blackfin.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/io.h>
#include "gpio_cfi_flash.h"

diff --git a/board/zeus/update.c b/board/zeus/update.c
index 6119627..141f14b 100644
--- 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)
diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c
index 4e6878a..a29e518 100644
--- 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;

diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index 1a1809a..0bf2a72 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -52,7 +52,7 @@
#include <i2c.h>

#if defined(CONFIG_SOFT_I2C_GPIO_SCL)
-# include <asm/gpio.h>
+# include <asm/ppc4xx-gpio.h>

# ifndef I2C_GPIO_SYNC
# define I2C_GPIO_SYNC
diff --git a/drivers/misc/gpio_led.c b/drivers/misc/gpio_led.c
index 3fedddc..32b34c1 100644
--- a/drivers/misc/gpio_led.c
+++ b/drivers/misc/gpio_led.c
@@ -7,7 +7,7 @@

#include <common.h>
#include <status_led.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>

void __led_init(led_id_t mask, int state)
{
diff --git a/drivers/mtd/nand/nand_plat.c b/drivers/mtd/nand/nand_plat.c
index 37a0206..4ca5cc2 100644
--- a/drivers/mtd/nand/nand_plat.c
+++ b/drivers/mtd/nand/nand_plat.c
@@ -17,7 +17,7 @@
#include <common.h>
#include <asm/io.h>
#ifdef NAND_PLAT_GPIO_DEV_READY
-# include <asm/gpio.h>
+# include <asm/ppc4xx-gpio.h>
# define NAND_PLAT_DEV_READY(chip) gpio_get_value(NAND_PLAT_GPIO_DEV_READY)
#endif

diff --git a/drivers/spi/bfin_spi.c b/drivers/spi/bfin_spi.c
index e0ad029..b190d3a 100644
--- a/drivers/spi/bfin_spi.c
+++ b/drivers/spi/bfin_spi.c
@@ -13,7 +13,7 @@
#include <spi.h>

#include <asm/blackfin.h>
-#include <asm/gpio.h>
+#include <asm/ppc4xx-gpio.h>
#include <asm/portmux.h>
#include <asm/mach-common/bits/spi.h>

diff --git a/post/board/lwmon5/watchdog.c b/post/board/lwmon5/watchdog.c
index 44f0488..f181506 100644
--- 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)
--
1.7.2.3