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

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

AT91 dt for 5.15:

- add sama7g5 SoC and associated evaluation kit, the sama7g5-ek
- adaptation of some DT for sama5d27 som1 ek, sama5d4 xplained and
  sama5d2 icp boards
- fixes to gpio and shutdown controller nodes for all boards

* tag 'at91-dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: use the right property for shutdown controller
  ARM: dts: at91: sama5d2_icp: enable digital filter for I2C nodes
  ARM: dts: at91: sama5d4_xplained: change the key code of the gpio key
  ARM: dts: at91: add conflict note for d3
  ARM: dts: at91: add pinctrl-{names, 0} for all gpios
  ARM: dts: at91: sama5d27_som1_ek: enable ADC node
  ARM: dts: at91: sama5d4_xplained: Remove spi0 node
  dt-bindings: atmel-sysreg: add bindings for sama7g5
  ARM: dts: at91: add sama7g5 SoC DT and sama7g5-ek
  dt-bindings: ARM: at91: document sama7g5ek board

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 72ee3b4d 818c4593

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

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,11 @@ properties: 
          - const: atmel,sama5d4

          - const: atmel,sama5



      - items:

          - const: microchip,sama7g5ek # SAMA7G5 Evaluation Kit

          - const: microchip,sama7g5

          - const: microchip,sama7



      - items:

          - enum:

              - atmel,sams70j19

Documentation/devicetree/bindings/arm/atmel-sysregs.txt

+13 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ RAMC SDRAM/DDR Controller required properties: 
			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

			"atmel,sama5d3-ddramc",

			"microchip,sam9x60-ddramc"

			"microchip,sam9x60-ddramc",

			"microchip,sama7g5-uddrc"

- reg: Should contain registers location and length



Examples:
@@ -55,6 +56,17 @@ Examples: 
		reg = <0xffffe800 0x200>;

	};



RAMC PHY Controller required properties:

- compatible: Should be "microchip,sama7g5-ddr3phy", "syscon"

- reg: Should contain registers location and length



Example:



	ddr3phy: ddr3phy@e3804000 {

		compatible = "microchip,sama7g5-ddr3phy", "syscon";

		reg = <0xe3804000 0x1000>;

};



SHDWC Shutdown Controller



required properties:

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ 
	at91-sama5d4_xplained.dtb \

	at91-sama5d4ek.dtb \

	at91-vinco.dtb

dtb-$(CONFIG_SOC_SAMA7G5) += \

	at91-sama7g5ek.dtb

dtb-$(CONFIG_ARCH_AXXIA) += \

	axm5516-amarillo.dtb

dtb-$(CONFIG_ARCH_BCM2835) += \

arch/arm/boot/dts/at91-kizbox3_common.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ 
};



&shutdown_controller {

	atmel,shdwc-debouncer = <976>;

	debounce-delay-us = <976>;

	atmel,wakeup-rtc-timer;



	input@0 {

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

+16 −2
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ 


	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpio_leds>;

		status = "okay"; /* Conflict with pwm0. */



		red {
@@ -537,6 +539,10 @@ 
				 AT91_PIOA 19 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)	/* PA19 DAT2 periph A with pullup */

				 AT91_PIOA 20 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)>;	/* PA20 DAT3 periph A with pullup */

		};

		pinctrl_sdmmc0_cd: sdmmc0_cd {

			atmel,pins =

				<AT91_PIOA 23 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};

	};



	sdmmc1 {
@@ -569,6 +575,14 @@ 
				      AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};

	};



	leds {

		pinctrl_gpio_leds: gpio_leds {

			atmel,pins = <AT91_PIOB 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE

				      AT91_PIOB 12 AT91_PERIPH_GPIO AT91_PINCTRL_NONE

				      AT91_PIOB 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};

	};

}; /* pinctrl */



&pwm0 {
@@ -580,7 +594,7 @@ 
&sdmmc0 {

	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sdmmc0_default>;

	pinctrl-0 = <&pinctrl_sdmmc0_default &pinctrl_sdmmc0_cd>;

	status = "okay";

	cd-gpios = <&pioA 23 GPIO_ACTIVE_LOW>;

	disable-wp;
@@ -648,7 +662,7 @@ 
};



&shutdown_controller {

	atmel,shdwc-debouncer = <976>;

	debounce-delay-us = <976>;

	status = "okay";



	input@0 {