Skip to content
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

Change AON to use control instead of mem for reg-names #211

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions bare_header/sifive_aon0.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class sifive_aon0 : public Device {
uint64_t base_address(const node &n) {
uint64_t b;

n.named_tuples("reg-names", "reg", "mem",
n.named_tuples("reg-names", "reg", "control",
tuple_t<target_addr, target_size>(),
[&](target_addr base, target_size size) { b = base; });

Expand All @@ -26,7 +26,7 @@ class sifive_aon0 : public Device {
uint64_t size(const node &n) {
uint64_t s;

n.named_tuples("reg-names", "reg", "mem",
n.named_tuples("reg-names", "reg", "control",
tuple_t<target_addr, target_size>(),
[&](target_addr base, target_size size) { s = size; });

Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-sifive-e31/core.dts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
aon: aon@10000000 {
compatible = "sifive,aon0";
reg = <0x10000000 0x8000>;
reg-names = "mem";
reg-names = "control";
};
prci: prci@10008000 {
compatible = "sifive,fe310-g000,prci";
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-sifive-s51/core.dts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
aon: aon@10000000 {
compatible = "sifive,aon0";
reg = <0x10000000 0x8000>;
reg-names = "mem";
reg-names = "control";
};

prci: prci@10008000 {
Expand Down
2 changes: 1 addition & 1 deletion tests/sifive-hifive1-revb/core.dts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
aon: aon@10000000 {
compatible = "sifive,aon0";
reg = <0x10000000 0x8000>;
reg-names = "mem";
reg-names = "control";
interrupt-parent = <&plic>;
interrupts = <1 2>;
clocks = <&lfclk>;
Expand Down
2 changes: 1 addition & 1 deletion tests/sifive-hifive1/core.dts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
aon: aon@10000000 {
compatible = "sifive,aon0";
reg = <0x10000000 0x8000>;
reg-names = "mem";
reg-names = "control";
};

prci: prci@10008000 {
Expand Down