Unverified Commit 306b8201 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

AT91 device tree updates for 6.3 #2

It contains:
- cleanups arround flexcom nodes on SAM9X60 SoC as follows:
	- preserve same ID for flexcoms and the embedded nodes (e.g. flx4
	  will embed uart4, spi4, i2c4 but not e.g. uart1, spi2, i2c3);
	- SoC specific bindings were moved from board specific file to SoC
	  specific file
	- DMA bindings for all flexcom nodes were added
	- SoC file was filled with missing flexcom nodes
- new SAM9X60 Curiosity board that contains 1 uSDcard interface, 1 SDcard
  interface, 1 USB device interface, 2 USB Type-A interfaces, 2 CAN
  interfaces, 1 10/100 Ethernet interface, 1 LCD RGB666 interface,
  1 Gb DDR2, 4 Gb NAND Flash, 2Kb EEPROM, leds, button, power
  regulators, UART and JTAG connectors

* tag 'at91-dt-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sam9x60_curiosity: Add device tree for sam9x60 curiosity board
  dt-bindings: arm: at91: Add info on sam9x60 curiosity
  ARM: dts: at91: sam9x60: Add missing flexcom definitions
  ARM: dts: at91: sam9x60: Add DMA bindings for the flexcom nodes
  ARM: dts: at91: sam9x60: Specify the FIFO size for the Flexcom UART
  ARM: dts: at91: sam9x60: fix spi4 node
  ARM: dts: at91: sam9x60: move flexcom definitions
  ARM: dts: at91: sam9x60: Fix the label numbering for the flexcom functions

Link: https://lore.kernel.org/r/20230209084930.289721-1-claudiu.beznea@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2508d5ef 3048a4de

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

+4 −2
Original line number Diff line number Diff line
@@ -91,9 +91,11 @@ properties: 
          - const: atmel,sama5d2

          - const: atmel,sama5



      - description: SAM9X60-EK board

      - description: Microchip SAM9X60 Evaluation Boards

        items:

          - const: microchip,sam9x60ek

          - enum:

              - microchip,sam9x60ek

              - microchip,sam9x60-curiosity

          - const: microchip,sam9x60

          - const: atmel,at91sam9

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ 
	at91sam9x25ek.dtb \

	at91sam9x35ek.dtb

dtb-$(CONFIG_SOC_SAM9X60) += \

	at91-sam9x60_curiosity.dtb \

	at91-sam9x60ek.dtb

dtb-$(CONFIG_SOC_SAM_V7) += \

	at91-kizbox2-2.dtb \

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

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

/*

 * at91-sam9x60_curiosity.dts - Device Tree file for Microchip SAM9X60 Curiosity board

 *

 * Copyright (C) 2022 Microchip Technology Inc. and its subsidiaries

 *

 * Author: Durai Manickam KR <durai.manickamkr@microchip.com>

 */

/dts-v1/;

#include "sam9x60.dtsi"

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



/ {

	model = "Microchip SAM9X60 Curiosity";

	compatible = "microchip,sam9x60-curiosity", "microchip,sam9x60", "atmel,at91sam9";



	aliases {

		i2c0 = &i2c0;

		i2c1 = &i2c6;

		serial2 = &uart7;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@20000000 {

		reg = <0x20000000 0x8000000>;

	};



	clocks {

		slow_xtal {

			clock-frequency = <32768>;

		};



		main_xtal {

			clock-frequency = <24000000>;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_key_gpio_default>;



		button-user {

			label = "PB_USER";

			gpios = <&pioA 29 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_PROG1>;

			wakeup-source;

		};

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpio_leds>;



		led-red {

			label = "red";

			gpios = <&pioD 17 GPIO_ACTIVE_HIGH>;

		};



		led-green {

			label = "green";

			gpios = <&pioD 19 GPIO_ACTIVE_HIGH>;

		};



		led-blue {

			label = "blue";

			gpios = <&pioD 21 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

		};

	};





	vdd_1v8: regulator-0 {

		compatible = "regulator-fixed";

		regulator-always-on;

		regulator-max-microvolt = <1800000>;

		regulator-min-microvolt = <1800000>;

		regulator-name = "VDD_1V8";

	};



	vdd_1v15: regulator-1 {

		compatible = "regulator-fixed";

		regulator-always-on;

		regulator-max-microvolt = <1150000>;

		regulator-min-microvolt = <1150000>;

		regulator-name = "VDD_1V15";

	};



	vdd1_3v3: regulator-2 {

		compatible = "regulator-fixed";

		regulator-always-on;

		regulator-max-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-name = "VDD1_3V3";

	};

};



&adc {

	vddana-supply = <&vdd1_3v3>;

	vref-supply = <&vdd1_3v3>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_adc_default &pinctrl_adtrg_default>;

	status = "okay";

};



&can0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_can0_rx_tx>;

	status = "disabled"; /* Conflict with dbgu. */

};



&can1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_can1_rx_tx>;

	status = "okay";

};



