Merge branch '83xx' into for_paulus (ffd84881) · Commits · jan.koester / Linux

Documentation/powerpc/booting-without-of.txt

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -509,7 +509,6 @@ looks like in practice.
	o chosen		o chosen
	\|- name = "chosen"		\|- name = "chosen"
	\|- bootargs = "root=/dev/sda2"		\|- bootargs = "root=/dev/sda2"
	\|- linux,platform = <00000600>
	\|- linux,phandle = <4>		\|- linux,phandle = <4>

	This tree is almost a minimal tree. It pretty much contains the		This tree is almost a minimal tree. It pretty much contains the
	@@ -733,8 +732,7 @@ address which can extend beyond that limit.
	that typically get driven by the same platform code in the		that typically get driven by the same platform code in the
	kernel, you would use a different "model" property but put a		kernel, you would use a different "model" property but put a
	value in "compatible". The kernel doesn't directly use that		value in "compatible". The kernel doesn't directly use that
	value (see /chosen/linux,platform for how the kernel chooses a		value but it is generally useful.
	platform type) but it is generally useful.

	The root node is also generally where you add additional properties		The root node is also generally where you add additional properties
	specific to your board like the serial number if any, that sort of		specific to your board like the serial number if any, that sort of
	@@ -842,11 +840,6 @@ address which can extend beyond that limit.
	the prom_init() trampoline when booting with an OF client interface,		the prom_init() trampoline when booting with an OF client interface,
	but that you have to provide yourself when using the flattened format.		but that you have to provide yourself when using the flattened format.

	Required properties:

	- linux,platform : This is your platform number as assigned by the
	architecture maintainers

	Recommended properties:		Recommended properties:

	- bootargs : This zero-terminated string is passed as the kernel		- bootargs : This zero-terminated string is passed as the kernel

arch/powerpc/boot/dts/mpc8313erdb.dts

+29 −33

