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

Commit 5809938c authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: dts: split RealView EB 11MPCore variants 



There used to be two versions of the RealView EB 11MPCore:

- arm-realview-eb-11mp.dts: the most common variant supported by
  QEMU with the revision C core tile
- arm-realview-eb-revb.dts: for the variant with the elder revision
  B core tile.

As it turns out that there are also a few variants of the
baseboard, unrelated to the coretile, and that these can of
course be mounted on top of each other in all permutations, we
create:

- arm-realview-eb-11mp.dts: the most common variant supported by
  QEMU with the pre-revision D baseboard and the revision C core
  tile.
- arm-realview-eb-11mp-bbrevd.dts: the revision D baseboard
  with the common revision C core tile.
- arm-realview-eb-11mp-ctrevb.dts: the pre-revision D baseboard
  with the revision B core tile.
- arm-realview-eb-11mp-bbrevd-ctrevb.dts: the revision D baseboard
  with the revision B core time.

Or as a table:

           | Core tile: C               | Core tile: B
-----------+----------------------------+-----------------------------------
Baseboard: |                            |
pre-D      |arm-realvie-eb-11mp         | arm-realview-eb-11mp-ctrevb
-----------+----------------------------+-----------------------------------
Baseboard: |                            |
D          |arm-realview-eb-11mp-bbrevd | arm-realview-eb-11mp-bbrevd-ctrevb
-----------+----------------------------+-----------------------------------

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6a29fa31

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -610,7 +610,9 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \ 
	arm-realview-eb.dtb \

	arm-realview-eb-bbrevd.dtb \

	arm-realview-eb-11mp.dtb \

	arm-realview-eb-11mp-revb.dtb \

	arm-realview-eb-11mp-bbrevd.dtb \

	arm-realview-eb-11mp-ctrevb.dtb \

	arm-realview-eb-11mp-bbrevd-ctrevb.dtb \

	arm-realview-eb-a9mp.dtb \

	arm-realview-pba8.dtb \

	arm-realview-pbx-a9.dtb

arch/arm/boot/dts/arm-realview-eb-11mp-bbrevd-ctrevb.dts

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

 * Copyright 2016 Linaro Ltd

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#include "arm-realview-eb-11mp-ctrevb.dts"

#include "arm-realview-eb-bbrevd.dtsi"



/*

 * This is the EB with the new Revision D baseboard with SMSC9118 ethernet and

 * the Rev B core tile.

 */

/ {

	model = "ARM RealView Emulation Baseboard Rev D with ARM11MPCore Core Tile Rev B";

};

arch/arm/boot/dts/arm-realview-eb-11mp-bbrevd.dts

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

 * Copyright 2016 Linaro Ltd

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#include "arm-realview-eb-11mp.dts"

#include "arm-realview-eb-bbrevd.dtsi"



/ {

	model = "ARM RealView Emulation Baseboard Rev D with ARM11MPCore Rev C Core Tile";

};

arch/arm/boot/dts/arm-realview-eb-11mp.dts

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "arm-realview-eb-mp.dtsi"



/ {

	model = "ARM RealView Emulation Baseboard with ARM11MPCore Rev C";

	model = "ARM RealView Emulation Baseboard with ARM11MPCore Rev C Core Tile";

	arm,hbi = <0x146>;



	/*