&dbgu {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_dbgu>;

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

};



&ebi {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_ebi_addr_nand &pinctrl_ebi_data_lsb>;

	status = "okay";



	nand_controller: nand-controller {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_nand_oe_we &pinctrl_nand_cs &pinctrl_nand_rb>;

		status = "okay";



		nand@3 {

			reg = <0x3 0x0 0x800000>;

			rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;

			cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;

			nand-bus-width = <8>;

			nand-ecc-mode = "hw";

			nand-ecc-strength = <8>;

			nand-ecc-step-size = <512>;

			nand-on-flash-bbt;

			label = "atmel_nand";



			partitions {

				compatible = "fixed-partitions";

				#address-cells = <1>;

				#size-cells = <1>;



				at91bootstrap@0 {

					label = "at91bootstrap";

					reg = <0x0 0x40000>;

				};



				uboot@40000 {

					label = "u-boot";

					reg = <0x40000 0xc0000>;

				};



				ubootenvred@100000 {

					label = "U-Boot Env Redundant";

					reg = <0x100000 0x40000>;

				};



				ubootenv@140000 {

					label = "U-Boot Env";

					reg = <0x140000 0x40000>;

				};



				dtb@180000 {

					label = "device tree";

					reg = <0x180000 0x80000>;

				};



				kernel@200000 {

					label = "kernel";

					reg = <0x200000 0x600000>;

				};



				rootfs@800000 {

					label = "rootfs";

					reg = <0x800000 0x1f800000>;

				};

			};

		};

	};

};



&flx0 {

	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;

	status = "okay";



	i2c0: i2c@600 {

		dmas = <0>, <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_flx0_default>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-analog-filter;

		i2c-digital-filter;

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

		status = "okay";



		eeprom@53 {

			compatible = "atmel,24c02";

			reg = <0x53>;

			pagesize = <16>;

		};

	};

};



&flx6 {

	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;

	status = "okay";



	i2c6: i2c@600 {

		dmas = <0>, <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_flx6_default>;

		i2c-analog-filter;

		i2c-digital-filter;

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

		status = "disabled";

	};

};



&flx7 {

	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;

	status = "okay";



	uart7: serial@200 {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_flx7_default>;

		status = "okay";

	};

};



&macb0 {

	phy-mode = "rmii";

	#address-cells = <1>;

	#size-cells = <0>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_macb0_rmii>;

	status = "okay";



	ethernet-phy@0 {

		reg = <0x0>;

	};

};



