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

Commit ec026b50 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-4.10-3' of... 

Merge tag 'imx-fixes-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into HEAD

Pull "i.MX fixes for 4.10, 3rd round" from Shawn Guo:
 - Fix a 'defined but not used' warning in MMDC driver when
   CONFIG_PERF_EVENTS is disabled.
 - Fix i.MX6DL device tree GPIO4_11 range setting.
 - A bandaid fix for boot failure found on a couple of platforms due to
   missing 'chosen' and 'memory' node.

* tag 'imx-fixes-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx: Pass 'chosen' and 'memory' nodes
  ARM: dts: imx6dl: fix GPIO4 range
  ARM: imx: hide unused variable in #ifdef
parents bba8e3f4 a971c554

arch/arm/boot/dts/imx1.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,14 @@ 
/ {

	#address-cells = <1>;

	#size-cells = <1>;

	/*

	 * The decompressor and also some bootloaders rely on a

	 * pre-existing /chosen node to be available to insert the

	 * command line and merge other ATAGS info.

	 * Also for U-Boot there must be a pre-existing /memory node.

	 */

	chosen {};

	memory { device_type = "memory"; reg = <0 0>; };



	aliases {

		gpio0 = &gpio1;

arch/arm/boot/dts/imx23.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ 
	#size-cells = <1>;



	interrupt-parent = <&icoll>;

	/*

	 * The decompressor and also some bootloaders rely on a

	 * pre-existing /chosen node to be available to insert the

	 * command line and merge other ATAGS info.

	 * Also for U-Boot there must be a pre-existing /memory node.

	 */

	chosen {};

	memory { device_type = "memory"; reg = <0 0>; };



	aliases {

		gpio0 = &gpio0;

arch/arm/boot/dts/imx25.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,14 @@ 
/ {

	#address-cells = <1>;

	#size-cells = <1>;

	/*

	 * The decompressor and also some bootloaders rely on a

	 * pre-existing /chosen node to be available to insert the

	 * command line and merge other ATAGS info.

	 * Also for U-Boot there must be a pre-existing /memory node.

	 */

	chosen {};

	memory { device_type = "memory"; reg = <0 0>; };



	aliases {

		ethernet0 = &fec;

arch/arm/boot/dts/imx27.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,14 @@ 
/ {

	#address-cells = <1>;

	#size-cells = <1>;

	/*

	 * The decompressor and also some bootloaders rely on a

	 * pre-existing /chosen node to be available to insert the

	 * command line and merge other ATAGS info.

	 * Also for U-Boot there must be a pre-existing /memory node.

	 */

	chosen {};

	memory { device_type = "memory"; reg = <0 0>; };



	aliases {

		ethernet0 = &fec;

arch/arm/boot/dts/imx28.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ 
	#size-cells = <1>;



	interrupt-parent = <&icoll>;

	/*

	 * The decompressor and also some bootloaders rely on a

	 * pre-existing /chosen node to be available to insert the

	 * command line and merge other ATAGS info.

	 * Also for U-Boot there must be a pre-existing /memory node.

	 */

	chosen {};

	memory { device_type = "memory"; reg = <0 0>; };



	aliases {

		ethernet0 = &mac0;