Skip to content

arm64: dts: adi: sc846: fix DRAM size and drop SRAM memory nodes #3508

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

Draft
artursartamonovsadi wants to merge 1 commit into
base: adsp-6.18.31-y
Choose a base branch
from
Draft

arm64: dts: adi: sc846: fix DRAM size and drop SRAM memory nodes #3508

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
43 changes: 7 additions & 36 deletions arch/arm64/boot/dts/adi/sc846-som.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,50 +17,21 @@
stdout-path = &uart0;
};

memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};

memory@20040000 {
device_type = "memory";
reg = <0x20040000 0x40000>;
};

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

vdev0vrings: vdev0vring0@20080000 {
reg = <0x20080000 0x4000>;
no-map;
};

vdev0buffer: vdev0buffer@20084000 {
compatible = "shared-dma-pool";
reg = <0x20084000 0x20000>;
no-map;
};
#address-cells = <1>;
#size-cells = <1>;
ranges;

vdev1vrings: vdev1vring0@200a4000 {
reg = <0x200a4000 0x4000>;
vdev0vrings: vdev0vring0@20400000 {
reg = <0x20400000 0x4000>;
no-map;
};

vdev1buffer: vdev1buffer@200a8000 {
compatible = "shared-dma-pool";
reg = <0x200a8000 0x20000>;
rsc_tbl0: rsc_tbl0@20404000 {
reg = <0x20404000 0x400>;
no-map;
};
};

sram1_mmap: sram-mmap {
compatible = "adi,sram-mmap";
memory-region = <&sram1_res>;
status = "okay";
};
};

&scb {
Expand Down
34 changes: 1 addition & 33 deletions arch/arm64/boot/dts/adi/sc846.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,39 +68,7 @@

memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>;
};

memory@20040000 {
device_type = "memory";
reg = <0x20040000 0x40000>;
};

sram1_mmap: sram-mmap {
compatible = "adi,sram-mmap";
memory-region = <&sram1_res>;
status = "okay";
};

reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;

rsc_tbl0: rsc-table@20000000 {
reg = <0x20000000 0x400>; /*1KiB*/
no-map;
};

rsc_tbl1: rsc-table@20000400 {
reg = <0x20000400 0x400>; /*1KiB*/
no-map;
};

sharc-internal-icc@20005000 {
reg = <0x20005000 0x20000>; /*128KiB*/
no-map;
};
reg = <0x80000000 0x40000000>;
};

pmu {
Expand Down Expand Up @@ -247,11 +215,11 @@
* pads registers directly, while the emac glue and sru-ctrl
* reach them through this syscon regmap (adi,pads-syscon).
*/
pads_syscon: syscon@31004600 {
compatible = "adi,sc5xx-pads-syscon", "syscon";
reg = <0x31004600 0x200>;
status = "okay";
};

Check warning on line 222 in arch/arm64/boot/dts/adi/sc846.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build 

(unique_unit_address): /scb/syscon@31004600: duplicate unit-address (also used in node /scb/pinctrl@31004600)

dmc_pmu: dmc-pmu@31070000 {
compatible = "adi,dmc-pmu";
Expand Down
Loading