&pinctrl {

	adc {

		pinctrl_adc_default: adc-default {

			atmel,pins = <AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE>;

		};



		pinctrl_adtrg_default: adtrg-default {

			atmel,pins = <AT91_PIOB 18 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;

		};

	};



	can0 {

		pinctrl_can0_rx_tx: can0-rx-tx {

			atmel,pins =

				<AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_NONE	/* CANRX0 */

				 AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_NONE	/* CANTX0 */

				 AT91_PIOC 9 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_DOWN>;	/* Enable CAN Transceivers */

		};

	};



	can1 {

		pinctrl_can1_rx_tx: can1-rx-tx {

			atmel,pins =

				<AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE	/* CANRX1 */

				 AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_NONE	/* CANTX1 */

				 AT91_PIOB 17 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_DOWN>;	/* Enable CAN Transceivers */

		};

	};



	dbgu {

		pinctrl_dbgu: dbgu-0 {

			atmel,pins = <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP

				      AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;

		};

	};



	ebi {

		pinctrl_ebi_data_lsb: ebi-data-lsb {

			atmel,pins =

				<AT91_PIOD 6 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)

				 AT91_PIOD 7 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)

				 AT91_PIOD 8 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)

				 AT91_PIOD 9 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)

				 AT91_PIOD 10 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)

				 AT91_PIOD 11 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)

				 AT91_PIOD 12 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)

				 AT91_PIOD 13 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)>;

		};



		pinctrl_ebi_addr_nand: ebi-addr-nand {

			atmel,pins =

				<AT91_PIOD 2 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)

				 AT91_PIOD 3 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)>;

		};

	};



	flexcom {

		pinctrl_flx0_default: flx0-twi {

			atmel,pins =

				<AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP

				 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

		};



		pinctrl_flx6_default: flx6-twi {

			atmel,pins =

				<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP

				 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;

		};



		pinctrl_flx7_default: flx7-usart {

			atmel,pins =

				<AT91_PIOC 0 AT91_PERIPH_C AT91_PINCTRL_NONE

				 AT91_PIOC 1 AT91_PERIPH_C AT91_PINCTRL_NONE>;

		};

	};



	gpio-keys {

		pinctrl_key_gpio_default: pinctrl-key-gpio {

			atmel,pins = <AT91_PIOA 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};

	};



	leds {

		pinctrl_gpio_leds: gpio-leds {

			atmel,pins = <AT91_PIOD 17 AT91_PERIPH_GPIO AT91_PINCTRL_NONE

				      AT91_PIOD 19 AT91_PERIPH_GPIO AT91_PINCTRL_NONE

				      AT91_PIOD 21 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};

	};



	macb0 {

		pinctrl_macb0_rmii: macb0-rmii-0 {

			atmel,pins =

				<AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB0 periph A */

				 AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB1 periph A */

				 AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB2 periph A */

				 AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB3 periph A */

				 AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB4 periph A */

				 AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB5 periph A */

				 AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB6 periph A */

				 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB7 periph A */

				 AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE	/* PB9 periph A */

				 AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* PB10 periph A */

		};

	};



	nand {

		pinctrl_nand_oe_we: nand-oe-we-0 {

			atmel,pins =

				<AT91_PIOD 0 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)

				 AT91_PIOD 1 AT91_PERIPH_A (AT91_PINCTRL_NONE | AT91_PINCTRL_SLEWRATE_DIS)>;

		};



		pinctrl_nand_rb: nand-rb-0 {

			atmel,pins =

				<AT91_PIOD 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;

		};



		pinctrl_nand_cs: nand-cs-0 {

			atmel,pins =

				<AT91_PIOD 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;

		};

	};



	pwm0 {

		pinctrl_pwm0_0: pwm0-0 {

			atmel,pins = <AT91_PIOB 12 AT91_PERIPH_B AT91_PINCTRL_NONE>;

		};



		pinctrl_pwm0_1: pwm0-1 {

			atmel,pins = <AT91_PIOB 13 AT91_PERIPH_B AT91_PINCTRL_NONE>;

		};



		pinctrl_pwm0_2: pwm0-2 {

			atmel,pins = <AT91_PIOD 16 AT91_PERIPH_B AT91_PINCTRL_NONE>;

		};

	};



	sdmmc0 {

		pinctrl_sdmmc0_default: sdmmc0 {

			atmel,pins =

				<AT91_PIOA 17 AT91_PERIPH_A (AT91_PINCTRL_DRIVE_STRENGTH_HI)				/* PA17 CK  periph A with pullup */

				 AT91_PIOA 16 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)	/* PA16 CMD periph A with pullup */

				 AT91_PIOA 15 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)	/* PA15 DAT0 periph A */

				 AT91_PIOA 18 AT91_PERIPH_A (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)	/* PA18 DAT1 periph A with pullup */

				 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 25 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};

	};



	sdmmc1 {

		pinctrl_sdmmc1_default: sdmmc1 {

			atmel,pins =

				<AT91_PIOA 13 AT91_PERIPH_B (AT91_PINCTRL_DRIVE_STRENGTH_HI)				/* PA13 CK periph B */

				 AT91_PIOA 12 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)	/* PA12 CMD periph B with pullup */

				 AT91_PIOA 11 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)	/* PA11 DAT0 periph B with pullup */

				 AT91_PIOA 2 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)	/* PA2 DAT1 periph B with pullup */

				 AT91_PIOA 3 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)	/* PA3 DAT2 periph B with pullup */

				 AT91_PIOA 4 AT91_PERIPH_B (AT91_PINCTRL_PULL_UP | AT91_PINCTRL_DRIVE_STRENGTH_HI)>;	/* PA4 DAT3 periph B with pullup */

		};

	};



	usb0 {

		pinctrl_usba_vbus: usba-vbus {

			atmel,pins = <AT91_PIOA 27 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};

	};



	usb1 {

		pinctrl_usb_default: usb-default {

			atmel,pins = <AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_NONE

				      AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;

		};

	};

}; /* pinctrl */



