From 6f51ef8a4c61bb2c61f5933dd659584db25f5481 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 5 Feb 2020 12:57:12 -0600 Subject: [PATCH] boards: em_starterkit: cleanup dts warnings Fix the following device tree warnings: unit-address and first reg (0x20000) don't match for iccm@0 unit-address and first reg (0x80010000) don't match for dccm@80000000 Since the em_starterkit_em7d_normal has a different base address for iccm & dccm, and most of the em_starterkit variants have different sizes for iccm & dccm. Just define the nodes in the specific em_starterkit*.dts file and remove them from emsk.dtsi. This removes the issue reported in the warning. Signed-off-by: Kumar Gala --- boards/arc/em_starterkit/em_starterkit.dts | 6 ++++-- boards/arc/em_starterkit/em_starterkit_em11d.dts | 6 ++++-- boards/arc/em_starterkit/em_starterkit_em7d.dts | 6 ++++-- boards/arc/em_starterkit/em_starterkit_em7d_normal.dts | 6 ++++-- boards/arc/em_starterkit/em_starterkit_em7d_v22.dts | 6 ++++-- dts/arc/emsk.dtsi | 8 -------- soc/arc/snps_emsk/dts_fixup.h | 4 ++-- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/boards/arc/em_starterkit/em_starterkit.dts b/boards/arc/em_starterkit/em_starterkit.dts index 7be62324a7b..0e2e9b0b1a3 100644 --- a/boards/arc/em_starterkit/em_starterkit.dts +++ b/boards/arc/em_starterkit/em_starterkit.dts @@ -27,11 +27,13 @@ zephyr,shell-uart = &uart1; }; - iccm@0 { + iccm0: iccm@0 { + compatible = "arc,iccm"; reg = <0x0 DT_SIZE_K(256)>; }; - dccm@80000000 { + dccm0: dccm@80000000 { + compatible = "arc,dccm"; reg = <0x80000000 DT_SIZE_K(128)>; }; }; diff --git a/boards/arc/em_starterkit/em_starterkit_em11d.dts b/boards/arc/em_starterkit/em_starterkit_em11d.dts index 0c09497b7dd..4ee399af9e2 100644 --- a/boards/arc/em_starterkit/em_starterkit_em11d.dts +++ b/boards/arc/em_starterkit/em_starterkit_em11d.dts @@ -27,11 +27,13 @@ zephyr,shell-uart = &uart1; }; - iccm@0 { + iccm0: iccm@0 { + compatible = "arc,iccm"; reg = <0x0 DT_SIZE_K(64)>; }; - dccm@80000000 { + dccm0: dccm@80000000 { + compatible = "arc,dccm"; reg = <0x80000000 DT_SIZE_K(64)>; }; }; diff --git a/boards/arc/em_starterkit/em_starterkit_em7d.dts b/boards/arc/em_starterkit/em_starterkit_em7d.dts index c04e46cc7db..0ba1e6e1d60 100644 --- a/boards/arc/em_starterkit/em_starterkit_em7d.dts +++ b/boards/arc/em_starterkit/em_starterkit_em7d.dts @@ -27,11 +27,13 @@ zephyr,shell-uart = &uart1; }; - iccm@0 { + iccm0: iccm@0 { + compatible = "arc,iccm"; reg = <0x0 DT_SIZE_K(256)>; }; - dccm@80000000 { + dccm0: dccm@80000000 { + compatible = "arc,dccm"; reg = <0x80000000 DT_SIZE_K(128)>; }; }; diff --git a/boards/arc/em_starterkit/em_starterkit_em7d_normal.dts b/boards/arc/em_starterkit/em_starterkit_em7d_normal.dts index 6e558253773..d0a7a68a5c9 100644 --- a/boards/arc/em_starterkit/em_starterkit_em7d_normal.dts +++ b/boards/arc/em_starterkit/em_starterkit_em7d_normal.dts @@ -27,11 +27,13 @@ zephyr,shell-uart = &uart1; }; - iccm@0 { + iccm0: iccm@20000 { + compatible = "arc,iccm"; reg = <0x20000 DT_SIZE_K(128)>; }; - dccm@80000000 { + dccm0: dccm@80010000 { + compatible = "arc,dccm"; reg = <0x80010000 DT_SIZE_K(64)>; }; }; diff --git a/boards/arc/em_starterkit/em_starterkit_em7d_v22.dts b/boards/arc/em_starterkit/em_starterkit_em7d_v22.dts index e8dfbc11646..2b96629d7c9 100644 --- a/boards/arc/em_starterkit/em_starterkit_em7d_v22.dts +++ b/boards/arc/em_starterkit/em_starterkit_em7d_v22.dts @@ -27,11 +27,13 @@ zephyr,shell-uart = &uart1; }; - iccm@0 { + iccm0: iccm@0 { + compatible = "arc,iccm"; reg = <0x0 DT_SIZE_K(256)>; }; - dccm@80000000 { + dccm0: dccm@80000000 { + compatible = "arc,dccm"; reg = <0x80000000 DT_SIZE_K(128)>; }; }; diff --git a/dts/arc/emsk.dtsi b/dts/arc/emsk.dtsi index 2e69c53de10..6cc26891e3c 100644 --- a/dts/arc/emsk.dtsi +++ b/dts/arc/emsk.dtsi @@ -28,14 +28,6 @@ }; }; - iccm0: iccm@0 { - compatible = "arc,iccm"; - }; - - dccm0: dccm@80000000 { - compatible = "arc,dccm"; - }; - sysclk: system-clock { compatible = "fixed-clock"; clock-frequency = ; diff --git a/soc/arc/snps_emsk/dts_fixup.h b/soc/arc/snps_emsk/dts_fixup.h index 573f9a8b480..c835a0df5b0 100644 --- a/soc/arc/snps_emsk/dts_fixup.h +++ b/soc/arc/snps_emsk/dts_fixup.h @@ -3,8 +3,8 @@ /* SoC level DTS fixup file */ /* CCM configuration */ -#define DT_DCCM_BASE_ADDRESS DT_ARC_DCCM_80000000_BASE_ADDRESS -#define DT_DCCM_SIZE (DT_ARC_DCCM_80000000_SIZE >> 10) +#define DT_DCCM_BASE_ADDRESS DT_INST_0_ARC_DCCM_BASE_ADDRESS +#define DT_DCCM_SIZE (DT_INST_0_ARC_DCCM_SIZE >> 10) #define DT_ICCM_BASE_ADDRESS DT_INST_0_ARC_ICCM_BASE_ADDRESS #define DT_ICCM_SIZE (DT_INST_0_ARC_ICCM_SIZE >> 10)