Unverified Commit 8071974c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

AT91 DT #1 for 5.16:

- Addition of a new variant in the sama5d2 family: the sama5d29 with
  significant updates being CAN and Ethernet controllers;
- Add support for Exegin Q5xR5 and CalAmp LMU5000 boards which were
  maintained up to this moment, separately, in OpenWrt tree;
- Two more boards gained I2C bus recovery support;
- Tse850 updated with one Ethernet fix;
- Sama7g5ek gained ADC nodes  and sama5d27_wlsom1 WiFi support.

* tag 'at91-dt-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: at91: dts: sama5d29: Add dtsi file for sama5d29
  ARM: dts: at91-sama5d2_icp.dts: Added I2C bus recovery support
  ARM: dts: at91: tse850: the emac<->phy interface is rmii
  ARM: dts: at91: add Exegin Q5xR5 board
  dt-bindings: ARM: at91: document exegin q5xr5 board
  dt-bindings: add vendor prefix for exegin
  ARM: dts: at91: add CalAmp LMU5000 board
  dt-bindings: ARM: at91: document CalAmp LMU5000 board
  dt-bindings: add vendor prefix for calamp
  ARM: dts: at91: at91sam9260: add pinctrl label
  ARM: dts: at91-sama5d27_som1_ek: Added I2C bus recovery support
  ARM: dts: at91: sama7g5ek: enable ADC on the board
  ARM: dts: at91: sama7g5: add node for the ADC
  ARM: dts: at91: sama5d27_wlsom1: add wifi device

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c3bb12ba 4c46b991

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

+12 −0
Original line number Diff line number Diff line
@@ -126,6 +126,18 @@ properties: 
          - const: atmel,sama5d3

          - const: atmel,sama5



      - description: CalAmp LMU5000 board

        items:

          - const: calamp,lmu5000

          - const: atmel,at91sam9g20

          - const: atmel,at91sam9



      - description: Exegin Q5xR5 board

        items:

          - const: exegin,q5xr5

          - const: atmel,at91sam9g20

          - const: atmel,at91sam9



      - items:

          - enum:

              - atmel,sama5d31

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ patternProperties: 
    description: B&R Industrial Automation GmbH

  "^bticino,.*":

    description: Bticino International

  "^calamp,.*":

    description: CalAmp Corp.

  "^calaosystems,.*":

    description: CALAO Systems SAS

  "^calxeda,.*":
@@ -395,6 +397,8 @@ patternProperties: 
    description: Exar Corporation

  "^excito,.*":

    description: Excito

  "^exegin,.*":

    description: Exegin Technologies Limited

  "^ezchip,.*":

    description: EZchip Semiconductor

  "^facebook,.*":

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ 
	usb_a9263.dtb \

	at91-foxg20.dtb \

	at91-kizbox.dtb \

	at91-lmu5000.dtb \

	at91sam9g20ek.dtb \

	at91sam9g20ek_2mmc.dtb \

	tny_a9g20.dtb \
@@ -40,6 +41,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ 
	at91-kizboxmini-base.dtb \

	at91-kizboxmini-mb.dtb \

	at91-kizboxmini-rd.dtb \

	at91-q5xr5.dtb \

	at91-smartkiz.dtb \

	at91-wb45n.dtb \

	at91sam9g15ek.dtb \

arch/arm/boot/dts/at91-lmu5000.dts

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

/*

 * Device Tree file for CalAmp LMU5000 board

 *

 * Copyright (C) 2013 Adam Porter <porter.adam@gmail.com>

 */



/dts-v1/;

#include "at91sam9g20.dtsi"



/ {

	model = "CalAmp LMU5000";

	compatible = "calamp,lmu5000", "atmel,at91sam9g20", "atmel,at91sam9";



	chosen {

		bootargs = "mem=64M console=ttyS0,115200 rootfstype=jffs2";

	};



	memory {

		reg = <0x20000000 0x4000000>;

	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

			compatible = "atmel,osc", "fixed-clock";

			clock-frequency = <18432000>;

		};

	};

};



&dbgu {

	status = "okay";

};



&ebi {

	status = "okay";



	nand_controller: nand-controller {

		pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;

		pinctrl-names = "default";

		status = "okay";



		nand@3 {

			reg = <0x3 0x0 0x800000>;

			rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;

			cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;

			nand-bus-width = <8>;

			nand-ecc-mode = "soft";

			nand-on-flash-bbt;

			label = "atmel_nand";

			status = "okay";



			partitions {

				compatible = "fixed-partitions";

				#address-cells = <1>;

				#size-cells = <1>;



				kernel@0 {

					label = "kernel";

					reg = <0x0 0x400000>;

				};



				rootfs@400000 {

					label = "rootfs";

					reg = <0x400000 0x3C00000>;

				};



				user1@4000000 {

					label = "user1";

					reg = <0x4000000 0x2000000>;

				};



				user2@6000000 {

					label = "user2";

					reg = <0x6000000 0x2000000>;

				};

			};

		};

	};

};



&macb0 {

	phy-mode = "mii";

	status = "okay";

};