&pwm0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_pwm0_0 &pinctrl_pwm0_1 &pinctrl_pwm0_2>;

	status = "okay";

};



&sdmmc0 {

	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sdmmc0_default &pinctrl_sdmmc0_cd>;

	cd-gpios = <&pioA 25 GPIO_ACTIVE_LOW>;

	disable-wp;

	status = "okay";

};



&sdmmc1 {

	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sdmmc1_default>;

	disable-wp;

	status = "okay";

};



&shutdown_controller {

	debounce-delay-us = <976>;

	status = "okay";



	input@0 {

		reg = <0>;

	};

};



&tcb0 {

	timer0: timer@0 {

		compatible = "atmel,tcb-timer";

		reg = <0>;

	};



	timer1: timer@1 {

		compatible = "atmel,tcb-timer";

		reg = <1>;

	};

};



&usb0 {

	atmel,vbus-gpio = <&pioA 27 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usba_vbus>;

	status = "okay";

};



&usb1 {

	num-ports = <3>;

	atmel,vbus-gpio = <0

			   &pioD 18 GPIO_ACTIVE_HIGH

			   &pioD 15 GPIO_ACTIVE_HIGH>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usb_default>;

	status = "okay";

};



&usb2 {

	status = "okay";

};



&watchdog {

	status = "okay";

};

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

+10 −40
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


	aliases {

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		serial1 = &uart1;

		i2c1 = &i2c6;

		serial1 = &uart5;

	};



	chosen {
@@ -207,15 +207,11 @@ 
	status = "okay";



	i2c0: i2c@600 {

		compatible = "microchip,sam9x60-i2c";

		reg = <0x600 0x200>;

		interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;

		dmas = <0>, <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_flx0_default>;

		atmel,fifo-size = <16>;

		i2c-analog-filter;

		i2c-digital-filter;

		i2c-digital-filter-width-ns = <35>;
@@ -234,17 +230,10 @@ 
	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>;

	status = "disabled";



	spi0: spi@400 {

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

		reg = <0x400 0x200>;

		interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;

		clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;

		clock-names = "spi_clk";

	spi4: spi@400 {

		dmas = <0>, <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_flx4_default>;

		atmel,fifo-size = <16>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabled";

	};

};
@@ -253,24 +242,9 @@ 
	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;

	status = "okay";



	uart1: serial@200 {

		compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";

		reg = <0x200 0x200>;

		atmel,usart-mode = <AT91_USART_MODE_SERIAL>;

		interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;

		dmas = <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |

			 AT91_XDMAC_DT_PERID(10))>,

		       <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |

			 AT91_XDMAC_DT_PERID(11))>;

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

		clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;

		clock-names = "usart";

		pinctrl-0 = <&pinctrl_flx5_default>;

	uart5: serial@200 {

		pinctrl-names = "default";

		atmel,use-dma-rx;

		atmel,use-dma-tx;

		pinctrl-0 = <&pinctrl_flx5_default>;

		status = "okay";

	};

};
@@ -279,16 +253,12 @@ 
	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;

	status = "okay";



	i2c1: i2c@600 {

		compatible = "microchip,sam9x60-i2c";

		reg = <0x600 0x200>;

		interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;

	i2c6: i2c@600 {

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;

		dmas = <0>, <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_flx6_default>;

		atmel,fifo-size = <16>;

		i2c-analog-filter;

		i2c-digital-filter;

		i2c-digital-filter-width-ns = <35>;
@@ -439,7 +409,7 @@ 
				 AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE>;

		};



		pinctrl_flx5_default: flx_uart {

		pinctrl_flx5_default: flx5_uart {

			atmel,pins =

				<AT91_PIOA 7 AT91_PERIPH_C AT91_PINCTRL_NONE

				 AT91_PIOA 8 AT91_PERIPH_B AT91_PINCTRL_NONE

arch/arm/boot/dts/sam9x60.dtsi

+622 −0

File changed.

Preview size limit exceeded, changes collapsed.