On 25.11.2022 09:54, Eugen Hristev wrote:
Align the DT with current Linux 6.1 tree, wherever possible.
Signed-off-by: Eugen Hristev eugen.hristev@microchip.com
Reviewed-by: Claudiu Beznea claudiu.beznea@microchip.com
arch/arm/dts/at91-sama7g5ek.dts | 23 +++++++++++------------ arch/arm/dts/sama7g5.dtsi | 27 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/arch/arm/dts/at91-sama7g5ek.dts b/arch/arm/dts/at91-sama7g5ek.dts index aed84f15a1..9b247fcaf6 100644 --- a/arch/arm/dts/at91-sama7g5ek.dts +++ b/arch/arm/dts/at91-sama7g5ek.dts @@ -45,13 +45,13 @@ }; };
- gpio_keys {
gpio-keys { compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_key_gpio_default>;
bp1 {
button { label = "PB_USER"; gpios = <&pioA PIN_PA12 GPIO_ACTIVE_LOW>; linux,code = <KEY_PROG1>;@@ -244,8 +244,8 @@ regulators { vdd_3v3: VDD_IO { regulator-name = "VDD_IO";
regulator-min-microvolt = <1200000>;regulator-max-microvolt = <3700000>;
regulator-min-microvolt = <3300000>;regulator-max-microvolt = <3300000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-always-on;@@ -264,8 +264,8 @@
vddioddr: VDD_DDR { regulator-name = "VDD_DDR";
regulator-min-microvolt = <1300000>;regulator-max-microvolt = <1450000>;
regulator-min-microvolt = <1350000>;regulator-max-microvolt = <1350000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-always-on;@@ -285,8 +285,8 @@
vddcore: VDD_CORE { regulator-name = "VDD_CORE";
regulator-min-microvolt = <1100000>;regulator-max-microvolt = <1850000>;
regulator-min-microvolt = <1150000>;regulator-max-microvolt = <1150000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-always-on;@@ -306,7 +306,7 @@ vddcpu: VDD_OTHER { regulator-name = "VDD_OTHER"; regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1850000>;
regulator-max-microvolt = <1250000>; regulator-initial-mode = <2>; regulator-allowed-modes = <2>, <4>; regulator-ramp-delay = <3125>;@@ -326,8 +326,8 @@
vldo1: LDO1 { regulator-name = "LDO1";
regulator-min-microvolt = <1200000>;regulator-max-microvolt = <3700000>;
regulator-min-microvolt = <1800000>;regulator-max-microvolt = <1800000>; regulator-always-on; regulator-state-standby {@@ -707,7 +707,6 @@ ck_cd_rstn_vddsel { pinmux = <PIN_PA0__SDMMC0_CK>, <PIN_PA2__SDMMC0_RSTN>,
<PIN_PA14__SDMMC0_CD>, <PIN_PA11__SDMMC0_DS>; slew-rate = <0>; bias-pull-up;diff --git a/arch/arm/dts/sama7g5.dtsi b/arch/arm/dts/sama7g5.dtsi index d38090d7dd..6388a60e53 100644 --- a/arch/arm/dts/sama7g5.dtsi +++ b/arch/arm/dts/sama7g5.dtsi @@ -15,6 +15,7 @@ #include <dt-bindings/clk/at91.h> #include <dt-bindings/dma/at91.h> #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/mfd/at91-usart.h>
/ { model = "Microchip SAMA7G5 family SoC"; @@ -195,11 +196,11 @@ <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 11>; interrupt-controller; #interrupt-cells = <2>; gpio-controller; #gpio-cells = <2>;
clocks = <&pmc PMC_TYPE_PERIPHERAL 11>;};
pmc: pmc@e0018000 {
@@ -211,6 +212,13 @@ clock-names = "td_slck", "md_slck", "main_xtal", "main_rc"; };
reset_controller: reset-controller@e001d000 {compatible = "microchip,sama7g5-rstc";reg = <0xe001d000 0xc>, <0xe001d0e4 0x4>;#reset-cells = <1>;clocks = <&clk32k 0>;};- shdwc: shdwc@e001d010 { compatible = "microchip,sama7g5-shdwc", "syscon"; reg = <0xe001d010 0x10>;
@@ -229,13 +237,6 @@ clocks = <&clk32k 0>; };
reset_controller: rstc@e001d000 {compatible = "microchip,sama7g5-rstc", "microchip,sam9x60-rstc";reg = <0xe001d000 0xc>, <0xe001d0e4 0x4>;#reset-cells = <1>;clocks = <&clk32k 0>;};- clk32k: clock-controller@e001d050 { compatible = "microchip,sama7g5-sckc", "microchip,sam9x60-sckc"; reg = <0xe001d050 0x4>;
@@ -620,6 +621,7 @@ uart0: serial@200 { compatible = "atmel,at91sam9260-usart"; reg = <0x200 0x200>;
atmel,usart-mode = <AT91_USART_MODE_SERIAL>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; clocks = <&pmc PMC_TYPE_PERIPHERAL 38>; clock-names = "usart";@@ -668,6 +670,7 @@ uart3: serial@200 { compatible = "atmel,at91sam9260-usart"; reg = <0x200 0x200>;
atmel,usart-mode = <AT91_USART_MODE_SERIAL>; interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; clocks = <&pmc PMC_TYPE_PERIPHERAL 41>; clock-names = "usart";@@ -711,6 +714,7 @@ uart4: serial@200 { compatible = "atmel,at91sam9260-usart"; reg = <0x200 0x200>;
atmel,usart-mode = <AT91_USART_MODE_SERIAL>; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; clocks = <&pmc PMC_TYPE_PERIPHERAL 42>; clock-names = "usart";@@ -736,6 +740,7 @@ uart7: serial@200 { compatible = "atmel,at91sam9260-usart"; reg = <0x200 0x200>;
atmel,usart-mode = <AT91_USART_MODE_SERIAL>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; clocks = <&pmc PMC_TYPE_PERIPHERAL 45>; clock-names = "usart";@@ -884,9 +889,9 @@ #address-cells = <1>; #size-cells = <0>; atmel,fifo-size = <32>;
dmas = <&dma0 AT91_XDMAC_DT_PERID(27)>,<&dma0 AT91_XDMAC_DT_PERID(28)>;dma-names = "rx", "tx";
dmas = <&dma0 AT91_XDMAC_DT_PERID(28)>,<&dma0 AT91_XDMAC_DT_PERID(27)>;dma-names = "tx", "rx"; status = "disabled"; };