Original line number	Original line	Diff line number	Diff line
	@@ -11,7 +11,7 @@

	/ {		/ {
	model = "MPC8313ERDB";		model = "MPC8313ERDB";
	compatible = "MPC83xx";		compatible = "MPC8313ERDB", "MPC831xRDB", "MPC83xxRDB";
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <1>;		#size-cells = <1>;

	@@ -59,7 +59,7 @@ i2c@3000 {
	compatible = "fsl-i2c";		compatible = "fsl-i2c";
	reg = <3000 100>;		reg = <3000 100>;
	interrupts = <e 8>;		interrupts = <e 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	dfsrr;		dfsrr;
	};		};

	@@ -68,7 +68,7 @@ i2c@3100 {
	compatible = "fsl-i2c";		compatible = "fsl-i2c";
	reg = <3100 100>;		reg = <3100 100>;
	interrupts = <f 8>;		interrupts = <f 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	dfsrr;		dfsrr;
	};		};

	@@ -77,7 +77,7 @@ spi@7000 {
	compatible = "mpc83xx_spi";		compatible = "mpc83xx_spi";
	reg = <7000 1000>;		reg = <7000 1000>;
	interrupts = <10 8>;		interrupts = <10 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	mode = <0>;		mode = <0>;
	};		};

	@@ -88,8 +88,8 @@ usb@23000 {
	reg = <23000 1000>;		reg = <23000 1000>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	interrupts = <26 2>;		interrupts = <26 8>;
	phy_type = "utmi_wide";		phy_type = "utmi_wide";
	};		};

	@@ -99,18 +99,15 @@ mdio@24520 {
	reg = <24520 20>;		reg = <24520 20>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;
	linux,phandle = <24520>;		phy1: ethernet-phy@1 {
	ethernet-phy@1 {		interrupt-parent = < &ipic >;
	linux,phandle = <2452001>;		interrupts = <13 8>;
	interrupt-parent = <700>;
	interrupts = <13 2>;
	reg = <1>;		reg = <1>;
	device_type = "ethernet-phy";		device_type = "ethernet-phy";
	};		};
	ethernet-phy@4 {		phy4: ethernet-phy@4 {
	linux,phandle = <2452004>;		interrupt-parent = < &ipic >;
	interrupt-parent = <700>;		interrupts = <14 8>;
	interrupts = <14 2>;
	reg = <4>;		reg = <4>;
	device_type = "ethernet-phy";		device_type = "ethernet-phy";
	};		};
	@@ -123,8 +120,8 @@ ethernet@24000 {
	reg = <24000 1000>;		reg = <24000 1000>;
	local-mac-address = [ 00 00 00 00 00 00 ];		local-mac-address = [ 00 00 00 00 00 00 ];
	interrupts = <25 8 24 8 23 8>;		interrupts = <25 8 24 8 23 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	phy-handle = <2452001>;		phy-handle = < &phy1 >;
	};		};

	ethernet@25000 {		ethernet@25000 {
	@@ -134,8 +131,8 @@ ethernet@25000 {
	reg = <25000 1000>;		reg = <25000 1000>;
	local-mac-address = [ 00 00 00 00 00 00 ];		local-mac-address = [ 00 00 00 00 00 00 ];
	interrupts = <22 8 21 8 20 8>;		interrupts = <22 8 21 8 20 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	phy-handle = <2452004>;		phy-handle = < &phy4 >;
	};		};

	serial@4500 {		serial@4500 {
	@@ -144,7 +141,7 @@ serial@4500 {
	reg = <4500 100>;		reg = <4500 100>;
	clock-frequency = <0>;		clock-frequency = <0>;
	interrupts = <9 8>;		interrupts = <9 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	};		};

	serial@4600 {		serial@4600 {
	@@ -153,7 +150,7 @@ serial@4600 {
	reg = <4600 100>;		reg = <4600 100>;
	clock-frequency = <0>;		clock-frequency = <0>;
	interrupts = <a 8>;		interrupts = <a 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	};		};

	pci@8500 {		pci@8500 {
	@@ -161,17 +158,17 @@ pci@8500 {
	interrupt-map = <		interrupt-map = <

	/* IDSEL 0x0E -mini PCI */		/* IDSEL 0x0E -mini PCI */
	7000 0 0 1 700 12 8		7000 0 0 1 &ipic 12 8
	7000 0 0 2 700 12 8		7000 0 0 2 &ipic 12 8
	7000 0 0 3 700 12 8		7000 0 0 3 &ipic 12 8
	7000 0 0 4 700 12 8		7000 0 0 4 &ipic 12 8

	/* IDSEL 0x0F - PCI slot */		/* IDSEL 0x0F - PCI slot */
	7800 0 0 1 700 11 8		7800 0 0 1 &ipic 11 8
	7800 0 0 2 700 12 8		7800 0 0 2 &ipic 12 8
	7800 0 0 3 700 11 8		7800 0 0 3 &ipic 11 8
	7800 0 0 4 700 12 8>;		7800 0 0 4 &ipic 12 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	interrupts = <42 8>;		interrupts = <42 8>;
	bus-range = <0 0>;		bus-range = <0 0>;
	ranges = <02000000 0 90000000 90000000 0 10000000		ranges = <02000000 0 90000000 90000000 0 10000000
	@@ -192,7 +189,7 @@ crypto@30000 {
	compatible = "talitos";		compatible = "talitos";
	reg = <30000 7000>;		reg = <30000 7000>;
	interrupts = <b 8>;		interrupts = <b 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	/* Rev. 2.2 */		/* Rev. 2.2 */
	num-channels = <1>;		num-channels = <1>;
	channel-fifo-len = <18>;		channel-fifo-len = <18>;
	@@ -206,8 +203,7 @@ crypto@30000 {
	* sense == 8: Level, low assertion		* sense == 8: Level, low assertion
	* sense == 2: Edge, high-to-low change		* sense == 2: Edge, high-to-low change
	*/		*/
	pic@700 {		ipic: pic@700 {
	linux,phandle = <700>;
	interrupt-controller;		interrupt-controller;
	#address-cells = <0>;		#address-cells = <0>;
	#interrupt-cells = <2>;		#interrupt-cells = <2>;

arch/powerpc/boot/dts/mpc8323emds.dts→arch/powerpc/boot/dts/mpc832x_mds.dts

+54 −65

Original line number	Original line	Diff line number	Diff line
	@@ -11,16 +11,14 @@

	/ {		/ {
	model = "MPC8323EMDS";		model = "MPC8323EMDS";
	compatible = "MPC83xx";		compatible = "MPC8323EMDS", "MPC832xMDS", "MPC83xxMDS";
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <1>;		#size-cells = <1>;
	linux,phandle = <100>;

	cpus {		cpus {
	#cpus = <1>;		#cpus = <1>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;
	linux,phandle = <200>;

	PowerPC,8323@0 {		PowerPC,8323@0 {
	device_type = "cpu";		device_type = "cpu";
	@@ -33,13 +31,11 @@ PowerPC,8323@0 {
	bus-frequency = <0>;		bus-frequency = <0>;
	clock-frequency = <0>;		clock-frequency = <0>;
	32-bit;		32-bit;
	linux,phandle = <201>;
	};		};
	};		};

	memory {		memory {
	device_type = "memory";		device_type = "memory";
	linux,phandle = <300>;
	reg = <00000000 08000000>;		reg = <00000000 08000000>;
	};		};

	@@ -68,7 +64,7 @@ i2c@3000 {
	compatible = "fsl-i2c";		compatible = "fsl-i2c";
	reg = <3000 100>;		reg = <3000 100>;
	interrupts = <e 8>;		interrupts = <e 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	dfsrr;		dfsrr;
	};		};

	@@ -78,7 +74,7 @@ serial@4500 {
	reg = <4500 100>;		reg = <4500 100>;
	clock-frequency = <0>;		clock-frequency = <0>;
	interrupts = <9 8>;		interrupts = <9 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	};		};

	serial@4600 {		serial@4600 {
	@@ -87,7 +83,7 @@ serial@4600 {
	reg = <4600 100>;		reg = <4600 100>;
	clock-frequency = <0>;		clock-frequency = <0>;
	interrupts = <a 8>;		interrupts = <a 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	};		};

	crypto@30000 {		crypto@30000 {
	@@ -96,7 +92,7 @@ crypto@30000 {
	compatible = "talitos";		compatible = "talitos";
	reg = <30000 7000>;		reg = <30000 7000>;
	interrupts = <b 8>;		interrupts = <b 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	/* Rev. 2.2 */		/* Rev. 2.2 */
	num-channels = <1>;		num-channels = <1>;
	channel-fifo-len = <18>;		channel-fifo-len = <18>;
	@@ -105,51 +101,50 @@ crypto@30000 {
	};		};

	pci@8500 {		pci@8500 {
	linux,phandle = <8500>;
	interrupt-map-mask = <f800 0 0 7>;		interrupt-map-mask = <f800 0 0 7>;
	interrupt-map = <		interrupt-map = <
	/* IDSEL 0x11 AD17 */		/* IDSEL 0x11 AD17 */
	8800 0 0 1 700 14 8		8800 0 0 1 &ipic 14 8
	8800 0 0 2 700 15 8		8800 0 0 2 &ipic 15 8
	8800 0 0 3 700 16 8		8800 0 0 3 &ipic 16 8
	8800 0 0 4 700 17 8		8800 0 0 4 &ipic 17 8

	/* IDSEL 0x12 AD18 */		/* IDSEL 0x12 AD18 */
	9000 0 0 1 700 16 8		9000 0 0 1 &ipic 16 8
	9000 0 0 2 700 17 8		9000 0 0 2 &ipic 17 8
	9000 0 0 3 700 14 8		9000 0 0 3 &ipic 14 8
	9000 0 0 4 700 15 8		9000 0 0 4 &ipic 15 8

	/* IDSEL 0x13 AD19 */		/* IDSEL 0x13 AD19 */
	9800 0 0 1 700 17 8		9800 0 0 1 &ipic 17 8
	9800 0 0 2 700 14 8		9800 0 0 2 &ipic 14 8
	9800 0 0 3 700 15 8		9800 0 0 3 &ipic 15 8
	9800 0 0 4 700 16 8		9800 0 0 4 &ipic 16 8

	/* IDSEL 0x15 AD21*/		/* IDSEL 0x15 AD21*/
	a800 0 0 1 700 14 8		a800 0 0 1 &ipic 14 8
	a800 0 0 2 700 15 8		a800 0 0 2 &ipic 15 8
	a800 0 0 3 700 16 8		a800 0 0 3 &ipic 16 8
	a800 0 0 4 700 17 8		a800 0 0 4 &ipic 17 8

	/* IDSEL 0x16 AD22*/		/* IDSEL 0x16 AD22*/
	b000 0 0 1 700 17 8		b000 0 0 1 &ipic 17 8
	b000 0 0 2 700 14 8		b000 0 0 2 &ipic 14 8
	b000 0 0 3 700 15 8		b000 0 0 3 &ipic 15 8
	b000 0 0 4 700 16 8		b000 0 0 4 &ipic 16 8

	/* IDSEL 0x17 AD23*/		/* IDSEL 0x17 AD23*/
	b800 0 0 1 700 16 8		b800 0 0 1 &ipic 16 8
	b800 0 0 2 700 17 8		b800 0 0 2 &ipic 17 8
	b800 0 0 3 700 14 8		b800 0 0 3 &ipic 14 8
	b800 0 0 4 700 15 8		b800 0 0 4 &ipic 15 8

	/* IDSEL 0x18 AD24*/		/* IDSEL 0x18 AD24*/
	c000 0 0 1 700 15 8		c000 0 0 1 &ipic 15 8
	c000 0 0 2 700 16 8		c000 0 0 2 &ipic 16 8
	c000 0 0 3 700 17 8		c000 0 0 3 &ipic 17 8
	c000 0 0 4 700 14 8>;		c000 0 0 4 &ipic 14 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	interrupts = <42 8>;		interrupts = <42 8>;
	bus-range = <0 0>;		bus-range = <0 0>;
	ranges = <02000000 0 a0000000 90000000 0 10000000		ranges = <02000000 0 a0000000 90000000 0 10000000
	@@ -164,8 +159,7 @@ c000 0 0 3 700 17 8
	device_type = "pci";		device_type = "pci";
	};		};

	pic@700 {		ipic: pic@700 {
	linux,phandle = <700>;
	interrupt-controller;		interrupt-controller;
	#address-cells = <0>;		#address-cells = <0>;
	#interrupt-cells = <2>;		#interrupt-cells = <2>;
	@@ -179,8 +173,7 @@ par_io@1400 {
	device_type = "par_io";		device_type = "par_io";
	num-ports = <7>;		num-ports = <7>;

	ucc_pin@03 {		pio3: ucc_pin@03 {
	linux,phandle = <140003>;
	pio-map = <		pio-map = <
	/* port pin dir open_drain assignment has_irq */		/* port pin dir open_drain assignment has_irq */
	3 4 3 0 2 0 /* MDIO */		3 4 3 0 2 0 /* MDIO */
	@@ -203,8 +196,7 @@ ucc_pin@03 {
	1 c 1 0 1 0 /* TX_EN */		1 c 1 0 1 0 /* TX_EN */
	1 d 2 0 1 0>;/* CRS */		1 d 2 0 1 0>;/* CRS */
	};		};
	ucc_pin@04 {		pio4: ucc_pin@04 {
	linux,phandle = <140004>;
	pio-map = <		pio-map = <
	/* port pin dir open_drain assignment has_irq */		/* port pin dir open_drain assignment has_irq */
	3 1f 2 0 1 0 /* RX_CLK (CLK7) */		3 1f 2 0 1 0 /* RX_CLK (CLK7) */
	@@ -251,7 +243,7 @@ spi@4c0 {
	compatible = "fsl_spi";		compatible = "fsl_spi";
	reg = <4c0 40>;		reg = <4c0 40>;
	interrupts = <2>;		interrupts = <2>;
	interrupt-parent = <80>;		interrupt-parent = < &qeic >;
	mode = "cpu";		mode = "cpu";
	};		};

	@@ -260,7 +252,7 @@ spi@500 {
	compatible = "fsl_spi";		compatible = "fsl_spi";
	reg = <500 40>;		reg = <500 40>;
	interrupts = <1>;		interrupts = <1>;
	interrupt-parent = <80>;		interrupt-parent = < &qeic >;
	mode = "cpu";		mode = "cpu";
	};		};

	@@ -269,7 +261,7 @@ usb@6c0 {
	compatible = "qe_udc";		compatible = "qe_udc";
	reg = <6c0 40 8B00 100>;		reg = <6c0 40 8B00 100>;
	interrupts = <b>;		interrupts = <b>;
	interrupt-parent = <80>;		interrupt-parent = < &qeic >;
	mode = "slave";		mode = "slave";
	};		};

	@@ -280,12 +272,12 @@ ucc@2200 {
	device-id = <3>;		device-id = <3>;
	reg = <2200 200>;		reg = <2200 200>;
	interrupts = <22>;		interrupts = <22>;
	interrupt-parent = <80>;		interrupt-parent = < &qeic >;
	mac-address = [ 00 04 9f 00 23 23 ];		mac-address = [ 00 04 9f 00 23 23 ];
	rx-clock = <19>;		rx-clock = <19>;
	tx-clock = <1a>;		tx-clock = <1a>;
	phy-handle = <212003>;		phy-handle = < &phy3 >;
	pio-handle = <140003>;		pio-handle = < &pio3 >;
	};		};

	ucc@3200 {		ucc@3200 {
	@@ -295,12 +287,12 @@ ucc@3200 {
	device-id = <4>;		device-id = <4>;
	reg = <3000 200>;		reg = <3000 200>;
	interrupts = <23>;		interrupts = <23>;
	interrupt-parent = <80>;		interrupt-parent = < &qeic >;
	mac-address = [ 00 11 22 33 44 55 ];		mac-address = [ 00 11 22 33 44 55 ];
	rx-clock = <17>;		rx-clock = <17>;
	tx-clock = <18>;		tx-clock = <18>;
	phy-handle = <212004>;		phy-handle = < &phy4 >;
	pio-handle = <140004>;		pio-handle = < &pio4 >;
	};		};

	mdio@2320 {		mdio@2320 {
	@@ -310,26 +302,23 @@ mdio@2320 {
	device_type = "mdio";		device_type = "mdio";
	compatible = "ucc_geth_phy";		compatible = "ucc_geth_phy";

	ethernet-phy@03 {		phy3: ethernet-phy@03 {
	linux,phandle = <212003>;		interrupt-parent = < &ipic >;
	interrupt-parent = <700>;		interrupts = <11 8>;
	interrupts = <11 2>;
	reg = <3>;		reg = <3>;
	device_type = "ethernet-phy";		device_type = "ethernet-phy";
	interface = <3>; //ENET_100_MII		interface = <3>; //ENET_100_MII
	};		};
	ethernet-phy@04 {		phy4: ethernet-phy@04 {
	linux,phandle = <212004>;		interrupt-parent = < &ipic >;
	interrupt-parent = <700>;		interrupts = <12 8>;
	interrupts = <12 2>;
	reg = <4>;		reg = <4>;
	device_type = "ethernet-phy";		device_type = "ethernet-phy";
	interface = <3>;		interface = <3>;
	};		};
	};		};

	qeic@80 {		qeic: qeic@80 {
	linux,phandle = <80>;
	interrupt-controller;		interrupt-controller;
	device_type = "qeic";		device_type = "qeic";
	#address-cells = <0>;		#address-cells = <0>;
	@@ -338,7 +327,7 @@ qeic@80 {
	built-in;		built-in;
	big-endian;		big-endian;
	interrupts = <20 8 21 8>; //high:32 low:33		interrupts = <20 8 21 8>; //high:32 low:33
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	};		};
	};		};
	};		};

arch/powerpc/boot/dts/mpc8349emitx.dts

+28 −32

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@
	*/		*/
	/ {		/ {
	model = "MPC8349EMITX";		model = "MPC8349EMITX";
	compatible = "MPC834xMITX";		compatible = "MPC8349EMITX", "MPC834xMITX", "MPC83xxMITX";
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <1>;		#size-cells = <1>;

	@@ -58,7 +58,7 @@ i2c@3000 {
	compatible = "fsl-i2c";		compatible = "fsl-i2c";
	reg = <3000 100>;		reg = <3000 100>;
	interrupts = <e 8>;		interrupts = <e 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	dfsrr;		dfsrr;
	};		};

	@@ -67,7 +67,7 @@ i2c@3100 {
	compatible = "fsl-i2c";		compatible = "fsl-i2c";
	reg = <3100 100>;		reg = <3100 100>;
	interrupts = <f 8>;		interrupts = <f 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	dfsrr;		dfsrr;
	};		};

	@@ -76,7 +76,7 @@ spi@7000 {
	compatible = "mpc83xx_spi";		compatible = "mpc83xx_spi";
	reg = <7000 1000>;		reg = <7000 1000>;
	interrupts = <10 8>;		interrupts = <10 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	mode = <0>;		mode = <0>;
	};		};

	@@ -86,8 +86,8 @@ usb@22000 {
	reg = <22000 1000>;		reg = <22000 1000>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	interrupts = <27 2>;		interrupts = <27 8>;
	phy_type = "ulpi";		phy_type = "ulpi";
	port1;		port1;
	};		};
	@@ -98,8 +98,8 @@ usb@23000 {
	reg = <23000 1000>;		reg = <23000 1000>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	interrupts = <26 2>;		interrupts = <26 8>;
	phy_type = "ulpi";		phy_type = "ulpi";
	};		};

	@@ -109,22 +109,19 @@ mdio@24520 {
	reg = <24520 20>;		reg = <24520 20>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;
	linux,phandle = <24520>;

	/* Vitesse 8201 */		/* Vitesse 8201 */
	ethernet-phy@1c {		phy1c: ethernet-phy@1c {
	linux,phandle = <245201c>;		interrupt-parent = < &ipic >;
	interrupt-parent = <700>;		interrupts = <12 8>;
	interrupts = <12 2>;
	reg = <1c>;		reg = <1c>;
	device_type = "ethernet-phy";		device_type = "ethernet-phy";
	};		};

	/* Vitesse 7385 */		/* Vitesse 7385 */
	ethernet-phy@1f {		phy1f: ethernet-phy@1f {
	linux,phandle = <245201f>;		interrupt-parent = < &ipic >;
	interrupt-parent = <700>;		interrupts = <12 8>;
	interrupts = <12 2>;
	reg = <1f>;		reg = <1f>;
	device_type = "ethernet-phy";		device_type = "ethernet-phy";
	};		};
	@@ -138,8 +135,8 @@ ethernet@24000 {
	address = [ 00 00 00 00 00 00 ];		address = [ 00 00 00 00 00 00 ];
	local-mac-address = [ 00 00 00 00 00 00 ];		local-mac-address = [ 00 00 00 00 00 00 ];
	interrupts = <20 8 21 8 22 8>;		interrupts = <20 8 21 8 22 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	phy-handle = <245201c>;		phy-handle = < &phy1c >;
	};		};

	ethernet@25000 {		ethernet@25000 {
	@@ -152,8 +149,8 @@ ethernet@25000 {
	address = [ 00 00 00 00 00 00 ];		address = [ 00 00 00 00 00 00 ];
	local-mac-address = [ 00 00 00 00 00 00 ];		local-mac-address = [ 00 00 00 00 00 00 ];
	interrupts = <23 8 24 8 25 8>;		interrupts = <23 8 24 8 25 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	phy-handle = <245201f>;		phy-handle = < &phy1f >;
	};		};

	serial@4500 {		serial@4500 {
	@@ -162,7 +159,7 @@ serial@4500 {
	reg = <4500 100>;		reg = <4500 100>;
	clock-frequency = <0>; // from bootloader		clock-frequency = <0>; // from bootloader
	interrupts = <9 8>;		interrupts = <9 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	};		};

	serial@4600 {		serial@4600 {
	@@ -171,16 +168,16 @@ serial@4600 {
	reg = <4600 100>;		reg = <4600 100>;
	clock-frequency = <0>; // from bootloader		clock-frequency = <0>; // from bootloader
	interrupts = <a 8>;		interrupts = <a 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	};		};

	pci@8500 {		pci@8500 {
	interrupt-map-mask = <f800 0 0 7>;		interrupt-map-mask = <f800 0 0 7>;
	interrupt-map = <		interrupt-map = <
	/* IDSEL 0x10 - SATA */		/* IDSEL 0x10 - SATA */
	8000 0 0 1 700 16 8 /* SATA_INTA */		8000 0 0 1 &ipic 16 8 /* SATA_INTA */
	>;		>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	interrupts = <42 8>;		interrupts = <42 8>;
	bus-range = <0 0>;		bus-range = <0 0>;
	ranges = <42000000 0 80000000 80000000 0 10000000		ranges = <42000000 0 80000000 80000000 0 10000000
	@@ -199,13 +196,13 @@ pci@8600 {
	interrupt-map-mask = <f800 0 0 7>;		interrupt-map-mask = <f800 0 0 7>;
	interrupt-map = <		interrupt-map = <
	/* IDSEL 0x0E - MiniPCI Slot */		/* IDSEL 0x0E - MiniPCI Slot */
	7000 0 0 1 700 15 8 /* PCI_INTA */		7000 0 0 1 &ipic 15 8 /* PCI_INTA */

	/* IDSEL 0x0F - PCI Slot */		/* IDSEL 0x0F - PCI Slot */
	7800 0 0 1 700 14 8 /* PCI_INTA */		7800 0 0 1 &ipic 14 8 /* PCI_INTA */
	7800 0 0 2 700 15 8 /* PCI_INTB */		7800 0 0 2 &ipic 15 8 /* PCI_INTB */
	>;		>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	interrupts = <43 8>;		interrupts = <43 8>;
	bus-range = <1 1>;		bus-range = <1 1>;
	ranges = <42000000 0 a0000000 a0000000 0 10000000		ranges = <42000000 0 a0000000 a0000000 0 10000000
	@@ -226,15 +223,14 @@ crypto@30000 {
	compatible = "talitos";		compatible = "talitos";
	reg = <30000 10000>;		reg = <30000 10000>;
	interrupts = <b 8>;		interrupts = <b 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	num-channels = <4>;		num-channels = <4>;
	channel-fifo-len = <18>;		channel-fifo-len = <18>;
	exec-units-mask = <0000007e>;		exec-units-mask = <0000007e>;
	descriptor-types-mask = <01010ebf>;		descriptor-types-mask = <01010ebf>;
	};		};

	pic@700 {		ipic: pic@700 {
	linux,phandle = <700>;
	interrupt-controller;		interrupt-controller;
	#address-cells = <0>;		#address-cells = <0>;
	#interrupt-cells = <2>;		#interrupt-cells = <2>;

arch/powerpc/boot/dts/mpc8349emitxgp.dts

+18 −21

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@
	*/		*/
	/ {		/ {
	model = "MPC8349EMITXGP";		model = "MPC8349EMITXGP";
	compatible = "MPC834xMITXGP";		compatible = "MPC8349EMITXGP", "MPC834xMITX", "MPC83xxMITX";
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <1>;		#size-cells = <1>;

	@@ -58,7 +58,7 @@ i2c@3000 {
	compatible = "fsl-i2c";		compatible = "fsl-i2c";
	reg = <3000 100>;		reg = <3000 100>;
	interrupts = <e 8>;		interrupts = <e 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	dfsrr;		dfsrr;
	};		};

	@@ -67,7 +67,7 @@ i2c@3100 {
	compatible = "fsl-i2c";		compatible = "fsl-i2c";
	reg = <3100 100>;		reg = <3100 100>;
	interrupts = <f 8>;		interrupts = <f 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	dfsrr;		dfsrr;
	};		};

	@@ -76,7 +76,7 @@ spi@7000 {
	compatible = "mpc83xx_spi";		compatible = "mpc83xx_spi";
	reg = <7000 1000>;		reg = <7000 1000>;
	interrupts = <10 8>;		interrupts = <10 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	mode = <0>;		mode = <0>;
	};		};

	@@ -86,8 +86,8 @@ usb@23000 {
	reg = <23000 1000>;		reg = <23000 1000>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	interrupts = <26 2>;		interrupts = <26 8>;
	dr_mode = "otg";		dr_mode = "otg";
	phy_type = "ulpi";		phy_type = "ulpi";
	};		};
	@@ -98,13 +98,11 @@ mdio@24520 {
	reg = <24520 20>;		reg = <24520 20>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;
	linux,phandle = <24520>;

	/* Vitesse 8201 */		/* Vitesse 8201 */
	ethernet-phy@1c {		phy1c: ethernet-phy@1c {
	linux,phandle = <245201c>;		interrupt-parent = < &ipic >;
	interrupt-parent = <700>;		interrupts = <12 8>;
	interrupts = <12 2>;
	reg = <1c>;		reg = <1c>;
	device_type = "ethernet-phy";		device_type = "ethernet-phy";
	};		};
	@@ -117,8 +115,8 @@ ethernet@24000 {
	reg = <24000 1000>;		reg = <24000 1000>;
	local-mac-address = [ 00 00 00 00 00 00 ];		local-mac-address = [ 00 00 00 00 00 00 ];
	interrupts = <20 8 21 8 22 8>;		interrupts = <20 8 21 8 22 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	phy-handle = <245201c>;		phy-handle = < &phy1c >;
	};		};

	serial@4500 {		serial@4500 {
	@@ -127,7 +125,7 @@ serial@4500 {
	reg = <4500 100>;		reg = <4500 100>;
	clock-frequency = <0>; // from bootloader		clock-frequency = <0>; // from bootloader
	interrupts = <9 8>;		interrupts = <9 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	};		};

	serial@4600 {		serial@4600 {
	@@ -136,17 +134,17 @@ serial@4600 {
	reg = <4600 100>;		reg = <4600 100>;
	clock-frequency = <0>; // from bootloader		clock-frequency = <0>; // from bootloader
	interrupts = <a 8>;		interrupts = <a 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	};		};

	pci@8600 {		pci@8600 {
	interrupt-map-mask = <f800 0 0 7>;		interrupt-map-mask = <f800 0 0 7>;
	interrupt-map = <		interrupt-map = <
	/* IDSEL 0x0F - PCI Slot */		/* IDSEL 0x0F - PCI Slot */
	7800 0 0 1 700 14 8 /* PCI_INTA */		7800 0 0 1 &ipic 14 8 /* PCI_INTA */
	7800 0 0 2 700 15 8 /* PCI_INTB */		7800 0 0 2 &ipic 15 8 /* PCI_INTB */
	>;		>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	interrupts = <43 8>;		interrupts = <43 8>;
	bus-range = <1 1>;		bus-range = <1 1>;
	ranges = <42000000 0 a0000000 a0000000 0 10000000		ranges = <42000000 0 a0000000 a0000000 0 10000000
	@@ -167,15 +165,14 @@ crypto@30000 {
	compatible = "talitos";		compatible = "talitos";
	reg = <30000 10000>;		reg = <30000 10000>;
	interrupts = <b 8>;		interrupts = <b 8>;
	interrupt-parent = <700>;		interrupt-parent = < &ipic >;
	num-channels = <4>;		num-channels = <4>;
	channel-fifo-len = <18>;		channel-fifo-len = <18>;
	exec-units-mask = <0000007e>;		exec-units-mask = <0000007e>;
	descriptor-types-mask = <01010ebf>;		descriptor-types-mask = <01010ebf>;
	};		};

	pic@700 {		ipic: pic@700 {
	linux,phandle = <700>;
	interrupt-controller;		interrupt-controller;
	#address-cells = <0>;		#address-cells = <0>;
	#interrupt-cells = <2>;		#interrupt-cells = <2>;