Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos3250-monk.dts

diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts
index 24822aa98057a03e56a6603ddecc54e5146f9646..1d483c1c8b48dcd978effc490af4f99a1bfb3fef 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-monk.dts
+++ b/arch/arm/boot/dts/exynos3250-monk.dts
@@ -15,6 +15,7 @@
 /dts-v1/;
 #include "exynos3250.dtsi"
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
        model = "Samsung Monk board";
@@ -37,9 +38,7 @@
                compatible = "gpio-keys";
 
                power_key {
-                       interrupt-parent = <&gpx2>;
-                       interrupts = <7 0>;
-                       gpios = <&gpx2 7 1>;
+                       gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "power key";
                        debounce-interval = <10>;
@@ -109,6 +108,13 @@
                        };
                };
        };
+
+       haptics {
+               compatible = "regulator-haptic";
+               haptic-supply = <&motor_reg>;
+               min-microvolt = <1100000>;
+               max-microvolt = <2700000>;
+       };
 };
 
 &adc {
@@ -134,6 +140,17 @@
        };
 };
 
+&exynos_usbphy {
+       status = "okay";
+};
+
+&hsotg {
+       vusb_d-supply = <&ldo15_reg>;
+       vusb_a-supply = <&ldo12_reg>;
+       dr_mode = "peripheral";
+       status = "okay";
+};
+
 &i2c_0 {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -420,6 +437,46 @@
        status = "okay";
 };
 
+&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";
+               };
+       };
+};
+
 &xusbxti {
        clock-frequency = <24000000>;
 };