&pinctrl {

	board {

		pinctrl_pck0_as_mck: pck0_as_mck {

			atmel,pins = <AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;

		};

	};



	usb0 {

		pinctrl_usb1_vbus_gpio: usb0_vbus_gpio {

			atmel,pins = <AT91_PIOC 5 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};

	};

};



&ssc0 {

	status = "okay";

	pinctrl-0 = <&pinctrl_ssc0_tx>;

};



&uart0 {

	status = "okay";

};



&uart1 {

	status = "okay";

};



&usart0 {

	pinctrl-0 =

		<&pinctrl_usart0

		 &pinctrl_usart0_rts

		 &pinctrl_usart0_cts

		 &pinctrl_usart0_dtr_dsr

		 &pinctrl_usart0_dcd

		 &pinctrl_usart0_ri>;

	status = "okay";

};



&usart2 {

	status = "okay";

};



&usb0 {

	num-ports = <2>;

	status = "okay";

};



&usb1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usb1_vbus_gpio>;

	atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;

	status = "okay";

};



&watchdog {

	status = "okay";

};

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

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

/*

 * Device Tree file for Exegin Q5xR5 board

 *

 * Copyright (C) 2014 Owen Kirby <osk@exegin.com>

 */



/dts-v1/;

#include "at91sam9g20.dtsi"



/ {

	model = "Exegin Q5x (rev5)";

	compatible = "exegin,q5xr5", "atmel,at91sam9g20", "atmel,at91sam9";



	chosen {

		bootargs = "console=ttyS0,115200 rootfstype=squashfs,jffs2";

	};



	memory {

		reg = <0x20000000 0x0>;

	};



	clocks {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		main_clock: clock@0 {

			compatible = "atmel,osc", "fixed-clock";

			clock-frequency = <18432000>;

		};



		slow_xtal {

			clock-frequency = <32768>;

		};



		main_xtal {

			clock-frequency = <18432000>;

		};

	};

};



&dbgu {

	status = "okay";

};



&ebi {

	status = "okay";



	flash: flash@0 {

		compatible = "cfi-flash";

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0x0 0x1000000 0x800000>;

		bank-width = <2>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			kernel@0 {

				label = "kernel";

				reg = <0x0 0x200000>;

			};



			rootfs@200000 {

				label = "rootfs";

				reg = <0x200000 0x600000>;

			};

		};

	};

};



&macb0 {

	phy-mode = "mii";

	status = "okay";

};



&pinctrl {

	board {

		pinctrl_pck0_as_mck: pck0_as_mck {

			atmel,pins = <AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;

		};

	};



	spi0 {

		pinctrl_spi0: spi0-0 {

			atmel,pins =

				<AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE

				 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE

				 AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;

		};



		pinctrl_spi0_npcs0: spi0_npcs0 {

			atmel,pins = <AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_NONE>;

		};



		pinctrl_spi0_npcs1: spi0_npcs1 {

			atmel,pins = <AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_NONE>;

		};

	};



	spi1 {

		pinctrl_spi1: spi1-0 {

			atmel,pins =

				<AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE

				 AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE

				 AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE>;

		};



		pinctrl_spi1_npcs0: spi1_npcs0 {

			atmel,pins = <AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE>;

		};



		pinctrl_spi1_npcs1: spi1_npcs1 {

			atmel,pins = <AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_NONE>;

		};

	};

};



&spi0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi0 &pinctrl_spi0_npcs0 &pinctrl_spi0_npcs1>;

	cs-gpios = <&pioA 3 GPIO_ACTIVE_HIGH>, <&pioC 11 GPIO_ACTIVE_LOW>, <0>, <0>;

	status = "okay";



	m25p80@0 {

		compatible = "jedec,spi-nor";

		spi-max-frequency = <20000000>;

		reg = <0>;

		#address-cells = <1>;

		#size-cells = <1>;



		at91boot@0 {

			label = "at91boot";

			reg = <0x0 0x4000>;

		};



		uenv@4000 {

			label = "uboot-env";

			reg = <0x4000 0x4000>;

		};



		uboot@8000 {

			label = "uboot";

			reg = <0x8000 0x3E000>;

		};

	};



	spidev@1 {

		compatible = "spidev";

		spi-max-frequency = <2000000>;

		reg = <1>;

	};

};



&spi1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi1 &pinctrl_spi1_npcs0 &pinctrl_spi1_npcs1>;

	cs-gpios = <&pioB 3 GPIO_ACTIVE_HIGH>, <&pioC 5 GPIO_ACTIVE_LOW>, <0>, <0>;

	status = "okay";



	spidev@0 {

		compatible = "spidev";

		spi-max-frequency = <2000000>;

		reg = <0>;

	};



	spidev@1 {

		compatible = "spidev";

		spi-max-frequency = <2000000>;

		reg = <1>;

	};

};



&usart0 {

	pinctrl-0 =

		<&pinctrl_usart0

		 &pinctrl_usart0_rts

		 &pinctrl_usart0_cts

		 &pinctrl_usart0_dtr_dsr

		 &pinctrl_usart0_dcd

		 &pinctrl_usart0_ri>;

	status = "okay";

};



&usb0 {

	num-ports = <2>;

	status = "okay";

};



&usb1 {

	status = "okay";

};



&watchdog {

	status = "okay";

};