diff options
| author | Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | 2010-11-26 15:20:52 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-03 11:05:16 +0100 |
| commit | 96886c4361f1ae3f6c775d7c9295e2d557101d0f (patch) | |
| tree | f3101c9303ed759ab5660985291366619a8e8fd9 /arch/arm/mach-mx5/board-mx51_efikamx.c | |
| parent | ARM: mx5: dynamically allocate imx2-wdt devices (diff) | |
| download | linux-96886c4361f1ae3f6c775d7c9295e2d557101d0f.tar.xz linux-96886c4361f1ae3f6c775d7c9295e2d557101d0f.zip | |
iMX51: introduce IMX_GPIO_NR
Currently, to define a GPIO number, we're using something like :
#define EFIKAMX_PCBID0 (2*32 + 16)
to define GPIO 3 16.
This is not really readable and it's error prone imho (note the 3 vs 2).
So, I'm introducing a new macro to define this in a better way. Now, the
code sample become :
#define EFIKAMX_PCBID0 IMX_GPIO_NR(3, 16)
v2:
- move to gpio.h
- add parens & spaces
- switch to IMX_GPIO_NR instead of MX51_GPIO_NR
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Amit Kucheria <amit.kucheria@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx5/board-mx51_efikamx.c')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx51_efikamx.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c index 3a4607bb79b5..5ab21a0036c1 100644 --- a/arch/arm/mach-mx5/board-mx51_efikamx.c +++ b/arch/arm/mach-mx5/board-mx51_efikamx.c @@ -43,22 +43,22 @@ #define MX51_USB_PLL_DIV_24_MHZ 0x01 -#define EFIKAMX_PCBID0 (2*32 + 16) -#define EFIKAMX_PCBID1 (2*32 + 17) -#define EFIKAMX_PCBID2 (2*32 + 11) +#define EFIKAMX_PCBID0 IMX_GPIO_NR(3, 16) +#define EFIKAMX_PCBID1 IMX_GPIO_NR(3, 17) +#define EFIKAMX_PCBID2 IMX_GPIO_NR(3, 11) -#define EFIKAMX_BLUE_LED (2*32 + 13) -#define EFIKAMX_GREEN_LED (2*32 + 14) -#define EFIKAMX_RED_LED (2*32 + 15) +#define EFIKAMX_BLUE_LED IMX_GPIO_NR(3, 13) +#define EFIKAMX_GREEN_LED IMX_GPIO_NR(3, 14) +#define EFIKAMX_RED_LED IMX_GPIO_NR(3, 15) -#define EFIKAMX_POWER_KEY (1*32 + 31) +#define EFIKAMX_POWER_KEY IMX_GPIO_NR(2, 31) -#define EFIKAMX_SPI_CS0 (3*32 + 24) -#define EFIKAMX_SPI_CS1 (3*32 + 25) +#define EFIKAMX_SPI_CS0 IMX_GPIO_NR(4, 24) +#define EFIKAMX_SPI_CS1 IMX_GPIO_NR(4, 25) /* board 1.1 doesn't have same reset gpio */ -#define EFIKAMX_RESET1_1 (2*32 + 2) -#define EFIKAMX_RESET (0*32 + 4) +#define EFIKAMX_RESET1_1 IMX_GPIO_NR(3, 2) +#define EFIKAMX_RESET IMX_GPIO_NR(1, 4) /* the pci ids pin have pull up. they're driven low according to board id */ #define MX51_PAD_PCBID0 IOMUX_PAD(0x518, 0x130, 3, 0x0, 0, PAD_CTL_PUS_100K_UP) |