Unverified Commit 07d0eca0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Microchip AT91 device tree updates for v6.18

This update includes:
- sama7d65 and curiosity board: addition of gpio, leds and usart3
- sam9x75: qspi node
- one cleanup

* tag 'at91-dt-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: microchip: sam9x7: Add qspi controller
  ARM: dts: microchip: sama7d65: add uart3 definition for flexcom3 peripheral
  ARM: dts: microchip: sama7d65: Add GPIO buttons and LEDs
  ARM: dts: microchip: Minor whitespace cleanup

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a08be517 c656932c

arch/arm/boot/dts/microchip/at91-sama7d65_curiosity.dts

+52 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include "sama7d65-pinfunc.h"

#include "sama7d65.dtsi"

#include <dt-bindings/mfd/atmel-flexcom.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/leds/common.h>

#include <dt-bindings/pinctrl/at91.h>



/ {
@@ -26,6 +28,43 @@ chosen { 
		stdout-path = "serial0:115200n8";

	};



	gpio-keys {

		compatible = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_key_gpio_default>;



		button {

			label = "PB_USER";

			gpios = <&pioa PIN_PC10 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_PROG1>;

			wakeup-source;

		};

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_led_gpio_default>;



		led0: led-red {

			color = <LED_COLOR_ID_RED>;

			gpios = <&pioa PIN_PB17 GPIO_ACTIVE_HIGH>; /* Conflict with pwm. */

		};



		led1: led-green {

			color = <LED_COLOR_ID_GREEN>;

			gpios = <&pioa PIN_PB15 GPIO_ACTIVE_HIGH>; /* Conflict with pwm. */

		};



		led2: led-blue {

			color = <LED_COLOR_ID_BLUE>;

			function = LED_FUNCTION_HEARTBEAT;

			gpios = <&pioa PIN_PA21 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

		};

	};



	memory@60000000 {

		device_type = "memory";

		reg = <0x60000000 0x40000000>;
@@ -352,6 +391,18 @@ pinctrl_i2c10_default: i2c10-default{ 
		bias-pull-up;

	};



	pinctrl_key_gpio_default: key-gpio-default {

		pinmux = <PIN_PC10__GPIO>;

		bias-pull-up;

	};



	pinctrl_led_gpio_default: led-gpio-default {

		pinmux = <PIN_PB15__GPIO>,

			 <PIN_PB17__GPIO>,

			 <PIN_PA21__GPIO>;

		bias-pull-up;

	};



	pinctrl_sdmmc1_default: sdmmc1-default {

		cmd-data {

			pinmux = <PIN_PB22__SDMMC1_CMD>,

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

+21 −0
Original line number Diff line number Diff line
@@ -271,6 +271,27 @@ AT91_XDMAC_DT_PERID(38))>, 
			status = "disabled";

		};



		qspi: spi@f0014000 {

			compatible = "microchip,sam9x7-ospi";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xf0014000 0x100>, <0x60000000 0x20000000>;

			reg-names = "qspi_base", "qspi_mmap";

			interrupts = <35 IRQ_TYPE_LEVEL_HIGH 7>;

			dmas = <&dma0

				(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |

				AT91_XDMAC_DT_PERID(26))>,

				<&dma0

				(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |

				AT91_XDMAC_DT_PERID(27))>;

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

			clocks = <&pmc PMC_TYPE_PERIPHERAL 35>, <&pmc PMC_TYPE_GCK 35>;

			clock-names = "pclk", "gclk";

			assigned-clocks = <&pmc PMC_TYPE_GCK 35>;

			assigned-clock-parents = <&pmc PMC_TYPE_CORE PMC_PLLADIV2>;

			status = "disabled";

		};



		i2s: i2s@f001c000 {

			compatible = "microchip,sam9x7-i2smcc", "microchip,sam9x60-i2smcc";

			reg = <0xf001c000 0x100>;

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

+16 −1
Original line number Diff line number Diff line
@@ -506,6 +506,21 @@ flx3: flexcom@e182c000 { 
			#size-cells = <1>;

			status = "disabled";



			uart3: serial@200 {

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

				reg = <0x200 0x200>;

				interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;

				clock-names = "usart";

				dmas = <&dma0 AT91_XDMAC_DT_PERID(12)>,

				       <&dma0 AT91_XDMAC_DT_PERID(11)>;

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

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

				status = "disabled";

			};



			i2c3: i2c@600 {

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

				reg = <0x600 0x200>;