Commit 31a3fcab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux 

Pull device tree fixes from Grant Likely:
 "Drivercore bugfixes for v3.15

  This branch contains bug fixes important to get into v3.15.  There is
  a fix for modifying properties seen during early boot, a fix for an
  incorrect prototype when CONFIG_OF=n, and a couple of corrections to
  device tree memory nodes on a few platforms"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
  mips: dts: Fix missing device_type="memory" property in memory nodes
  arm: dts: Fix missing device_type="memory" for ste-ccu8540
  of: fix CONFIG_OF=n prototype of of_node_full_name()
  of: make of_update_property() usable earlier in the boot process
parents 60b5f90d dfc44f80

arch/arm/boot/dts/ste-ccu8540.dts

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
	compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";



	memory@0 {

		device_type = "memory";

		reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;

	};

arch/mips/lantiq/dts/easy50712.dts

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
	};



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x2000000>;

	};

arch/mips/ralink/dts/mt7620a_eval.dts

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
	model = "Ralink MT7620A evaluation board";



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x2000000>;

	};

arch/mips/ralink/dts/rt2880_eval.dts

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
	model = "Ralink RT2880 evaluation board";



	memory@0 {

		device_type = "memory";

		reg = <0x8000000 0x2000000>;

	};

arch/mips/ralink/dts/rt3052_eval.dts

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
	model = "Ralink RT3052 evaluation board";



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x2000000>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE