diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-06-26 11:55:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-06-26 11:55:42 +0200 |
| commit | 18e49f74703943ca293974d9c09a312b91eb85b7 (patch) | |
| tree | f15d516b97ba5214c87c24063dc20fe26c81b379 /include | |
| parent | d1a54ab5c49b6feca35cb52e030584ce0aa51412 (diff) | |
| parent | 01b784d33154ed90a7bebab861740628bdb8fa71 (diff) | |
| download | barebox-18e49f74703943ca293974d9c09a312b91eb85b7.tar.gz barebox-18e49f74703943ca293974d9c09a312b91eb85b7.tar.xz | |
Merge branch 'master' of /ptx/work/octopus/lfu/svn/u-boot-v2
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-imx/gpio.h | 3 | ||||
| -rw-r--r-- | include/asm-arm/arch-imx/imx-regs.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-imx/imx27-regs.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-arm/arch-imx/gpio.h b/include/asm-arm/arch-imx/gpio.h index 528b4b3c31..554040ad84 100644 --- a/include/asm-arm/arch-imx/gpio.h +++ b/include/asm-arm/arch-imx/gpio.h @@ -2,6 +2,9 @@ #define __ASM_ARCH_GPIO_H void imx_gpio_mode(int gpio_mode); +void imx_gpio_set_value(unsigned gpio, int value); +int imx_gpio_direction_output(unsigned gpio, int value); +int imx_gpio_direction_input(unsigned gpio); #endif /* __ASM_ARCH_GPIO_H */ diff --git a/include/asm-arm/arch-imx/imx-regs.h b/include/asm-arm/arch-imx/imx-regs.h index 9e530dcdff..a4ba5ef6b2 100644 --- a/include/asm-arm/arch-imx/imx-regs.h +++ b/include/asm-arm/arch-imx/imx-regs.h @@ -118,4 +118,6 @@ #define GPIO_BOUT_0 (2 << GPIO_BOUT_SHIFT) #define GPIO_BOUT_1 (3 << GPIO_BOUT_SHIFT) +#define GPIO_GIUS (1<<16) + #endif /* _IMX_REGS_H */ diff --git a/include/asm-arm/arch-imx/imx27-regs.h b/include/asm-arm/arch-imx/imx27-regs.h index 3af42ae259..7a010f82d1 100644 --- a/include/asm-arm/arch-imx/imx27-regs.h +++ b/include/asm-arm/arch-imx/imx27-regs.h @@ -299,4 +299,6 @@ #define IMX_CS4_BASE 0xD4000000 #define IMX_CS5_BASE 0xD6000000 +#define GPIO_DR 0x1C + #endif /* _IMX27_REGS_H */ |