Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos5250-snow.dts

diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 1eca97ee4bd6320a3a3a44ede264e269041cd088..b7f4122df456b05438b8f719adaa9eb95a5dfb5f 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -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";
 
@@ -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>;