Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Pull "Samsung 3rd DT updates for v3.19" from Kukjin Kim:

- exynos3250
  : remove unused bootargs on exynos3250-rinato
  : add new board dt file for exynos3250-monk
- exynos4
  : add missing clock for MFC
  : specify default clocks for camera
- exynos4x12
  : add TMU related DT nodes
- exynos4412-trats2
  : add max77693-haptic and pwm nodes, enable TMU support
- exynos4412-odroid
  : specify audio clock parents and rates
- exynos5250 and exynos5420
  : add syscon based phandle to i2c device nodes
- exynos5250-spring
  : add trackpad, temperature sensor and usb3505 pinctrl

Note: based on previous tags/samsung-dt-2 for v3.19

* tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: add sysreg phandle to i2c device nodes for exynos
  ARM: dts: Remove unused bootargs from exynos3250-rinato
  ARM: dts: add board dts file for Exynos3250-based Monk board
  Documentation: devicetree: Add Exynos-based boards compatible string
  ARM: dts: add missing clock to MFC device for exynos4
  ARM: dts: Specify audio clock parents and rates for exynos4412-odroid-common
  ARM: dts: Add trackpad to exynos5250-spring
  ARM: dts: Add temperature sensor to exynos5250-spring
  ARM: dts: Add usb3503 pinctrl to exynos5250-spring
  ARM: dts: Add max77693-haptic node for exynos4412-trats2
  ARM: dts: add pwm node for exynos4412-trats2
  ARM: dts: Specify default clocks for Exynos4 camera devices
  ARM: dts: Enable TMU support for exynos4412-trats2
  ARM: dts: Device tree node definition for TMU on exynos4x12

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

14 files changed, 751 insertions, 15 deletions

diff --git a/Documentation/devicetree/bindings/arm/samsung-boards.txt b/Documentation/devicetree/bindings/arm/samsung-boards.txt
index 2168ed31e1b0..43589d2466a7 100644
--- a/Documentation/devicetree/bindings/arm/samsung-boards.txt
+++ b/Documentation/devicetree/bindings/arm/samsung-boards.txt
@@ -1,11 +1,20 @@
-* Samsung's Exynos4210 based SMDKV310 evaluation board
-
-SMDKV310 evaluation board is based on Samsung's Exynos4210 SoC.
+* Samsung's Exynos SoC based boards
 
 Required root node properties:
     - compatible = should be one or more of the following.
-        (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.
-        (b) "samsung,exynos4210"  - for boards based on Exynos4210 SoC.
+        - "samsung,monk"        - for Exynos3250-based Samsung Simband board.
+        - "samsung,rinato"      - for Exynos3250-based Samsung Gear2 board.
+        - "samsung,smdkv310"    - for Exynos4210-based Samsung SMDKV310 eval board.
+        - "samsung,trats"       - for Exynos4210-based Tizen Reference board.
+        - "samsung,universal_c210" - for Exynos4210-based Samsung board.
+        - "samsung,smdk4412",   - for Exynos4412-based Samsung SMDK4412 eval board.
+        - "samsung,trats2"      - for Exynos4412-based Tizen Reference board.
+        - "samsung,smdk5250"    - for Exynos5250-based Samsung SMDK5250 eval board.
+        - "samsung,xyref5260"   - for Exynos5260-based Samsung board.
+        - "samsung,smdk5410"    - for Exynos5410-based Samsung SMDK5410 eval board.
+        - "samsung,smdk5420"    - for Exynos5420-based Samsung SMDK5420 eval board.
+        - "samsung,sd5v1"       - for Exynos5440-based Samsung board.
+        - "samsung,ssdk5440"    - for Exynos5440-based Samsung board.
 
 Optional:
     - firmware node, specifying presence and type of secure firmware:
diff --git a/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt b/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
index 278de8e64bbf..89b3250f049b 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt
@@ -32,6 +32,7 @@ Optional properties:
     specified, default value is 0.
   - samsung,i2c-max-bus-freq: Desired frequency in Hz of the bus. If not
     specified, the default value in Hz is 100000.
+  - samsung,sysreg-phandle - handle to syscon used to control the system registers
 
 Example:
 
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 71f68695c40c..b242f82637c5 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -71,7 +71,8 @@ dtb-$(CONFIG_ARCH_BRCMSTB) += \
 dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
         da850-evm.dtb
 dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
-dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-rinato.dtb \
+dtb-$(CONFIG_ARCH_EXYNOS) += exynos3250-monk.dtb \
+        exynos3250-rinato.dtb \
         exynos4210-origen.dtb \
         exynos4210-smdkv310.dtb \
         exynos4210-trats.dtb \
diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts
new file mode 100644
index 000000000000..24822aa98057
--- /dev/null
+++ b/arch/arm/boot/dts/exynos3250-monk.dts
@@ -0,0 +1,579 @@
+/*
+ * Samsung's Exynos3250 based Monk board device tree source
+ *
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ *
+ * Device tree source file for Samsung's Monk board which is based on
+ * Samsung Exynos3250 SoC.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/dts-v1/;
+#include "exynos3250.dtsi"
+#include <dt-bindings/input/input.h>
+
+/ {
+        model = "Samsung Monk board";
+        compatible = "samsung,monk", "samsung,exynos3250", "samsung,exynos3";
+
+        aliases {
+                i2c7 = &i2c_max77836;
+        };
+
+        memory {
+                reg =  <0x40000000 0x1ff00000>;
+        };
+
+        firmware@0205F000 {
+                compatible = "samsung,secure-firmware";
+                reg = <0x0205F000 0x1000>;
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+
+                power_key {
+                        interrupt-parent = <&gpx2>;
+                        interrupts = <7 0>;
+                        gpios = <&gpx2 7 1>;
+                        linux,code = <KEY_POWER>;
+                        label = "power key";
+                        debounce-interval = <10>;
+                        gpio-key,wakeup;
+                };
+        };
+
+        vemmc_reg: voltage-regulator-0 {
+                compatible = "regulator-fixed";
+                regulator-name = "V_EMMC_2.8V-fixed";
+                regulator-min-microvolt = <2800000>;
+                regulator-max-microvolt = <2800000>;
+                gpio = <&gpk0 2 0>;
+                enable-active-high;
+        };
+
+        i2c_max77836: i2c-gpio-0 {
+                compatible = "i2c-gpio";
+                gpios = <&gpd0 2 0>, <&gpd0 3 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                max77836: subpmic@25 {
+                        compatible = "maxim,max77836";
+                        interrupt-parent = <&gpx1>;
+                        interrupts = <5 0>;
+                        reg = <0x25>;
+                        wakeup;
+
+                        muic: max77836-muic {
+                                compatible = "maxim,max77836-muic";
+                        };
+
+                        regulators {
+                                compatible = "maxim,max77836-regulator";
+                                safeout_reg: SAFEOUT {
+                                        regulator-name = "SAFEOUT";
+                                };
+
+                                charger_reg: CHARGER {
+                                        regulator-name = "CHARGER";
+                                        regulator-min-microamp = <45000>;
+                                        regulator-max-microamp = <475000>;
+                                        regulator-boot-on;
+                                };
+
+                                motor_reg: LDO1 {
+                                        regulator-name = "MOT_2.7V";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <2700000>;
+                                };
+
+                                LDO2 {
+                                        regulator-name = "UNUSED_LDO2";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <3950000>;