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

Commit d7f46190 authored by Li Yang's avatar Li Yang Committed by Kumar Gala
Browse files

[POWERPC] 83xx: Add local bus device nodes to MPC837xMDS device trees. 



Signed-off-by: default avatarLi Yang <leoli@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 28b95885

arch/powerpc/boot/dts/mpc8377_mds.dts

+66 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,72 @@ 
		reg = <0x00000000 0x20000000>;	// 512MB at 0

		reg = <0x00000000 0x20000000>;	// 512MB at 0

	};

	};





	localbus@e0005000 {

		#address-cells = <2>;

		#size-cells = <1>;

		compatible = "fsl,mpc8377-elbc", "fsl,elbc", "simple-bus";

		reg = <0xe0005000 0x1000>;

		interrupts = <77 0x8>;

		interrupt-parent = <&ipic>;



		// booting from NOR flash

		ranges = <0 0x0 0xfe000000 0x02000000

		          1 0x0 0xf8000000 0x00008000

		          3 0x0 0xe0600000 0x00008000>;



		flash@0,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0 0x0 0x2000000>;

			bank-width = <2>;

			device-width = <1>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			fs@100000 {

				reg = <0x100000 0x800000>;

			};



			kernel@1d00000 {

				reg = <0x1d00000 0x200000>;

			};



			dtb@1f00000 {

				reg = <0x1f00000 0x100000>;

			};

		};



		bcsr@1,0 {

			reg = <1 0x0 0x8000>;

			compatible = "fsl,mpc837xmds-bcsr";

		};



		nand@3,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,mpc8377-fcm-nand",

			             "fsl,elbc-fcm-nand";

			reg = <3 0x0 0x8000>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			kernel@100000 {

				reg = <0x100000 0x300000>;

			};



			fs@400000 {

				reg = <0x400000 0x1c00000>;

			};

		};

	};



	soc@e0000000 {

	soc@e0000000 {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;

arch/powerpc/boot/dts/mpc8378_mds.dts

+66 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,72 @@ 
		reg = <0x00000000 0x20000000>;	// 512MB at 0

		reg = <0x00000000 0x20000000>;	// 512MB at 0

	};

	};





	localbus@e0005000 {

		#address-cells = <2>;

		#size-cells = <1>;

		compatible = "fsl,mpc8378-elbc", "fsl,elbc", "simple-bus";

		reg = <0xe0005000 0x1000>;

		interrupts = <77 0x8>;

		interrupt-parent = <&ipic>;



		// booting from NOR flash

		ranges = <0 0x0 0xfe000000 0x02000000

		          1 0x0 0xf8000000 0x00008000

		          3 0x0 0xe0600000 0x00008000>;



		flash@0,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0 0x0 0x2000000>;

			bank-width = <2>;

			device-width = <1>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			fs@100000 {

				reg = <0x100000 0x800000>;

			};



			kernel@1d00000 {

				reg = <0x1d00000 0x200000>;

			};



			dtb@1f00000 {

				reg = <0x1f00000 0x100000>;

			};

		};



		bcsr@1,0 {

			reg = <1 0x0 0x8000>;

			compatible = "fsl,mpc837xmds-bcsr";

		};



		nand@3,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,mpc8378-fcm-nand",

			             "fsl,elbc-fcm-nand";

			reg = <3 0x0 0x8000>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			kernel@100000 {

				reg = <0x100000 0x300000>;

			};



			fs@400000 {

				reg = <0x400000 0x1c00000>;

			};

		};

	};



	soc@e0000000 {

	soc@e0000000 {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;

arch/powerpc/boot/dts/mpc8379_mds.dts

+66 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,72 @@ 
		reg = <0x00000000 0x20000000>;	// 512MB at 0

		reg = <0x00000000 0x20000000>;	// 512MB at 0

	};

	};





	localbus@e0005000 {

		#address-cells = <2>;

		#size-cells = <1>;

		compatible = "fsl,mpc8379-elbc", "fsl,elbc", "simple-bus";

		reg = <0xe0005000 0x1000>;

		interrupts = <77 0x8>;

		interrupt-parent = <&ipic>;



		// booting from NOR flash

		ranges = <0 0x0 0xfe000000 0x02000000

		          1 0x0 0xf8000000 0x00008000

		          3 0x0 0xe0600000 0x00008000>;



		flash@0,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0 0x0 0x2000000>;

			bank-width = <2>;

			device-width = <1>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			fs@100000 {

				reg = <0x100000 0x800000>;

			};



			kernel@1d00000 {

				reg = <0x1d00000 0x200000>;

			};



			dtb@1f00000 {

				reg = <0x1f00000 0x100000>;

			};

		};



		bcsr@1,0 {

			reg = <1 0x0 0x8000>;

			compatible = "fsl,mpc837xmds-bcsr";

		};



		nand@3,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "fsl,mpc8379-fcm-nand",

			             "fsl,elbc-fcm-nand";

			reg = <3 0x0 0x8000>;



			u-boot@0 {

				reg = <0x0 0x100000>;

				read-only;

			};



			kernel@100000 {

				reg = <0x100000 0x300000>;

			};



			fs@400000 {

				reg = <0x400000 0x1c00000>;

			};

		};

	};



	soc@e0000000 {

	soc@e0000000 {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;

arch/powerpc/platforms/83xx/mpc837x_mds.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -39,12 +39,9 @@ static int mpc837xmds_usb_cfg(void) 
	if (ret)

	if (ret)

		return ret;

		return ret;

	/* Map BCSR area */

	/* Map BCSR area */

	np = of_find_node_by_name(NULL, "bcsr");

	np = of_find_compatible_node(NULL, NULL, "fsl,mpc837xmds-bcsr");

	if (np) {

	if (np) {

		struct resource res;

		bcsr_regs = of_iomap(np, 0);



		of_address_to_resource(np, 0, &res);

		bcsr_regs = ioremap(res.start, res.end - res.start + 1);

		of_node_put(np);

		of_node_put(np);

	}

	}

	if (!bcsr_regs)

	if (!bcsr_regs)
@@ -96,6 +93,7 @@ static void __init mpc837x_mds_setup_arch(void) 
static struct of_device_id mpc837x_ids[] = {

static struct of_device_id mpc837x_ids[] = {

	{ .type = "soc", },

	{ .type = "soc", },

	{ .compatible = "soc", },

	{ .compatible = "soc", },

	{ .compatible = "simple-bus", },

	{},

	{},

};

};