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

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

Merge tag 'uniphier-dt-v4.12' of... 

Merge tag 'uniphier-dt-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

Pull "UniPhier ARM SoC DT updates for v4.12" from Masahiro Yamada:

- Remove skeleton.dtsi inclusion
- Fix W=* build warnings
- Fix eMMC pin-mux node
- Add pagesize properties to EEPROM nodes

* tag 'uniphier-dt-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add pagesize property to EEPROM of proto boards
  ARM: dts: uniphier: add pagesize property to EEPROM of Support Card
  ARM: dts: uniphier: fix pin groups of eMMC pin-mux node
  ARM: dts: uniphier: move memory node below aliases node
  ARM: dts: uniphier: fix no unit name warnings
  ARM: dts: uniphier: remove skeleton.dtsi inclusion
parents af48251c facc7a55

arch/arm/boot/dts/uniphier-ld4-ref.dts

+5 −5
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ 
	model = "UniPhier LD4 Reference Board";

	compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4";



	memory {

		device_type = "memory";

		reg = <0x80000000 0x20000000>;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};
@@ -71,6 +66,11 @@ 
		i2c2 = &i2c2;

		i2c3 = &i2c3;

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>;

	};

};



&ethsc {

arch/arm/boot/dts/uniphier-ld4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/include/ "skeleton.dtsi"



/ {

	compatible = "socionext,uniphier-ld4";

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		#address-cells = <1>;

arch/arm/boot/dts/uniphier-ld6b-ref.dts

+5 −5
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ 
	model = "UniPhier LD6b Reference Board";

	compatible = "socionext,uniphier-ld6b-ref", "socionext,uniphier-ld6b";



	memory {

		device_type = "memory";

		reg = <0x80000000 0x80000000>;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};
@@ -73,6 +68,11 @@ 
		i2c5 = &i2c5;

		i2c6 = &i2c6;

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x80000000>;

	};

};



&ethsc {

arch/arm/boot/dts/uniphier-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


&pinctrl {

	pinctrl_emmc: emmc_grp {

		groups = "emmc";

		groups = "emmc", "emmc_dat8";

		function = "emmc";

	};

arch/arm/boot/dts/uniphier-pro4-ace.dts

+6 −5
Original line number Diff line number Diff line
@@ -50,11 +50,6 @@ 
	model = "UniPhier Pro4 Ace Board";

	compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4";



	memory {

		device_type = "memory";

		reg = <0x80000000 0x40000000>;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};
@@ -70,6 +65,11 @@ 
		i2c5 = &i2c5;

		i2c6 = &i2c6;

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x40000000>;

	};

};



&serial0 {
@@ -90,6 +90,7 @@ 
	eeprom@54 {

		compatible = "st,24c64";

		reg = <0x54>;

		pagesize = <32>;

	};

};