Skip to content

Commit

Permalink
ARM: dt: tegra: ventana: define pinmux for ddc
Browse files Browse the repository at this point in the history
Tegra 2's I2C2 controller can be routed to either the PTA
or DDC pin group on Ventana. So:
- Remove the HDMI function definition of pta pingroup
- Define child i2c adapters(ddc & pta) for I2C2 controller

Signed-off-by: Mark Zhang <markz@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
  • Loading branch information
Mark Zhang authored and Stephen Warren committed Nov 15, 2012
1 parent 6fb1113 commit cf63346
Showing 1 changed file with 63 additions and 6 deletions.
69 changes: 63 additions & 6 deletions arch/arm/boot/dts/tegra20-ventana.dts
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@
nvidia,pins = "dap4";
nvidia,function = "dap4";
};
ddc {
nvidia,pins = "ddc", "owc", "spdi", "spdo",
"uac";
nvidia,function = "rsvd2";
};
dta {
nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte";
nvidia,function = "vi";
Expand Down Expand Up @@ -98,7 +93,7 @@
nvidia,function = "pcie";
};
hdint {
nvidia,pins = "hdint", "pta";
nvidia,pins = "hdint";
nvidia,function = "hdmi";
};
i2cp {
Expand Down Expand Up @@ -129,6 +124,10 @@
"lspi", "lvp1", "lvs";
nvidia,function = "displaya";
};
owc {
nvidia,pins = "owc", "spdi", "spdo", "uac";
nvidia,function = "rsvd2";
};
pmc {
nvidia,pins = "pmc";
nvidia,function = "pwr_on";
Expand Down Expand Up @@ -248,6 +247,39 @@
nvidia,slew-rate-falling = <3>;
};
};

state_i2cmux_ddc: pinmux_i2cmux_ddc {
ddc {
nvidia,pins = "ddc";
nvidia,function = "i2c2";
};
pta {
nvidia,pins = "pta";
nvidia,function = "rsvd4";
};
};

state_i2cmux_pta: pinmux_i2cmux_pta {
ddc {
nvidia,pins = "ddc";
nvidia,function = "rsvd4";
};
pta {
nvidia,pins = "pta";
nvidia,function = "i2c2";
};
};

state_i2cmux_idle: pinmux_i2cmux_idle {
ddc {
nvidia,pins = "ddc";
nvidia,function = "rsvd4";
};
pta {
nvidia,pins = "pta";
nvidia,function = "rsvd4";
};
};
};

i2s@70002800 {
Expand Down Expand Up @@ -291,6 +323,31 @@
clock-frequency = <400000>;
};

i2cmux {
compatible = "i2c-mux-pinctrl";
#address-cells = <1>;
#size-cells = <0>;

i2c-parent = <&{/i2c@7000c400}>;

pinctrl-names = "ddc", "pta", "idle";
pinctrl-0 = <&state_i2cmux_ddc>;
pinctrl-1 = <&state_i2cmux_pta>;
pinctrl-2 = <&state_i2cmux_idle>;

i2c@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;
};

i2c@1 {
reg = <1>;
#address-cells = <1>;
#size-cells = <0>;
};
};

i2c@7000c500 {
status = "okay";
clock-frequency = <400000>;
Expand Down

0 comments on commit cf63346

Please sign in to comment.