Unverified Commit 2af1017c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt 

Microchip AT91 device tree updates for v6.20

This update includes:
- update the SAMA7D65 flexcom nodes to add the missing i2c, spi, and usart
  child nodes; the flexcom child nodes were also updated with DMA
  properties
- add basic support for the PCB8385 board, based on LAN966X SoC
- drop usb_a9g20-dab-mmx.dtsi as it is not used anywhere in the tree

* tag 'at91-dt-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  ARM: dts: microchip: Drop usb_a9g20-dab-mmx.dtsi
  ARM: dts: Add support for pcb8385
  dt-bindings: arm: at91: add lan966 pcb8385 board
  ARM: dts: microchip: sama7d65: add missing flexcom nodes
  ARM: dts: microchip: sama7d65: add fifo-size to usart
  ARM: dts: microchip: sama7d65: add dma properties to usart6

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 52c1a896 e9ed88a4

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

+4 −2
Original line number Diff line number Diff line
@@ -235,9 +235,11 @@ properties: 
          - const: microchip,lan9662

          - const: microchip,lan966



      - description: Microchip LAN9668 PCB8290 Evaluation Board.

      - description: Microchip LAN9668 Evaluation Board.

        items:

          - const: microchip,lan9668-pcb8290

          - enum:

              - microchip,lan9668-pcb8290

              - microchip,lan9668-pcb8385

          - const: microchip,lan9668

          - const: microchip,lan966

arch/arm/boot/dts/microchip/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -102,4 +102,5 @@ dtb-$(CONFIG_SOC_LAN966) += \ 
	lan966x-kontron-kswitch-d10-mmt-8g.dtb \

	lan966x-pcb8290.dtb \

	lan966x-pcb8291.dtb \

	lan966x-pcb8309.dtb
 
	lan966x-pcb8309.dtb \

	lan966x-pcb8385.dtb

arch/arm/boot/dts/microchip/lan966x-pcb8385.dts

0 → 100644
+131 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * lan966x-pcb8385.dts - Device Tree file for PCB8385

 */

/dts-v1/;



#include "lan966x.dtsi"

#include "dt-bindings/phy/phy-lan966x-serdes.h"



