Commit f2c6d71e authored by Jan Kiszka's avatar Jan Kiszka Committed by Vignesh Raghavendra
Browse files

arm64: dts: ti: iot2050: Factor out DP related bits 



There is a variant coming which does not support the Display Port. Move
all related bits into a separate dtsi so that only those variants
supporting the interface can include it.

Along that, remove a redundant clock setting from
k3-am65-iot2050-common-pg1.dtsi.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Link: https://lore.kernel.org/r/3397d917d7c97f7aec05bc5f65eef3a6fe843650.1707463401.git.jan.kiszka@siemens.com


Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent f1a024f7

arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi

+1 −4
Original line number Diff line number Diff line
@@ -8,10 +8,7 @@ 
 * Common bits of the IOT2050 Basic and Advanced variants, PG1

 */



&dss {

	assigned-clocks = <&k3_clks 67 2>;

	assigned-clock-parents = <&k3_clks 67 5>;

};

#include "k3-am65-iot2050-dp.dtsi"



&serdes0 {

	status = "disabled";

arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi

+0 −85
Original line number Diff line number Diff line
@@ -312,45 +312,6 @@ AM65X_IOPAD(0x02c0, PIN_OUTPUT, 0) /* (AC8) USB1_DRVVBUS */ 
		>;

	};



	dss_vout1_pins_default: dss-vout1-default-pins {

		pinctrl-single,pins = <

			AM65X_IOPAD(0x0000, PIN_OUTPUT, 1)  /* VOUT1_DATA0 */

			AM65X_IOPAD(0x0004, PIN_OUTPUT, 1)  /* VOUT1_DATA1 */

			AM65X_IOPAD(0x0008, PIN_OUTPUT, 1)  /* VOUT1_DATA2 */

			AM65X_IOPAD(0x000c, PIN_OUTPUT, 1)  /* VOUT1_DATA3 */

			AM65X_IOPAD(0x0010, PIN_OUTPUT, 1)  /* VOUT1_DATA4 */

			AM65X_IOPAD(0x0014, PIN_OUTPUT, 1)  /* VOUT1_DATA5 */

			AM65X_IOPAD(0x0018, PIN_OUTPUT, 1)  /* VOUT1_DATA6 */

			AM65X_IOPAD(0x001c, PIN_OUTPUT, 1)  /* VOUT1_DATA7 */

			AM65X_IOPAD(0x0020, PIN_OUTPUT, 1)  /* VOUT1_DATA8 */

			AM65X_IOPAD(0x0024, PIN_OUTPUT, 1)  /* VOUT1_DATA9 */

			AM65X_IOPAD(0x0028, PIN_OUTPUT, 1)  /* VOUT1_DATA10 */

			AM65X_IOPAD(0x002c, PIN_OUTPUT, 1)  /* VOUT1_DATA11 */

			AM65X_IOPAD(0x0030, PIN_OUTPUT, 1)  /* VOUT1_DATA12 */

			AM65X_IOPAD(0x0034, PIN_OUTPUT, 1)  /* VOUT1_DATA13 */

			AM65X_IOPAD(0x0038, PIN_OUTPUT, 1)  /* VOUT1_DATA14 */

			AM65X_IOPAD(0x003c, PIN_OUTPUT, 1)  /* VOUT1_DATA15 */

			AM65X_IOPAD(0x0040, PIN_OUTPUT, 1)  /* VOUT1_DATA16 */

			AM65X_IOPAD(0x0044, PIN_OUTPUT, 1)  /* VOUT1_DATA17 */

			AM65X_IOPAD(0x0048, PIN_OUTPUT, 1)  /* VOUT1_DATA18 */

			AM65X_IOPAD(0x004c, PIN_OUTPUT, 1)  /* VOUT1_DATA19 */

			AM65X_IOPAD(0x0050, PIN_OUTPUT, 1)  /* VOUT1_DATA20 */

			AM65X_IOPAD(0x0054, PIN_OUTPUT, 1)  /* VOUT1_DATA21 */

			AM65X_IOPAD(0x0058, PIN_OUTPUT, 1)  /* VOUT1_DATA22 */

			AM65X_IOPAD(0x005c, PIN_OUTPUT, 1)  /* VOUT1_DATA23 */

			AM65X_IOPAD(0x0060, PIN_OUTPUT, 1)  /* VOUT1_VSYNC */

			AM65X_IOPAD(0x0064, PIN_OUTPUT, 1)  /* VOUT1_HSYNC */

			AM65X_IOPAD(0x0068, PIN_OUTPUT, 1)  /* VOUT1_PCLK */

			AM65X_IOPAD(0x006c, PIN_OUTPUT, 1)  /* VOUT1_DE */

		>;

	};



	dp_pins_default: dp-default-pins {

		pinctrl-single,pins = <

			AM65X_IOPAD(0x0078, PIN_OUTPUT, 7)  /* (AF18) DP rst_n */

		>;

	};



	main_i2c2_pins_default: main-i2c2-default-pins {

		pinctrl-single,pins = <

			AM65X_IOPAD(0x0074, PIN_INPUT,  5)  /* (T27) I2C2_SCL */
@@ -487,32 +448,6 @@ &main_i2c3 { 


	#address-cells = <1>;

	#size-cells = <0>;



	edp-bridge@f {

		compatible = "toshiba,tc358767";

		reg = <0x0f>;

		pinctrl-names = "default";

		pinctrl-0 = <&dp_pins_default>;

		reset-gpios = <&main_gpio0 30 GPIO_ACTIVE_HIGH>;



		clock-names = "ref";

		clocks = <&dp_refclk>;



		toshiba,hpd-pin = <0>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@1 {

				reg = <1>;



				bridge_in: endpoint {

					remote-endpoint = <&dpi_out>;

				};

			};

		};

	};

};



