Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dc0f265 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8bca927f 909e481e

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 \

arch/arm/boot/dts/stih407-family.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -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";

		};

arch/arm/boot/dts/ntc-gr8-evb.dts→arch/arm/boot/dts/sun5i-gr8-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm64/boot/dts/arm/juno-base.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -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>;