Skip to contentSkip to conversation

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

PATCH New Stefan Roese 2 participants 2 messages Sep 16, 2010 – Sep 22, 2010 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH v2 3/5 ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific

---
v2:
- Removed all non-PPC4xx related files. Sorry for this.

 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/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/zeus/update.c                                |    2 +-
 board/zeus/zeus.c                                  |    2 +-
 post/board/lwmon5/watchdog.c                       |    2 +-
 23 files changed, 22 insertions(+), 22 deletions(-)
 rename arch/powerpc/include/asm/{gpio.h => ppc4xx-gpio.h} (100%)
arch/powerpc/cpu/ppc4xx/cpu_init.c +1 -1
index 7a7954d..6456dc7 100644
@@ -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)
arch/powerpc/cpu/ppc4xx/gpio.c +1 -1
index c0d351a..1f9f93a 100644
@@ -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;
arch/powerpc/include/asm/ppc4xx-gpio.h renamed from arch/powerpc/include/asm/gpio.h +0 -0
similarity index 100%
rename from arch/powerpc/include/asm/gpio.h
rename to arch/powerpc/include/asm/ppc4xx-gpio.h
board/amcc/acadia/memory.c +1 -1
index 8c2addc..703a668 100644
@@ -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);
 
board/amcc/bamboo/bamboo.c +1 -1
index 99497b2..41957c9 100644
@@ -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"
board/amcc/canyonlands/canyonlands.c +1 -1
index ccc44f4..b26cadb 100644
@@ -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 */
board/amcc/katmai/katmai.c +1 -1
index 15cf703..7301cd5 100644
@@ -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>
 
board/amcc/makalu/makalu.c +1 -1
index 3e3fccd..483df66 100644
@@ -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>
board/amcc/sequoia/sequoia.c +1 -1
index 1a6dfc1..4338e6b 100644
@@ -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>
board/amcc/taihu/lcd.c +1 -1
index 9b2afda..15cfcb0 100644
@@ -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
board/amcc/taihu/taihu.c +1 -1
index dd2aba5..87c9403 100644
@@ -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);
 
board/esd/pmc405de/pmc405de.c +1 -1
index b84e08a..c266ebe 100644
@@ -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>
board/gdsys/dlvision/dlvision.c +1 -1
index ff5f183..3499bdc 100644
@@ -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,
board/gdsys/intip/intip.c +1 -1
index 8d83198..aa85ea4 100644
@@ -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];
 
board/korat/korat.c +1 -1
index cdcd8c9..afa36d6 100644
@@ -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>
board/lwmon5/lwmon5.c +1 -1
index aec0263..0c6f4e5 100644
@@ -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;
board/mosaixtech/icon/icon.c +1 -1
index 70b03dc..e09dbc3 100644
@@ -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>
board/quad100hd/nand.c +1 -1
index 35525bc..a222099 100644
@@ -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>
 
board/quad100hd/quad100hd.c +1 -1
index f878c49..2f72d2b 100644
@@ -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;
 
board/t3corp/t3corp.c +1 -1
index 26568e2..04d6a2e 100644
@@ -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)
 {
board/zeus/update.c +1 -1
index 6119627..141f14b 100644
@@ -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)
board/zeus/zeus.c +1 -1
index 4e6878a..a29e518 100644
@@ -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;
 
post/board/lwmon5/watchdog.c +1 -1
index 44f0488..f181506 100644
@@ -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)
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH v2 3/5 ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific

Hi Stefan,

Quoted 22 lines

---
v2:
- Removed all non-PPC4xx related files. Sorry for this.

 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/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 +-
Quoted 8 lines
 board/quad100hd/nand.c                             |    2 +-
 board/quad100hd/quad100hd.c                        |    2 +-
 board/t3corp/t3corp.c                              |    2 +-
 board/zeus/update.c                                |    2 +-
 board/zeus/zeus.c                                  |    2 +-
 post/board/lwmon5/watchdog.c                       |    2 +-
 23 files changed, 22 insertions(+), 22 deletions(-)
 rename arch/powerpc/include/asm/{gpio.h => ppc4xx-gpio.h} (100%)

Can't you rename the file "internally" so that users of the header still only include asm/gpio.h? Really at some point I want to see only such an include for users of the gpio system, so why introduce such a detail in all users now?

I.e. why not have a gpio.h which does a conditional include of ppc4xx-gpio.h?

Thanks
Detlev

Signature · 6 lines
Bacchus, n. A convenient deity invented by the ancients as an excuse for
getting drunk.
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de