Skip to content

Commit ea15963

Browse files
arndbarndb
committed
Merge tag 'at91-dt-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt
Microchip AT91 device tree updates for v6.16 This update includes: - more controllers enabled for SAMA7D65 SoC (Ethernet, Flexcoms, SRAM, DRAM, RTC, RTT, GBPR) - cleanups and fixes for Calao boards * tag 'at91-dt-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: microchip: sama7g54_curiosity: Add fixed-partitions for spi-nor flash ARM: dts: microchip: sama7d65: Add RTT timer to curiosity board ARM: dts: microchip: sama7d65: Add RTT and GPBR Support for sama7d65 SoC ARM: dts: microchip: sama7d65: Add SRAM and DRAM components support ARM: dts: microchip: sama7d65_curiosity: add EEPROM ARM: dts: microchip: sama7d65: Add MCP16502 to sama7d65 curiosity ARM: dts: microchip: sama7d65: Enable GMAC interface ARM: dts: microchip: sama7d65: Add FLEXCOMs to sama7d65 SoC ARM: dts: microchip: sama7d65: Add gmac interfaces for sama7d65 SoC ARM: dts: at91: at91sam9263: fix NAND chip selects ARM: dts: at91: usb_a9g20: move wrong RTC node ARM: dts: at91: calao_usb: simplify chosen node ARM: dts: at91: usb_a9260: use 'stdout-path' ARM: dts: at91: calao_usb: simplify memory node ARM: dts: at91: usb_a9263: fix GPIO for Dataflash chip select ARM: dts: at91: usb_a9g20: add SPI EEPROM Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 0feaf3c + 36e9e1a commit ea15963

11 files changed

+625
-41
lines changed

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

Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@
3030
device_type = "memory";
3131
reg = <0x60000000 0x40000000>;
3232
};
33+
34+
reg_5v: regulator-5v {
35+
compatible = "regulator-fixed";
36+
regulator-name = "5V_MAIN";
37+
regulator-min-microvolt = <5000000>;
38+
regulator-max-microvolt = <5000000>;
39+
regulator-always-on;
40+
};
41+
3342
};
3443

3544
&dma0 {
@@ -60,6 +69,26 @@
6069
status = "okay";
6170
};
6271

72+
&gmac0 {
73+
#address-cells = <1>;
74+
#size-cells = <0>;
75+
pinctrl-names = "default";
76+
pinctrl-0 = <&pinctrl_gmac0_default
77+
&pinctrl_gmac0_mdio_default
78+
&pinctrl_gmac0_txck_default
79+
&pinctrl_gmac0_phy_irq>;
80+
phy-mode = "rgmii-id";
81+
nvmem-cells = <&eeprom0_eui48>;
82+
nvmem-cell-names = "mac-address";
83+
status = "okay";
84+
85+
ethernet-phy@7 {
86+
reg = <0x7>;
87+
interrupt-parent = <&pioa>;
88+
interrupts = <PIN_PC1 IRQ_TYPE_LEVEL_LOW>;
89+
};
90+
};
91+
6392
&i2c10 {
6493
dmas = <0>, <0>;
6594
i2c-analog-filter;
@@ -99,13 +128,189 @@
99128
label = "VDDCPU";
100129
};
101130
};
131+
132+
pmic@5b {
133+
compatible = "microchip,mcp16502";
134+
reg = <0x5b>;
135+
lvin-supply = <&reg_5v>;
136+
pvin1-supply = <&reg_5v>;
137+
pvin2-supply = <&reg_5v>;
138+
pvin3-supply = <&reg_5v>;
139+
pvin4-supply = <&reg_5v>;
140+
status = "okay";
141+
142+
regulators {
143+
vdd_3v3: VDD_IO {
144+
regulator-name = "VDD_IO";
145+
regulator-min-microvolt = <3300000>;
146+
regulator-max-microvolt = <3300000>;
147+
regulator-initial-mode = <2>;
148+
regulator-allowed-modes = <2>, <4>;
149+
regulator-always-on;
150+
151+
regulator-state-standby {
152+
regulator-on-in-suspend;
153+
regulator-suspend-microvolt = <3300000>;
154+
regulator-mode = <4>;
155+
};
156+
157+
regulator-state-mem {
158+
regulator-off-in-suspend;
159+
regulator-mode = <4>;
160+
};
161+
};
162+
163+
vddioddr: VDD_DDR {
164+
regulator-name = "VDD_DDR";
165+
regulator-min-microvolt = <1350000>;
166+
regulator-max-microvolt = <1350000>;
167+
regulator-initial-mode = <2>;
168+
regulator-allowed-modes = <2>, <4>;
169+
regulator-always-on;
170+
171+
regulator-state-standby {
172+
regulator-on-in-suspend;
173+
regulator-suspend-microvolt = <1350000>;
174+
regulator-mode = <4>;
175+
};
176+
177+
regulator-state-mem {
178+
regulator-on-in-suspend;
179+
regulator-suspend-microvolt = <1350000>;
180+
regulator-mode = <4>;
181+
};
182+
};
183+
184+
vddcore: VDD_CORE {
185+
regulator-name = "VDD_CORE";
186+
regulator-min-microvolt = <1050000>;
187+
regulator-max-microvolt = <1050000>;
188+
regulator-initial-mode = <2>;
189+
regulator-allowed-modes = <2>, <4>;
190+
regulator-always-on;
191+
192+
regulator-state-standby {
193+
regulator-on-in-suspend;
194+
regulator-suspend-microvolt = <1050000>;
195+
regulator-mode = <4>;
196+
};
197+
198+
regulator-state-mem {
199+
regulator-off-in-suspend;
200+
regulator-mode = <4>;
201+
};
202+
};
203+
204+
vddcpu: VDD_OTHER {
205+
regulator-name = "VDD_OTHER";
206+
regulator-min-microvolt = <1050000>;
207+
regulator-max-microvolt = <1250000>;
208+
regulator-initial-mode = <2>;
209+
regulator-allowed-modes = <2>, <4>;
210+
regulator-ramp-delay = <3125>;
211+
regulator-always-on;
212+
213+
regulator-state-standby {
214+
regulator-on-in-suspend;
215+
regulator-suspend-microvolt = <1050000>;
216+
regulator-mode = <4>;
217+
};
218+
219+
regulator-state-mem {
220+
regulator-off-in-suspend;
221+
regulator-mode = <4>;
222+
};
223+
};
224+
225+
vldo1: LDO1 {
226+
regulator-name = "LDO1";
227+
regulator-min-microvolt = <1800000>;
228+
regulator-max-microvolt = <1800000>;
229+
regulator-always-on;
230+
231+
regulator-state-standby {
232+
regulator-suspend-microvolt = <1800000>;
233+
regulator-on-in-suspend;
234+
};
235+
236+
regulator-state-mem {
237+
regulator-off-in-suspend;
238+
};
239+
};
240+
241+
vldo2: LDO2 {
242+
regulator-name = "LDO2";
243+
regulator-min-microvolt = <1200000>;
244+
regulator-max-microvolt = <3700000>;
245+
246+
regulator-state-standby {
247+
regulator-on-in-suspend;
248+
};
249+
250+
regulator-state-mem {
251+
regulator-off-in-suspend;
252+
};
253+
};
254+
};
255+
};
256+
257+
eeprom0: eeprom@51 {
258+
compatible = "microchip,24aa025e48";
259+
reg = <0x51>;
260+
size = <256>;
261+
pagesize = <16>;
262+
vcc-supply = <&vdd_3v3>;
263+
264+
nvmem-layout {
265+
compatible = "fixed-layout";
266+
#address-cells = <1>;
267+
#size-cells = <1>;
268+
269+
eeprom0_eui48: eui48@fa {
270+
reg = <0xfa 0x6>;
271+
};
272+
};
273+
};
102274
};
103275

