Skip to content

Commit 6253c63

Browse files
arndbarndb
committed
Merge tag 'at91-dt-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt
Microchip AT91 device tree updates for v6.14 This update includes: - power monitor support for the SAM9X75 Curiosity board (using the PAC1934 device) - fix the VDDSDMMC rail to 3.3V to avoid breaking USB (for SAMA5D27 WLSOM1 EK and SAMA5D29 Curiosity boards) - partial support for the SAMA7D65 SoC - cleanups * tag 'at91-dt-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: microchip: sam9x7: Add address/size to spi-controller nodes ARM: dts: microchip: sam9x60: Add address/size to spi-controller nodes ARM: dts: microchip: sama5d27_wlsom1_ek: Add no-1-8-v property to sdmmc0 node ARM: dts: microchip: sama5d29_curiosity: Add no-1-8-v property to sdmmc0 node ARM: dts: at91: Add sama7d65 pinmux dt-bindings: atmel-sysreg: add sama7d65 RAM and PIT dt-bindings: ARM: at91: Document Microchip SAMA7D65 Curiosity ARM: dts: microchip: sam9x75_curiosity: Add power monitor support ARM: dts: microchip: sam9x7: Move i2c address/size to dtsi Link: https://lore.kernel.org/r/20250107081424.758980-2-claudiu.beznea@tuxon.dev Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents c50a335 + f72aada commit 6253c63

8 files changed

Lines changed: 1066 additions & 8 deletions

File tree

‎Documentation/devicetree/bindings/arm/atmel-at91.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,13 @@ properties:
180180
- const: atmel,sama5d4
181181
- const: atmel,sama5
182182

183+
- description: Microchip SAMA7D65 Curiosity Board
184+
items:
185+
- const: microchip,sama7d65-curiosity
186+
- const: microchip,sama7d65
187+
- const: microchip,sama7d6
188+
- const: microchip,sama7
189+
183190
- items:
184191
- const: microchip,sama7g5ek # SAMA7G5 Evaluation Kit
185192
- const: microchip,sama7g5

‎Documentation/devicetree/bindings/arm/atmel-sysregs.txt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PIT Timer required properties:
1313
PIT64B Timer required properties:
1414
- compatible: Should be "microchip,sam9x60-pit64b" or
1515
"microchip,sam9x7-pit64b", "microchip,sam9x60-pit64b"
16+
"microchip,sama7d65-pit64b", "microchip,sam9x60-pit64b"
1617
- reg: Should contain registers location and length
1718
- interrupts: Should contain interrupt for PIT64B timer
1819
- clocks: Should contain the available clock sources for PIT64B timer.
@@ -27,12 +28,13 @@ Its subnodes can be:
2728
- watchdog: compatible should be "atmel,at91rm9200-wdt"
2829

2930
RAMC SDRAM/DDR Controller required properties:
30-
- compatible: Should be "atmel,at91rm9200-sdramc", "syscon"
31-
"atmel,at91sam9260-sdramc",
32-
"atmel,at91sam9g45-ddramc",
33-
"atmel,sama5d3-ddramc",
34-
"microchip,sam9x60-ddramc",
35-
"microchip,sama7g5-uddrc",
31+
- compatible: Should be "atmel,at91rm9200-sdramc", "syscon" or
32+
"atmel,at91sam9260-sdramc" or
33+
"atmel,at91sam9g45-ddramc" or
34+
"atmel,sama5d3-ddramc" or
35+
"microchip,sam9x60-ddramc" or
36+
"microchip,sama7g5-uddrc" or
37+
"microchip,sama7d65-uddrc", "microchip,sama7g5-uddrc" or
3638
"microchip,sam9x7-ddramc", "atmel,sama5d3-ddramc".
3739
- reg: Should contain registers location and length
3840

‎arch/arm/boot/dts/microchip/at91-sam9x75_curiosity.dts‎

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@
8888
};
8989

