From: Tony Lindgren <tony@atomide.com>
Date: Thu, 23 Jan 2020 17:59:29 +0000 (-0800)
Subject: Merge branch 'omap-for-v5.6/ti-sysc-dt-cam' into omap-for-v5.6/dt
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d7a9d45d5f060aec1e1909e3d57da5635a1bac97;p=linux.git

Merge branch 'omap-for-v5.6/ti-sysc-dt-cam' into omap-for-v5.6/dt
---

d7a9d45d5f060aec1e1909e3d57da5635a1bac97
diff --cc arch/arm/boot/dts/dra76-evm.dts
index 86a3e79909a86,a17d4875bb2e0..e958cb3d1b314
--- a/arch/arm/boot/dts/dra76-evm.dts
+++ b/arch/arm/boot/dts/dra76-evm.dts
@@@ -124,47 -117,11 +124,53 @@@
  		regulator-max-microvolt = <1800000>;
  	};
  
+ 	clk_ov5640_fixed: clock {
+ 		compatible = "fixed-clock";
+ 		#clock-cells = <0>;
+ 		clock-frequency = <24000000>;
+ 	};
++
 +	hdmi0: connector {
 +		compatible = "hdmi-connector";
 +		label = "hdmi";
 +
 +		type = "a";
 +
 +		port {
 +			hdmi_connector_in: endpoint {
 +				remote-endpoint = <&tpd12s015_out>;
 +			};
 +		};
 +	};
 +
 +	tpd12s015: encoder {
 +		compatible = "ti,tpd12s015";
 +
 +		gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>,   /* gpio7_30, CT CP HPD */
 +			<&gpio7 31 GPIO_ACTIVE_HIGH>,   /* gpio7_31, LS OE */
 +			<&gpio7 12 GPIO_ACTIVE_HIGH>;   /* gpio7_12/sp1_cs2, HPD */
 +
 +		ports {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
 +			port@0 {
 +				reg = <0>;
 +
 +				tpd12s015_in: endpoint {
 +					remote-endpoint = <&hdmi_out>;
 +				};
 +			};
 +
 +			port@1 {
 +				reg = <1>;
 +
 +				tpd12s015_out: endpoint {
 +					remote-endpoint = <&hdmi_connector_in>;
 +				};
 +			};
 +		};
 +	};
  };
  
  &i2c1 {