From 2682167b2d0073bc4a0a83569263c941591fddaa Mon Sep 17 00:00:00 2001
From: jebba <root@localhost>
Date: Sat, 26 Jun 2021 16:56:05 -0600
Subject: [PATCH] reMarkable2 patch to view console on serial port from
 remarkablewiki.com/tech/rm2_otg_pogo

---
 arch/arm/boot/dts/zero-sugar.dts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/zero-sugar.dts b/arch/arm/boot/dts/zero-sugar.dts
index 111cafb92e0a..165740774a13 100644
--- a/arch/arm/boot/dts/zero-sugar.dts
+++ b/arch/arm/boot/dts/zero-sugar.dts
@@ -50,7 +50,7 @@
 	compatible = "fsl,imx7d-sdb", "fsl,imx7d";
 
 	chosen {
-		stdout-path = &uart1;
+		stdout-path = &uart6;
 	};
 
 	memory {
@@ -648,7 +648,8 @@
 };
 
 &uart6 {
-	/* Pinctrl is defined under 'otgcontrol' driver, which will switch the pinmuxing as required */
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart6>;
 	assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>;
 	assigned-clock-parents = <&clks IMX7D_OSC_24M_CLK>;
 	status = "okay";
@@ -823,6 +824,13 @@
 		>;
 	};
 
+	pinctrl_uart6: uart6grp {
+		fsl,pins = <
+			MX7D_PAD_EPDC_DATA09__UART6_DCE_TX	0x79
+			MX7D_PAD_EPDC_DATA08__UART6_DCE_RX	0x79
+		>;
+	};
+
 	pinctrl_usdhc2: usdhc2grp {
 		fsl,pins = <
 			MX7D_PAD_SD2_CMD__SD2_CMD		0x59
@@ -944,13 +952,14 @@
 	pinctrl_one_wire_uart6_tx: one_wire_uart6_tx_grp {
 		fsl,pins = <
 			MX7D_PAD_EPDC_DATA08__GPIO2_IO8		0x00000004
-			MX7D_PAD_EPDC_DATA09__UART6_DCE_TX	0x00000004
+			MX7D_PAD_EPDC_DATA09__UART6_DCE_TX      0x00000079
+
 		>;
 	};
 
 	pinctrl_one_wire_uart6_rx: one_wire_uart6_rx_grp {
 		fsl,pins = <
-			MX7D_PAD_EPDC_DATA08__UART6_DCE_RX	0x00000004
+			MX7D_PAD_EPDC_DATA08__UART6_DCE_RX      0x00000079
 			MX7D_PAD_EPDC_DATA09__GPIO2_IO9		0x00000004
 		>;
 	};