Merge tag 'v4.14-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Pull "Rockchip dts64 Fixes for 4.14 part 2" from Heiko Stübner:

The vqmmc voltages on rk3399 pose a risk for the chip if they
exceed 3.0V, so they got fixed to not be at 3.3V
And Arnd found a typo in the recently added iommu nodes.

* tag 'v4.14-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: fix typo in iommu nodes
  arm64: dts: rockchip: correct vqmmc voltage for rk3399 platforms

5 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 6d615cb6e64d..41d61840fb99 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -582,7 +582,7 @@
         vop_mmu: iommu@ff373f00 {
                 compatible = "rockchip,iommu";
                 reg = <0x0 0xff373f00 0x0 0x100>;
-                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH 0>;
+                interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
                 interrupt-names = "vop_mmu";
                 #iommu-cells = <0>;
                 status = "disabled";
diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index 19fbaa5e7bdd..1070c8264c13 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -740,7 +740,7 @@
         iep_mmu: iommu@ff900800 {
                 compatible = "rockchip,iommu";
                 reg = <0x0 0xff900800 0x0 0x100>;
-                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH 0>;
+                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
                 interrupt-names = "iep_mmu";
                 #iommu-cells = <0>;
                 status = "disabled";
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
index 7fd4bfcaa38e..fef82274a39d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -371,10 +371,10 @@
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <3300000>;
+                                regulator-max-microvolt = <3000000>;
                                 regulator-state-mem {
                                         regulator-on-in-suspend;
-                                        regulator-suspend-microvolt = <3300000>;
+                                        regulator-suspend-microvolt = <3000000>;
                                 };
                         };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 53ff3d191a1d..910628d18add 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -325,12 +325,12 @@
                         vcc_sd: LDO_REG4 {
                                 regulator-name = "vcc_sd";
                                 regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <3300000>;
+                                regulator-max-microvolt = <3000000>;
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-state-mem {
                                         regulator-on-in-suspend;
-                                        regulator-suspend-microvolt = <3300000>;
+                                        regulator-suspend-microvolt = <3000000>;
                                 };
                         };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 6c30bb02210d..0f873c897d0d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -315,10 +315,10 @@
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <3300000>;
+                                regulator-max-microvolt = <3000000>;
                                 regulator-state-mem {
                                         regulator-on-in-suspend;
-                                        regulator-suspend-microvolt = <3300000>;
+                                        regulator-suspend-microvolt = <3000000>;
                                 };
                         };