Skip to content

Refactor and fix Cortex-R device tree #19696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions dts/arm/armv7-r.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,14 @@
*
* SPDX-License-Identifier: Apache-2.0
*/

#include "skeleton.dtsi"

/ {
cpus {
#address-cells = <1>;
#size-cells = <0>;

cpu@0 {
device_type = "cpu";
compatible = "Cortex-R";
reg = <0>;
};

core_intc: core_intc@0 {
compatible = "armv7-r,core-intc";
reg = <0x00 0x4>;
interrupt-controller;
#interrupt-cells = <2>;
};
};

soc {
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
ranges;
};
};

13 changes: 11 additions & 2 deletions dts/arm/xilinx/zynqmp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,24 @@
* Copyright (c) 2019 Lexmark International, Inc.
*
* SPDX-License-Identifier: Apache-2.0
*
*/

#include <mem.h>
#include <arm/armv7-r.dtsi>
#include <dt-bindings/interrupt-controller/arm-gic.h>

/ {
cpus {
#address-cells = <1>;
#size-cells = <0>;

cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-r4";
reg = <0>;
};
};

soc {
interrupt-parent = <&gic>;

Expand All @@ -19,7 +29,6 @@
<0xf9020000 0x100>;
interrupt-controller;
#interrupt-cells = <3>;
interrupt-parent = <&core_intc>;
label = "GIC";
status = "okay";
};
Expand Down
11 changes: 11 additions & 0 deletions dts/bindings/cpu/arm,cortex-r4.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Copyright (c) 2019 Stephanos Ioannidis <[email protected]>
# SPDX-License-Identifier: Apache-2.0

title: ARM Cortex-R4 CPU

description: >
This is a representation of ARM Cortex-R4 CPU.

compatible: "arm,cortex-r4"

include: cpu.yaml
11 changes: 11 additions & 0 deletions dts/bindings/cpu/arm,cortex-r4f.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Copyright (c) 2019 Stephanos Ioannidis <[email protected]>
# SPDX-License-Identifier: Apache-2.0

title: ARM Cortex-R4F CPU

description: >
This is a representation of ARM Cortex-R4F CPU.

compatible: "arm,cortex-r4f"

include: cpu.yaml
11 changes: 11 additions & 0 deletions dts/bindings/cpu/arm,cortex-r5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Copyright (c) 2019 Stephanos Ioannidis <[email protected]>
# SPDX-License-Identifier: Apache-2.0

title: ARM Cortex-R5 CPU

description: >
This is a representation of ARM Cortex-R5 CPU.

compatible: "arm,cortex-r5"

include: cpu.yaml
11 changes: 11 additions & 0 deletions dts/bindings/cpu/arm,cortex-r5f.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Copyright (c) 2019 Stephanos Ioannidis <[email protected]>
# SPDX-License-Identifier: Apache-2.0

title: ARM Cortex-R5F CPU

description: >
This is a representation of ARM Cortex-R5F CPU.

compatible: "arm,cortex-r5f"

include: cpu.yaml