Merge tag 'dlm-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[karo-tx-linux.git] / arch / arm / boot / dts / exynos5422-odroidxu3-common.dtsi

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 8adf455744e9c8d0545fe69cd0038b9f1f450d16..1565667e6f699d171aa769a904a5993698c5203f 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -15,6 +15,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/sound/samsung-i2s.h>
 #include "exynos5800.dtsi"
+#include "exynos5422-cpu-thermal.dtsi"
 
 / {
        memory {
@@ -107,6 +108,15 @@
                        clocks = <&i2s0 CLK_I2S_CDCLK>;
                };
        };
+
+       fan0: pwm-fan {
+               compatible = "pwm-fan";
+               pwms = <&pwm 0 20972 0>;
+               cooling-min-state = <0>;
+               cooling-max-state = <3>;
+               #cooling-cells = <2>;
+               cooling-levels = <0 130 170 230>;
+       };
 };
 
 &clock_audss {
@@ -461,6 +471,32 @@
         */
        pinctrl-0 = <&pwm0_out &pwm1_out &pwm2_out &pwm3_out>;
        pinctrl-names = "default";
+       samsung,pwm-outputs = <0>;
+       status = "okay";
+};
+
+&tmu_cpu0 {
+       vtmu-supply = <&ldo7_reg>;
+       status = "okay";
+};
+
+&tmu_cpu1 {
+       vtmu-supply = <&ldo7_reg>;
+       status = "okay";
+};
+
+&tmu_cpu2 {
+       vtmu-supply = <&ldo7_reg>;
+       status = "okay";
+};
+
+&tmu_cpu3 {
+       vtmu-supply = <&ldo7_reg>;
+       status = "okay";
+};
+
+&tmu_gpu {
+       vtmu-supply = <&ldo7_reg>;
        status = "okay";
 };
 
@@ -477,3 +513,13 @@
 &usbdrd_dwc3_1 {
        dr_mode = "otg";
 };
+
+&usbdrd3_0 {
+       vdd33-supply = <&ldo9_reg>;
+       vdd10-supply = <&ldo11_reg>;
+};
+
+&usbdrd3_1 {
+       vdd33-supply = <&ldo9_reg>;
+       vdd10-supply = <&ldo11_reg>;
+};