Skip to contentSkip to conversation

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

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

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 arch/arm/dts/Makefile                              | 2 +-
 arch/arm/dts/{sama7g5ek.dts => at91-sama7g5ek.dts} | 0
 configs/sama7g5ek_mmc1_defconfig                   | 2 +-
 configs/sama7g5ek_mmc_defconfig                    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 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.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 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.dts | 727 ++++++++++++++++++++----
 arch/arm/dts/sama7g5.dtsi       | 942 +++++++++++++++++++++++++++-----
 2 files changed, 1419 insertions(+), 250 deletions(-)
arch/arm/dts/at91-sama7g5ek.dts +628 -99
index ac6f23f64e..5313c6d160 100644
@@ -1,69 +1,150 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * sama7g5ek.dts - Device Tree file for SAMA7G5 EK
- *		   SAMA7G5 Evaluation Kit
+ *  at91-sama7g5ek.dts - Device Tree file for SAMA7G5-EK board
+ *
+ *  Copyright (c) 2020 Microchip Technology Inc. and its subsidiaries
+ *
+ *  Author: Eugen Hristev <[email protected]>
+ *  Author: Claudiu Beznea <[email protected]>
  *
- *  Copyright (c) 2020, Microchip Technology Inc.
- *                2020, Eugen Hristev <[email protected]>
- *		  2020, Claudiu Beznea <[email protected]>
  */
 /dts-v1/;
-#include <dt-bindings/mfd/atmel-flexcom.h>
-#include "sama7g5.dtsi"
 #include "sama7g5-pinfunc.h"
