| Message ID | 546994402.2410687.1344973189988.JavaMail.root@advansee.com |
|---|---|
| State | Accepted |
| Commit | fe24d6143d11448ae8cbe386a4ef514dfb8bb528 |
| Delegated to: | Stefano Babic |
| Headers | show |
On 14/08/2012 21:39, Benoît Thébaudeau wrote: > Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > Cc: Stefano Babic <sbabic@denx.de> > --- > .../arch/arm/include/asm/arch-mx35/mx35_pins.h | 3 --- > .../board/CarMediaLab/flea3/flea3.c | 4 ++-- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/mx35_pins.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/mx35_pins.h > index 8c38139..00e5e75 100644 > --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/mx35_pins.h > +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/mx35_pins.h > @@ -347,9 +347,6 @@ typedef enum iomux_pins { > MX35_PIN_FEC_TDATA2 = _MXC_BUILD_GPIO_PIN(2, 21, 0x31C, 0x780), > MX35_PIN_FEC_RDATA3 = _MXC_BUILD_GPIO_PIN(2, 22, 0x320, 0x784), > MX35_PIN_FEC_TDATA3 = _MXC_BUILD_GPIO_PIN(2, 23, 0x324, 0x788), > - > - MX35_PIN_RTS2_UART3_RXD_MUX = _MXC_BUILD_NON_GPIO_PIN(0x1a0, 0x5e4), > - MX35_PIN_CTS2_UART3_TXD_MUX = _MXC_BUILD_NON_GPIO_PIN(0x1a4, 0x5e8), > } iomux_pin_name_t; > > #endif > diff --git u-boot-4d3c95f.orig/board/CarMediaLab/flea3/flea3.c u-boot-4d3c95f/board/CarMediaLab/flea3/flea3.c > index 34ede87..5015a1a 100644 > --- u-boot-4d3c95f.orig/board/CarMediaLab/flea3/flea3.c > +++ u-boot-4d3c95f/board/CarMediaLab/flea3/flea3.c > @@ -165,8 +165,8 @@ static void board_setup_sdram(void) > > static void setup_iomux_uart3(void) > { > - mxc_request_iomux(MX35_PIN_RTS2_UART3_RXD_MUX, MUX_CONFIG_ALT7); > - mxc_request_iomux(MX35_PIN_CTS2_UART3_TXD_MUX, MUX_CONFIG_ALT7); > + mxc_request_iomux(MX35_PIN_RTS2, MUX_CONFIG_ALT7); > + mxc_request_iomux(MX35_PIN_CTS2, MUX_CONFIG_ALT7); > } > That is correct, the pin was already defined. Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 14/08/2012 21:39, Benoît Thébaudeau wrote: > Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > Cc: Stefano Babic <sbabic@denx.de> > --- Applied to u-boot-imx, thanks. Best regards, Stefano Babic
On 14/08/2012 21:39, Benoît Thébaudeau wrote: > Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> > Cc: Stefano Babic <sbabic@denx.de> > --- Applied to u-boot-imx, thanks. Best regards, Stefano Babic
diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/mx35_pins.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/mx35_pins.h index 8c38139..00e5e75 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/mx35_pins.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/mx35_pins.h @@ -347,9 +347,6 @@ typedef enum iomux_pins { MX35_PIN_FEC_TDATA2 = _MXC_BUILD_GPIO_PIN(2, 21, 0x31C, 0x780), MX35_PIN_FEC_RDATA3 = _MXC_BUILD_GPIO_PIN(2, 22, 0x320, 0x784), MX35_PIN_FEC_TDATA3 = _MXC_BUILD_GPIO_PIN(2, 23, 0x324, 0x788), - - MX35_PIN_RTS2_UART3_RXD_MUX = _MXC_BUILD_NON_GPIO_PIN(0x1a0, 0x5e4), - MX35_PIN_CTS2_UART3_TXD_MUX = _MXC_BUILD_NON_GPIO_PIN(0x1a4, 0x5e8), } iomux_pin_name_t; #endif diff --git u-boot-4d3c95f.orig/board/CarMediaLab/flea3/flea3.c u-boot-4d3c95f/board/CarMediaLab/flea3/flea3.c index 34ede87..5015a1a 100644 --- u-boot-4d3c95f.orig/board/CarMediaLab/flea3/flea3.c +++ u-boot-4d3c95f/board/CarMediaLab/flea3/flea3.c @@ -165,8 +165,8 @@ static void board_setup_sdram(void) static void setup_iomux_uart3(void) { - mxc_request_iomux(MX35_PIN_RTS2_UART3_RXD_MUX, MUX_CONFIG_ALT7); - mxc_request_iomux(MX35_PIN_CTS2_UART3_TXD_MUX, MUX_CONFIG_ALT7); + mxc_request_iomux(MX35_PIN_RTS2, MUX_CONFIG_ALT7); + mxc_request_iomux(MX35_PIN_CTS2, MUX_CONFIG_ALT7); } static void setup_iomux_i2c(void)
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Stefano Babic <sbabic@denx.de> --- .../arch/arm/include/asm/arch-mx35/mx35_pins.h | 3 --- .../board/CarMediaLab/flea3/flea3.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-)