| Message ID | 20190609205447.11212-11-lukma@denx.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | DM: display5: Convert display5 board to DM/DTS (including 'factory' setup) | expand |
> Subject: [PATCH v1 10/11] ARM: display5: Remove UART initialization code > after DM/DTS conversion (non-console) > > This UART is not used in U-Boot, so there is no need to initialize it. > > Signed-off-by: Lukasz Majewski <lukma@denx.de> > --- > > board/liebherr/display5/common.c | 13 ------------- > board/liebherr/display5/common.h | 1 - > board/liebherr/display5/display5.c | 2 -- > 3 files changed, 16 deletions(-) > > diff --git a/board/liebherr/display5/common.c > b/board/liebherr/display5/common.c > index 2b3253d88d..71d79f85ab 100644 > --- a/board/liebherr/display5/common.c > +++ b/board/liebherr/display5/common.c > @@ -8,14 +8,6 @@ > #include <asm/arch/mx6-pins.h> > #include "common.h" > > -iomux_v3_cfg_t const uart_pads[] = { > - /* UART4 */ > - MX6_PAD_CSI0_DAT12__UART4_TX_DATA | > MUX_PAD_CTRL(UART_PAD_CTRL), > - MX6_PAD_CSI0_DAT13__UART4_RX_DATA | > MUX_PAD_CTRL(UART_PAD_CTRL), > - MX6_PAD_CSI0_DAT16__UART4_RTS_B | > MUX_PAD_CTRL(UART_PAD_CTRL), > - MX6_PAD_CSI0_DAT17__UART4_CTS_B | > MUX_PAD_CTRL(UART_PAD_CTRL), > -}; > - > iomux_v3_cfg_t const uart_console_pads[] = { > /* UART5 */ > MX6_PAD_CSI0_DAT14__UART5_TX_DATA | > MUX_PAD_CTRL(UART_PAD_CTRL), @@ -29,11 +21,6 @@ void > displ5_set_iomux_uart_spl(void) > SETUP_IOMUX_PADS(uart_console_pads); > } > > -void displ5_set_iomux_uart(void) > -{ > - SETUP_IOMUX_PADS(uart_pads); > -} > - > iomux_v3_cfg_t const misc_pads_spl[] = { > /* Emergency recovery pin */ > MX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL), > diff --git a/board/liebherr/display5/common.h > b/board/liebherr/display5/common.h > index 2bbd934e7a..4eb70dc42f 100644 > --- a/board/liebherr/display5/common.h > +++ b/board/liebherr/display5/common.h > @@ -32,7 +32,6 @@ > PAD_CTL_SPEED_HIGH | PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) > > void displ5_set_iomux_uart_spl(void); > -void displ5_set_iomux_uart(void); > void displ5_set_iomux_ecspi_spl(void); > void displ5_set_iomux_usdhc_spl(void); > void displ5_set_iomux_misc_spl(void); > diff --git a/board/liebherr/display5/display5.c > b/board/liebherr/display5/display5.c > index 6592f0c3ca..8d048006da 100644 > --- a/board/liebherr/display5/display5.c > +++ b/board/liebherr/display5/display5.c > @@ -171,8 +171,6 @@ int board_init(void) > /* address of boot parameters */ > gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; > > - /* Setup iomux for non console UARTS */ > - displ5_set_iomux_uart(); > /* Setup misc (application specific) stuff */ > SETUP_IOMUX_PADS(misc_pads); > Acked-by: Peng Fan <peng.fan@nxp.com> > -- > 2.11.0
diff --git a/board/liebherr/display5/common.c b/board/liebherr/display5/common.c index 2b3253d88d..71d79f85ab 100644 --- a/board/liebherr/display5/common.c +++ b/board/liebherr/display5/common.c @@ -8,14 +8,6 @@ #include <asm/arch/mx6-pins.h> #include "common.h" -iomux_v3_cfg_t const uart_pads[] = { - /* UART4 */ - MX6_PAD_CSI0_DAT12__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_CSI0_DAT13__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_CSI0_DAT16__UART4_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_CSI0_DAT17__UART4_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - iomux_v3_cfg_t const uart_console_pads[] = { /* UART5 */ MX6_PAD_CSI0_DAT14__UART5_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), @@ -29,11 +21,6 @@ void displ5_set_iomux_uart_spl(void) SETUP_IOMUX_PADS(uart_console_pads); } -void displ5_set_iomux_uart(void) -{ - SETUP_IOMUX_PADS(uart_pads); -} - iomux_v3_cfg_t const misc_pads_spl[] = { /* Emergency recovery pin */ MX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL), diff --git a/board/liebherr/display5/common.h b/board/liebherr/display5/common.h index 2bbd934e7a..4eb70dc42f 100644 --- a/board/liebherr/display5/common.h +++ b/board/liebherr/display5/common.h @@ -32,7 +32,6 @@ PAD_CTL_SPEED_HIGH | PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) void displ5_set_iomux_uart_spl(void); -void displ5_set_iomux_uart(void); void displ5_set_iomux_ecspi_spl(void); void displ5_set_iomux_usdhc_spl(void); void displ5_set_iomux_misc_spl(void); diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c index 6592f0c3ca..8d048006da 100644 --- a/board/liebherr/display5/display5.c +++ b/board/liebherr/display5/display5.c @@ -171,8 +171,6 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - /* Setup iomux for non console UARTS */ - displ5_set_iomux_uart(); /* Setup misc (application specific) stuff */ SETUP_IOMUX_PADS(misc_pads);
This UART is not used in U-Boot, so there is no need to initialize it. Signed-off-by: Lukasz Majewski <lukma@denx.de> --- board/liebherr/display5/common.c | 13 ------------- board/liebherr/display5/common.h | 1 - board/liebherr/display5/display5.c | 2 -- 3 files changed, 16 deletions(-)