ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific
Subsystems (6)
PATCH 3/5 ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific
---
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%)arch/blackfin/cpu/cmd_gpio.c +1 -1
@@ -10,7 +10,7 @@#include <command.h> #include <asm/blackfin.h> -#include <asm/gpio.h> +#include <asm/ppc4xx-gpio.h> enum {GPIO_INPUT ,
arch/blackfin/cpu/gpio.c +1 -1
@@ -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
arch/powerpc/cpu/ppc4xx/cpu_init.c +1 -1
@@ -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
@@ -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
board/amcc/acadia/memory.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/bf527-ezkit/bf527-ezkit.c +1 -1
@@ -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>
board/bf533-stamp/bf533-stamp.c +1 -1
@@ -27,7 +27,7 @@#include <common.h> #include <netdev.h> -#include <asm/gpio.h> +#include <asm/ppc4xx-gpio.h> DECLARE_GLOBAL_DATA_PTR ;
board/bf548-ezkit/bf548-ezkit.c +1 -1
@@ -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>
board/bf548-ezkit/video.c +1 -1
@@ -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>
board/blackstamp/blackstamp.c +1 -1
@@ -13,7 +13,7 @@#include <common.h> #include <netdev.h> -#include <asm/gpio.h> +#include <asm/ppc4xx-gpio.h> DECLARE_GLOBAL_DATA_PTR ;
board/cm-bf527/gpio_cfi_flash.c +1 -1
@@ -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"
board/cm-bf537e/gpio_cfi_flash.c +1 -1
@@ -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"
board/cm-bf537u/gpio_cfi_flash.c +1 -1
@@ -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"
board/cm-bf548/video.c +1 -1
@@ -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>
board/esd/pmc405de/pmc405de.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/tcm-bf537/gpio_cfi_flash.c +1 -1
@@ -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"
board/zeus/update.c +1 -1
@@ -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
@@ -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 ;
drivers/i2c/soft_i2c.c +1 -1
@@ -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
drivers/misc/gpio_led.c +1 -1
@@ -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) {
drivers/mtd/nand/nand_plat.c +1 -1
@@ -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
drivers/spi/bfin_spi.c +1 -1
@@ -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>
post/board/lwmon5/watchdog.c +1 -1
@@ -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
PATCH 3/5 ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific
Hi Stefan,
Quoted 49 lines
Signed-off-by Stefan Roese <[email protected]>--- 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%)arch/blackfin/cpu/cmd_gpio.c +0
-0
arch/blackfin/cpu/cmd_gpio.c line 13
Quoted 5 lines
arch/blackfin/cpu/cmd_gpio.c +1
-1@@ -10,7 +10,7 @@#include <command.h> #include <asm/blackfin.h> -#include <asm/gpio.h> +#include <asm/ppc4xx-gpio.h>
This really defeats the symlinking of the asm directory and using generic names. I believe you will break lots of non-4xx boards with this change. In other words, did you try a Blackfin build with this change? ;)
Cheers
Detlev
Signature · 8 lines
Cyberwar is certainly not a myth. But you haven't seen it yet, despite
the attacks on Estonia. Cyberwar is warfare in cyberspace. And warfare
involves massive death and destruction. When you see it, you'll know it.
-- Bruce Schneier, Nov. 2007
--
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.dePATCH 3/5 ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific
Hi Detlev,
Quoted 7 lines · On Thursday 16 September 2010 14:05:08 Detlev Zundel wrote:
Quoted 7 lines
+++
b/arch/blackfin/cpu/cmd_gpio.carch/blackfin/cpu/cmd_gpio.c +0
-0@@ -10,7 +10,7 @@#include <command.h> #include <asm/blackfin.h>
Quoted 7 lines
Review line 15
Quoted 2 lines
(quoted diff) +1
-1-#include <asm/gpio.h> +#include <asm/ppc4xx-gpio.h>This really defeats the symlinking of the asm directory and using generic names. I believe you will break lots of non-4xx boards with this change. In other words, did you try a Blackfin build with this change? ;)
Ups. No, I totally missed this. Thanks for spotting. Will fix soon.
Please note that I plan to stay with this "asm/ppc4xx-gpio.h" name instead of "asm/gpio.h", since there are many other PowerPC variants out there.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de
PATCH 3/5 ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific
Hi Stefan,
Quoted 1 line
Ups. No, I totally missed this. Thanks for spotting. Will fix soon.
Ok.
Quoted 2 lines
Please note that I plan to stay with this "
asm/ppc4xx-gpio.h" name instead of "asm/gpio.h", since there are many other PowerPC variants out there.
I have to admit that I don't like this.
Hm, while you are doing something here, why not follow the Blackfin example which I like a lot and move towards the Linux gpio interface (see end of ./arch/blackfin/include/asm/gpio.h). It will be just lovely to only generically request a gpio in common driver code.
Going down this route, code using gpios will only include "asm/gpio.h" and use the generic functions. Doesn't that sound like a worthwhile target? ;)
Cheers
Detlev
Signature · 8 lines
Infolge sklavischer "Kategoritis" werden die wissenschaftlichen unlogischen und - wie wir sehen werden - oft sinnlosen Fragen wie "Wo wohnst du?", "Was bist du?", "Welche Religion?", "Welche Rasse?", "Welche Nationalit?t?" alle- samt heute f?r logische Fragen gehalten. -- Richard Buckminster Fuller -- 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
PATCH 3/5 ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific
Hi Detlev,
Quoted 6 lines · On Thursday 16 September 2010 15:00:05 Detlev Zundel wrote:
Quoted 3 lines
Please note that I plan to stay with this "
asm/ppc4xx-gpio.h" name instead of "asm/gpio.h", since there are many other PowerPC variants out there.I have to admit that I don't like this.
Quoted 8 lines
Hm, while you are doing something here, why not follow the Blackfin example which I like a lot and move towards the Linux gpio interface (see end of
./arch/blackfin/include/asm/gpio.h). It will be just lovely to only generically request a gpio in common driver code.Going down this route, code using gpios will only include "
asm/gpio.h" and use the generic functions. Doesn't that sound like a worthwhile target? ;)
Sure. I'm all for this idea, all platforms implementing this common GPIO framework. The current 4xx GPIO implementation out-dates the Linux framework, since I added this quite some time ago. Perhaps I'll find some time in the future to move to this common platform for PPC4xx as well. I won't complain if somebody beats me at though. ;)
Back to the subject: This patch right now was simply meant as part of a header cleanup patch, moving a 4xx specific header with stuff like this:
/* GPIO controller */
struct ppc4xx_gpio {
u32 or; /* Output Control */
u32 tcr; /* Tri-State Control */
...
to a "better" name. Even though the common gpio framework should be the "final target", I think it makes sense to make this header name move right now.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de
PATCH 3/5 ppc4xx: Move gpio.h to ppc4xx-gpio.h since its ppc4xx specific
Dear Stefan Roese,
Quoted 3 lines · In message <[email protected]> you wrote:
Back to the subject: This patch right now was simply meant as part of a header cleanup patch, moving a 4xx specific header with stuff like this:
...
Quoted 2 lines
to a "better" name. Even though the common gpio framework should be the "final target", I think it makes sense to make this header name move right now.
So a "real" cleanup patch will follow soon? OK, I guess we can buy that.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de A Puritan is someone who is deathly afraid that someone, somewhere, is having fun.