Skip to content

SC598: Revert device tree sram changes #14

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

SC598: Revert device tree sram changes #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 12 additions & 36 deletions arch/arm64/boot/dts/adi/sc598-som.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
};

reserved-memory {
sram1_res: sram1-reserved@20040000 {
compatible = "adi,sram-access";
reg = <0x20040000 0x40000>;
};

vdev0vrings: vdev0vring0@20080000 {
reg = <0x20080000 0x4000>;
Expand All @@ -56,11 +52,13 @@
};
};

sram1_mmap: sram-mmap@0 {
compatible = "adi,sram-mmap";
memory-region = <&sram1_res>;
status = "okay";
};
sram2: sram-reserved@200C8000 {
compatible = "mmio-sram";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x200C8000 0x138000>;
ranges = <0 0x200C8000 0x138000>; /*1248KiB*/
};

scb {
sharc0: core1-rproc@0x28240000 {
Expand Down Expand Up @@ -99,33 +97,7 @@
status = "okay";
};

sharc0_rpmsg: core0-rpmsg@0x28240000 {
status = "disabled";
compatible = "adi,rpmsg-SC598";
core-id = <1>;
adi,rcu = <&rcu>;
adi,check-idle;
adi,rsc-table = <&rsc_tbl0>;
interrupts = <GIC_SPI 337 IRQ_TYPE_EDGE_RISING>; /* TRU0_SLV3 */
adi,tru = <&tru>;
adi,tru-master-id = <135>; /* trigger master SOFT4 */
vdev-vring = <&vdev0vrings>;
memory-region = <&vdev0buffer>;
};

sharc1_rpmsg: core1-rpmsg@0x28a40000 {
status = "disabled";
compatible = "adi,rpmsg-SC598";
core-id = <2>;
adi,rcu = <&rcu>;
adi,check-idle;
adi,rsc-table = <&rsc_tbl1>;
interrupts = <GIC_SPI 337 IRQ_TYPE_EDGE_RISING>; /* TRU0_SLV3 */
adi,tru = <&tru>;
adi,tru-master-id = <136>; /* trigger master SOFT5 */
vdev-vring = <&vdev1vrings>;
memory-region = <&vdev1buffer>;
};

};

};
Expand Down Expand Up @@ -357,6 +329,10 @@
status = "okay";
};

&sram_mmap {
status = "okay";
};

&pinctrl0 {
uart0_default: uart0_default_pins {
pins {
Expand Down
25 changes: 24 additions & 1 deletion arch/arm64/boot/dts/adi/sc59x-64.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,22 @@
<0x31240000 0x40000>; /* GICR */
};

sram0: sram-icc@20025000 {
compatible = "mmio-sram";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x20025000 0x1B000>;
ranges = <0 0x20025000 0x1B000>; /*108KiB*/
};

sram1: sram-reserved@20040000 {
compatible = "mmio-sram";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x20040000 0x40000>;
ranges = <0 0x20040000 0x40000>; /*256KiB*/
};

timer {
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, /* Physical Secure */
Expand Down Expand Up @@ -222,11 +238,18 @@
sram-controller@31080000 {
compatible = "adi,sram-controller";
reg = <0x31080000 0x100>;
/* adi,sram = <&sram0>, <&sram1>; */
adi,sram = <&sram0>, <&sram1>;
interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
status = "okay";
};

sram_mmap: sram-mmap@0 {
compatible = "adi,sram-mmap";
memory-region = <&sram1>;
status = "disabled";
};


gptimer_counter: gptimer-counters@0 {
compatible = "adi,gptimer-counter";
status = "okay";
Expand Down