+#include "sama7g5.dtsi"
+#include <dt-bindings/mfd/atmel-flexcom.h>
+#include <dt-bindings/input/input.h>
 #include <dt-bindings/pinctrl/at91.h>
 
 / {
-	model = "Microchip SAMA7G5 Evaluation Kit";
-	compatible = "microchip,sama7g5ek", "microchip,sama7g54", "microchip,sama7g5", "microchip,sama7";
+	model = "Microchip SAMA7G5-EK";
+	compatible = "microchip,sama7g5ek", "microchip,sama7g5", "microchip,sama7";
+
+	chosen {
+		bootargs = "rw root=/dev/mmcblk1p2 rootfstype=ext4 rootwait";
+		stdout-path = "serial0:115200n8";
+	};
 
 	aliases {
-		serial0 = &uart0;
+		serial0 = &uart3;
+		serial1 = &uart4;
+		serial2 = &uart7;
+		serial3 = &uart0;
 		i2c0 = &i2c1;
 		i2c1 = &i2c8;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
+		i2c2 = &i2c9;
 	};
 
 	clocks {
-		slow_xtal: slow_xtal {
+		slow_xtal {
 			clock-frequency = <32768>;
 		};
 
-		main_xtal: main_xtal {
+		main_xtal {
 			clock-frequency = <24000000>;
 		};
 	};
 
-	ahb {
+	gpio_keys {
+		compatible = "gpio-keys";
 
-		apb {
-			sdmmc0: sdio-host@e1204000 {
-				bus-width = <8>;
-				non-removable;
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_sdmmc0_cmd_data_default
-					     &pinctrl_sdmmc0_ck_rstn_ds_cd_default>;
-				status = "okay";
-			};
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_key_gpio_default>;
 
-			sdmmc1: sdio-host@e1208000 {
-				bus-width = <4>;
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_sdmmc1_cmd_data_default
-					     &pinctrl_sdmmc1_ck_cd_rstn_vddsel_default>;
-				status = "okay";
-			};
+		bp1 {
+			label = "PB_USER";
+			gpios = <&pioA PIN_PA12 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_PROG1>;
+			wakeup-source;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_led_gpio_default>;
+		status = "okay"; /* Conflict with pwm. */
+
+		red_led {
+			label = "red";
+			gpios = <&pioA PIN_PB8 GPIO_ACTIVE_HIGH>;
+		};
+
+		green_led {
+			label = "green";
+			gpios = <&pioA PIN_PA13 GPIO_ACTIVE_HIGH>;
+		};
+
+		blue_led {
+			label = "blue";
+			gpios = <&pioA PIN_PD20 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "heartbeat";
+		};
+	};
+
+	/* 512 M */
+	memory@60000000 {
+		device_type = "memory";
+		reg = <0x60000000 0x20000000>;
+	};
 
-			uart0: serial@e1824200 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_flx3_default>;
-				status = "okay";
+	sound: sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "sama7g5ek audio";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		simple-audio-card,dai-link@0 {
+			reg = <0>;
+			cpu {
+				sound-dai = <&spdiftx>;
+			};
+			codec {
+				sound-dai = <&spdif_out>;
+			};
+		};
+		simple-audio-card,dai-link@1 {
+			reg = <1>;
+			cpu {
+				sound-dai = <&spdifrx>;
+			};
+			codec {
+				sound-dai = <&spdif_in>;
 			};
 		};
 	};
+
+	spdif_in: spdif-in {
+		#sound-dai-cells = <0>;
+		compatible = "linux,spdif-dir";
+	};
+
+	spdif_out: spdif-out {
+		#sound-dai-cells = <0>;
+		compatible = "linux,spdif-dit";
+	};
+};
+
+&adc {
+	vddana-supply = <&vddout25>;
+	vref-supply = <&vddout25>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_mikrobus1_an_default &pinctrl_mikrobus2_an_default>;
+	status = "okay";
+};
+
+&can0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_can0_default>;
+	status = "okay";
+};
+
+&can1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_can1_default>;
+	status = "okay";
+};
+
+&cpu0 {
+	cpu-supply = <&vddcpu>;
 };
 
 &qspi0 {
@@ -81,18 +162,233 @@
 		spi-rx-bus-width = <8>;
 		m25p,fast-read;
 
+		at91bootstrap@0 {
+			label = "ospi: at91bootstrap";
+			reg = <0x0 0x40000>;
+		};
+
+		bootloader@40000 {
+			label = "ospi: bootloader";
+			reg = <0x40000 0xc0000>;
+		};
+
+		bootloaderenvred@100000 {
+			label = "ospi: bootloader env redundant";
+			reg = <0x100000 0x40000>;
+		};
+
+		bootloaderenv@140000 {
+			label = "ospi: bootloader env";
+			reg = <0x140000 0x40000>;
+		};
+
+		dtb@180000 {
+			label = "ospi: device tree";
+			reg = <0x180000 0x80000>;
+		};
+
+		kernel@200000 {
+			label = "ospi: kernel";
+			reg = <0x200000 0x600000>;
+		};
+
+		rootfs@800000 {
+			label = "ospi: rootfs";
+			reg = <0x800000 0x7800000>;
+		};
+
+	};
+};
+
+&dma0 {
+	status = "okay";
+};
+
+&dma1 {
+	status = "okay";
+};
+
+&dma2 {
+	status = "okay";
+};
+
+&flx0 {
+	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
+	status = "disabled";
+
+	uart0: serial@200 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_flx0_default>;
+		status = "disabled";
 	};
 };
 
 &flx1 {
 	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
 	status = "okay";
+
+	i2c1: i2c@600 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_i2c1_default>;
+		i2c-analog-filter;
+		i2c-digital-filter;
+		i2c-digital-filter-width-ns = <35>;
+		status = "okay";
+
+		mcp16502@5b {
+			compatible = "microchip,mcp16502";
+			reg = <0x5b>;
+			status = "okay";
+
+			regulators {
+				vdd_3v3: VDD_IO {
+					regulator-name = "VDD_IO";
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <3700000>;
+					regulator-initial-mode = <2>;
+					regulator-allowed-modes = <2>, <4>;
+					regulator-always-on;
+
+					regulator-state-standby {
+						regulator-on-in-suspend;
+						regulator-suspend-microvolt = <3300000>;
+						regulator-mode = <4>;
+					};
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+						regulator-mode = <4>;
+					};
+				};
+
+				vddioddr: VDD_DDR {
+					regulator-name = "VDD_DDR";
+					regulator-min-microvolt = <1300000>;
+					regulator-max-microvolt = <1450000>;
+					regulator-initial-mode = <2>;
+					regulator-allowed-modes = <2>, <4>;
+					regulator-always-on;
+
+					regulator-state-standby {
+						regulator-on-in-suspend;
+						regulator-suspend-microvolt = <1350000>;
+						regulator-mode = <4>;
+					};
+
+					regulator-state-mem {
+						regulator-on-in-suspend;
+						regulator-suspend-microvolt = <1350000>;
+						regulator-mode = <4>;
+					};
+				};
+
+				vddcore: VDD_CORE {
+					regulator-name = "VDD_CORE";
+					regulator-min-microvolt = <1100000>;
+					regulator-max-microvolt = <1850000>;
+					regulator-initial-mode = <2>;
+					regulator-allowed-modes = <2>, <4>;
+					regulator-always-on;
+
+					regulator-state-standby {
+						regulator-on-in-suspend;
+						regulator-suspend-voltage = <1150000>;
+						regulator-mode = <4>;
+					};
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+						regulator-mode = <4>;
+					};
+				};
+
+				vddcpu: VDD_OTHER {
+					regulator-name = "VDD_OTHER";
+					regulator-min-microvolt = <1050000>;
+					regulator-max-microvolt = <1850000>;
+					regulator-initial-mode = <2>;
+					regulator-allowed-modes = <2>, <4>;
+					regulator-ramp-delay = <3125>;
+					regulator-always-on;
+
+					regulator-state-standby {
+						regulator-on-in-suspend;
+						regulator-suspend-voltage = <1050000>;
+						regulator-mode = <4>;
+					};
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+						regulator-mode = <4>;
+					};
+				};
+
+				vldo1: LDO1 {
+					regulator-name = "LDO1";
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <3700000>;
+					regulator-always-on;
+
+					regulator-state-standby {
+						regulator-suspend-voltage = <1800000>;
+						regulator-on-in-suspend;
+					};
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+
+				vldo2: LDO2 {
+					regulator-name = "LDO2";
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <3700000>;
+
+					regulator-state-standby {
+						regulator-suspend-voltage = <1800000>;
+						regulator-on-in-suspend;
+					};
+
+					regulator-state-mem {
+						regulator-off-in-suspend;
+					};
+				};
+			};
+		};
+	};
+};
+
+&flx3 {
+	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
+	status = "okay";
+
+	uart3: serial@200 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_flx3_default>;
+		status = "okay";
+	};
 };
 
