Skip to content

Commit 67e473a

Browse files
arndbarndb
committed
Merge tag 'at91-fixes-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes
AT91 fixes #1 for 5.18: Only DT fixes. They cover syntax issues as well as features: - fix dtschema check warnings for DMA channel entries, boolean properties and flash names - sam9g20ek audio clock and regulator description - sama5d[34]_xplained SPI pinctrl - align DT with hardware subtleties on sama7g5ek * tag 'at91-fixes-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: at91: fix pinctrl phandles ARM: dts: at91: sama5d4_xplained: fix pinctrl phandle name ARM: dts: at91: Describe regulators on at91sam9g20ek ARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ek ARM: dts: at91: Fix boolean properties with values ARM: dts: at91: use generic node name for dataflash ARM: dts: at91: align SPI NOR node name with dtschema ARM: dts: at91: sama7g5ek: Align the impedance of the QSPI0's HSIO and PCB lines ARM: dts: at91: sama7g5ek: enable pull-up on flexcom3 console lines ARM: dts: at91: sama7g5: Swap `rx` and `tx` for `i2c` nodes Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents c834eff + 0c640d9 commit 67e473a

25 files changed

+83
-40
lines changed

‎Documentation/devicetree/bindings/mfd/atmel-flexcom.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ flexcom@f8034000 {
5454
clock-names = "spi_clk";
5555
atmel,fifo-size = <32>;
5656

57-
mtd_dataflash@0 {
57+
flash@0 {
5858
compatible = "atmel,at25f512b";
5959
reg = <0>;
6060
spi-max-frequency = <20000000>;

‎arch/arm/boot/dts/at91-dvk_su60_somc.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
status = "okay";
4545

4646
/* spi0.0: 4M Flash Macronix MX25R4035FM1IL0 */
47-
spi-flash@0 {
47+
flash@0 {
4848
compatible = "mxicy,mx25u4035", "jedec,spi-nor";
4949
spi-max-frequency = <33000000>;
5050
reg = <0>;

‎arch/arm/boot/dts/at91-q5xr5.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>, <&pioC 11 GPIO_ACTIVE_LOW>, <0>, <0>;
126126
status = "okay";
127127

128-
m25p80@0 {
128+
flash@0 {
129129
compatible = "jedec,spi-nor";
130130
spi-max-frequency = <20000000>;
131131
reg = <0>;

‎arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
pinctrl-0 = <&pinctrl_qspi1_default>;
215215
status = "disabled";
216216

217-
qspi1_flash: spi_flash@0 {
217+
qspi1_flash: flash@0 {
218218
#address-cells = <1>;
219219
#size-cells = <1>;
220220
compatible = "jedec,spi-nor";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
&qspi1 {
192192
status = "okay";
193193

194-
qspi1_flash: spi_flash@0 {
194+
qspi1_flash: flash@0 {
195195
status = "okay";
196196
};
197197
};

‎arch/arm/boot/dts/at91-sama5d2_xplained.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
pinctrl-0 = <&pinctrl_spi0_default>;
138138
status = "okay";
139139

140-
m25p80@0 {
140+
flash@0 {
141141
compatible = "atmel,at25df321a";
142142
reg = <0>;
143143
spi-max-frequency = <50000000>;

‎arch/arm/boot/dts/at91-sama5d3_xplained.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
};
5858

5959
spi0: spi@f0004000 {
60-
pinctrl-names = "default";
61-
pinctrl-0 = <&pinctrl_spi0_cs>;
60+
pinctrl-names = "default", "cs";
61+
pinctrl-1 = <&pinctrl_spi0_cs>;
6262
cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>;
6363
status = "okay";
6464
};
@@ -171,8 +171,8 @@
171171
};
172172

173173
spi1: spi@f8008000 {
174-
pinctrl-names = "default";
175-
pinctrl-0 = <&pinctrl_spi1_cs>;
174+
pinctrl-names = "default", "cs";
175+
pinctrl-1 = <&pinctrl_spi1_cs>;
176176
cs-gpios = <&pioC 25 0>;
177177
status = "okay";
178178
};

‎arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
5050
status = "okay";
5151

52-
m25p80@0 {
52+
flash@0 {
5353
compatible = "atmel,at25df321a";
5454
spi-max-frequency = <50000000>;
5555
reg = <0>;

‎arch/arm/boot/dts/at91-sama5d4_xplained.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
};
8282

8383
spi1: spi@fc018000 {
84-
pinctrl-names = "default";
85-
pinctrl-0 = <&pinctrl_spi0_cs>;
84+
pinctrl-names = "default", "cs";
85+
pinctrl-1 = <&pinctrl_spi1_cs>;
8686
cs-gpios = <&pioB 21 0>;
8787
status = "okay";
8888
};
@@ -140,7 +140,7 @@
140140
atmel,pins =
141141
<AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
142142
};
143-
pinctrl_spi0_cs: spi0_cs_default {
143+
pinctrl_spi1_cs: spi1_cs_default {
144144
atmel,pins =
145145
<AT91_PIOB 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
146146
};

‎arch/arm/boot/dts/at91-sama5d4ek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
spi0: spi@f8010000 {
6666
cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
6767
status = "okay";
68-
m25p80@0 {
68+
flash@0 {
6969
compatible = "atmel,at25df321a";
7070
spi-max-frequency = <50000000>;
7171
reg = <0>;

0 commit comments

Comments
 (0)