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

Commit 9667a364 authored by Zhao Qiang's avatar Zhao Qiang Committed by Scott Wood
Browse files

powerpc/p1010rdb:update dts to adapt to both old and new p1010rdb 



P1010rdb-pa and p1010rdb-pb have different phy interrupts.
So update dts to adapt to both p1010rdb-pa and p1010rdb-pb.

Signed-off-by: default avatarShengzhou Liu <Shengzhou.Liu@freescale.com>
Signed-off-by: default avatarZhao Qiang <B45475@freescale.com>
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 01c9ccee

arch/powerpc/boot/dts/p1010rdb.dts→arch/powerpc/boot/dts/p1010rdb-pa.dts

+35 −0
Original line number Diff line number Diff line
@@ -15,52 +15,21 @@ 
	model = "fsl,P1010RDB";

	compatible = "fsl,P1010RDB";



	memory {

		device_type = "memory";

	/include/ "p1010rdb_32b.dtsi"

};



	board_ifc: ifc: ifc@ffe1e000 {

		/* NOR, NAND Flashes and CPLD on board */

		ranges = <0x0 0x0 0x0 0xee000000 0x02000000

			  0x1 0x0 0x0 0xff800000 0x00010000

			  0x3 0x0 0x0 0xffb00000 0x00000020>;

		reg = <0x0 0xffe1e000 0 0x2000>;

	};

/include/ "p1010rdb.dtsi"



	board_soc: soc: soc@ffe00000 {

		ranges = <0x0 0x0 0xffe00000 0x100000>;

&phy0 {

	interrupts = <3 1 0 0>;

};



	pci0: pcie@ffe09000 {

		reg = <0 0xffe09000 0 0x1000>;

		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;

		pcie@0 {

			ranges = <0x2000000 0x0 0xa0000000

				  0x2000000 0x0 0xa0000000

				  0x0 0x20000000



				  0x1000000 0x0 0x0

				  0x1000000 0x0 0x0

				  0x0 0x100000>;

		};

&phy1 {

	interrupts = <2 1 0 0>;

};



	pci1: pcie@ffe0a000 {

		reg = <0 0xffe0a000 0 0x1000>;

		ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;

		pcie@0 {

			ranges = <0x2000000 0x0 0x80000000

				  0x2000000 0x0 0x80000000

				  0x0 0x20000000



				  0x1000000 0x0 0x0

				  0x1000000 0x0 0x0

				  0x0 0x100000>;

		};

	};

&phy2 {

	interrupts = <2 1 0 0>;

};



/include/ "p1010rdb.dtsi"

/include/ "fsl/p1010si-post.dtsi"

arch/powerpc/boot/dts/p1010rdb_36b.dts→arch/powerpc/boot/dts/p1010rdb-pa_36b.dts

+11 −42
Original line number Diff line number Diff line
@@ -38,52 +38,21 @@ 
	model = "fsl,P1010RDB";

	compatible = "fsl,P1010RDB";



	memory {

		device_type = "memory";

	/include/ "p1010rdb_36b.dtsi"

};



	board_ifc: ifc: ifc@fffe1e000 {

		/* NOR, NAND Flashes and CPLD on board */

		ranges = <0x0 0x0 0xf 0xee000000 0x02000000

			  0x1 0x0 0xf 0xff800000 0x00010000

			  0x3 0x0 0xf 0xffb00000 0x00000020>;

		reg = <0xf 0xffe1e000 0 0x2000>;

	};

/include/ "p1010rdb.dtsi"



	board_soc: soc: soc@fffe00000 {

		ranges = <0x0 0xf 0xffe00000 0x100000>;

&phy0 {

	interrupts = <3 1 0 0>;

};



	pci0: pcie@fffe09000 {

		reg = <0xf 0xffe09000 0 0x1000>;

		ranges = <0x2000000 0x0 0xc0000000 0xc 0x20000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000>;

		pcie@0 {

			ranges = <0x2000000 0x0 0xc0000000

				  0x2000000 0x0 0xc0000000

				  0x0 0x20000000



				  0x1000000 0x0 0x0

				  0x1000000 0x0 0x0

				  0x0 0x100000>;

		};

&phy1 {

	interrupts = <2 1 0 0>;

};



	pci1: pcie@fffe0a000 {

		reg = <0xf 0xffe0a000 0 0x1000>;

		ranges = <0x2000000 0x0 0xc0000000 0xc 0x20000000 0x0 0x20000000

			  0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000>;

		pcie@0 {

			ranges = <0x2000000 0x0 0xc0000000

				  0x2000000 0x0 0xc0000000

				  0x0 0x20000000



				  0x1000000 0x0 0x0

				  0x1000000 0x0 0x0

				  0x0 0x100000>;

		};

	};

&phy2 {

	interrupts = <2 1 0 0>;

};



/include/ "p1010rdb.dtsi"

/include/ "fsl/p1010si-post.dtsi"

arch/powerpc/boot/dts/p1010rdb-pb.dts

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * P1010 RDB Device Tree Source

 *

 * Copyright 2011 Freescale Semiconductor Inc.

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



/include/ "fsl/p1010si-pre.dtsi"



/ {

	model = "fsl,P1010RDB-PB";

	compatible = "fsl,P1010RDB-PB";



	/include/ "p1010rdb_32b.dtsi"

};



/include/ "p1010rdb.dtsi"



&phy0 {

	interrupts = <0 1 0 0>;

};



&phy1 {

	interrupts = <2 1 0 0>;

};



&phy2 {

	interrupts = <1 1 0 0>;

};



/include/ "fsl/p1010si-post.dtsi"

arch/powerpc/boot/dts/p1010rdb-pb_36b.dts

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * P1010 RDB Device Tree Source (36-bit address map)

 *

 * Copyright 2011 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

 *     * Neither the name of Freescale Semiconductor nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY

 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

 * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY

 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



/include/ "fsl/p1010si-pre.dtsi"



/ {

	model = "fsl,P1010RDB-PB";

	compatible = "fsl,P1010RDB-PB";



	/include/ "p1010rdb_36b.dtsi"

};



/include/ "p1010rdb.dtsi"



&phy0 {

	interrupts = <0 1 0 0>;

};



&phy1 {

	interrupts = <2 1 0 0>;

};



&phy2 {

	interrupts = <1 1 0 0>;

};



/include/ "fsl/p1010si-post.dtsi"

arch/powerpc/boot/dts/p1010rdb.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -193,17 +193,14 @@ 


	mdio@24000 {

		phy0: ethernet-phy@0 {

			interrupts = <3 1 0 0>;

			reg = <0x1>;

		};



		phy1: ethernet-phy@1 {

			interrupts = <2 1 0 0>;

			reg = <0x0>;

		};



		phy2: ethernet-phy@2 {

			interrupts = <2 1 0 0>;

			reg = <0x2>;

		};