arm64: tegra: Enable HDMI on Jetson TX2

Enable the host1x and necessary children and hook up the HDMI +5V pin to
enable video output on the HDMI port found on Jetson TX2.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
index 42a23997dcdb7d7d3d7e24178671b18c1cb43620..bd5305a634b161dee703098a3444fe25e7f94ba2 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
@@ -74,6 +74,43 @@
                };
        };
 
+       host1x@13e00000 {
+               status = "okay";
+
+               dpaux@15040000 {
+                       status = "okay";
+               };
+
+               display-hub@15200000 {
+                       status = "okay";
+               };
+
+               dsi@15300000 {
+                       status = "disabled";
+               };
+
+               sor@15540000 {
+                       status = "disabled";
+
+                       nvidia,dpaux = <&dpaux1>;
+               };
+
+               sor@15580000 {
+                       status = "okay";
+
+                       avdd-io-supply = <&vdd_hdmi_1v05>;
+                       vdd-pll-supply = <&vdd_1v8_ap>;
+                       hdmi-supply = <&vdd_hdmi>;
+
+                       nvidia,ddc-i2c-bus = <&ddc>;
+                       nvidia,hpd-gpio = <&gpio TEGRA_MAIN_GPIO(P, 1) GPIO_ACTIVE_LOW>;
+               };
+
+               dpaux@155c0000 {
+                       status = "okay";
+               };
+       };
+
        gpio-keys {
                compatible = "gpio-keys";
 
@@ -120,5 +157,19 @@
 
                        vin-supply = <&vdd_3v3_sys>;
                };
+
+               vdd_hdmi: regulator@101 {
+                       compatible = "regulator-fixed";
+                       reg = <101>;
+
+                       regulator-name = "VDD_HDMI_5V0";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+
+                       gpio = <&exp1 14 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+
+                       vin-supply = <&vdd_5v0_sys>;
+               };
        };
 };

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
index 923a4c6b52c088bdbc38b0d0cfab9360a7d7fabc..09f1707539a0533ab6af6e2993ef8c673adfde00 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
@@ -321,7 +321,7 @@
                                                regulator-max-microvolt = <2800000>;
                                        };
 
-                                       avdd_1v05: ldo7 {
+                                       vdd_hdmi_1v05: ldo7 {
                                                regulator-name = "VDD_HDMI_1V05";
                                                regulator-min-microvolt = <1050000>;
                                                regulator-max-microvolt = <1050000>;