diff options
| -rw-r--r-- | arch/arm/mach-pxa/reset.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/spitz.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 1 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/hardware.h | 5 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/reset.h | 9 |
5 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/reset.c b/arch/arm/mach-pxa/reset.c index 9d39dea57ce2..d610a1244abb 100644 --- a/arch/arm/mach-pxa/reset.c +++ b/arch/arm/mach-pxa/reset.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <asm/arch/pxa-regs.h> | 13 | #include <asm/arch/pxa-regs.h> |
| 14 | #include <asm/arch/pxa2xx-regs.h> | 14 | #include <asm/arch/pxa2xx-regs.h> |
| 15 | #include <asm/arch/reset.h> | ||
| 15 | 16 | ||
| 16 | static void do_hw_reset(void); | 17 | static void do_hw_reset(void); |
| 17 | 18 | ||
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 762249c03ded..207fe3e6a3d2 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <asm/arch/pxa2xx-regs.h> | 39 | #include <asm/arch/pxa2xx-regs.h> |
| 40 | #include <asm/arch/pxa2xx-gpio.h> | 40 | #include <asm/arch/pxa2xx-gpio.h> |
| 41 | #include <asm/arch/pxa27x-udc.h> | 41 | #include <asm/arch/pxa27x-udc.h> |
| 42 | #include <asm/arch/reset.h> | ||
| 42 | #include <asm/arch/irda.h> | 43 | #include <asm/arch/irda.h> |
| 43 | #include <asm/arch/mmc.h> | 44 | #include <asm/arch/mmc.h> |
| 44 | #include <asm/arch/ohci.h> | 45 | #include <asm/arch/ohci.h> |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index fea17ce6b55f..4bd7d4f006e2 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
| 37 | #include <asm/arch/pxa2xx-regs.h> | 37 | #include <asm/arch/pxa2xx-regs.h> |
| 38 | #include <asm/arch/mfp-pxa25x.h> | 38 | #include <asm/arch/mfp-pxa25x.h> |
| 39 | #include <asm/arch/reset.h> | ||
| 39 | #include <asm/arch/irda.h> | 40 | #include <asm/arch/irda.h> |
| 40 | #include <asm/arch/i2c.h> | 41 | #include <asm/arch/i2c.h> |
| 41 | #include <asm/arch/mmc.h> | 42 | #include <asm/arch/mmc.h> |
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index 979a45695d7d..351d0a721769 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h | |||
| @@ -224,11 +224,6 @@ extern void pxa_gpio_set_value(unsigned gpio, int value); | |||
| 224 | */ | 224 | */ |
| 225 | extern unsigned int get_memclk_frequency_10khz(void); | 225 | extern unsigned int get_memclk_frequency_10khz(void); |
| 226 | 226 | ||
| 227 | /* | ||
| 228 | * register GPIO as reset generator | ||
| 229 | */ | ||
| 230 | extern int init_gpio_reset(int gpio); | ||
| 231 | |||
| 232 | #endif | 227 | #endif |
| 233 | 228 | ||
| 234 | #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) | 229 | #if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) |
diff --git a/include/asm-arm/arch-pxa/reset.h b/include/asm-arm/arch-pxa/reset.h new file mode 100644 index 000000000000..6ca72c5cf7db --- /dev/null +++ b/include/asm-arm/arch-pxa/reset.h | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | #ifndef __ASM_ARCH_RESET_H | ||
| 2 | #define __ASM_ARCH_RESET_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * register GPIO as reset generator | ||
| 6 | */ | ||
| 7 | extern int init_gpio_reset(int gpio); | ||
| 8 | |||
| 9 | #endif /* __ASM_ARCH_RESET_H */ | ||