&mcu_cpsw {
@@ -611,26 +546,6 @@ seboot-backup@e80000 { 
	};

};



&dss {

	pinctrl-names = "default";

	pinctrl-0 = <&dss_vout1_pins_default>;



	assigned-clocks = <&k3_clks 67 2>;

	assigned-clock-parents = <&k3_clks 67 5>;

};



&dss_ports {

	#address-cells = <1>;

	#size-cells = <0>;

	port@1 {

		reg = <1>;



		dpi_out: endpoint {

			remote-endpoint = <&bridge_in>;

		};

	};

};



&pcie1_rc {

	status = "okay";

	pinctrl-names = "default";

arch/arm64/boot/dts/ti/k3-am65-iot2050-dp.dtsi

0 → 100644
+98 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) Siemens AG, 2024

 *

 * Authors:

 *   Jan Kiszka <jan.kiszka@siemens.com>

 *

 * Common bits for IOT2050 variants with Display Port

 */



&main_pmx0 {

	dss_vout1_pins_default: dss-vout1-default-pins {

		pinctrl-single,pins = <

			AM65X_IOPAD(0x0000, PIN_OUTPUT, 1)  /* VOUT1_DATA0 */

			AM65X_IOPAD(0x0004, PIN_OUTPUT, 1)  /* VOUT1_DATA1 */

			AM65X_IOPAD(0x0008, PIN_OUTPUT, 1)  /* VOUT1_DATA2 */

			AM65X_IOPAD(0x000c, PIN_OUTPUT, 1)  /* VOUT1_DATA3 */

			AM65X_IOPAD(0x0010, PIN_OUTPUT, 1)  /* VOUT1_DATA4 */

			AM65X_IOPAD(0x0014, PIN_OUTPUT, 1)  /* VOUT1_DATA5 */

			AM65X_IOPAD(0x0018, PIN_OUTPUT, 1)  /* VOUT1_DATA6 */

			AM65X_IOPAD(0x001c, PIN_OUTPUT, 1)  /* VOUT1_DATA7 */

			AM65X_IOPAD(0x0020, PIN_OUTPUT, 1)  /* VOUT1_DATA8 */

			AM65X_IOPAD(0x0024, PIN_OUTPUT, 1)  /* VOUT1_DATA9 */

			AM65X_IOPAD(0x0028, PIN_OUTPUT, 1)  /* VOUT1_DATA10 */

			AM65X_IOPAD(0x002c, PIN_OUTPUT, 1)  /* VOUT1_DATA11 */

			AM65X_IOPAD(0x0030, PIN_OUTPUT, 1)  /* VOUT1_DATA12 */

			AM65X_IOPAD(0x0034, PIN_OUTPUT, 1)  /* VOUT1_DATA13 */

			AM65X_IOPAD(0x0038, PIN_OUTPUT, 1)  /* VOUT1_DATA14 */

			AM65X_IOPAD(0x003c, PIN_OUTPUT, 1)  /* VOUT1_DATA15 */

			AM65X_IOPAD(0x0040, PIN_OUTPUT, 1)  /* VOUT1_DATA16 */

			AM65X_IOPAD(0x0044, PIN_OUTPUT, 1)  /* VOUT1_DATA17 */

			AM65X_IOPAD(0x0048, PIN_OUTPUT, 1)  /* VOUT1_DATA18 */

			AM65X_IOPAD(0x004c, PIN_OUTPUT, 1)  /* VOUT1_DATA19 */

			AM65X_IOPAD(0x0050, PIN_OUTPUT, 1)  /* VOUT1_DATA20 */

			AM65X_IOPAD(0x0054, PIN_OUTPUT, 1)  /* VOUT1_DATA21 */

			AM65X_IOPAD(0x0058, PIN_OUTPUT, 1)  /* VOUT1_DATA22 */

			AM65X_IOPAD(0x005c, PIN_OUTPUT, 1)  /* VOUT1_DATA23 */

			AM65X_IOPAD(0x0060, PIN_OUTPUT, 1)  /* VOUT1_VSYNC */

			AM65X_IOPAD(0x0064, PIN_OUTPUT, 1)  /* VOUT1_HSYNC */

			AM65X_IOPAD(0x0068, PIN_OUTPUT, 1)  /* VOUT1_PCLK */

			AM65X_IOPAD(0x006c, PIN_OUTPUT, 1)  /* VOUT1_DE */

		>;

	};



	dp_pins_default: dp-default-pins {

		pinctrl-single,pins = <

			AM65X_IOPAD(0x0078, PIN_OUTPUT, 7)  /* (AF18) DP rst_n */

		>;

	};

};



