Unverified Commit 8f311c09 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt 

AT91 & LAN966 DT #1 for 5.19:

- at91: DT compliance updates to gic and dataflash nodes
- lan966: addition to many basic nodes for various peripherals
- lan966: Kontron KSwitch D10: support for this new board
  and its network switch

* tag 'at91-dt-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: kswitch-d10: enable networking
  ARM: dts: lan966x: add switch node
  ARM: dts: lan966x: add serdes node
  ARM: dts: lan966x: add reset switch reset node
  ARM: dts: lan966x: add MIIM nodes
  ARM: dts: lan966x: add hwmon node
  ARM: dts: lan966x: add basic Kontron KSwitch D10 support
  ARM: dts: lan966x: add flexcom I2C nodes
  ARM: dts: lan966x: add flexcom SPI nodes
  ARM: dts: lan966x: add all flexcom usart nodes
  ARM: dts: lan966x: add missing uart DMA channel
  ARM: dts: lan966x: add sgpio node
  ARM: dts: lan966x: swap dma channels for crypto node
  ARM: dts: lan966x: rename pinctrl nodes
  ARM: dts: at91: sama7g5: remove interrupt-parent from gic node
  ARM: dts: at91: use generic node name for dataflash

Link: https://lore.kernel.org/r/20220513162338.87717-1-nicolas.ferre@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7213d3a5 46a9556d

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ flexcom@f8034000 { 
		clock-names = "spi_clk";

		atmel,fifo-size = <32>;



		mtd_dataflash@0 {

		flash@0 {

			compatible = "atmel,at25f512b";

			reg = <0>;

			spi-max-frequency = <20000000>;

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -768,7 +768,9 @@ dtb-$(CONFIG_SOC_IMX7ULP) += \ 
dtb-$(CONFIG_SOC_IMXRT) += \

	imxrt1050-evk.dtb

dtb-$(CONFIG_SOC_LAN966) += \

	lan966x-pcb8291.dtb

	lan966x-pcb8291.dtb \

	lan966x-kontron-kswitch-d10-mmt-6g-2gs.dtb \

	lan966x-kontron-kswitch-d10-mmt-8g.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-iot.dtb \

	ls1021a-moxa-uc-8410a.dtb \

arch/arm/boot/dts/at91rm9200ek.dts

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
			spi0: spi@fffe0000 {

				status = "okay";

				cs-gpios = <&pioA 3 0>, <0>, <0>, <0>;

				mtd_dataflash@0 {

				flash@0 {

					compatible = "atmel,at45", "atmel,dataflash";

					spi-max-frequency = <15000000>;

					reg = <0>;
@@ -94,7 +94,7 @@ 
			status = "okay";

		};



		nor_flash@10000000 {

		flash@10000000 {

			compatible = "cfi-flash";

			reg = <0x10000000 0x800000>;

			linux,mtd-name = "physmap-flash.0";

arch/arm/boot/dts/at91sam9260ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 


			spi0: spi@fffc8000 {

				cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;

				mtd_dataflash@1 {

				flash@1 {

					compatible = "atmel,at45", "atmel,dataflash";

					spi-max-frequency = <50000000>;

					reg = <1>;

arch/arm/boot/dts/at91sam9261ek.dts

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
				cs-gpios = <&pioA 3 0>, <0>, <&pioA 28 0>, <0>;

				status = "okay";



				mtd_dataflash@0 {

				flash@0 {

					compatible = "atmel,at45", "atmel,dataflash";

					reg = <0>;

					spi-max-frequency = <15000000>;