Skip to contentSkip to conversation

ARM: dts: at91: rename sama7g5ek.dts to at91-sama7g5ek.dts

PATCH Superseded Eugen Hristev 2 participants 4 messages Mar 7, 2022

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 ARM: dts: at91: rename sama7g5ek.dts to at91-sama7g5ek.dts

In Linux this DT file is named at91-sama7g5ek.dts. Rename it accordingly.

---
Changes in v2:
- rename also sama7g5ek-u-boot.dtsi

 arch/arm/dts/Makefile                                           | 2 +-
 .../dts/{sama7g5ek-u-boot.dtsi => at91-sama7g5ek-u-boot.dtsi}   | 0
 arch/arm/dts/{sama7g5ek.dts => at91-sama7g5ek.dts}              | 0
 configs/sama7g5ek_mmc1_defconfig                                | 2 +-
 configs/sama7g5ek_mmc_defconfig                                 | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/arm/dts/{sama7g5ek-u-boot.dtsi => at91-sama7g5ek-u-boot.dtsi} (100%)
 rename arch/arm/dts/{sama7g5ek.dts => at91-sama7g5ek.dts} (100%)
arch/arm/dts/Makefile +1 -1
index 960f1a9fd4..771115dc53 100644
@@ -1044,7 +1044,7 @@ dtb-$(CONFIG_TARGET_OMAP5_UEVM) += \
 	omap5-uevm.dtb
 
 dtb-$(CONFIG_TARGET_SAMA7G5EK) += \
-	sama7g5ek.dtb
+	at91-sama7g5ek.dtb
 
 dtb-$(CONFIG_TARGET_SAMA5D2_PTC_EK) += \
 	at91-sama5d2_ptc_ek.dtb
arch/arm/dts/at91-sama7g5ek-u-boot.dtsi renamed from arch/arm/dts/sama7g5ek-u-boot.dtsi +0 -0
similarity index 100%
rename from arch/arm/dts/sama7g5ek-u-boot.dtsi
rename to arch/arm/dts/at91-sama7g5ek-u-boot.dtsi
arch/arm/dts/at91-sama7g5ek.dts renamed from arch/arm/dts/sama7g5ek.dts +0 -0
similarity index 100%
rename from arch/arm/dts/sama7g5ek.dts
rename to arch/arm/dts/at91-sama7g5ek.dts
configs/sama7g5ek_mmc1_defconfig +1 -1
index 15a5c54e75..2da3fd0e68 100644
@@ -8,7 +8,7 @@ CONFIG_SYS_MEMTEST_START=0x60000000
 CONFIG_SYS_MEMTEST_END=0x70000000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="sama7g5ek"
+CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
 CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_DEBUG_UART_BASE=0xe1824200
 CONFIG_DEBUG_UART_CLOCK=200000000
configs/sama7g5ek_mmc_defconfig +1 -1
index 7abd5c8a38..a33f794494 100644
@@ -8,7 +8,7 @@ CONFIG_SYS_MEMTEST_START=0x60000000
 CONFIG_SYS_MEMTEST_END=0x70000000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="sama7g5ek"
+CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
 CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_DEBUG_UART_BASE=0xe1824200
 CONFIG_DEBUG_UART_CLOCK=200000000
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 2/2 ARM: dts: at91: sama7g5/sama7g5ek: align with Linux DT

Align the DT for sama7g5 SoC and sama7g5 EK board with Linux devicetree in version 5.18.

Some things remain still different, due to some things yet unimplemented in certain drivers. These include in PMC, pinctrl, and others.

---
 arch/arm/dts/at91-sama7g5ek-u-boot.dtsi |  18 +-
 arch/arm/dts/at91-sama7g5ek.dts         | 727 +++++++++++++++---
 arch/arm/dts/sama7g5.dtsi               | 942 ++++++++++++++++++++----
 3 files changed, 1426 insertions(+), 261 deletions(-)
arch/arm/dts/at91-sama7g5ek-u-boot.dtsi +7 -11
index 5e1a0d53a5..407c94406e 100644
@@ -14,12 +14,8 @@
 		u-boot,dm-pre-reloc;
 	};
 
-	ahb {
+	soc {
 		u-boot,dm-pre-reloc;
-
-		apb {
-			u-boot,dm-pre-reloc;
-		};
 	};
 };
 