&main_i2c3 {

	edp-bridge@f {

		compatible = "toshiba,tc358767";

		reg = <0x0f>;

		pinctrl-names = "default";

		pinctrl-0 = <&dp_pins_default>;

		reset-gpios = <&main_gpio0 30 GPIO_ACTIVE_HIGH>;



		clock-names = "ref";

		clocks = <&dp_refclk>;



		toshiba,hpd-pin = <0>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@1 {

				reg = <1>;



				bridge_in: endpoint {

					remote-endpoint = <&dpi_out>;

				};

			};

		};

	};

};



&dss {

	pinctrl-names = "default";

	pinctrl-0 = <&dss_vout1_pins_default>;



	assigned-clocks = <&k3_clks 67 2>;

	assigned-clock-parents = <&k3_clks 67 5>;

};



&dss_ports {

	#address-cells = <1>;

	#size-cells = <0>;

	port@1 {

		reg = <1>;



		dpi_out: endpoint {

			remote-endpoint = <&bridge_in>;

		};

	};

};

arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include "k3-am6528-iot2050-basic-common.dtsi"

#include "k3-am65-iot2050-common-pg2.dtsi"

#include "k3-am65-iot2050-dp.dtsi"

#include "k3-am65-iot2050-usb3.dtsi"



/ {

arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "k3-am6548-iot2050-advanced-common.dtsi"

#include "k3-am65-iot2050-common-pg2.dtsi"

#include "k3-am65-iot2050-arduino-connector.dtsi"

#include "k3-am65-iot2050-dp.dtsi"



/ {

	compatible = "siemens,iot2050-advanced-m2", "ti,am654";