Commit a9418e89 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

AT91 DT for 5.8

 - New board: Microchip SAMA5D2 Industrial Connectivity Platform
 - All SoCs are now converted to the new PMC device tree binding
 - sama5d2 flexcom nodes are now fully described in sama5d2.dtsi

* tag 'at91-5.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: (35 commits)
  ARM: dts: at91: sama5d2_xplained: Add aliases for the dedicated I2C IPs
  ARM: dts: at91: Configure I2C SCL gpio as open drain
  ARM: dts: at91: sama5d2_xplained: Describe the flx0 I2C function
  ARM: dts: at91: sama5d2_ptc_ek: Add comments to describe the aliases
  ARM: dts: at91: sama5d2_xplained: Add alias for DBGU
  ARM: dts: at91: sama5d2: Add missing flexcom definitions
  ARM: dts: at91: sama5d2: Remove i2s and tcb aliases from SoC dtsi
  ARM: dts: at91: sama5d2: Add DMA bindings for the SPI and I2C flx0 functions
  ARM: dts: at91: sama5d2: Add DMA bindings for the flx1 I2C function
  ARM: dts: at91: sama5d2: Add DMA bindings for the flx3 SPI function
  ARM: dts: at91: sama5d2: Add DMA bindings for the SPI and UART flx4 functions
  ARM: dts: at91: sama5d2: Specify the FIFO size for the Flexcom UART
  ARM: dts: at91: sama5d2: Move flx0 definitions in the SoC dtsi
  ARM: dts: at91: sama5d2: Move flx1 definitions in the SoC dtsi
  ARM: dts: at91: sama5d2: Move flx2 definitions in the SoC dtsi
  ARM: dts: at91: sama5d2: Move flx3 definitions in the SoC dtsi
  ARM: dts: at91: sama5d2: Move flx4 definitions in the SoC dtsi
  ARM: dts: at91: sama5d2: Fix the label numbering for flexcom functions
  ARM: dts: at91: sama5d27_wlsom1: Add alias for i2c0
  ARM: dts: at91: sama5d2-icp: add SAMA5D2-ICP
  ...

Link: https://lore.kernel.org/r/20200518212844.GA26356@piout.net


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c8128b5c 88d801ae

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

+7 −0
Original line number Diff line number Diff line
@@ -82,6 +82,13 @@ properties: 
          - const: atmel,sama5d2

          - const: atmel,sama5



      - description: Microchip SAMA5D2 Industrial Connectivity Platform

        items:

          - const: microchip,sama5d2-icp

          - const: atmel,sama5d27

          - const: atmel,sama5d2

          - const: atmel,sama5



      - description: SAM9X60-EK board

        items:

          - const: microchip,sam9x60ek

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ 
	at91-nattis-2-natte-2.dtb \

	at91-sama5d27_som1_ek.dtb \

	at91-sama5d27_wlsom1_ek.dtb \

	at91-sama5d2_icp.dtb \

	at91-sama5d2_ptc_ek.dtb \

	at91-sama5d2_xplained.dtb \

	at91-sama5d3_xplained.dtb \

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
	wm8904: wm8904@1a {

		compatible = "wlf,wm8904";

		reg = <0x1a>;

		clocks = <&pck2>;

		clocks = <&pmc PMC_TYPE_SYSTEM 10>;

		clock-names = "mclk";

	};

};

arch/arm/boot/dts/at91-kizbox3-hs.dts

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ 


&flx3 {

	status = "okay";

	uart6: serial@200 {

	uart8: serial@200 {

		status = "okay";

	};

};
@@ -291,7 +291,7 @@ 
&flx4 {

	status = "okay";



	i2c2: i2c@600 {

	i2c6: i2c@600 {

		status = "okay";

	};

};

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

+4 −44
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		serial3 = &uart3;

		serial4 = &uart4;

		serial5 = &uart5;

		serial6 = &uart6;

		serial6 = &uart8;

	};



	chosen {
@@ -207,7 +207,7 @@ 
		};

	};



	pinctrl_flx4_default: flx4_i2c2_default {

	pinctrl_flx4_default: flx4_i2c6_default {

		pinmux = <PIN_PD12__FLEXCOM4_IO0>, //DATA

		<PIN_PD13__FLEXCOM4_IO1>; //CLK

		bias-disable;
@@ -299,21 +299,8 @@ 
	status = "disabled";



	uart5: serial@200  {

		compatible = "atmel,at91sam9260-usart";

		reg = <0x200 0x400>;

		interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>;

		dmas = <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

			| AT91_XDMAC_DT_PERID(11))>,

		       <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

			| AT91_XDMAC_DT_PERID(12))>;

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

		clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;

		clock-names = "usart";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_flx0_default>;

		atmel,fifo-size = <32>;

		atmel,use-dma-rx;

		atmel,use-dma-tx;

		status = "disabled";
@@ -324,22 +311,9 @@ 
	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_USART>;

	status = "disabled";



	uart6: serial@200 {

		compatible = "atmel,at91sam9260-usart";

		reg = <0x200 0x400>;

		interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>;

		dmas = <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

			| AT91_XDMAC_DT_PERID(17))>,

		       <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

			| AT91_XDMAC_DT_PERID(18))>;

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

		clocks = <&pmc PMC_TYPE_PERIPHERAL 22>;

		clock-names = "usart";

	uart8: serial@200 {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_flx3_default>;

		atmel,fifo-size = <32>;

		atmel,use-dma-rx;

		atmel,use-dma-tx;

		status = "disabled";
@@ -350,23 +324,9 @@ 
	atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;

	status = "disabled";



	i2c2: i2c@600 {

		compatible = "atmel,sama5d2-i2c";

		reg = <0x600 0x200>;

		interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>;

		dmas = <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

			| AT91_XDMAC_DT_PERID(19))>,

		       <&dma0

			(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

			| AT91_XDMAC_DT_PERID(20))>;

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

		#address-cells = <1>;

		#size-cells = <0>;

		clocks = <&pmc PMC_TYPE_PERIPHERAL 23>;

	i2c6: i2c@600 {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_flx4_default>;

		atmel,fifo-size = <16>;

		status = "disabled";

	};

};