diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-20 07:48:11 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-20 07:48:12 +0100 |
| commit | 55a03ac8374d1f6ad149624419777bfbf077dc42 (patch) | |
| tree | e90bafdcd8ec2cc8b7fe91f39b9592af48e23dc4 /Documentation/devicetree/bindings/media | |
| parent | Merge tag 'v5.6-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ARM: dts: at91: sam9x60: add device tree for soc and board (diff) | |
| download | linux-55a03ac8374d1f6ad149624419777bfbf077dc42.tar.xz linux-55a03ac8374d1f6ad149624419777bfbf077dc42.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/media')
| -rw-r--r-- | Documentation/devicetree/bindings/media/atmel-isi.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/media/atmel-isi.txt b/Documentation/devicetree/bindings/media/atmel-isi.txt index 332513a151cc..8924c7545b63 100644 --- a/Documentation/devicetree/bindings/media/atmel-isi.txt +++ b/Documentation/devicetree/bindings/media/atmel-isi.txt @@ -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 |