Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dced3e3e authored by Thierry Reding's avatar Thierry Reding Committed by Stephen Warren
Browse files

ARM: tegra: trimslice: enable HDMI port



Enable host1x, and the HDMI output. Harmony also has a DVI port with an
HDMI form-factor connector, driven by Tegra's LVDS output. This isn't
enabled yet, due to potential issues with having multiple outputs enabled.

Correct DDC I2C frequency to 100KHz.

Add dummy/fixed regulators to satisfy the HDMI driver.

Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
[swarren: add commit description, remove enable of DVI port]
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 20ffbd7d
Loading
Loading
Loading
Loading
+40 −4
Original line number Diff line number Diff line
@@ -10,6 +10,18 @@
		reg = <0x00000000 0x40000000>;
	};

	host1x {
		hdmi {
			status = "okay";

			vdd-supply = <&hdmi_vdd_reg>;
			pll-supply = <&hdmi_pll_reg>;

			nvidia,ddc-i2c-bus = <&hdmi_ddc>;
			nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
		};
	};

	pinmux {
		pinctrl-names = "default";
		pinctrl-0 = <&state_default>;
@@ -249,9 +261,9 @@
		clock-frequency = <216000000>;
	};

	i2c@7000c000 {
	dvi_ddc: i2c@7000c000 {
		status = "okay";
		clock-frequency = <400000>;
		clock-frequency = <100000>;
	};

	spi@7000c380 {
@@ -264,9 +276,9 @@
		};
	};

	i2c@7000c400 {
	hdmi_ddc: i2c@7000c400 {
		status = "okay";
		clock-frequency = <400000>;
		clock-frequency = <100000>;
	};

	i2c@7000c500 {
@@ -310,6 +322,30 @@
		bus-width = <4>;
	};

	regulators {
		compatible = "simple-bus";
		#address-cells = <1>;
		#size-cells = <0>;

		hdmi_vdd_reg: regulator@0 {
			compatible = "regulator-fixed";
			reg = <0>;
			regulator-name = "avdd_hdmi";
			regulator-min-microvolt = <3300000>;
			regulator-max-microvolt = <3300000>;
			regulator-always-on;
		};

		hdmi_pll_reg: regulator@1 {
			compatible = "regulator-fixed";
			reg = <1>;
			regulator-name = "avdd_hdmi_pll";
			regulator-min-microvolt = <1800000>;
			regulator-max-microvolt = <1800000>;
			regulator-always-on;
		};
	};

	sound {
		compatible = "nvidia,tegra-audio-trimslice";
		nvidia,i2s-controller = <&tegra_i2s1>;