Skip to content

Commit

Permalink
ARM: dts: imx: e60k02: add second uart
Browse files Browse the repository at this point in the history
There is another uart next to the console uart used by vendor uboot and
kernel, enable it and document its location.

Signed-off-by: Andreas Kemnade <[email protected]>
Signed-off-by: Shawn Guo <[email protected]>
  • Loading branch information
akemnade authored and Shawn Guo committed Jan 18, 2021
1 parent 035a3e1 commit 3ad6be9
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/e60k02.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,12 @@
};

&uart1 {
/* J4, through-hole */
status = "okay";
};

&uart4 {
/* TP198, next to J4, SMD pads */
status = "okay";
};

Expand Down
13 changes: 12 additions & 1 deletion arch/arm/boot/dts/imx6sl-tolino-shine3.dts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
MX6SL_PAD_KEY_ROW7__GPIO4_IO07 0x79
MX6SL_PAD_ECSPI2_MOSI__GPIO4_IO13 0x79
MX6SL_PAD_KEY_COL5__GPIO4_IO02 0x79
MX6SL_PAD_KEY_ROW6__GPIO4_IO05 0x79
>;
};

Expand Down Expand Up @@ -160,6 +159,13 @@
>;
};

pinctrl_uart4: uart4grp {
fsl,pins = <
MX6SL_PAD_KEY_ROW6__UART4_TX_DATA 0x1b0b1
MX6SL_PAD_KEY_COL6__UART4_RX_DATA 0x1b0b1
>;
};

pinctrl_usbotg1: usbotg1grp {
fsl,pins = <
MX6SL_PAD_EPDC_PWRCOM__USB_OTG1_ID 0x17059
Expand Down Expand Up @@ -300,6 +306,11 @@
pinctrl-0 = <&pinctrl_uart1>;
};

&uart4 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart4>;
};

&usdhc2 {
pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep";
pinctrl-0 = <&pinctrl_usdhc2>;
Expand Down
13 changes: 12 additions & 1 deletion arch/arm/boot/dts/imx6sll-kobo-clarahd.dts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
MX6SLL_PAD_KEY_ROW7__GPIO4_IO07 0x79
MX6SLL_PAD_ECSPI2_MOSI__GPIO4_IO13 0x79
MX6SLL_PAD_KEY_COL5__GPIO4_IO02 0x79
MX6SLL_PAD_KEY_ROW6__GPIO4_IO05 0x79
>;
};

Expand Down Expand Up @@ -170,6 +169,13 @@
>;
};

pinctrl_uart4: uart4grp {
fsl,pins = <
MX6SLL_PAD_KEY_ROW6__UART4_DCE_TX 0x1b0b1
MX6SLL_PAD_KEY_COL6__UART4_DCE_RX 0x1b0b1
>;
};

pinctrl_usbotg1: usbotg1grp {
fsl,pins = <
MX6SLL_PAD_EPDC_PWR_COM__USB_OTG1_ID 0x17059
Expand Down Expand Up @@ -302,6 +308,11 @@
pinctrl-0 = <&pinctrl_uart1>;
};

&uart4 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart4>;
};

&usdhc2 {
pinctrl-names = "default", "state_100mhz", "state_200mhz","sleep";
pinctrl-0 = <&pinctrl_usdhc2>;
Expand Down

0 comments on commit 3ad6be9

Please sign in to comment.