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

Pull ARM SoC fixes from Arnd Bergmann:
 "This should be the last set of bugfixes for arm-soc in v4.9. None of
  these are critical regressions, but it would be nice to still get them
  merged.

   - On the Juno platform, the idle latency was described wrong, leading
     to suboptimal cpuidle tuning.

   - Also on the same platform, PCI I/O space was set up incorrectly and
     could not work.

   - On the sti platform, a syntactically incorrect DT entry caused
     warnings.

   - The newly added 'gr8' platform has somewhat confusing file names,
     which we rename for consistency"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: dts: juno: fix cluster sleep state entry latency on all SoC versions
  arm64: dts: juno: Correct PCI IO window
  ARM: dts: STiH407-family: fix i2c nodes
  ARM: gr8: Rename the DTSI and relevant DTS

8 files changed, 22 insertions, 6 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index befcd2619902..c558ba75cbcc 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -745,7 +745,6 @@ dtb-$(CONFIG_MACH_SUN4I) += \
         sun4i-a10-pcduino2.dtb \
         sun4i-a10-pov-protab2-ips9.dtb
 dtb-$(CONFIG_MACH_SUN5I) += \
-        ntc-gr8-evb.dtb \
         sun5i-a10s-auxtek-t003.dtb \
         sun5i-a10s-auxtek-t004.dtb \
         sun5i-a10s-mk802.dtb \
@@ -761,6 +760,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
         sun5i-a13-olinuxino-micro.dtb \
         sun5i-a13-q8-tablet.dtb \
         sun5i-a13-utoo-p66.dtb \
+        sun5i-gr8-evb.dtb \
         sun5i-r8-chip.dtb
 dtb-$(CONFIG_MACH_SUN6I) += \
         sun6i-a31-app4-evb1.dtb \
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 91096a49efa9..8f79b4147bba 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -283,6 +283,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c0_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -296,6 +298,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c1_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -309,6 +313,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c2_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -322,6 +328,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c3_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -335,6 +343,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c4_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -348,6 +358,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c5_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -363,6 +375,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c10_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
@@ -376,6 +390,8 @@
                         clock-frequency = <400000>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_i2c11_default>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
 
                         status = "disabled";
                 };
diff --git a/arch/arm/boot/dts/ntc-gr8-evb.dts b/arch/arm/boot/dts/sun5i-gr8-evb.dts
index 4b622f3b5220..714381fd64d7 100644
--- a/arch/arm/boot/dts/ntc-gr8-evb.dts
+++ b/arch/arm/boot/dts/sun5i-gr8-evb.dts
@@ -44,7 +44,7 @@
  */
 
 /dts-v1/;
-#include "ntc-gr8.dtsi"
+#include "sun5i-gr8.dtsi"
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/boot/dts/ntc-gr8.dtsi b/arch/arm/boot/dts/sun5i-gr8.dtsi
index ca54e03ef366..ca54e03ef366 100644
--- a/arch/arm/boot/dts/ntc-gr8.dtsi
+++ b/arch/arm/boot/dts/sun5i-gr8.dtsi
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 334271a25f70..7d3a2acc6a55 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -393,7 +393,7 @@
                 #address-cells = <3>;
                 #size-cells = <2>;
                 dma-coherent;
-                ranges = <0x01000000 0x00 0x5f800000 0x00 0x5f800000 0x0 0x00800000>,
+                ranges = <0x01000000 0x00 0x00000000 0x00 0x5f800000 0x0 0x00800000>,
                          <0x02000000 0x00 0x50000000 0x00 0x50000000 0x0 0x08000000>,
                          <0x42000000 0x40 0x00000000 0x40 0x00000000 0x1 0x00000000>;
                 #interrupt-cells = <1>;
diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
index 123a58b29cbd..f0b857d6d73c 100644
--- a/arch/arm64/boot/dts/arm/juno-r1.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1.dts
@@ -76,7 +76,7 @@
                                 compatible = "arm,idle-state";
                                 arm,psci-suspend-param = <0x1010000>;
                                 local-timer-stop;
-                                entry-latency-us = <300>;
+                                entry-latency-us = <400>;
                                 exit-latency-us = <1200>;
                                 min-residency-us = <2500>;
                         };
diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
index 007be826efce..26aaa6a7670f 100644
--- a/arch/arm64/boot/dts/arm/juno-r2.dts
+++ b/arch/arm64/boot/dts/arm/juno-r2.dts
@@ -76,7 +76,7 @@
                                 compatible = "arm,idle-state";
                                 arm,psci-suspend-param = <0x1010000>;
                                 local-timer-stop;
-                                entry-latency-us = <300>;
+                                entry-latency-us = <400>;
                                 exit-latency-us = <1200>;
                                 min-residency-us = <2500>;
                         };
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index a7270eff6939..6e154d948a80 100644
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -76,7 +76,7 @@
                                 compatible = "arm,idle-state";
                                 arm,psci-suspend-param = <0x1010000>;
                                 local-timer-stop;
-                                entry-latency-us = <300>;
+                                entry-latency-us = <400>;
                                 exit-latency-us = <1200>;
                                 min-residency-us = <2500>;
                         };