9090
&i2c6 {
91-
#address-cells = <1>;
92-
#size-cells = <0>;
9391
pinctrl-names = "default";
9492
pinctrl-0 = <&pinctrl_flx6_default>;
9593
i2c-analog-filter;
@@ -200,6 +198,52 @@
200198
};
201199
};
202200

201+
&flx7 {
202+
atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
203+
status = "okay";
204+
};
205+
206+
&i2c7 {
207+
dmas = <0>, <0>;
208+
i2c-analog-filter;
209+
i2c-digital-filter;
210+
i2c-digital-filter-width-ns = <35>;
211+
pinctrl-names = "default";
212+
pinctrl-0 = <&pinctrl_flx7_default>;
213+
status = "okay";
214+
215+
power-monitor@10 {
216+
compatible = "microchip,pac1934";
217+
reg = <0x10>;
218+
#address-cells = <1>;
219+
#size-cells = <0>;
220+
221+
channel@1 {
222+
reg = <0x1>;
223+
shunt-resistor-micro-ohms = <10000>;
224+
label = "VDD3V3";
225+
};
226+
227+
channel@2 {
228+
reg = <0x2>;
229+
shunt-resistor-micro-ohms = <10000>;
230+
label = "DCDC4";
231+
};
232+
233+
channel@3 {
234+
reg = <0x3>;
235+
shunt-resistor-micro-ohms = <10000>;
236+
label = "VDDCORE";
237+
};
238+
239+
channel@4 {
240+
reg = <0x4>;
241+
shunt-resistor-micro-ohms = <10000>;
242+
label = "VDDIODDR";
243+
};
244+
};
245+
};
246+
203247
&i2s {
204248
pinctrl-names = "default";
205249
pinctrl-0 = <&pinctrl_i2s_default>;
@@ -233,6 +277,12 @@
233277
<AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
234278
<AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
235279
};
280+
281+
pinctrl_flx7_default: flx7-default {
282+
atmel,pins =
283+
<AT91_PIOC 0 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>,
284+
<AT91_PIOC 1 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>;
285+
};
236286
};
237287

