Commit 3ad6be94 authored by Andreas Kemnade's avatar Andreas Kemnade Committed by Shawn Guo
Browse files

ARM: dts: imx: e60k02: add second uart 



There is another uart next to the console uart used by vendor uboot and
kernel, enable it and document its location.

Signed-off-by: default avatarAndreas Kemnade <andreas@kemnade.info>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 035a3e16

arch/arm/boot/dts/e60k02.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -278,6 +278,12 @@ &snvs_rtc { 
};



&uart1 {

	/* J4, through-hole */

	status = "okay";

};



&uart4 {

	/* TP198, next to J4, SMD pads */

	status = "okay";

};

arch/arm/boot/dts/imx6sl-tolino-shine3.dts

+12 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ MX6SL_PAD_KEY_COL3__GPIO3_IO30 0x79 
			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

		>;

	};
@@ -160,6 +159,13 @@ MX6SL_PAD_UART1_RXD__UART1_RX_DATA 0x1b0b1 
		>;

	};



	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
@@ -300,6 +306,11 @@ &uart1 { 
	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>;

arch/arm/boot/dts/imx6sll-kobo-clarahd.dts

+12 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ MX6SLL_PAD_KEY_COL3__GPIO3_IO30 0x79 
			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

		>;

	};
@@ -170,6 +169,13 @@ MX6SLL_PAD_UART1_RXD__UART1_DCE_RX 0x1b0b1 
		>;

	};



	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
@@ -302,6 +308,11 @@ &uart1 { 
	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>;