Commit 603986a7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'keystone_dts_for_5.7' of... 

Merge tag 'keystone_dts_for_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into arm/dt

ARM: Keystone DTS updates for 5.7

Add display support for K2G EVM Board

* tag 'keystone_dts_for_5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone

:
  ARM: dts: keystone-k2g-evm: add HDMI video support
  ARM: dts: keystone-k2g: Add DSS node

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 36e29139 7856488b

arch/arm/boot/dts/keystone-k2g-evm.dts

+101 −0
Original line number Diff line number Diff line
@@ -45,6 +45,19 @@ 
		regulator-max-microvolt = <1800000>;

		regulator-always-on;

	};



	hdmi: connector {

		compatible = "hdmi-connector";

		label = "hdmi";



		type = "a";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&sii9022_out>;

			};

		};

	};

};



&k2g_pinctrl {
@@ -89,6 +102,13 @@ 
		>;

	};



	i2c1_pins: pinmux_i2c1_pins {

		pinctrl-single,pins = <

			K2G_CORE_IOPAD(0x1384) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0)	/* i2c1_scl.i2c1_scl */

			K2G_CORE_IOPAD(0x1388) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0)	/* i2c1_sda.i2c1_sda */

		>;

	};



	ecap0_pins: ecap0_pins {

		pinctrl-single,pins = <

			K2G_CORE_IOPAD(0x1374) (BUFFER_CLASS_B | MUX_MODE4)	/* pr1_mdio_data.ecap0_in_apwm0_out */
@@ -160,6 +180,40 @@ 
			K2G_CORE_IOPAD(0x1188) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* MDIO_DATA.MDIO_DATA */

		>;

	};



	vout_pins: pinmux_vout_pins {

		pinctrl-single,pins = <

			K2G_CORE_IOPAD(0x1078) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata23.dssdata23 */

			K2G_CORE_IOPAD(0x107c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata22.dssdata22 */

			K2G_CORE_IOPAD(0x1080) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata21.dssdata21 */

			K2G_CORE_IOPAD(0x1084) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata20.dssdata20 */

			K2G_CORE_IOPAD(0x1088) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata19.dssdata19 */

			K2G_CORE_IOPAD(0x108c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata18.dssdata18 */

			K2G_CORE_IOPAD(0x1090) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata17.dssdata17 */

			K2G_CORE_IOPAD(0x1094) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata16.dssdata16 */

			K2G_CORE_IOPAD(0x1098) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata15.dssdata15 */

			K2G_CORE_IOPAD(0x109c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata14.dssdata14 */

			K2G_CORE_IOPAD(0x10a0) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata13.dssdata13 */

			K2G_CORE_IOPAD(0x10a4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata12.dssdata12 */

			K2G_CORE_IOPAD(0x10a8) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata11.dssdata11 */

			K2G_CORE_IOPAD(0x10ac) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata10.dssdata10 */

			K2G_CORE_IOPAD(0x10b0) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata9.dssdata9 */

			K2G_CORE_IOPAD(0x10b4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata8.dssdata8 */

			K2G_CORE_IOPAD(0x10b8) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata7.dssdata7 */

			K2G_CORE_IOPAD(0x10bc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata6.dssdata6 */

			K2G_CORE_IOPAD(0x10c0) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata5.dssdata5 */

			K2G_CORE_IOPAD(0x10c4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata4.dssdata4 */

			K2G_CORE_IOPAD(0x10c8) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata3.dssdata3 */

			K2G_CORE_IOPAD(0x10cc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata2.dssdata2 */

			K2G_CORE_IOPAD(0x10d0) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata1.dssdata1 */

			K2G_CORE_IOPAD(0x10d4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata0.dssdata0 */

			K2G_CORE_IOPAD(0x10d8) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssvsync.dssvsync */

			K2G_CORE_IOPAD(0x10dc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dsshsync.dsshsync */

			K2G_CORE_IOPAD(0x10e0) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dsspclk.dsspclk */

			K2G_CORE_IOPAD(0x10e4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssde.dssde */

			K2G_CORE_IOPAD(0x10e8) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssfid.dssfid */

		>;

	};

};



&uart0 {
@@ -357,3 +411,50 @@ 
	pinctrl-0 = <&emac_pins>;

	status = "okay";

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	status = "okay";

	clock-frequency = <400000>;



	sii9022: sii9022@3b {

		#sound-dai-cells = <0>;

		compatible = "sil,sii9022";

		reg = <0x3b>;



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;



				sii9022_in: endpoint {

					remote-endpoint = <&dpi_out>;

				};

			};



			port@1 {

				reg = <1>;



				sii9022_out: endpoint {

					remote-endpoint = <&hdmi_connector_in>;

				};

			};

		};

	};

};



&dss {

	pinctrl-names = "default";

	pinctrl-0 = <&vout_pins>;

	status = "ok";



	port {

		dpi_out: endpoint {

			remote-endpoint = <&sii9022_in>;

			data-lines = <24>;

		};

	};

};

arch/arm/boot/dts/keystone-k2g.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -324,6 +324,28 @@ 
			clock-names = "gpio";

		};



		dss: dss@02540000 {

			compatible = "ti,k2g-dss";

			reg =	<0x02540000 0x400>,

				<0x02550000 0x1000>,

				<0x02557000 0x1000>,

				<0x0255a800 0x100>,

				<0x0255ac00 0x100>;

			reg-names = "cfg", "common", "vid1", "ovr1", "vp1";

			clocks =	<&k2g_clks 0x2 0>,

					<&k2g_clks 0x2 1>;

			clock-names = "fck", "vp1";

			interrupts = <GIC_SPI 247 IRQ_TYPE_EDGE_RISING>;



			power-domains = <&k2g_pds 0x2>;

			status = "disabled";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



			max-memory-bandwidth = <230000000>;

		};



		edma0: edma@2700000 {

			compatible = "ti,k2g-edma3-tpcc", "ti,edma3-tpcc";

			reg =	<0x02700000 0x8000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE