Merge remote-tracking branches 'regulator/fix/ab3100' and 'regulator/fix/s2mps11...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos4.dtsi

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index a73eeb5f258fba0b88e55640f6e0df220b7b1cbb..08452e183b57a642581d37fdff11f5d0f651a4db 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -85,21 +85,21 @@
                reg = <0x10023CE0 0x20>;
        };
 
-       gic:interrupt-controller@10490000 {
+       gic: interrupt-controller@10490000 {
                compatible = "arm,cortex-a9-gic";
                #interrupt-cells = <3>;
                interrupt-controller;
                reg = <0x10490000 0x1000>, <0x10480000 0x100>;
        };
 
-       combiner:interrupt-controller@10440000 {
+       combiner: interrupt-controller@10440000 {
                compatible = "samsung,exynos4210-combiner";
                #interrupt-cells = <2>;
                interrupt-controller;
                reg = <0x10440000 0x1000>;
        };
 
-       sys_reg: sysreg {
+       sys_reg: syscon@10010000 {
                compatible = "samsung,exynos4-sysreg", "syscon";
                reg = <0x10010000 0x400>;
        };