Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for...

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

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 045785c44c048b3b15c923b07f059744c717cfa4..c679b3cc3c488d3dcb33a1533404f43f53f8d71c 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -22,6 +22,7 @@
 #include <dt-bindings/clock/exynos4.h>
 #include <dt-bindings/clock/exynos-audss-clk.h>
 #include "skeleton.dtsi"
+#include "exynos-syscon-restart.dtsi"
 
 / {
        interrupt-parent = <&gic>;
@@ -76,6 +77,11 @@
                reg = <0x10000000 0x100>;
        };
 
+       sromc@12570000 {
+               compatible = "samsung,exynos-srom";
+               reg = <0x12570000 0x14>;
+       };
+
        mipi_phy: video-phy@10020710 {
                compatible = "samsung,s5pv210-mipi-video-phy";
                #phy-cells = <1>;
@@ -158,20 +164,6 @@
                interrupt-parent = <&gic>;
        };
 
-       poweroff: syscon-poweroff {
-               compatible = "syscon-poweroff";
-               regmap = <&pmu_system_controller>;
-               offset = <0x330C>; /* PS_HOLD_CONTROL */
-               mask = <0x5200>; /* reset value */
-       };
-
-       reboot: syscon-reboot {
-               compatible = "syscon-reboot";
-               regmap = <&pmu_system_controller>;
-               offset = <0x0400>; /* SWRESET */
-               mask = <0x1>;
-       };
-
        dsi_0: dsi@11C80000 {
                compatible = "samsung,exynos4210-mipi-dsi";
                reg = <0x11C80000 0x10000>;
@@ -661,7 +653,7 @@
        amba {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "arm,amba-bus";
+               compatible = "simple-bus";
                interrupt-parent = <&gic>;
                ranges;