-&i2c1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_flx1_default>;
+&flx4 {
+	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
 	status = "okay";
+
+	uart4: serial@200 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_flx4_default>;
+		status = "okay";
+	};
+};
+
+&flx7 {
+	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;
+	status = "okay";
+
+	uart7: serial@200 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_flx7_default>;
+		status = "okay";
+	};
 };
 
 &flx8 {
@@ -121,18 +417,46 @@
 	};
 };
 
+&flx9 {
+	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
+	status = "okay";
+
+	i2c9: i2c@600 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_i2c9_default>;
+		i2c-analog-filter;
+		i2c-digital-filter;
+		i2c-digital-filter-width-ns = <35>;
+		status = "okay";
+	};
+};
+
+&flx11 {
+	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>;
+	status = "okay";
+
+	spi11: spi@400 {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_mikrobus1_spi &pinctrl_mikrobus1_spi_cs>;
+		status = "okay";
+	};
+};
+
 &gmac0 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gmac0_default
 		     &pinctrl_gmac0_mdio_default
-		     &pinctrl_gmac0_txc_default>;
+		     &pinctrl_gmac0_txck_default
+		     &pinctrl_gmac0_phy_irq>;
 	phy-mode = "rgmii-id";
 	status = "okay";
 
 	ethernet-phy@7 {
 		reg = <0x7>;
+		interrupt-parent = <&pioA>;
+		interrupts = <PIN_PA31 IRQ_TYPE_LEVEL_LOW>;
 	};
 };
 
@@ -140,19 +464,43 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_gmac1_default &pinctrl_gmac1_mdio_default>;
+	pinctrl-0 = <&pinctrl_gmac1_default
+		     &pinctrl_gmac1_mdio_default
+		     &pinctrl_gmac1_phy_irq>;
 	phy-mode = "rmii";
 	status = "okay";
 
 	ethernet-phy@0 {
 		reg = <0x0>;
+		interrupt-parent = <&pioA>;
+		interrupts = <PIN_PA21 IRQ_TYPE_LEVEL_LOW>;
 	};
 };
 
