Commit 55a03ac8 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

AT91 DT for 5.6 #2

 - Add sam9x60 dtsi
 - New board sam9x60 Evaluation Kit

* tag 'at91-5.6-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sam9x60: add device tree for soc and board
  dt-bindings: arm: add sam9x60-ek board
  dt-bindings: atmel-gpbr: add microchip,sam9x60-gpbr
  dt-bindings: atmel-smc: add microchip,sam9x60-smc
  dt-bindings: atmel-sysreg: add microchip,sam9x60-ddramc
  dt-bindings: atmel-nand: add microchip,sam9x60-pmecc
  dt-bindings: atmel-matrix: add microchip,sam9x60-matrix
  dt-bindings: at91-sama5d2_adc: add microchip,sam9x60-adc
  dt-bindings: atmel-isi: add microchip,sam9x60-isi
  dt-bindings: atmel-can: add microchip,sam9x60-can
  dt-bindings: at_xdmac: add microchip,sam9x60-dma
  dt-bindings: at_xdmac: remove wildcard

Link: https://lore.kernel.org/r/20200119234707.GA90094@piout.net


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 71acc94c 1e5f532c

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

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

          - const: atmel,sama5



      - description: SAM9X60-EK board

        items:

          - const: microchip,sam9x60ek

          - const: microchip,sam9x60

          - const: atmel,at91sam9



      - description: Nattis v2 board with Natte v2 power board

        items:

          - const: axentia,nattis-2

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

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ RAMC SDRAM/DDR Controller required properties: 
			"atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

			"atmel,sama5d3-ddramc",

			"microchip,sam9x60-ddramc"

- reg: Should contain registers location and length



Examples:

Documentation/devicetree/bindings/dma/atmel-xdma.txt

+1 −3
Original line number Diff line number Diff line
@@ -2,9 +2,7 @@ 


* XDMA Controller

Required properties:

- compatible: Should be "atmel,<chip>-dma".

  <chip> compatible description:

  - sama5d4: first SoC adding the XDMAC

- compatible: Should be "atmel,sama5d4-dma" or "microchip,sam9x60-dma".

- reg: Should contain DMA registers location and length.

- interrupts: Should contain DMA interrupt.

- #dma-cells: Must be <1>, used to represent the number of integer cells in

Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt

+1 −1
Original line number Diff line number Diff line 
* AT91 SAMA5D2 Analog to Digital Converter (ADC)



Required properties:

  - compatible: Should be "atmel,sama5d2-adc".

  - compatible: Should be "atmel,sama5d2-adc" or "microchip,sam9x60-adc".

  - reg: Should contain ADC registers location and length.

  - interrupts: Should contain the IRQ line for the ADC.

  - clocks: phandle to device clock.

Documentation/devicetree/bindings/media/atmel-isi.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Atmel Image Sensor Interface (ISI) 
----------------------------------



Required properties for ISI:

- compatible: must be "atmel,at91sam9g45-isi".

- compatible: must be "atmel,at91sam9g45-isi" or "microchip,sam9x60-isi".

- reg: physical base address and length of the registers set for the device.

- interrupts: should contain IRQ line for the ISI.

- clocks: list of clock specifiers, corresponding to entries in the clock-names