Merge branch 'omap/dt' into next/late

[karo-tx-linux.git] / arch / arm / boot / dts / omap36xx.dtsi

diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 3502fe00ec7d2713692c54ca85408952b36b0038..86253de5a97a99ddb12ea5f41c72f3c59279fced 100644 (file)
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -78,7 +78,7 @@
                               0x480bd800 0x0600>;
                        interrupts = <24>;
                        iommus = <&mmu_isp>;
-                       syscon = <&omap3_scm_general 0x2f0>;
+                       syscon = <&scm_conf 0x2f0>;
                        ti,phy-type = <OMAP3ISP_PHY_TYPE_CSIPHY>;
                        #clock-cells = <1>;
                        ports {