-&pinctrl {
-	pinctrl_flx1_default: flx1_default {
-		pinmux = <PIN_PC9__FLEXCOM1_IO0>,
-			 <PIN_PC10__FLEXCOM1_IO1>;
+&i2s0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2s0_default>;
+};
+
+&pioA {
+
+	pinctrl_can0_default: can0_default {
+		pinmux = <PIN_PD12__CANTX0>,
+			 <PIN_PD13__CANRX0 >;
+		bias-disable;
+	};
+
+	pinctrl_can1_default: can1_default {
+		pinmux = <PIN_PD14__CANTX1>,
+			 <PIN_PD15__CANRX1 >;
+		bias-disable;
+	};
+
+	pinctrl_flx0_default: flx0_default {
+		pinmux = <PIN_PE3__FLEXCOM0_IO0>,
+			 <PIN_PE4__FLEXCOM0_IO1>,
+			 <PIN_PE6__FLEXCOM0_IO3>,
+			 <PIN_PE7__FLEXCOM0_IO4>;
 		bias-disable;
 	};
 
@@ -162,12 +510,147 @@
 		bias-pull-up;
 	};
 
+	pinctrl_flx4_default: flx4_default {
+		pinmux = <PIN_PD18__FLEXCOM4_IO0>,
+			 <PIN_PD19__FLEXCOM4_IO1>;
+		bias-disable;
+	};
+
+	pinctrl_flx7_default: flx7_default {
+		pinmux = <PIN_PC23__FLEXCOM7_IO0>,
+			 <PIN_PC24__FLEXCOM7_IO1>;
+		bias-disable;
+	};
+
+	pinctrl_gmac0_default: gmac0_default {
+		pinmux = <PIN_PA16__G0_TX0>,
+			 <PIN_PA17__G0_TX1>,
+			 <PIN_PA26__G0_TX2>,
+			 <PIN_PA27__G0_TX3>,
+			 <PIN_PA19__G0_RX0>,
+			 <PIN_PA20__G0_RX1>,
+			 <PIN_PA28__G0_RX2>,
+			 <PIN_PA29__G0_RX3>,
+			 <PIN_PA15__G0_TXEN>,
+			 <PIN_PA30__G0_RXCK>,
+			 <PIN_PA18__G0_RXDV>,
+			 <PIN_PA25__G0_125CK>;
+		slew-rate = <0>;
+		bias-disable;
+	};
+
+	pinctrl_gmac0_mdio_default: gmac0_mdio_default {
+		pinmux = <PIN_PA22__G0_MDC>,
+			 <PIN_PA23__G0_MDIO>;
+		bias-disable;
+	};
+
+	pinctrl_gmac0_txck_default: gmac0_txck_default {
+		pinmux = <PIN_PA24__G0_TXCK>;
+		slew-rate = <0>;
+		bias-pull-up;
+	};
+
+	pinctrl_gmac0_phy_irq: gmac0_phy_irq {
+		pinmux = <PIN_PA31__GPIO>;
+		bias-disable;
+	};
+
+	pinctrl_gmac1_default: gmac1_default {
+		pinmux = <PIN_PD30__G1_TXCK>,
+			 <PIN_PD22__G1_TX0>,
+			 <PIN_PD23__G1_TX1>,
+			 <PIN_PD21__G1_TXEN>,
+			 <PIN_PD25__G1_RX0>,
+			 <PIN_PD26__G1_RX1>,
+			 <PIN_PD27__G1_RXER>,
+			 <PIN_PD24__G1_RXDV>;
+		slew-rate = <0>;
+		bias-disable;
+	};
+
+	pinctrl_gmac1_mdio_default: gmac1_mdio_default {
+		pinmux = <PIN_PD28__G1_MDC>,
+			 <PIN_PD29__G1_MDIO>;
+		bias-disable;
+	};
+
+	pinctrl_gmac1_phy_irq: gmac1_phy_irq {
+		pinmux = <PIN_PA21__GPIO>;
+		bias-disable;
+	};
+
+	pinctrl_i2c1_default: i2c1_default {
+		pinmux = <PIN_PC9__FLEXCOM1_IO0>,
+			 <PIN_PC10__FLEXCOM1_IO1>;
+		bias-disable;
+	};
+
 	pinctrl_i2c8_default: i2c8_default {
 		pinmux = <PIN_PC14__FLEXCOM8_IO0>,
 			 <PIN_PC13__FLEXCOM8_IO1>;
 		bias-disable;
 	};
 
+	pinctrl_i2c9_default: i2c9_default {
+		pinmux = <PIN_PC18__FLEXCOM9_IO0>,
+			 <PIN_PC19__FLEXCOM9_IO1>;
+		bias-disable;
+	};
+
+	pinctrl_i2s0_default: i2s0_default {
+		pinmux = <PIN_PB23__I2SMCC0_CK>,
+			 <PIN_PB24__I2SMCC0_WS>,
+			 <PIN_PB25__I2SMCC0_DOUT1>,
+			 <PIN_PB26__I2SMCC0_DOUT0>,
+			 <PIN_PB27__I2SMCC0_MCK>;
+		bias-disable;
+	};
+
+	pinctrl_key_gpio_default: key_gpio_default {
+		pinmux = <PIN_PA12__GPIO>;
+		bias-pull-up;
+	};
+
+	pinctrl_led_gpio_default: led_gpio_default {
+		pinmux = <PIN_PA13__GPIO>,
+			 <PIN_PB8__GPIO>,
+			 <PIN_PD20__GPIO>;
+		bias-pull-up;
+	};
+
+	pinctrl_mikrobus1_an_default: mikrobus1_an_default {
+		pinmux = <PIN_PD0__GPIO>;
+		bias-disable;
+	};
+
+	pinctrl_mikrobus2_an_default: mikrobus2_an_default {
+		pinmux = <PIN_PD1__GPIO>;
+		bias-disable;
+	};
+
+	pinctrl_mikrobus1_pwm2_default: mikrobus1_pwm2_default {
+		pinmux = <PIN_PA13__PWMH2>;
+		bias-disable;
+	};
+
+	pinctrl_mikrobus2_pwm3_default: mikrobus2_pwm3_default {
+		pinmux = <PIN_PD20__PWMH3>;
+		bias-disable;
+	};
+
+	pinctrl_mikrobus1_spi_cs: mikrobus1_spi_cs {
+		pinmux = <PIN_PB6__FLEXCOM11_IO3>;
+		bias-disable;
+	};
+
+	pinctrl_mikrobus1_spi: mikrobus1_spi {
+		pinmux = <PIN_PB3__FLEXCOM11_IO0>,
+			 <PIN_PB4__FLEXCOM11_IO1>,
+			 <PIN_PB5__FLEXCOM11_IO2>;
+		bias-disable;
+	};
+
 	pinctrl_qspi: qspi {
 		pinmux = <PIN_PB12__QSPI0_IO0>,
 			 <PIN_PB11__QSPI0_IO1>,
@@ -187,7 +670,7 @@
 		atmel,drive-strength = <ATMEL_PIO_DRVSTR_HI>;
 	};
 
-	pinctrl_sdmmc0_cmd_data_default: sdmmc0_cmd_data_default {
+	pinctrl_sdmmc0_default: sdmmc0_default {
 		pinmux = <PIN_PA1__SDMMC0_CMD>,
 			 <PIN_PA3__SDMMC0_DAT0>,
 			 <PIN_PA4__SDMMC0_DAT1>,
@@ -196,80 +679,126 @@
 			 <PIN_PA7__SDMMC0_DAT4>,
 			 <PIN_PA8__SDMMC0_DAT5>,
 			 <PIN_PA9__SDMMC0_DAT6>,
-			 <PIN_PA10__SDMMC0_DAT7>;
-		bias-pull-up;
-	};
-
-	pinctrl_sdmmc0_ck_rstn_ds_cd_default: sdmmc0_ck_rstn_ds_cd_default {
-		pinmux = <PIN_PA0__SDMMC0_CK>,
+			 <PIN_PA10__SDMMC0_DAT7>,
+			 <PIN_PA0__SDMMC0_CK>,
 			 <PIN_PA2__SDMMC0_RSTN>,
-			 <PIN_PA11__SDMMC0_DS>,
-			 <PIN_PA14__SDMMC0_CD>;
-		bias-pull-up;
+			 <PIN_PA14__SDMMC0_CD>,
+			 <PIN_PA11__SDMMC0_DS>;
+			slew-rate = <0>;
+			bias-pull-up;
 	};
 
-	pinctrl_sdmmc1_cmd_data_default: sdmmc1_cmd_data_default {
+	pinctrl_sdmmc1_default: sdmmc1_default {
 		pinmux = <PIN_PB29__SDMMC1_CMD>,
 			 <PIN_PB31__SDMMC1_DAT0>,
 			 <PIN_PC0__SDMMC1_DAT1>,
 			 <PIN_PC1__SDMMC1_DAT2>,
-			 <PIN_PC2__SDMMC1_DAT3>;
-		bias-pull-up;
-	};
-
-	pinctrl_sdmmc1_ck_cd_rstn_vddsel_default: sdmmc1_ck_cd_rstn_vddsel_default {
-		pinmux = <PIN_PB30__SDMMC1_CK>,
+			 <PIN_PC2__SDMMC1_DAT3>,
+			 <PIN_PB30__SDMMC1_CK>,
 			 <PIN_PB28__SDMMC1_RSTN>,
 			 <PIN_PC5__SDMMC1_1V8SEL>,
 			 <PIN_PC4__SDMMC1_CD>;
+		slew-rate = <0>;
 		bias-pull-up;
 	};
 
-	pinctrl_gmac0_default: gmac0_default {
-		pinmux = <PIN_PA16__G0_TX0>,
-			 <PIN_PA17__G0_TX1>,
-			 <PIN_PA26__G0_TX2>,
-			 <PIN_PA27__G0_TX3>,
-			 <PIN_PA19__G0_RX0>,
-			 <PIN_PA20__G0_RX1>,
-			 <PIN_PA28__G0_RX2>,
-			 <PIN_PA29__G0_RX3>,
-			 <PIN_PA15__G0_TXEN>,
-			 <PIN_PA30__G0_RXCK>,
-			 <PIN_PA18__G0_RXDV>,
-			 <PIN_PA25__G0_125CK>;
+	pinctrl_sdmmc2_default: sdmmc2_default {
+		pinmux = <PIN_PD3__SDMMC2_CMD>,
+			 <PIN_PD5__SDMMC2_DAT0>,
+			 <PIN_PD6__SDMMC2_DAT1>,
+			 <PIN_PD7__SDMMC2_DAT2>,
+			 <PIN_PD8__SDMMC2_DAT3>,
+			 <PIN_PD4__SDMMC2_CK>;
 		slew-rate = <0>;
+		bias-pull-up;
+	};
+
+	pinctrl_spdifrx_default: spdifrx_default {
+		pinmux = <PIN_PB0__SPDIF_RX>;
 		bias-disable;
 	};
 
-	pinctrl_gmac0_mdio_default: gmac0_mdio_default {
-		pinmux = <PIN_PA22__G0_MDC>,
-			 <PIN_PA23__G0_MDIO>;
+	pinctrl_spdiftx_default: spdiftx_default {
+		pinmux = <PIN_PB1__SPDIF_TX>;
 		bias-disable;
 	};
+};
 
-	pinctrl_gmac0_txc_default: gmac0_txc_default {
-		pinmux = <PIN_PA24__G0_TXCK>;
-		slew-rate = <0>;
-		bias-pull-up;
+&pwm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_mikrobus1_pwm2_default &pinctrl_mikrobus2_pwm3_default>;
+	status = "disabled"; /* Conflict with leds. */
+};
+
+&rtt {
+	atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
+};
+
+&sdmmc0 {
+	bus-width = <8>;
+	non-removable;
+	no-1-8-v;
+	sdhci-caps-mask = <0x0 0x00200000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sdmmc0_default>;
+	status = "okay";
+};
+
+&sdmmc1 {
+	bus-width = <4>;
+	no-1-8-v;
+	sdhci-caps-mask = <0x0 0x00200000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sdmmc1_default>;
+	status = "okay";
+};
+
+&sdmmc2 {
+	bus-width = <4>;
+	no-1-8-v;
+	sdhci-caps-mask = <0x0 0x00200000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sdmmc2_default>;
+};
+
+&shdwc {
+	atmel,shdwc-debouncer = <976>;
+	status = "okay";
+
+	input@0 {
+		reg = <0>;
 	};
+};
 
-	pinctrl_gmac1_default: gmac1_default {
-		pinmux = <PIN_PD30__G1_TXCK>,
-			 <PIN_PD22__G1_TX0>,
-			 <PIN_PD23__G1_TX1>,
-			 <PIN_PD21__G1_TXEN>,
-			 <PIN_PD25__G1_RX0>,
-			 <PIN_PD26__G1_RX1>,
-			 <PIN_PD27__G1_RXER>,
-			 <PIN_PD24__G1_RXDV>;
-		slew-rate = <0>;
-		bias-disable;
+&spdifrx {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spdifrx_default>;
+	status = "okay";
+};
+
+&spdiftx {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spdiftx_default>;
+	status = "okay";
+};
+
+&tcb0 {
+	timer0: timer@0 {
+		compatible = "atmel,tcb-timer";
+		reg = <0>;
 	};
 
-	pinctrl_gmac1_mdio_default: gmac1_mdio_default {
-		pinmux = <PIN_PD28__G1_MDC>,
-			 <PIN_PD29__G1_MDIO>;
-		bias-disable;
+	timer1: timer@1 {
+		compatible = "atmel,tcb-timer";
+		reg = <1>;
 	};
 };
+
+&trng {
+	status = "okay";
+};
+
+&vddout25 {
+	vin-supply = <&vdd_3v3>;
+	status = "okay";
+};
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

Re: [PATCH 2/2] ARM: dts: at91: sama7g5/sama7g5ek: align with Linux DT

Quoted 2 lines · Eugen Hristev

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

cool

Quoted 10 lines

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.dts | 727 ++++++++++++++++++++----
 arch/arm/dts/sama7g5.dtsi       | 942 +++++++++++++++++++++++++++-----
 2 files changed, 1419 insertions(+), 250 deletions(-)

For arch/arm/dts/at91-sama7g5ek.dts:
1/ pinctrl_flx3_default: flx3_default uses in linux bias-disable, you should update it too.
2/ I see linux's pinctrl_sdmmc0_default: sdmmc0_default splits the pins in cmd_data and ck_cd_rstn_vddsel. Can we do the same or it depends on something that's unsupported?

#3 lore raw

Re: [PATCH 2/2] ARM: dts: at91: sama7g5/sama7g5ek: align with Linux DT

Quoted 17 lines · On 3/7/22 1:05 PM, Tudor Ambarus - M18064 wrote:
Quoted 2 lines · Eugen Hristev

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

cool

Quoted 10 lines

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.dts | 727 ++++++++++++++++++++----
  arch/arm/dts/sama7g5.dtsi       | 942 +++++++++++++++++++++++++++-----
  2 files changed, 1419 insertions(+), 250 deletions(-)
Quoted 3 lines

For arch/arm/dts/at91-sama7g5ek.dts:
1/ pinctrl_flx3_default: flx3_default uses in linux bias-disable, you should update it too.

Linux should be updated.
If the bias is floating for these console pins, disconnecting the console cable stops the booting process because of stray characters detected on the console. The cable has an included pull-up which solves this.
(I will send a patch to fix Linux ), but it has to stay like this in Uboot until linux is fixed, otherwise boot fails

Quoted 4 lines

2/ I see linux's pinctrl_sdmmc0_default: sdmmc0_default splits the pins in cmd_data and ck_cd_rstn_vddsel. Can we do the same or it depends on something that's unsupported?

We cannot do anything at the moment. It doesn't work because the pinctrl driver does not support subnodes like this:

sdmmc_pins : pins {
subnode1 {
some pin mux...
};
subnode2 {
some other pin mux...
};
}

It has to be fixed in the pinctrl driver. Until then, this has to stay like this otherwise pinctrl cannot probe the pins in uboot.

Could you double check the QSPI part and pins ? I have not tested this part with this patch, and I do not wish to break anything. You can easily pull the patchset from here :

https://source.denx.de/u-boot/custodians/u-boot-at91/-/tree/testing

Thanks,
Eugen

Reviewed-by on v1 1/2
#4 lore raw
In reply to Eugen Hristev

Hi, Eugen,

Quoted 10 lines · Eugen Hristev

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

---
 arch/arm/dts/Makefile                              | 2 +-
 arch/arm/dts/{sama7g5ek.dts => at91-sama7g5ek.dts} | 0
 configs/sama7g5ek_mmc1_defconfig                   | 2 +-
 configs/sama7g5ek_mmc_defconfig                    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/arm/dts/{sama7g5ek.dts => at91-sama7g5ek.dts} (100%)

I find the idea good, but you should update in other places too:
~/work/u-boot$ git grep sama7g5ek
arch/arm/dts/at91-sama7g5ek.dts: * sama7g5ek.dts - Device Tree file for SAMA7G5 EK arch/arm/dts/sama7g5ek-u-boot.dtsi: * sama7g5ek-u-boot.dts - Device Tree file for SAMA7G5 SoC u-boot properties.

With these addressed: