Commit 3f9c6a6d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.6/dt-signed' of... 

Merge tag 'omap-for-v5.6/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Devicetree changes for omaps for v5.6 merge window

Devicetree changes for omaps for v5.6 to configure more
devices and update boards to use generic lcd panels:

- Configure HDMI for dra76-evm and am57xx-idk

- Correct node name for am3517 mdio

- Convert am335x-evm, am335x-evmsk, and am335x-icev2 to use generic
  panels

* tag 'omap-for-v5.6/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-icev2: Add support for OSD9616P0899-10 at i2c0
  ARM: dts: am335x-evmsk: Use drm simple-panel instead of tilcdc-panel
  ARM: dts: am335x-evm: Use drm simple-panel instead of tilcdc-panel
  ARM: dts: omap3: name mdio node properly
  ARM: dts: am57xx-idk-common: add HDMI to the common dtsi
  ARM: dts: dra76-evm: add HDMI output

Link: https://lore.kernel.org/r/pull-1578420398-290837@atomide.com-2


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 32d319c0 bfe0237d

arch/arm/boot/dts/am335x-evm.dts

+13 −27
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ switch10 { 
		};

	};



	backlight {

	backlight: backlight {

		compatible = "pwm-backlight";

		pwms = <&ecap0 0 50000 0>;

		brightness-levels = <0 51 53 56 62 75 101 152 255>;
@@ -121,35 +121,15 @@ backlight { 
	};



	panel {

		compatible = "ti,tilcdc,panel";

		status = "okay";

		compatible = "tfc,s9700rtwv43tr-01b";



		pinctrl-names = "default";

		pinctrl-0 = <&lcd_pins_s0>;

		panel-info {

			ac-bias           = <255>;

			ac-bias-intrpt    = <0>;

			dma-burst-sz      = <16>;

			bpp               = <32>;

			fdd               = <0x80>;

			sync-edge         = <0>;

			sync-ctrl         = <1>;

			raster-order      = <0>;

			fifo-th           = <0>;

		};



		display-timings {

			800x480p62 {

				clock-frequency = <30000000>;

				hactive = <800>;

				vactive = <480>;

				hfront-porch = <39>;

				hback-porch = <39>;

				hsync-len = <47>;

				vback-porch = <29>;

				vfront-porch = <13>;

				vsync-len = <2>;

				hsync-active = <1>;

				vsync-active = <1>;

		backlight = <&backlight>;



		port {

			panel_0: endpoint@0 {

				remote-endpoint = <&lcdc_0>;

			};

		};

	};
@@ -500,6 +480,12 @@ &lcdc { 
	status = "okay";



	blue-and-red-wiring = "crossed";



	port {

		lcdc_0: endpoint@0 {

			remote-endpoint = <&panel_0>;

		};

	};

};



&elm {

arch/arm/boot/dts/am335x-evmsk.dts

+12 −26
Original line number Diff line number Diff line
@@ -183,36 +183,16 @@ sound_master: simple-audio-card,codec { 
	};



	panel {

		compatible = "ti,tilcdc,panel";

		compatible = "newhaven,nhd-4.3-480272ef-atxl";



		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&lcd_pins_default>;

		pinctrl-1 = <&lcd_pins_sleep>;

		backlight = <&lcd_bl>;

		status = "okay";

		panel-info {

			ac-bias		= <255>;

			ac-bias-intrpt	= <0>;

			dma-burst-sz	= <16>;

			bpp		= <32>;

			fdd		= <0x80>;

			sync-edge	= <0>;

			sync-ctrl	= <1>;

			raster-order	= <0>;

			fifo-th		= <0>;

		};

		display-timings {

			480x272 {

				hactive		= <480>;

				vactive		= <272>;

				hback-porch	= <43>;

				hfront-porch	= <8>;

				hsync-len	= <4>;

				vback-porch	= <12>;

				vfront-porch	= <4>;

				vsync-len	= <10>;

				clock-frequency = <9000000>;

				hsync-active	= <0>;

				vsync-active	= <0>;



		port {

			panel_0: endpoint@0 {

				remote-endpoint = <&lcdc_0>;

			};

		};

	};
@@ -725,6 +705,12 @@ &lcdc { 
	status = "okay";



	blue-and-red-wiring = "crossed";



	port {

		lcdc_0: endpoint@0 {

			remote-endpoint = <&panel_0>;

		};

	};

};



&rtc {

arch/arm/boot/dts/am335x-icev2.dts

+13 −0
Original line number Diff line number Diff line
@@ -287,6 +287,19 @@ pca9536: gpio@41 { 
		gpio-controller;

		#gpio-cells = <2>;

	};



	/* osd9616p0899-10 */

	display@3c {

		compatible = "solomon,ssd1306fb-i2c";

		reg = <0x3c>;

		solomon,height = <16>;

		solomon,width = <96>;

		solomon,com-seq;

		solomon,com-invdir;

		solomon,page-offset = <0>;

		solomon,prechargep1 = <2>;

		solomon,prechargep2 = <13>;

	};

};



&spi0 {

arch/arm/boot/dts/am3517.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ davinci_emac: ethernet@5c000000 { 
			clock-names = "ick";

		};



		davinci_mdio: ethernet@5c030000 {

		davinci_mdio: mdio@5c030000 {

			compatible = "ti,davinci_mdio";

			ti,hwmods = "davinci_mdio";

			status = "disabled";

arch/arm/boot/dts/am57xx-idk-common.dtsi

+59 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ / { 
	aliases {

		rtc0 = &tps659038_rtc;

		rtc1 = &rtc;

		display0 = &hdmi0;

	};



	chosen {
@@ -96,6 +97,48 @@ led-out7 { 
			default-state = "off";

		};

	};



	hdmi0: connector@0 {

		compatible = "hdmi-connector";

		label = "hdmi";



		type = "a";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&tpd12s015_out>;

			};

		};

	};



	tpd12s015: encoder@0 {

		compatible = "ti,tpd12s016", "ti,tpd12s015";



		gpios = <0>, /* optional CT_CP_HPD */

			<0>, /* optional LS_OE */

			<&gpio7 12 GPIO_ACTIVE_HIGH>;	/* HPD */



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;



				tpd12s015_in: endpoint@0 {

					remote-endpoint = <&hdmi_out>;

				};

			};



			port@1 {

				reg = <1>;



				tpd12s015_out: endpoint@0 {

					remote-endpoint = <&hdmi_connector_in>;

				};

			};

		};

	};

};



&dra7_pmx_core {
@@ -485,3 +528,19 @@ partition@6 { 
&cpu0 {

	vdd-supply = <&smps12_reg>;

};



&hdmi {

	status = "okay";



	vdda-supply = <&ldo4_reg>;



	port {

		hdmi_out: endpoint {

			remote-endpoint = <&tpd12s015_in>;

		};

	};

};



&dss {

	status = "okay";

};