@@ -31,18 +27,18 @@
 	u-boot,dm-pre-reloc;
 };
 
-&pioA {
+&pinctrl {
 	u-boot,dm-pre-reloc;
-
-	pinctrl {
-		u-boot,dm-pre-reloc;
-	};
 };
 
 &pinctrl_flx3_default {
 	u-boot,dm-pre-reloc;
 };
 
+&pioA {
+	u-boot,dm-pre-reloc;
+};
+
 &pit64b0 {
 	u-boot,dm-pre-reloc;
 };
@@ -59,7 +55,7 @@
 	u-boot,dm-pre-reloc;
 };
 
-&uart0 {
+&uart3 {
 	u-boot,dm-pre-reloc;
 };
 
arch/arm/dts/at91-sama7g5ek.dts +628 -99

851 lines not on this page · raw message

arch/arm/dts/sama7g5.dtsi +791 -151

1,019 lines not on this page · raw message

Signature · 1 line
2.25.1
#2 lore raw
In reply to Eugen Hristev
Quoted 7 lines · Eugen Hristev

In Linux this DT file is named at91-sama7g5ek.dts. Rename it accordingly.

---
Changes in v2:
- rename also sama7g5ek-u-boot.dtsi

you missed comment on previous patch set.

Shall you update the description too?
arch/arm/dts/at91-sama7g5ek-u-boot.dtsi: * sama7g5ek-u-boot.dts - Device Tree file for SAMA7G5 SoC u-boot properties. arch/arm/dts/at91-sama7g5ek.dts: * sama7g5ek.dts - Device Tree file for SAMA7G5 EK

Quoted 56 lines
 arch/arm/dts/Makefile                                           | 2 +-
 .../dts/{sama7g5ek-u-boot.dtsi => at91-sama7g5ek-u-boot.dtsi}   | 0
 arch/arm/dts/{sama7g5ek.dts => at91-sama7g5ek.dts}              | 0
 configs/sama7g5ek_mmc1_defconfig                                | 2 +-
 configs/sama7g5ek_mmc_defconfig                                 | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/arm/dts/{sama7g5ek-u-boot.dtsi => at91-sama7g5ek-u-boot.dtsi} (100%)
 rename arch/arm/dts/{sama7g5ek.dts => at91-sama7g5ek.dts} (100%)
arch/arm/dts/Makefile +1 -1
index 960f1a9fd4..771115dc53 100644
@@ -1044,7 +1044,7 @@ dtb-$(CONFIG_TARGET_OMAP5_UEVM) += \
 	omap5-uevm.dtb
 
 dtb-$(CONFIG_TARGET_SAMA7G5EK) += \
-	sama7g5ek.dtb
+	at91-sama7g5ek.dtb
 
 dtb-$(CONFIG_TARGET_SAMA5D2_PTC_EK) += \
 	at91-sama5d2_ptc_ek.dtb
arch/arm/dts/at91-sama7g5ek-u-boot.dtsi renamed from arch/arm/dts/sama7g5ek-u-boot.dtsi +0 -0
similarity index 100%
rename from arch/arm/dts/sama7g5ek-u-boot.dtsi
rename to arch/arm/dts/at91-sama7g5ek-u-boot.dtsi
arch/arm/dts/at91-sama7g5ek.dts renamed from arch/arm/dts/sama7g5ek.dts +0 -0
similarity index 100%
rename from arch/arm/dts/sama7g5ek.dts
rename to arch/arm/dts/at91-sama7g5ek.dts
configs/sama7g5ek_mmc1_defconfig +1 -1
index 15a5c54e75..2da3fd0e68 100644
@@ -8,7 +8,7 @@ CONFIG_SYS_MEMTEST_START=0x60000000
 CONFIG_SYS_MEMTEST_END=0x70000000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="sama7g5ek"
+CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
 CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_DEBUG_UART_BASE=0xe1824200
 CONFIG_DEBUG_UART_CLOCK=200000000
configs/sama7g5ek_mmc_defconfig +1 -1
index 7abd5c8a38..a33f794494 100644
@@ -8,7 +8,7 @@ CONFIG_SYS_MEMTEST_START=0x60000000
 CONFIG_SYS_MEMTEST_END=0x70000000
 CONFIG_ENV_SIZE=0x4000
 CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="sama7g5ek"
+CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
 CONFIG_DEBUG_UART_BOARD_INIT=y
 CONFIG_DEBUG_UART_BASE=0xe1824200
 CONFIG_DEBUG_UART_CLOCK=200000000
#3 lore raw
Quoted 8 lines · On 3/7/22 3:48 PM, Tudor Ambarus - M18064 wrote:
Quoted 7 lines · Eugen Hristev

In Linux this DT file is named at91-sama7g5ek.dts. Rename it accordingly.

---
Changes in v2:
- rename also sama7g5ek-u-boot.dtsi

Quoted 5 lines

you missed comment on previous patch set.

Shall you update the description too?
arch/arm/dts/at91-sama7g5ek-u-boot.dtsi: * sama7g5ek-u-boot.dts - Device Tree file for SAMA7G5 SoC u-boot properties. arch/arm/dts/at91-sama7g5ek.dts: * sama7g5ek.dts - Device Tree file for SAMA7G5 EK

Okay, for at91-sama7g5ek.dts this is done in patch 2/2 but I can move it in this patch, and at91-sama7g5ek-u-boot.dtsi has to be changed.

Thanks

Quoted 58 lines
Quoted 57 lines
  arch/arm/dts/Makefile                                           | 2 +-
  .../dts/{sama7g5ek-u-boot.dtsi => at91-sama7g5ek-u-boot.dtsi}   | 0
  arch/arm/dts/{sama7g5ek.dts => at91-sama7g5ek.dts}              | 0
  configs/sama7g5ek_mmc1_defconfig                                | 2 +-
  configs/sama7g5ek_mmc_defconfig                                 | 2 +-
  5 files changed, 3 insertions(+), 3 deletions(-)

rename arch/arm/dts/{sama7g5ek-u-boot.dtsi => at91-sama7g5ek-u-boot.dtsi} (100%) rename arch/arm/dts/{sama7g5ek.dts => at91-sama7g5ek.dts} (100%)

arch/arm/dts/Makefile +1 -1
index 960f1a9fd4..771115dc53 100644
@@ -1044,7 +1044,7 @@ dtb-$(CONFIG_TARGET_OMAP5_UEVM) += \
  	omap5-uevm.dtb
 
  dtb-$(CONFIG_TARGET_SAMA7G5EK) += \
-	sama7g5ek.dtb
+	at91-sama7g5ek.dtb
 
  dtb-$(CONFIG_TARGET_SAMA5D2_PTC_EK) += \
  	at91-sama5d2_ptc_ek.dtb
arch/arm/dts/at91-sama7g5ek-u-boot.dtsi renamed from arch/arm/dts/sama7g5ek-u-boot.dtsi +0 -0
similarity index 100%
rename from arch/arm/dts/sama7g5ek-u-boot.dtsi
rename to arch/arm/dts/at91-sama7g5ek-u-boot.dtsi
arch/arm/dts/at91-sama7g5ek.dts renamed from arch/arm/dts/sama7g5ek.dts +0 -0
similarity index 100%
rename from arch/arm/dts/sama7g5ek.dts
rename to arch/arm/dts/at91-sama7g5ek.dts
configs/sama7g5ek_mmc1_defconfig +1 -1
index 15a5c54e75..2da3fd0e68 100644
@@ -8,7 +8,7 @@ CONFIG_SYS_MEMTEST_START=0x60000000
  CONFIG_SYS_MEMTEST_END=0x70000000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="sama7g5ek"
+CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xe1824200
  CONFIG_DEBUG_UART_CLOCK=200000000
configs/sama7g5ek_mmc_defconfig +1 -1
index 7abd5c8a38..a33f794494 100644
@@ -8,7 +8,7 @@ CONFIG_SYS_MEMTEST_START=0x60000000
  CONFIG_SYS_MEMTEST_END=0x70000000
  CONFIG_ENV_SIZE=0x4000
  CONFIG_DM_GPIO=y
-CONFIG_DEFAULT_DEVICE_TREE="sama7g5ek"
+CONFIG_DEFAULT_DEVICE_TREE="at91-sama7g5ek"
  CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xe1824200
  CONFIG_DEBUG_UART_CLOCK=200000000