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

Pull ARM SoC DT updates from Olof Johansson:
 "DT changes continue to be the bulk of our merge window contents.

  We continue to have a large set of changes across the board as new
  platforms and drivers are added.

  Some of the new platforms are:
   - Alphascale ASM9260
   - Marvell Armada 388
   - CSR Atlas7
   - TI Davinci DM816x
   - Hisilicon HiP01
   - ST STiH418

  There have also been some sweeping changes, including relicensing of
  DTS contents from GPL to GPLv2+/X11 so that the same files can be
  reused in other non-GPL projects more easily.  There's also been
  changes to the DT Makefile to make it a little less conflict-ridden
  and churny down the road"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (330 commits)
  ARM: dts: Add PPMU node for exynos4412-trats2
  ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato
  ARM: dts: Add PPMU dt node for exynos4 and exynos4210
  ARM: dts: Add PPMU dt node for exynos3250
  ARM: dts: add mipi dsi device node for exynos4415
  ARM: dts: add fimd device node for exynos4415
  ARM: dts: Add syscon phandle to the video-phy node for Exynos4
  ARM: dts: Add sound nodes for exynos4412-trats2
  ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2
  ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi
  ARM: dts: Add max77693 charger node for exynos4412-trats2
  ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2
  ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2
  ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2
  ARM: dts: am57xx-beagle-x15: Fix USB2 mode
  ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB
  ARM: dts: dra72-evm: Add extcon nodes for USB
  ARM: dts: dra7-evm: Add extcon nodes for USB
  ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards
  ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb
  ...

1 files changed, 52 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts
index e1d3eeb8f094..a1c294bf7fed 100644
--- a/arch/arm/boot/dts/rk3288-evb-rk808.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts
@@ -30,7 +30,6 @@
 
 &i2c0 {
         clock-frequency = <400000>;
-        status = "okay";
 
         rk808: pmic@1b {
                 compatible = "rockchip,rk808";
@@ -38,7 +37,7 @@
                 interrupt-parent = <&gpio0>;
                 interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                 pinctrl-names = "default";
-                pinctrl-0 = <&pmic_int>;
+                pinctrl-0 = <&pmic_int &global_pwroff>;
                 rockchip,system-power-controller;
                 wakeup-source;
                 #clock-cells = <1>;
@@ -57,6 +56,9 @@
                                 regulator-min-microvolt = <750000>;
                                 regulator-max-microvolt = <1350000>;
                                 regulator-name = "vdd_arm";
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
                         };
 
                         vdd_gpu: DCDC_REG2 {
@@ -65,12 +67,19 @@
                                 regulator-min-microvolt = <850000>;
                                 regulator-max-microvolt = <1250000>;
                                 regulator-name = "vdd_gpu";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1000000>;
+                                };
                         };
 
                         vcc_ddr: DCDC_REG3 {
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-name = "vcc_ddr";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
                         };
 
                         vcc_io: DCDC_REG4 {
@@ -79,6 +88,10 @@
                                 regulator-min-microvolt = <3300000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vcc_io";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <3300000>;
+                                };
                         };
 
                         vccio_pmu: LDO_REG1 {
@@ -87,6 +100,10 @@
                                 regulator-min-microvolt = <3300000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vccio_pmu";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <3300000>;
+                                };
                         };
 
                         vcc_tp: LDO_REG2 {
@@ -95,6 +112,9 @@
                                 regulator-min-microvolt = <3300000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vcc_tp";
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
                         };
 
                         vdd_10: LDO_REG3 {
@@ -103,6 +123,10 @@
                                 regulator-min-microvolt = <1000000>;
                                 regulator-max-microvolt = <1000000>;
                                 regulator-name = "vdd_10";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1000000>;
+                                };
                         };
 
                         vcc18_lcd: LDO_REG4 {
@@ -111,6 +135,10 @@
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <1800000>;
                                 regulator-name = "vcc18_lcd";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1800000>;
+                                };
                         };
 
                         vccio_sd: LDO_REG5 {
@@ -119,6 +147,10 @@
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vccio_sd";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <3300000>;
+                                };
                         };
 
                         vdd10_lcd: LDO_REG6 {
@@ -127,6 +159,10 @@
                                 regulator-min-microvolt = <1000000>;
                                 regulator-max-microvolt = <1000000>;
                                 regulator-name = "vdd10_lcd";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1000000>;
+                                };
                         };
 
                         vcc_18: LDO_REG7 {
@@ -135,6 +171,10 @@
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <1800000>;
                                 regulator-name = "vcc_18";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1800000>;
+                                };
                         };
 
                         vcca_codec: LDO_REG8 {
@@ -143,18 +183,28 @@
                                 regulator-min-microvolt = <3300000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vcca_codec";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <3300000>;
+                                };
                         };
 
                         vcc_wl: SWITCH_REG1 {
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-name = "vcc_wl";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
                         };
 
                         vcc_lcd: SWITCH_REG2 {
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-name = "vcc_lcd";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
                         };
                 };
         };