armv8/ls1043aqds: Select lpuart pins of various muxes

Set Board Configuration Register to select the lpuart pins of various muxes. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: York Sun <york.sun@nxp.com>

armv8/ls1043aqds: Select lpuart pins of various muxes
Set Board Configuration Register to select the lpuart pins of various muxes. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Mingkai Hu <Mingkai.Hu@freescale.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: York Sun <york.sun@nxp.com>
Shaohui Xie · York Sun
1 parent e978a31b63
Showing 1 changed file with 13 additions and 0 deletions Side-by-side Diff
board/freescale/ls1043aqds/ls1043aqds.c
@@ -40,6 +40,9 @@
 #define CFG_SD_MUX3_MUX4	0x1 /* MUX4 */
 #define CFG_SD_MUX4_SLOT3	0x0 /* SLOT3 TX/RX1 */
 #define CFG_SD_MUX4_SLOT1	0x1 /* SLOT1 TX/RX3 */
+#define CFG_UART_MUX_MASK	0x6
+#define CFG_UART_MUX_SHIFT	1
+#define CFG_LPUART_EN		0x1
  
 int checkboard(void)
 {
  
@@ -218,7 +221,17 @@
  
 int board_early_init_f(void)
 {
+#ifdef CONFIG_LPUART
+	u8 uart;
+#endif
 	fsl_lsch2_early_init_f();
+#ifdef CONFIG_LPUART
+	/* We use lpuart0 as system console */
+	uart = QIXIS_READ(brdcfg[14]);
+	uart &= ~CFG_UART_MUX_MASK;
+	uart |= CFG_LPUART_EN << CFG_UART_MUX_SHIFT;
+	QIXIS_WRITE(brdcfg[14], uart);
+#endif
  
 	return 0;
 }
...	...	@@ -40,6 +40,9 @@
40	40	#define CFG_SD_MUX3_MUX4 0x1 /* MUX4 */
41	41	#define CFG_SD_MUX4_SLOT3 0x0 /* SLOT3 TX/RX1 */
42	42	#define CFG_SD_MUX4_SLOT1 0x1 /* SLOT1 TX/RX3 */
	43	+#define CFG_UART_MUX_MASK 0x6
	44	+#define CFG_UART_MUX_SHIFT 1
	45	+#define CFG_LPUART_EN 0x1
43	46
44	47	int checkboard(void)
45	48	{
46	49
...	...	@@ -218,7 +221,17 @@
218	221
219	222	int board_early_init_f(void)
220	223	{
	224	+#ifdef CONFIG_LPUART
	225	+ u8 uart;
	226	+#endif
221	227	fsl_lsch2_early_init_f();
	228	+#ifdef CONFIG_LPUART
	229	+ /* We use lpuart0 as system console */
	230	+ uart = QIXIS_READ(brdcfg[14]);
	231	+ uart &= ~CFG_UART_MUX_MASK;
	232	+ uart \|= CFG_LPUART_EN << CFG_UART_MUX_SHIFT;
	233	+ QIXIS_WRITE(brdcfg[14], uart);
	234	+#endif
222	235
223	236	return 0;
224	237	}