238288
gpio-keys {

‎arch/arm/boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197

198198
&sdmmc0 {
199199
bus-width = <4>;
200+
no-1-8-v;
200201
pinctrl-names = "default";
201202
pinctrl-0 = <&pinctrl_sdmmc0_default>;
202203
status = "okay";

‎arch/arm/boot/dts/microchip/at91-sama5d29_curiosity.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@
514514

515515
&sdmmc0 {
516516
bus-width = <4>;
517+
no-1-8-v;
517518
pinctrl-names = "default";
518519
pinctrl-0 = <&pinctrl_sdmmc0_default>;
519520
disable-wp;

‎arch/arm/boot/dts/microchip/sam9x60.dtsi‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@
197197
compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
198198
reg = <0x400 0x200>;
199199
interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
200+
#address-cells = <1>;
201+
#size-cells = <0>;
200202
clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
201203
clock-names = "spi_clk";
202204
dmas = <&dma0
@@ -268,6 +270,8 @@
268270
compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
269271
reg = <0x400 0x200>;
270272
interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
273+
#address-cells = <1>;
274+
#size-cells = <0>;
271275
clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
272276
clock-names = "spi_clk";
273277
dmas = <&dma0
@@ -768,6 +772,8 @@
768772
compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
769773
reg = <0x400 0x200>;
770774
interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
775+
#address-cells = <1>;
776+
#size-cells = <0>;
771777
clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
772778
clock-names = "spi_clk";
773779
dmas = <&dma0
@@ -839,6 +845,8 @@
839845
compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
840846
reg = <0x400 0x200>;
841847
interrupts = <6 IRQ_TYPE_LEVEL_HIGH 7>;
848+
#address-cells = <1>;
849+
#size-cells = <0>;
842850
clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
843851
clock-names = "spi_clk";
844852
dmas = <&dma0
@@ -910,6 +918,8 @@
910918
compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
911919
reg = <0x400 0x200>;
912920
interrupts = <7 IRQ_TYPE_LEVEL_HIGH 7>;
921+
#address-cells = <1>;
922+
#size-cells = <0>;
913923
clocks = <&pmc PMC_TYPE_PERIPHERAL 7>;
914924
clock-names = "spi_clk";
915925
dmas = <&dma0
@@ -981,6 +991,8 @@
981991
compatible = "microchip,sam9x60-spi", "atmel,at91rm9200-spi";
982992
reg = <0x400 0x200>;
983993
interrupts = <8 IRQ_TYPE_LEVEL_HIGH 7>;
994+
#address-cells = <1>;
995+
#size-cells = <0>;
984996
clocks = <&pmc PMC_TYPE_PERIPHERAL 8>;
985997
clock-names = "spi_clk";
986998
dmas = <&dma0

‎arch/arm/boot/dts/microchip/sam9x7.dtsi‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@
132132
compatible = "microchip,sam9x7-spi", "atmel,at91rm9200-spi";
133133
reg = <0x400 0x200>;
134134
interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
135+
#address-cells = <1>;
136+
#size-cells = <0>;
135137
clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
136138
clock-names = "spi_clk";
137139
dmas = <&dma0
@@ -151,6 +153,8 @@
151153
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
152154
reg = <0x600 0x200>;
153155
interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
156+
#address-cells = <1>;
157+
#size-cells = <0>;
154158
clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
155159
dmas = <&dma0
156160
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -201,6 +205,8 @@
201205
compatible = "microchip,sam9x7-spi", "atmel,at91rm9200-spi";
202206
reg = <0x400 0x200>;
203207
interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
208+
#address-cells = <1>;
209+
#size-cells = <0>;
204210
clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
205211
clock-names = "spi_clk";
206212
dmas = <&dma0
@@ -220,6 +226,8 @@
220226
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
221227
reg = <0x600 0x200>;
222228
interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
229+
#address-cells = <1>;
230+
#size-cells = <0>;
223231
clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
224232
dmas = <&dma0
225233
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -312,6 +320,8 @@
312320
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
313321
reg = <0x600 0x200>;
314322
interrupts = <32 IRQ_TYPE_LEVEL_HIGH 7>;
323+
#address-cells = <1>;
324+
#size-cells = <0>;
315325
clocks = <&pmc PMC_TYPE_PERIPHERAL 32>;
316326
dmas = <&dma0
317327
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -362,6 +372,8 @@
362372
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
363373
reg = <0x600 0x200>;
364374
interrupts = <33 IRQ_TYPE_LEVEL_HIGH 7>;
375+
#address-cells = <1>;
376+
#size-cells = <0>;
365377
clocks = <&pmc PMC_TYPE_PERIPHERAL 33>;
366378
dmas = <&dma0
367379
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -533,6 +545,8 @@
533545
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
534546
reg = <0x600 0x200>;
535547
interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;
548+
#address-cells = <1>;
549+
#size-cells = <0>;
536550
clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
537551
dmas = <&dma0
538552
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -583,6 +597,8 @@
583597
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
584598
reg = <0x600 0x200>;
585599
interrupts = <10 IRQ_TYPE_LEVEL_HIGH 7>;
600+
#address-cells = <1>;
601+
#size-cells = <0>;
586602
clocks = <&pmc PMC_TYPE_PERIPHERAL 10>;
587603
dmas = <&dma0
588604
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -633,6 +649,8 @@
633649
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
634650
reg = <0x600 0x200>;
635651
interrupts = <11 IRQ_TYPE_LEVEL_HIGH 7>;
652+
#address-cells = <1>;
653+
#size-cells = <0>;
636654
clocks = <&pmc PMC_TYPE_PERIPHERAL 11>;
637655
dmas = <&dma0
638656
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -683,6 +701,8 @@
683701
compatible = "microchip,sam9x7-spi", "atmel,at91rm9200-spi";
684702
reg = <0x400 0x200>;
685703
interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
704+
#address-cells = <1>;
705+
#size-cells = <0>;
686706
clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
687707
clock-names = "spi_clk";
688708
dmas = <&dma0
@@ -702,6 +722,8 @@
702722
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
703723
reg = <0x600 0x200>;
704724
interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
725+
#address-cells = <1>;
726+
#size-cells = <0>;
705727
clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
706728
dmas = <&dma0
707729
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -752,6 +774,8 @@
752774
compatible = "microchip,sam9x7-spi", "atmel,at91rm9200-spi";
753775
reg = <0x400 0x200>;
754776
interrupts = <6 IRQ_TYPE_LEVEL_HIGH 7>;
777+
#address-cells = <1>;
778+
#size-cells = <0>;
755779
clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
756780
clock-names = "spi_clk";
757781
dmas = <&dma0
@@ -771,6 +795,8 @@
771795
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
772796
reg = <0x600 0x200>;
773797
interrupts = <6 IRQ_TYPE_LEVEL_HIGH 7>;
798+
#address-cells = <1>;
799+
#size-cells = <0>;
774800
clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
775801
dmas = <&dma0
776802
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -821,6 +847,8 @@
821847
compatible = "microchip,sam9x7-spi", "atmel,at91rm9200-spi";
822848
reg = <0x400 0x200>;
823849
interrupts = <7 IRQ_TYPE_LEVEL_HIGH 7>;
850+
#address-cells = <1>;
851+
#size-cells = <0>;
824852
clocks = <&pmc PMC_TYPE_PERIPHERAL 7>;
825853
clock-names = "spi_clk";
826854
dmas = <&dma0
@@ -840,6 +868,8 @@
840868
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
841869
reg = <0x600 0x200>;
842870
interrupts = <7 IRQ_TYPE_LEVEL_HIGH 7>;
871+
#address-cells = <1>;
872+
#size-cells = <0>;
843873
clocks = <&pmc PMC_TYPE_PERIPHERAL 7>;
844874
dmas = <&dma0
845875
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -890,6 +920,8 @@
890920
compatible = "microchip,sam9x7-spi", "atmel,at91rm9200-spi";
891921
reg = <0x400 0x200>;
892922
interrupts = <8 IRQ_TYPE_LEVEL_HIGH 7>;
923+
#address-cells = <1>;
924+
#size-cells = <0>;
893925
clocks = <&pmc PMC_TYPE_PERIPHERAL 8>;
894926
clock-names = "spi_clk";
895927
dmas = <&dma0
@@ -909,6 +941,8 @@
909941
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
910942
reg = <0x600 0x200>;
911943
interrupts = <8 IRQ_TYPE_LEVEL_HIGH 7>;
944+
#address-cells = <1>;
945+
#size-cells = <0>;
912946
clocks = <&pmc PMC_TYPE_PERIPHERAL 8>;
913947
dmas = <&dma0
914948
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -984,6 +1018,8 @@
9841018
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
9851019
reg = <0x600 0x200>;
9861020
interrupts = <15 IRQ_TYPE_LEVEL_HIGH 7>;
1021+
#address-cells = <1>;
1022+
#size-cells = <0>;
9871023
clocks = <&pmc PMC_TYPE_PERIPHERAL 15>;
9881024
dmas = <&dma0
9891025
(AT91_XDMAC_DT_MEM_IF(0) |
@@ -1034,6 +1070,8 @@
10341070
compatible = "microchip,sam9x7-i2c", "microchip,sam9x60-i2c";
10351071
reg = <0x600 0x200>;
10361072
interrupts = <16 IRQ_TYPE_LEVEL_HIGH 7>;
1073+
#address-cells = <1>;
1074+
#size-cells = <0>;
10371075
clocks = <&pmc PMC_TYPE_PERIPHERAL 16>;
10381076
dmas = <&dma0
10391077
(AT91_XDMAC_DT_MEM_IF(0) |

0 commit comments

Comments
 (0)