diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-02-25 00:48:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-06 11:21:28 +0200 |
| commit | f3524c8984f1708739eafd76977f0aae4a786a60 (patch) | |
| tree | 10e7e056ecb36ec6994428fd2e64c2a7f4e9a964 /board | |
| parent | b4b94664f0d77c2cae455be11ad8555bebe3753c (diff) | |
| download | barebox-f3524c8984f1708739eafd76977f0aae4a786a60.tar.gz barebox-f3524c8984f1708739eafd76977f0aae4a786a60.tar.xz | |
i.MX31:
Rework iomux support for i.MX31:
- rename gpio-imx31.c to iomux-v2.c
- add pin definitions from Kernel
- fixup pcm037 board
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'board')
| -rw-r--r-- | board/pcm037/pcm037.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c index 102cbba8f0..fa1c15d93f 100644 --- a/board/pcm037/pcm037.c +++ b/board/pcm037/pcm037.c @@ -27,6 +27,7 @@ #include <driver.h> #include <environment.h> #include <asm/arch/imx-regs.h> +#include <asm/arch/iomux-mx31.h> #include <asm/armlinux.h> #include <asm/arch/gpio.h> #include <asm/io.h> @@ -133,10 +134,6 @@ static int imx31_devices_init(void) __REG(CSCR_L(5)) = 0x444A0301; __REG(CSCR_A(5)) = 0x44443302; - /* setup pins for I2C2 (for EEPROM, RTC) */ - imx_gpio_mode(MUX_CSPI2_MOSI_I2C2_SCL); - imx_gpio_mode(MUX_CSPI2_MISO_I2C2_SCL); - register_device(&cfi_dev); /* @@ -176,10 +173,10 @@ static struct device_d imx31_serial_device = { static int imx31_console_init(void) { /* init gpios for serial port */ - imx_gpio_mode(MUX_RXD1_UART1_RXD_MUX); - imx_gpio_mode(MUX_TXD1_UART1_TXD_MUX); - imx_gpio_mode(MUX_RTS1_UART1_RTS_B); - imx_gpio_mode(MUX_RTS1_UART1_CTS_B); + imx_iomux_mode(MX31_PIN_RXD1__RXD1); + imx_iomux_mode(MX31_PIN_TXD1__TXD1); + imx_iomux_mode(MX31_PIN_CTS1__CTS1); + imx_iomux_mode(MX31_PIN_RTS1__RTS1); register_device(&imx31_serial_device); return 0; |