/ {

	model = "Microchip EVB - LAN9668";

	compatible = "microchip,lan9668-pcb8385", "microchip,lan9668", "microchip,lan966";



	aliases {

		serial0 = &usart3;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	gpio-restart {

		compatible = "gpio-restart";

		gpios = <&gpio 59 GPIO_ACTIVE_LOW>;

		open-source;

		priority = <200>;

	};



	leds {

		compatible = "gpio-leds";



		led-p1-green {

			label = "cu0:green";

			gpios = <&sgpio_out 2 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led-p1-yellow {

			label = "cu0:yellow";

			gpios = <&sgpio_out 2 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led-p2-green {

			label = "cu1:green";

			gpios = <&sgpio_out 3 0 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led-p2-yellow {

			label = "cu1:yellow";

			gpios = <&sgpio_out 3 1 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

	};

};



&aes {

	status = "reserved"; /* Reserved by secure OS */

};



&flx0 {

	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;

	status = "okay";

};



&flx3 {

	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;

	status = "okay";

};



&gpio {

	fc0_b_pins: fc0-b-pins {

		/* SCL, SDA */

		pins = "GPIO_25", "GPIO_26";

		function = "fc0_b";

	};



	fc3_b_pins: fc3-b-pins {

		/* RX, TX */

		pins = "GPIO_52", "GPIO_53";

		function = "fc3_b";

	};



	sgpio_a_pins: sgpio-a-pins {

		/* SCK, D0, D1, LD */

		pins = "GPIO_32", "GPIO_33", "GPIO_34", "GPIO_35";

		function = "sgpio_a";

	};

};



&i2c0 {

	pinctrl-0 = <&fc0_b_pins>;

	pinctrl-names = "default";

	dmas = <0>, <0>;

	i2c-analog-filter;

	i2c-digital-filter;

	i2c-digital-filter-width-ns = <35>;

	i2c-sda-hold-time-ns = <1500>;

	status = "okay";



	eeprom@54 {

		compatible = "atmel,24c01";

		reg = <0x54>;

	};



	eeprom@55 {

		compatible = "atmel,24c01";

		reg = <0x55>;

	};

};



&sgpio {

	pinctrl-0 = <&sgpio_a_pins>;

	pinctrl-names = "default";

	microchip,sgpio-port-ranges = <0 3>;

	status = "okay";



	gpio@0 {

		ngpios = <64>;

	};

	gpio@1 {

		ngpios = <64>;

	};

};



&usart3 {

	pinctrl-0 = <&fc3_b_pins>;

	pinctrl-names = "default";

	status = "okay";

};

arch/arm/boot/dts/microchip/sama7d65.dtsi

+279 −0
Original line number Diff line number Diff line
@@ -414,10 +414,26 @@ uart0: serial@200 { 
				dma-names = "tx", "rx";

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,fifo-size = <32>;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			spi0: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;

				interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 34>;

				clock-names = "spi_clk";

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma1 AT91_XDMAC_DT_PERID(6)>,

				       <&dma1 AT91_XDMAC_DT_PERID(5)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c0: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;
@@ -442,6 +458,22 @@ flx1: flexcom@e1824000 { 
			#size-cells = <1>;

			status = "disabled";



			uart1: serial@200 {

				compatible = "microchip,sama7d65-usart", "atmel,at91sam9260-usart";

				reg = <0x200 0x200>;

				interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 35>;

				clock-names = "usart";

				dmas = <&dma0 AT91_XDMAC_DT_PERID(8)>,

				       <&dma0 AT91_XDMAC_DT_PERID(7)>;

				dma-names = "tx", "rx";

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,fifo-size = <32>;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			spi1: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;
@@ -492,9 +524,39 @@ uart2: serial@200 { 
				dma-names = "tx", "rx";

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,fifo-size = <32>;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			spi2: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;

				interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 36>;

				clock-names = "spi_clk";

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma1 AT91_XDMAC_DT_PERID(10)>,

				       <&dma1 AT91_XDMAC_DT_PERID(9)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c2: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;

				interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 36>;

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma1 AT91_XDMAC_DT_PERID(10)>,

				       <&dma1 AT91_XDMAC_DT_PERID(9)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};

		};



		flx3: flexcom@e182c000 {
@@ -517,10 +579,26 @@ uart3: serial@200 { 
				dma-names = "tx", "rx";

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,fifo-size = <32>;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			spi3: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;

				interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;

				clock-names = "spi_clk";

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma0 AT91_XDMAC_DT_PERID(12)>,

				       <&dma0 AT91_XDMAC_DT_PERID(11)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c3: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;
@@ -576,6 +654,20 @@ spi4: spi@400 { 
				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c4: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;

				interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 38>;

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma1 AT91_XDMAC_DT_PERID(14)>,

				       <&dma1 AT91_XDMAC_DT_PERID(13)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};

		};



		flx5: flexcom@e201c000 {
@@ -587,6 +679,37 @@ flx5: flexcom@e201c000 { 
			#size-cells = <1>;

			status = "disabled";



			uart5: serial@200 {

				compatible = "microchip,sama7d65-usart", "atmel,at91sam9260-usart";

				reg = <0x200 0x200>;

				interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 39>;

				clock-names = "usart";

				dmas = <&dma0 AT91_XDMAC_DT_PERID(16)>,

				       <&dma0 AT91_XDMAC_DT_PERID(15)>;

				dma-names = "tx", "rx";

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,fifo-size = <32>;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			spi5: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;

				interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 39>;

				clock-names = "spi_clk";

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma0 AT91_XDMAC_DT_PERID(16)>,

				       <&dma0 AT91_XDMAC_DT_PERID(15)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c5: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;
@@ -617,10 +740,44 @@ uart6: serial@200 { 
				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 40>;

				clock-names = "usart";

				dmas = <&dma1 AT91_XDMAC_DT_PERID(18)>,

				       <&dma1 AT91_XDMAC_DT_PERID(17)>;

				dma-names = "tx", "rx";

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			spi6: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;

				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 40>;

				clock-names = "spi_clk";

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma1 AT91_XDMAC_DT_PERID(18)>,

				       <&dma1 AT91_XDMAC_DT_PERID(17)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c6: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;

				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 40>;

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma1 AT91_XDMAC_DT_PERID(18)>,

				       <&dma1 AT91_XDMAC_DT_PERID(17)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};

		};



		flx7: flexcom@e2024000 {
@@ -647,6 +804,35 @@ uart7: serial@200 { 
				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			spi7: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;

				interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 41>;

				clock-names = "spi_clk";

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma1 AT91_XDMAC_DT_PERID(20)>,

				       <&dma1 AT91_XDMAC_DT_PERID(19)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c7: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;

				interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 41>;

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma1 AT91_XDMAC_DT_PERID(20)>,

				       <&dma1 AT91_XDMAC_DT_PERID(19)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};

		};



		flx8: flexcom@e281c000 {
@@ -658,6 +844,37 @@ flx8: flexcom@e281c000 { 
			#size-cells = <1>;

			status = "disabled";



			uart8: serial@200 {

				compatible = "microchip,sama7d65-usart", "atmel,at91sam9260-usart";

				reg = <0x200 0x200>;

				interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 42>;

				clock-names = "usart";

				dmas = <&dma0 AT91_XDMAC_DT_PERID(22)>,

				       <&dma0 AT91_XDMAC_DT_PERID(21)>;

				dma-names = "tx", "rx";

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,fifo-size = <32>;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			spi8: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;

				interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 42>;

				clock-names = "spi_clk";

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma0 AT91_XDMAC_DT_PERID(22)>,

				       <&dma0 AT91_XDMAC_DT_PERID(21)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c8: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;
@@ -682,6 +899,37 @@ flx9: flexcom@e2820000 { 
			#size-cells = <1>;

			status = "disabled";



			uart9: serial@200 {

				compatible = "microchip,sama7d65-usart", "atmel,at91sam9260-usart";

				reg = <0x200 0x200>;

				interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 43>;

				clock-names = "usart";

				dmas = <&dma0 AT91_XDMAC_DT_PERID(24)>,

				       <&dma0 AT91_XDMAC_DT_PERID(23)>;

				dma-names = "tx", "rx";

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,fifo-size = <32>;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			spi9: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;

				interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 43>;

				clock-names = "spi_clk";

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma0 AT91_XDMAC_DT_PERID(24)>,

				       <&dma0 AT91_XDMAC_DT_PERID(23)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c9: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;
@@ -706,6 +954,37 @@ flx10: flexcom@e2824000 { 
			#size-cells = <1>;

			status = "disabled";



			uart10: serial@200 {

				compatible = "microchip,sama7d65-usart", "atmel,at91sam9260-usart";

				reg = <0x200 0x200>;

				interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 44>;

				clock-names = "usart";

				dmas = <&dma0 AT91_XDMAC_DT_PERID(26)>,

				       <&dma0 AT91_XDMAC_DT_PERID(25)>;

				dma-names = "tx", "rx";

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,fifo-size = <32>;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			spi10: spi@400 {

				compatible = "microchip,sama7d65-spi", "atmel,at91rm9200-spi";

				reg = <0x400 0x200>;

				interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 44>;

				clock-names = "spi_clk";

				#address-cells = <1>;

				#size-cells = <0>;

				dmas = <&dma0 AT91_XDMAC_DT_PERID(26)>,

				       <&dma0 AT91_XDMAC_DT_PERID(25)>;

				dma-names = "tx", "rx";

				atmel,fifo-size = <32>;

				status = "disabled";

			};



			i2c10: i2c@600 {

				compatible = "microchip,sama7d65-i2c", "microchip,sam9x60-i2c";

				reg = <0x600 0x200>;

arch/arm/boot/dts/microchip/usb_a9g20-dab-mmx.dtsi

deleted100644 → 0
+0 −93
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * calao-dab-mmx.dtsi - Device Tree Include file for Calao DAB-MMX Daughter Board

 *

 * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

 */



/ {

	ahb {

		apb {

			usart1: serial@fffb4000 {

				status = "okay";

			};



			usart3: serial@fffd0000 {

				status = "okay";

			};

		};

	};



	i2c-gpio@0 {

		status = "okay";

	};



	leds {

		compatible = "gpio-leds";



		user_led1 {

			label = "user_led1";

			gpios = <&pioB 20 GPIO_ACTIVE_LOW>;

		};



/*

* led already used by mother board but active as high

*		user_led2 {

*			label = "user_led2";

*			gpios = <&pioB 21 GPIO_ACTIVE_LOW>;

*		};

*/

		user_led3 {

			label = "user_led3";

			gpios = <&pioB 22 GPIO_ACTIVE_LOW>;

		};



		user_led4 {

			label = "user_led4";

			gpios = <&pioB 23 GPIO_ACTIVE_LOW>;

		};



		red {

			label = "red";

			gpios = <&pioB 24 GPIO_ACTIVE_LOW>;

		};



		orange {

			label = "orange";

			gpios = <&pioB 30 GPIO_ACTIVE_LOW>;

		};



		green {

			label = "green";

			gpios = <&pioB 31 GPIO_ACTIVE_LOW>;

		};

	};



	gpio_keys {

		compatible = "gpio-keys";



		button-user-pb1 {

			label = "user_pb1";

			gpios = <&pioB 25 GPIO_ACTIVE_LOW>;

			linux,code = <0x100>;

		};



		button-user-pb2 {

			label = "user_pb2";

			gpios = <&pioB 13 GPIO_ACTIVE_LOW>;

			linux,code = <0x101>;

		};



		button-user-pb3 {

			label = "user_pb3";

			gpios = <&pioA 26 GPIO_ACTIVE_LOW>;

			linux,code = <0x102>;

		};



		button-user-pb4 {

			label = "user_pb4";

			gpios = <&pioC 9 GPIO_ACTIVE_LOW>;

			linux,code = <0x103>;

		};

	};

};