mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-19 08:36:54 +07:00
Merge tag 'juno-updates-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/soc
Pull "ARMv8 Vexpress/Juno DT update for v4.15" from Sudeep Holla: Just single update to enable PSCI support on Foundation models * tag 'juno-updates-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: foundation-v8: Enable PSCI mode
This commit is contained in:
commit
6260304f1a
@ -1,4 +1,6 @@
|
||||
dtb-$(CONFIG_ARCH_VEXPRESS) += foundation-v8.dtb foundation-v8-gicv3.dtb
|
||||
dtb-$(CONFIG_ARCH_VEXPRESS) += \
|
||||
foundation-v8.dtb foundation-v8-psci.dtb \
|
||||
foundation-v8-gicv3.dtb foundation-v8-gicv3-psci.dtb
|
||||
dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb
|
||||
dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb
|
||||
dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2f-1xv7-ca53x2.dtb
|
||||
|
19
arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi
Normal file
19
arch/arm64/boot/dts/arm/foundation-v8-gicv2.dtsi
Normal file
@ -0,0 +1,19 @@
|
||||
/*
|
||||
* ARM Ltd.
|
||||
*
|
||||
* ARMv8 Foundation model DTS (GICv2 configuration)
|
||||
*/
|
||||
|
||||
/ {
|
||||
gic: interrupt-controller@2c001000 {
|
||||
compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
|
||||
#interrupt-cells = <3>;
|
||||
#address-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0x0 0x2c001000 0 0x1000>,
|
||||
<0x0 0x2c002000 0 0x2000>,
|
||||
<0x0 0x2c004000 0 0x2000>,
|
||||
<0x0 0x2c006000 0 0x2000>;
|
||||
interrupts = <1 9 0xf04>;
|
||||
};
|
||||
};
|
9
arch/arm64/boot/dts/arm/foundation-v8-gicv3-psci.dts
Normal file
9
arch/arm64/boot/dts/arm/foundation-v8-gicv3-psci.dts
Normal file
@ -0,0 +1,9 @@
|
||||
/*
|
||||
* ARM Ltd.
|
||||
*
|
||||
* ARMv8 Foundation model DTS (GICv3+PSCI configuration)
|
||||
*/
|
||||
|
||||
#include "foundation-v8.dtsi"
|
||||
#include "foundation-v8-gicv3.dtsi"
|
||||
#include "foundation-v8-psci.dtsi"
|
@ -5,26 +5,5 @@
|
||||
*/
|
||||
|
||||
#include "foundation-v8.dtsi"
|
||||
|
||||
/ {
|
||||
gic: interrupt-controller@2f000000 {
|
||||
compatible = "arm,gic-v3";
|
||||
#interrupt-cells = <3>;
|
||||
#address-cells = <2>;
|
||||
#size-cells = <2>;
|
||||
ranges;
|
||||
interrupt-controller;
|
||||
reg = <0x0 0x2f000000 0x0 0x10000>,
|
||||
<0x0 0x2f100000 0x0 0x200000>,
|
||||
<0x0 0x2c000000 0x0 0x2000>,
|
||||
<0x0 0x2c010000 0x0 0x2000>,
|
||||
<0x0 0x2c02f000 0x0 0x2000>;
|
||||
interrupts = <1 9 4>;
|
||||
|
||||
its: its@2f020000 {
|
||||
compatible = "arm,gic-v3-its";
|
||||
msi-controller;
|
||||
reg = <0x0 0x2f020000 0x0 0x20000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
#include "foundation-v8-gicv3.dtsi"
|
||||
#include "foundation-v8-spin-table.dtsi"
|
||||
|
28
arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi
Normal file
28
arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi
Normal file
@ -0,0 +1,28 @@
|
||||
/*
|
||||
* ARM Ltd.
|
||||
*
|
||||
* ARMv8 Foundation model DTS (GICv3 configuration)
|
||||
*/
|
||||
|
||||
/ {
|
||||
gic: interrupt-controller@2f000000 {
|
||||
compatible = "arm,gic-v3";
|
||||
#interrupt-cells = <3>;
|
||||
#address-cells = <2>;
|
||||
#size-cells = <2>;
|
||||
ranges;
|
||||
interrupt-controller;
|
||||
reg = <0x0 0x2f000000 0x0 0x10000>,
|
||||
<0x0 0x2f100000 0x0 0x200000>,
|
||||
<0x0 0x2c000000 0x0 0x2000>,
|
||||
<0x0 0x2c010000 0x0 0x2000>,
|
||||
<0x0 0x2c02f000 0x0 0x2000>;
|
||||
interrupts = <1 9 4>;
|
||||
|
||||
its: its@2f020000 {
|
||||
compatible = "arm,gic-v3-its";
|
||||
msi-controller;
|
||||
reg = <0x0 0x2f020000 0x0 0x20000>;
|
||||
};
|
||||
};
|
||||
};
|
9
arch/arm64/boot/dts/arm/foundation-v8-psci.dts
Normal file
9
arch/arm64/boot/dts/arm/foundation-v8-psci.dts
Normal file
@ -0,0 +1,9 @@
|
||||
/*
|
||||
* ARM Ltd.
|
||||
*
|
||||
* ARMv8 Foundation model DTS (GICv2+PSCI configuration)
|
||||
*/
|
||||
|
||||
#include "foundation-v8.dtsi"
|
||||
#include "foundation-v8-gicv2.dtsi"
|
||||
#include "foundation-v8-psci.dtsi"
|
28
arch/arm64/boot/dts/arm/foundation-v8-psci.dtsi
Normal file
28
arch/arm64/boot/dts/arm/foundation-v8-psci.dtsi
Normal file
@ -0,0 +1,28 @@
|
||||
/*
|
||||
* ARM Ltd.
|
||||
*
|
||||
* ARMv8 Foundation model DTS (PSCI configuration)
|
||||
*/
|
||||
|
||||
/ {
|
||||
psci {
|
||||
compatible = "arm,psci-1.0";
|
||||
method = "smc";
|
||||
};
|
||||
};
|
||||
|
||||
&cpu0 {
|
||||
enable-method = "psci";
|
||||
};
|
||||
|
||||
&cpu1 {
|
||||
enable-method = "psci";
|
||||
};
|
||||
|
||||
&cpu2 {
|
||||
enable-method = "psci";
|
||||
};
|
||||
|
||||
&cpu3 {
|
||||
enable-method = "psci";
|
||||
};
|
25
arch/arm64/boot/dts/arm/foundation-v8-spin-table.dtsi
Normal file
25
arch/arm64/boot/dts/arm/foundation-v8-spin-table.dtsi
Normal file
@ -0,0 +1,25 @@
|
||||
/*
|
||||
* ARM Ltd.
|
||||
*
|
||||
* ARMv8 Foundation model DTS (spin table configuration)
|
||||
*/
|
||||
|
||||
&cpu0 {
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x8000fff8>;
|
||||
};
|
||||
|
||||
&cpu1 {
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x8000fff8>;
|
||||
};
|
||||
|
||||
&cpu2 {
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x8000fff8>;
|
||||
};
|
||||
|
||||
&cpu3 {
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x8000fff8>;
|
||||
};
|
@ -5,17 +5,5 @@
|
||||
*/
|
||||
|
||||
#include "foundation-v8.dtsi"
|
||||
|
||||
/ {
|
||||
gic: interrupt-controller@2c001000 {
|
||||
compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
|
||||
#interrupt-cells = <3>;
|
||||
#address-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0x0 0x2c001000 0 0x1000>,
|
||||
<0x0 0x2c002000 0 0x2000>,
|
||||
<0x0 0x2c004000 0 0x2000>,
|
||||
<0x0 0x2c006000 0 0x2000>;
|
||||
interrupts = <1 9 0xf04>;
|
||||
};
|
||||
};
|
||||
#include "foundation-v8-gicv2.dtsi"
|
||||
#include "foundation-v8-spin-table.dtsi"
|
||||
|
@ -28,36 +28,28 @@ cpus {
|
||||
#address-cells = <2>;
|
||||
#size-cells = <0>;
|
||||
|
||||
cpu@0 {
|
||||
cpu0: cpu@0 {
|
||||
device_type = "cpu";
|
||||
compatible = "arm,armv8";
|
||||
reg = <0x0 0x0>;
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x8000fff8>;
|
||||
next-level-cache = <&L2_0>;
|
||||
};
|
||||
cpu@1 {
|
||||
cpu1: cpu@1 {
|
||||
device_type = "cpu";
|
||||
compatible = "arm,armv8";
|
||||
reg = <0x0 0x1>;
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x8000fff8>;
|
||||
next-level-cache = <&L2_0>;
|
||||
};
|
||||
cpu@2 {
|
||||
cpu2: cpu@2 {
|
||||
device_type = "cpu";
|
||||
compatible = "arm,armv8";
|
||||
reg = <0x0 0x2>;
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x8000fff8>;
|
||||
next-level-cache = <&L2_0>;
|
||||
};
|
||||
cpu@3 {
|
||||
cpu3: cpu@3 {
|
||||
device_type = "cpu";
|
||||
compatible = "arm,armv8";
|
||||
reg = <0x0 0x3>;
|
||||
enable-method = "spin-table";
|
||||
cpu-release-addr = <0x0 0x8000fff8>;
|
||||
next-level-cache = <&L2_0>;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user