Skip to content

Commit

Permalink
ARM: dts: Remove duplicated I2C7 nodes in exynos5250-snow
Browse files Browse the repository at this point in the history
The i2c_7 node (i2c@12CD0000) with LVDS bridge child node was put in
Exynos5250 Snow DTS file twice. Move the LVDS bridge to proper existing
i2c_7 node.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
  • Loading branch information
Krzysztof Kozlowski authored and Kukjin Kim committed Jun 3, 2015
1 parent e9a2f40 commit 34a2d5a
Showing 1 changed file with 22 additions and 24 deletions.
46 changes: 22 additions & 24 deletions arch/arm/boot/dts/exynos5250-snow.dts
Original file line number Diff line number Diff line change
Expand Up @@ -177,30 +177,6 @@
};
};

i2c@12CD0000 {
ptn3460: lvds-bridge@20 {
compatible = "nxp,ptn3460";
reg = <0x20>;
powerdown-gpios = <&gpy2 5 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpx1 5 GPIO_ACTIVE_HIGH>;
edid-emulation = <5>;

ports {
port@0 {
bridge_out: endpoint {
remote-endpoint = <&panel_in>;
};
};

port@1 {
bridge_in: endpoint {
remote-endpoint = <&dp_out>;
};
};
};
};
};

sound {
compatible = "google,snow-audio-max98095";

Expand Down Expand Up @@ -507,6 +483,28 @@
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <66000>;

ptn3460: lvds-bridge@20 {
compatible = "nxp,ptn3460";
reg = <0x20>;
powerdown-gpios = <&gpy2 5 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpx1 5 GPIO_ACTIVE_HIGH>;
edid-emulation = <5>;

ports {
port@0 {
bridge_out: endpoint {
remote-endpoint = <&panel_in>;
};
};

port@1 {
bridge_in: endpoint {
remote-endpoint = <&dp_out>;
};
};
};
};

max98095: codec@11 {
compatible = "maxim,max98095";
reg = <0x11>;
Expand Down

0 comments on commit 34a2d5a

Please sign in to comment.