104276
&main_xtal {
105277
clock-frequency = <24000000>;
106278
};
107279

108280
&pioa {
281+
pinctrl_gmac0_default: gmac0-default {
282+
pinmux = <PIN_PA26__G0_TX0>,
283+
<PIN_PA27__G0_TX1>,
284+
<PIN_PB4__G0_TX2>,
285+
<PIN_PB5__G0_TX3>,
286+
<PIN_PA29__G0_RX0>,
287+
<PIN_PA30__G0_RX1>,
288+
<PIN_PB2__G0_RX2>,
289+
<PIN_PB6__G0_RX3>,
290+
<PIN_PA25__G0_TXCTL>,
291+
<PIN_PB3__G0_RXCK>,
292+
<PIN_PA28__G0_RXCTL>;
293+
slew-rate = <0>;
294+
bias-disable;
295+
};
296+
297+
pinctrl_gmac0_mdio_default: gmac0-mdio-default {
298+
pinmux = <PIN_PA31__G0_MDC>,
299+
<PIN_PB0__G0_MDIO>;
300+
bias-disable;
301+
};
302+
303+
pinctrl_gmac0_phy_irq: gmac0-phy-irq {
304+
pinmux = <PIN_PC1__GPIO>;
305+
bias-disable;
306+
};
307+
308+
pinctrl_gmac0_txck_default: gmac0-txck-default {
309+
pinmux = <PIN_PB1__G0_REFCK>;
310+
slew-rate = <0>;
311+
bias-pull-up;
312+
};
313+
109314
pinctrl_i2c10_default: i2c10-default{
110315
pinmux = <PIN_PB19__FLEXCOM10_IO1>,
111316
<PIN_PB20__FLEXCOM10_IO0>;
@@ -141,6 +346,10 @@
141346
};
142347
};
143348

349+
&rtt {
350+
atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
351+
};
352+
144353
&sdmmc1 {
145354
bus-width = <4>;
146355
pinctrl-names = "default";

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,38 @@
369369
spi-tx-bus-width = <4>;
370370
spi-rx-bus-width = <4>;
371371
m25p,fast-read;
372+
label = "at91-qspi";
373+
374+
partitions {
375+
compatible = "fixed-partitions";
376+
#address-cells = <1>;
377+
#size-cells = <1>;
378+
379+
at91bootstrap@0 {
380+
label = "qspi1: at91bootstrap";
381+
reg = <0x0 0x40000>;
382+
};
383+
384+
bootloader@40000 {
385+
label = "qspi1: u-boot";
386+
reg = <0x40000 0x100000>;
387+
};
388+
389+
bootloaderenv@140000 {
390+
label = "qspi1: u-boot env";
391+
reg = <0x140000 0x40000>;
392+
};
393+
394+
dtb@180000 {
395+
label = "qspi1: device tree";
396+
reg = <0x180000 0x80000>;
397+
};
398+
399+
kernel@200000 {
400+
label = "qspi1: kernel";
401+
reg = <0x200000 0x600000>;
402+
};
403+
};
372404
};
373405
};
374406

‎arch/arm/boot/dts/microchip/at91sam9263ek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
nand@3 {
153153
reg = <0x3 0x0 0x800000>;
154154
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
155-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
155+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
156156
nand-bus-width = <8>;
157157
nand-ecc-mode = "soft";
158158
nand-on-flash-bbt;

0 commit comments

Comments
 (0)