aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2012-11-16 10:56:50 -0500
committerStephen Warren <swarren@nvidia.com>2012-11-16 11:17:08 -0500
commite6f097960621828bdce238aef7a7fc5404bfca71 (patch)
tree994d8d00df46bf45324bff066b37fcf442a985be
parentdced3e3ee5833109c04ecf8687ae44960c65ca73 (diff)
ARM: tegra: tamonten: Add host1x support
Hook up the required regulators, I2C DDC adapter and hotplug detect GPIO to the Tamonten HDMI output. Carrier boards still need to explicitly enable the output to use it. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--arch/arm/boot/dts/tegra20-tamonten.dtsi16
1 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 95df80e7cda..a239ccdfaa5 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -8,6 +8,16 @@
8 reg = <0x00000000 0x20000000>; 8 reg = <0x00000000 0x20000000>;
9 }; 9 };
10 10
11 host1x {
12 hdmi {
13 vdd-supply = <&hdmi_vdd_reg>;
14 pll-supply = <&hdmi_pll_reg>;
15
16 nvidia,ddc-i2c-bus = <&hdmi_ddc>;
17 nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */
18 };
19 };
20
11 pinmux { 21 pinmux {
12 pinctrl-names = "default"; 22 pinctrl-names = "default";
13 pinctrl-0 = <&state_default>; 23 pinctrl-0 = <&state_default>;
@@ -292,7 +302,7 @@
292 pinctrl-1 = <&state_i2cmux_pta>; 302 pinctrl-1 = <&state_i2cmux_pta>;
293 pinctrl-2 = <&state_i2cmux_idle>; 303 pinctrl-2 = <&state_i2cmux_idle>;
294 304
295 i2c@0 { 305 hdmi_ddc: i2c@0 {
296 reg = <0>; 306 reg = <0>;
297 #address-cells = <1>; 307 #address-cells = <1>;
298 #size-cells = <0>; 308 #size-cells = <0>;
@@ -407,13 +417,13 @@
407 regulator-max-microvolt = <2850000>; 417 regulator-max-microvolt = <2850000>;
408 }; 418 };
409 419
410 ldo7 { 420 hdmi_vdd_reg: ldo7 {
411 regulator-name = "vdd_ldo7,avdd_hdmi"; 421 regulator-name = "vdd_ldo7,avdd_hdmi";
412 regulator-min-microvolt = <3300000>; 422 regulator-min-microvolt = <3300000>;
413 regulator-max-microvolt = <3300000>; 423 regulator-max-microvolt = <3300000>;
414 }; 424 };
415 425
416 ldo8 { 426 hdmi_pll_reg: ldo8 {
417 regulator-name = "vdd_ldo8,avdd_hdmi_pll"; 427 regulator-name = "vdd_ldo8,avdd_hdmi_pll";
418 regulator-min-microvolt = <1800000>; 428 regulator-min-microvolt = <1800000>;
419 regulator-max-microvolt = <1800000>; 429 regulator-max-microvolt = <1800000>;