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

[can-eth-gw-linux.git] / arch / arm / boot / dts / dbx5x0.dtsi

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 7ce45fc461fbcdf28d5d3b1a5b322db1e893f485..0d69322f689f03bbe16b1d061d33cd847ced989f 100644 (file)
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -203,6 +203,14 @@
                                reg = <0x80157450 0xC>;
                        };
 
+                       thermal@801573c0 {
+                               compatible = "stericsson,db8500-thermal";
+                               reg = <0x801573c0 0x40>;
+                               interrupts = <21 0x4>, <22 0x4>;
+                               interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";
+                               status = "disabled";
+                        };
+
                        db8500-prcmu-regulators {
                                compatible = "stericsson,db8500-prcmu-regulator";
 
@@ -630,6 +638,11 @@
                        status = "disabled";
                };
 
+               cpufreq-cooling {
+                       compatible = "stericsson,db8500-cpufreq-cooling";
+                       status = "disabled";
+                };
+
                vmmci: regulator-gpio {
                        compatible = "regulator-gpio";
 
@@ -638,10 +651,10 @@
                        regulator-name = "mmci-reg";
                        regulator-type = "voltage";
 
-                       gpios = <&tc3589x_gpio 18 0x4>;
-                       gpio-enable = <&tc3589x_gpio 17 0x4>;
                        states = <1800000 0x1
                                  2900000 0x0>;
+
+                       status = "disabled";
                };
        };
 };