Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos4412-trats2.dts

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index ed017cc7b14fcf083bd0b89094a6c250fb809e47..9336fd4824d9949db63f3b91b59e8dfb67e81d14 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -14,6 +14,7 @@
 
 /dts-v1/;
 #include "exynos4412.dtsi"
+#include "exynos4412-ppmu-common.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/clock/maxim,max77686.h>
@@ -146,13 +147,13 @@
                        reg = <0x66>;
 
                        regulators {
-                               esafeout1_reg: ESAFEOUT1@1 {
+                               esafeout1_reg: ESAFEOUT1 {
                                        regulator-name = "ESAFEOUT1";
                                };
-                               esafeout2_reg: ESAFEOUT2@2 {
+                               esafeout2_reg: ESAFEOUT2 {
                                        regulator-name = "ESAFEOUT2";
                                };
-                               charger_reg: CHARGER@0 {
+                               charger_reg: CHARGER {
                                        regulator-name = "CHARGER";
                                        regulator-min-microamp = <60000>;
                                        regulator-max-microamp = <2580000>;
@@ -251,7 +252,7 @@
                        "SPK", "SPKOUTRP";
        };
 
-       thermistor-ap@0 {
+       thermistor-ap {
                compatible = "ntc,ncp15wb473";
                pullup-uv = <1800000>;   /* VCC_1.8V_AP */
                pullup-ohm = <100000>;   /* 100K */
@@ -259,7 +260,7 @@
                io-channels = <&adc 1>;  /* AP temperature */
        };
 
-       thermistor-battery@1 {
+       thermistor-battery {
                compatible = "ntc,ncp15wb473";
                pullup-uv = <1800000>;   /* VCC_1.8V_AP */
                pullup-ohm = <100000>;   /* 100K */
@@ -288,6 +289,53 @@
        status = "okay";
 };
 
+&bus_dmc {
+       devfreq-events = <&ppmu_dmc0_3>, <&ppmu_dmc1_3>;
+       vdd-supply = <&buck1_reg>;
+       status = "okay";
+};
+
+&bus_acp {
+       devfreq = <&bus_dmc>;
+       status = "okay";
+};
+
+&bus_c2c {
+       devfreq = <&bus_dmc>;
+       status = "okay";
+};
+
+&bus_leftbus {
+       devfreq-events = <&ppmu_leftbus_3>, <&ppmu_rightbus_3>;
+       vdd-supply = <&buck3_reg>;
+       status = "okay";
+};
+
+&bus_rightbus {
+       devfreq = <&bus_leftbus>;
+       status = "okay";
+};
+
+&bus_display {
+       devfreq = <&bus_leftbus>;
+       status = "okay";
+};
+
+&bus_fsys {
+       devfreq = <&bus_leftbus>;
+       status = "okay";
+};
+
+&bus_peri {
+       devfreq = <&bus_leftbus>;
+       status = "okay";
+};
+
+&bus_mfc {
+       devfreq = <&bus_leftbus>;
+       status = "okay";
+};
+
 &cpu0 {
        cpu0-supply = <&buck2_reg>;
 };
@@ -871,46 +919,6 @@
        assigned-clock-parents =  <&clock CLK_XUSBXTI>;
 };
 
-&ppmu_dmc0 {
-       status = "okay";
-
-       events {
-               ppmu_dmc0_3: ppmu-event3-dmc0 {
-                       event-name = "ppmu-event3-dmc0";
-               };
-       };
-};
-
-&ppmu_dmc1 {
-       status = "okay";
-
-       events {
-               ppmu_dmc1_3: ppmu-event3-dmc1 {
-                       event-name = "ppmu-event3-dmc1";
-               };
-       };
-};
-
-&ppmu_leftbus {
-       status = "okay";
-
-       events {
-               ppmu_leftbus_3: ppmu-event3-leftbus {
-                       event-name = "ppmu-event3-leftbus";
-               };
-       };
-};
-
-&ppmu_rightbus {
-       status = "okay";
-
-       events {
-               ppmu_rightbus_3: ppmu-event3-rightbus {
-                       event-name = "ppmu-event3-rightbus";
-               };
-       };
-};
-
 &pinctrl_0 {
        pinctrl-names = "default";
        pinctrl-0 = <&sleep0>;
@@ -1234,10 +1242,6 @@
        status = "okay";
 };
 
-&prng {
-       status = "okay";
-};
-
 &rtc {
        status = "okay";
        clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
@@ -1276,7 +1280,7 @@
        cs-gpios = <&gpb 5 GPIO_ACTIVE_HIGH>;
        status = "okay";
 
-       s5c73m3_spi: s5c73m3 {
+       s5c73m3_spi: s5c73m3@0 {
                compatible = "samsung,s5c73m3";
                spi-max-frequency = <50000000>;
                reg = <0>;