Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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/20220414143318.26363-1-nicolas.ferre@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+83 -40
+1 -1
Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
··· 54 54 clock-names = "spi_clk"; 55 55 atmel,fifo-size = <32>; 56 56 57 - mtd_dataflash@0 { 57 + flash@0 { 58 58 compatible = "atmel,at25f512b"; 59 59 reg = <0>; 60 60 spi-max-frequency = <20000000>;
+1 -1
arch/arm/boot/dts/at91-dvk_su60_somc.dtsi
··· 44 44 status = "okay"; 45 45 46 46 /* spi0.0: 4M Flash Macronix MX25R4035FM1IL0 */ 47 - spi-flash@0 { 47 + flash@0 { 48 48 compatible = "mxicy,mx25u4035", "jedec,spi-nor"; 49 49 spi-max-frequency = <33000000>; 50 50 reg = <0>;
+1 -1
arch/arm/boot/dts/at91-q5xr5.dts
··· 125 125 cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>, <&pioC 11 GPIO_ACTIVE_LOW>, <0>, <0>; 126 126 status = "okay"; 127 127 128 - m25p80@0 { 128 + flash@0 { 129 129 compatible = "jedec,spi-nor"; 130 130 spi-max-frequency = <20000000>; 131 131 reg = <0>;
+1 -1
arch/arm/boot/dts/at91-sama5d27_wlsom1.dtsi
··· 214 214 pinctrl-0 = <&pinctrl_qspi1_default>; 215 215 status = "disabled"; 216 216 217 - qspi1_flash: spi_flash@0 { 217 + qspi1_flash: flash@0 { 218 218 #address-cells = <1>; 219 219 #size-cells = <1>; 220 220 compatible = "jedec,spi-nor";
+1 -1
arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
··· 191 191 &qspi1 { 192 192 status = "okay"; 193 193 194 - qspi1_flash: spi_flash@0 { 194 + qspi1_flash: flash@0 { 195 195 status = "okay"; 196 196 }; 197 197 };
+1 -1
arch/arm/boot/dts/at91-sama5d2_xplained.dts
··· 137 137 pinctrl-0 = <&pinctrl_spi0_default>; 138 138 status = "okay"; 139 139 140 - m25p80@0 { 140 + flash@0 { 141 141 compatible = "atmel,at25df321a"; 142 142 reg = <0>; 143 143 spi-max-frequency = <50000000>;
+4 -4
arch/arm/boot/dts/at91-sama5d3_xplained.dts
··· 57 57 }; 58 58 59 59 spi0: spi@f0004000 { 60 - pinctrl-names = "default"; 61 - pinctrl-0 = <&pinctrl_spi0_cs>; 60 + pinctrl-names = "default", "cs"; 61 + pinctrl-1 = <&pinctrl_spi0_cs>; 62 62 cs-gpios = <&pioD 13 0>, <0>, <0>, <&pioD 16 0>; 63 63 status = "okay"; 64 64 }; ··· 171 171 }; 172 172 173 173 spi1: spi@f8008000 { 174 - pinctrl-names = "default"; 175 - pinctrl-0 = <&pinctrl_spi1_cs>; 174 + pinctrl-names = "default", "cs"; 175 + pinctrl-1 = <&pinctrl_spi1_cs>; 176 176 cs-gpios = <&pioC 25 0>; 177 177 status = "okay"; 178 178 };
+1 -1
arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
··· 49 49 cs-gpios = <&pioC 3 0>, <0>, <0>, <0>; 50 50 status = "okay"; 51 51 52 - m25p80@0 { 52 + flash@0 { 53 53 compatible = "atmel,at25df321a"; 54 54 spi-max-frequency = <50000000>; 55 55 reg = <0>;
+3 -3
arch/arm/boot/dts/at91-sama5d4_xplained.dts
··· 81 81 }; 82 82 83 83 spi1: spi@fc018000 { 84 - pinctrl-names = "default"; 85 - pinctrl-0 = <&pinctrl_spi0_cs>; 84 + pinctrl-names = "default", "cs"; 85 + pinctrl-1 = <&pinctrl_spi1_cs>; 86 86 cs-gpios = <&pioB 21 0>; 87 87 status = "okay"; 88 88 }; ··· 140 140 atmel,pins = 141 141 <AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; 142 142 }; 143 - pinctrl_spi0_cs: spi0_cs_default { 143 + pinctrl_spi1_cs: spi1_cs_default { 144 144 atmel,pins = 145 145 <AT91_PIOB 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; 146 146 };
+1 -1
arch/arm/boot/dts/at91-sama5d4ek.dts
··· 65 65 spi0: spi@f8010000 { 66 66 cs-gpios = <&pioC 3 0>, <0>, <0>, <0>; 67 67 status = "okay"; 68 - m25p80@0 { 68 + flash@0 { 69 69 compatible = "atmel,at25df321a"; 70 70 spi-max-frequency = <50000000>; 71 71 reg = <0>;
+2 -2
arch/arm/boot/dts/at91-sama7g5ek.dts
··· 495 495 pinctrl_flx3_default: flx3_default { 496 496 pinmux = <PIN_PD16__FLEXCOM3_IO0>, 497 497 <PIN_PD17__FLEXCOM3_IO1>; 498 - bias-disable; 498 + bias-pull-up; 499 499 }; 500 500 501 501 pinctrl_flx4_default: flx4_default { ··· 655 655 <PIN_PB21__QSPI0_INT>; 656 656 bias-disable; 657 657 slew-rate = <0>; 658 - atmel,drive-strength = <ATMEL_PIO_DRVSTR_HI>; 658 + atmel,drive-strength = <ATMEL_PIO_DRVSTR_ME>; 659 659 }; 660 660 661 661 pinctrl_sdmmc0_default: sdmmc0_default {
+1 -1
arch/arm/boot/dts/at91-vinco.dts
··· 59 59 spi0: spi@f8010000 { 60 60 cs-gpios = <&pioC 3 0>, <0>, <0>, <0>; 61 61 status = "okay"; 62 - m25p80@0 { 62 + flash@0 { 63 63 compatible = "n25q32b", "jedec,spi-nor"; 64 64 spi-max-frequency = <50000000>; 65 65 reg = <0>;
+2 -2
arch/arm/boot/dts/at91rm9200ek.dts
··· 73 73 spi0: spi@fffe0000 { 74 74 status = "okay"; 75 75 cs-gpios = <&pioA 3 0>, <0>, <0>, <0>; 76 - mtd_dataflash@0 { 76 + flash@0 { 77 77 compatible = "atmel,at45", "atmel,dataflash"; 78 78 spi-max-frequency = <15000000>; 79 79 reg = <0>; ··· 94 94 status = "okay"; 95 95 }; 96 96 97 - nor_flash@10000000 { 97 + flash@10000000 { 98 98 compatible = "cfi-flash"; 99 99 reg = <0x10000000 0x800000>; 100 100 linux,mtd-name = "physmap-flash.0";
+1 -1
arch/arm/boot/dts/at91sam9260ek.dts
··· 92 92 93 93 spi0: spi@fffc8000 { 94 94 cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; 95 - mtd_dataflash@1 { 95 + flash@1 { 96 96 compatible = "atmel,at45", "atmel,dataflash"; 97 97 spi-max-frequency = <50000000>; 98 98 reg = <1>;
+1 -1
arch/arm/boot/dts/at91sam9261ek.dts
··· 145 145 cs-gpios = <&pioA 3 0>, <0>, <&pioA 28 0>, <0>; 146 146 status = "okay"; 147 147 148 - mtd_dataflash@0 { 148 + flash@0 { 149 149 compatible = "atmel,at45", "atmel,dataflash"; 150 150 reg = <0>; 151 151 spi-max-frequency = <15000000>;
+1 -1
arch/arm/boot/dts/at91sam9263ek.dts
··· 95 95 spi0: spi@fffa4000 { 96 96 status = "okay"; 97 97 cs-gpios = <&pioA 5 0>, <0>, <0>, <0>; 98 - mtd_dataflash@0 { 98 + flash@0 { 99 99 compatible = "atmel,at45", "atmel,dataflash"; 100 100 spi-max-frequency = <50000000>; 101 101 reg = <0>;
+44 -1
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
··· 110 110 111 111 spi0: spi@fffc8000 { 112 112 cs-gpios = <0>, <&pioC 11 0>, <0>, <0>; 113 - mtd_dataflash@1 { 113 + flash@1 { 114 114 compatible = "atmel,at45", "atmel,dataflash"; 115 115 spi-max-frequency = <50000000>; 116 116 reg = <1>; ··· 214 214 24c512@50 { 215 215 compatible = "atmel,24c512"; 216 216 reg = <0x50>; 217 + vcc-supply = <&reg_3v3>; 217 218 }; 218 219 219 220 wm8731: wm8731@1b { 220 221 compatible = "wm8731"; 221 222 reg = <0x1b>; 223 + 224 + /* PCK0 at 12MHz */ 225 + clocks = <&pmc PMC_TYPE_SYSTEM 8>; 226 + clock-names = "mclk"; 227 + assigned-clocks = <&pmc PMC_TYPE_SYSTEM 8>; 228 + assigned-clock-rates = <12000000>; 229 + 230 + HPVDD-supply = <&vcc_dac>; 231 + AVDD-supply = <&vcc_dac>; 232 + DCVDD-supply = <&reg_3v3>; 233 + DBVDD-supply = <&reg_3v3>; 222 234 }; 223 235 }; 224 236 ··· 265 253 266 254 atmel,ssc-controller = <&ssc0>; 267 255 atmel,audio-codec = <&wm8731>; 256 + }; 257 + 258 + reg_5v: fixedregulator0 { 259 + compatible = "regulator-fixed"; 260 + regulator-name = "5V"; 261 + regulator-min-microvolt = <5000000>; 262 + regulator-max-microvolt = <5000000>; 263 + }; 264 + 265 + reg_3v3: fixedregulator1 { 266 + compatible = "regulator-fixed"; 267 + regulator-name = "3V3"; 268 + vin-supply = <&reg_5v>; 269 + regulator-min-microvolt = <3300000>; 270 + regulator-max-microvolt = <3300000>; 271 + }; 272 + 273 + reg_1v: fixedregulator2 { 274 + compatible = "regulator-fixed"; 275 + regulator-name = "1V"; 276 + vin-supply = <&reg_5v>; 277 + regulator-min-microvolt = <1000000>; 278 + regulator-max-microvolt = <1000000>; 279 + }; 280 + 281 + vcc_dac: fixedregulator3 { 282 + compatible = "regulator-fixed"; 283 + regulator-name = "VCC_DAC"; 284 + vin-supply = <&reg_3v3>; 285 + regulator-min-microvolt = <3300000>; 286 + regulator-max-microvolt = <3300000>; 268 287 }; 269 288 };
+1 -1
arch/arm/boot/dts/at91sam9m10g45ek.dts
··· 167 167 spi0: spi@fffa4000{ 168 168 status = "okay"; 169 169 cs-gpios = <&pioB 3 0>, <0>, <0>, <0>; 170 - mtd_dataflash@0 { 170 + flash@0 { 171 171 compatible = "atmel,at45", "atmel,dataflash"; 172 172 spi-max-frequency = <13000000>; 173 173 reg = <0>;
+1 -1
arch/arm/boot/dts/at91sam9n12ek.dts
··· 119 119 spi0: spi@f0000000 { 120 120 status = "okay"; 121 121 cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; 122 - m25p80@0 { 122 + flash@0 { 123 123 compatible = "atmel,at25df321a"; 124 124 spi-max-frequency = <50000000>; 125 125 reg = <0>;
+1 -1
arch/arm/boot/dts/at91sam9rlek.dts
··· 180 180 spi0: spi@fffcc000 { 181 181 status = "okay"; 182 182 cs-gpios = <&pioA 28 0>, <0>, <0>, <0>; 183 - mtd_dataflash@0 { 183 + flash@0 { 184 184 compatible = "atmel,at45", "atmel,dataflash"; 185 185 spi-max-frequency = <15000000>; 186 186 reg = <0>;
+1 -1
arch/arm/boot/dts/at91sam9x5ek.dtsi
··· 125 125 cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; 126 126 status = "disabled"; /* conflicts with mmc1 */ 127 127 128 - m25p80@0 { 128 + flash@0 { 129 129 compatible = "atmel,at25df321a"; 130 130 spi-max-frequency = <50000000>; 131 131 reg = <0>;
+1 -1
arch/arm/boot/dts/sama5d3xmb.dtsi
··· 26 26 spi0: spi@f0004000 { 27 27 dmas = <0>, <0>; /* Do not use DMA for spi0 */ 28 28 29 - m25p80@0 { 29 + flash@0 { 30 30 compatible = "atmel,at25df321a"; 31 31 spi-max-frequency = <50000000>; 32 32 reg = <0>;
+1 -1
arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
··· 25 25 spi0: spi@f0004000 { 26 26 dmas = <0>, <0>; /* Do not use DMA for spi0 */ 27 27 28 - m25p80@0 { 28 + flash@0 { 29 29 compatible = "atmel,at25df321a"; 30 30 spi-max-frequency = <50000000>; 31 31 reg = <0>;
+9 -9
arch/arm/boot/dts/sama7g5.dtsi
··· 601 601 #size-cells = <0>; 602 602 clocks = <&pmc PMC_TYPE_PERIPHERAL 39>; 603 603 atmel,fifo-size = <32>; 604 - dmas = <&dma0 AT91_XDMAC_DT_PERID(7)>, 605 - <&dma0 AT91_XDMAC_DT_PERID(8)>; 606 - dma-names = "rx", "tx"; 604 + dmas = <&dma0 AT91_XDMAC_DT_PERID(8)>, 605 + <&dma0 AT91_XDMAC_DT_PERID(7)>; 606 + dma-names = "tx", "rx"; 607 607 status = "disabled"; 608 608 }; 609 609 }; ··· 786 786 #size-cells = <0>; 787 787 clocks = <&pmc PMC_TYPE_PERIPHERAL 46>; 788 788 atmel,fifo-size = <32>; 789 - dmas = <&dma0 AT91_XDMAC_DT_PERID(21)>, 790 - <&dma0 AT91_XDMAC_DT_PERID(22)>; 791 - dma-names = "rx", "tx"; 789 + dmas = <&dma0 AT91_XDMAC_DT_PERID(22)>, 790 + <&dma0 AT91_XDMAC_DT_PERID(21)>; 791 + dma-names = "tx", "rx"; 792 792 status = "disabled"; 793 793 }; 794 794 }; ··· 810 810 #size-cells = <0>; 811 811 clocks = <&pmc PMC_TYPE_PERIPHERAL 47>; 812 812 atmel,fifo-size = <32>; 813 - dmas = <&dma0 AT91_XDMAC_DT_PERID(23)>, 814 - <&dma0 AT91_XDMAC_DT_PERID(24)>; 815 - dma-names = "rx", "tx"; 813 + dmas = <&dma0 AT91_XDMAC_DT_PERID(24)>, 814 + <&dma0 AT91_XDMAC_DT_PERID(23)>; 815 + dma-names = "tx", "rx"; 816 816 status = "disabled"; 817 817 }; 818 818 };
+1 -1
arch/arm/boot/dts/usb_a9263.dts
··· 60 60 spi0: spi@fffa4000 { 61 61 cs-gpios = <&pioB 15 GPIO_ACTIVE_HIGH>; 62 62 status = "okay"; 63 - mtd_dataflash@0 { 63 + flash@0 { 64 64 compatible = "atmel,at45", "atmel,dataflash"; 65 65 reg = <0>; 66 66 spi-max-frequency = <15000000>;