aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-11-09 18:58:11 -0500
committerStephen Warren <swarren@nvidia.com>2012-11-16 11:14:26 -0500
commit20ffbd7d6b357ee2f8a607c63805fb2c1f78effb (patch)
tree67ef301dcf10068949f4c9284fb252ff762e5ae9
parented39097c2ad97688d2734600ca20b7d66c311b92 (diff)
ARM: tegra: harmony: enable HDMI port
Enable host1x, and the HDMI output. Harmony also has an optional LCD, and a VGA output. The former isn't enabled due to potential issues with having multiple outputs enabled. The latter isn't enabled since the driver doesn't support VGA yet anyway. Correct DDC I2C frequency to 100KHz. Based on work by Thierry Reding for TrimSlice. Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--arch/arm/boot/dts/tegra20-harmony.dts20
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index a3f2f383c049..43eb72af8948 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -10,6 +10,18 @@
10 reg = <0x00000000 0x40000000>; 10 reg = <0x00000000 0x40000000>;
11 }; 11 };
12 12
13 host1x {
14 hdmi {
15 status = "okay";
16
17 vdd-supply = <&hdmi_vdd_reg>;
18 pll-supply = <&hdmi_pll_reg>;
19
20 nvidia,ddc-i2c-bus = <&hdmi_ddc>;
21 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
22 };
23 };
24
13 pinmux { 25 pinmux {
14 pinctrl-names = "default"; 26 pinctrl-names = "default";
15 pinctrl-0 = <&state_default>; 27 pinctrl-0 = <&state_default>;
@@ -262,9 +274,9 @@
262 }; 274 };
263 }; 275 };
264 276
265 i2c@7000c400 { 277 hdmi_ddc: i2c@7000c400 {
266 status = "okay"; 278 status = "okay";
267 clock-frequency = <400000>; 279 clock-frequency = <100000>;
268 }; 280 };
269 281
270 i2c@7000c500 { 282 i2c@7000c500 {
@@ -369,13 +381,13 @@
369 regulator-max-microvolt = <1800000>; 381 regulator-max-microvolt = <1800000>;
370 }; 382 };
371 383
372 ldo7 { 384 hdmi_vdd_reg: ldo7 {
373 regulator-name = "vdd_ldo7,avdd_hdmi"; 385 regulator-name = "vdd_ldo7,avdd_hdmi";
374 regulator-min-microvolt = <3300000>; 386 regulator-min-microvolt = <3300000>;
375 regulator-max-microvolt = <3300000>; 387 regulator-max-microvolt = <3300000>;
376 }; 388 };
377 389
378 ldo8 { 390 hdmi_pll_reg: ldo8 {
379 regulator-name = "vdd_ldo8,avdd_hdmi_pll"; 391 regulator-name = "vdd_ldo8,avdd_hdmi_pll";
380 regulator-min-microvolt = <1800000>; 392 regulator-min-microvolt = <1800000>;
381 regulator-max-microvolt = <1800000>; 393 regulator-max-microvolt = <1800000>;