arm64: dts: move from ARCH_VULCAN to ARCH_THUNDER2
Move and update device tree files as part of transition from Broadcom Vulcan to Cavium ThunderX2. The changes are to: * rename dts/broadcom/vulcan.dtsi to cavium/thunder2-99xx.dtsi, update cpu cores to be "cavium,thunder2", and update SoC to be "cavium,thunderx2-cn9900" * move SoC dts/broadcom/vulcan-eval.dtsi to cavium/thunder2-99xx.dtsi and update board name string * Update dts/broadcom/Makefile not to build vulcan dtbs * Update dts/cavium/Makefile to build thunder2 dtbs No changes to the dts contents except the updated "compatible" and "model" properties. Signed-off-by: Jayachandran C <jnair@caviumnetworks.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Родитель
8aac4bc519
Коммит
517b311eae
|
@ -1,6 +1,5 @@
|
|||
dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
|
||||
dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb ns2-xmc.dtb
|
||||
dtb-$(CONFIG_ARCH_VULCAN) += vulcan-eval.dtb
|
||||
|
||||
always := $(dtb-y)
|
||||
subdir-y := $(dts-dirs)
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
|
||||
dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb
|
||||
|
||||
always := $(dtb-y)
|
||||
subdir-y := $(dts-dirs)
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
/*
|
||||
* dts file for Broadcom (BRCM) Vulcan Evaluation Platform
|
||||
* dts file for Cavium ThunderX2 CN99XX Evaluation Platform
|
||||
*
|
||||
* Copyright (c) 2017 Cavium Inc.
|
||||
* Copyright (c) 2013-2016 Broadcom
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
|
@ -11,11 +12,11 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "vulcan.dtsi"
|
||||
#include "thunder2-99xx.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Broadcom Vulcan Eval Platform";
|
||||
compatible = "brcm,vulcan-eval", "brcm,vulcan-soc";
|
||||
model = "Cavium ThunderX2 CN99XX";
|
||||
compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc";
|
||||
|
||||
memory {
|
||||
device_type = "memory";
|
|
@ -1,6 +1,7 @@
|
|||
/*
|
||||
* dtsi file for Broadcom (BRCM) Vulcan processor
|
||||
* dtsi file for Cavium ThunderX2 CN99XX processor
|
||||
*
|
||||
* Copyright (c) 2017 Cavium Inc.
|
||||
* Copyright (c) 2013-2016 Broadcom
|
||||
* Author: Zi Shen Lim <zlim@broadcom.com>
|
||||
*
|
||||
|
@ -13,8 +14,8 @@
|
|||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
|
||||
/ {
|
||||
model = "Broadcom Vulcan";
|
||||
compatible = "brcm,vulcan-soc";
|
||||
model = "Cavium ThunderX2 CN99XX";
|
||||
compatible = "cavium,thunderx2-cn9900", "brcm,vulcan-soc";
|
||||
interrupt-parent = <&gic>;
|
||||
#address-cells = <2>;
|
||||
#size-cells = <2>;
|
||||
|
@ -26,28 +27,28 @@
|
|||
|
||||
cpu@0 {
|
||||
device_type = "cpu";
|
||||
compatible = "brcm,vulcan", "arm,armv8";
|
||||
compatible = "cavium,thunder2", "brcm,vulcan", "arm,armv8";
|
||||
reg = <0x0 0x0>;
|
||||
enable-method = "psci";
|
||||
};
|
||||
|
||||
cpu@1 {
|
||||
device_type = "cpu";
|
||||
compatible = "brcm,vulcan", "arm,armv8";
|
||||
compatible = "cavium,thunder2", "brcm,vulcan", "arm,armv8";
|
||||
reg = <0x0 0x1>;
|
||||
enable-method = "psci";
|
||||
};
|
||||
|
||||
cpu@2 {
|
||||
device_type = "cpu";
|
||||
compatible = "brcm,vulcan", "arm,armv8";
|
||||
compatible = "cavium,thunder2", "brcm,vulcan", "arm,armv8";
|
||||
reg = <0x0 0x2>;
|
||||
enable-method = "psci";
|
||||
};
|
||||
|
||||
cpu@3 {
|
||||
device_type = "cpu";
|
||||
compatible = "brcm,vulcan", "arm,armv8";
|
||||
compatible = "cavium,thunder2", "brcm,vulcan", "arm,armv8";
|
||||
reg = <0x0 0x3>;
|
||||
enable-method = "psci";
|
||||
};
|
Загрузка…
Ссылка в новой задаче