diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-20 09:48:11 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-20 09:48:12 +0300 |
| commit | 55a03ac8374d1f6ad149624419777bfbf077dc42 (patch) | |
| tree | e90bafdcd8ec2cc8b7fe91f39b9592af48e23dc4 /Documentation/devicetree/bindings/mfd | |
| parent | 71acc94c493299b68061bbf0d272590b903bd4a0 (diff) | |
| parent | 1e5f532c273714abf4275df930b2c77aa1b63b51 (diff) | |
| download | linux-55a03ac8374d1f6ad149624419777bfbf077dc42.tar.xz | |
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/mfd')
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/atmel-gpbr.txt | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/atmel-matrix.txt | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/atmel-smc.txt | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt b/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt index a28569540683..e8c525569f10 100644 --- a/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt +++ b/Documentation/devicetree/bindings/mfd/atmel-gpbr.txt @@ -3,7 +3,9 @@ The GPBR are a set of battery-backed registers. Required properties: -- compatible: "atmel,at91sam9260-gpbr", "syscon" +- compatible: Should be one of the following: + "atmel,at91sam9260-gpbr", "syscon" + "microchip,sam9x60-gpbr", "syscon" - reg: contains offset/length value of the GPBR memory region. diff --git a/Documentation/devicetree/bindings/mfd/atmel-matrix.txt b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt index e3ef50ca02a5..89d05c64fb01 100644 --- a/Documentation/devicetree/bindings/mfd/atmel-matrix.txt +++ b/Documentation/devicetree/bindings/mfd/atmel-matrix.txt @@ -13,6 +13,7 @@ Required properties: "atmel,at91sam9n12-matrix", "syscon" "atmel,at91sam9x5-matrix", "syscon" "atmel,sama5d3-matrix", "syscon" + "microchip,sam9x60-matrix", "syscon" - reg: Contains offset/length value of the Bus Matrix memory region. diff --git a/Documentation/devicetree/bindings/mfd/atmel-smc.txt b/Documentation/devicetree/bindings/mfd/atmel-smc.txt index 1103ce2030fb..5696d9fcb5dc 100644 --- a/Documentation/devicetree/bindings/mfd/atmel-smc.txt +++ b/Documentation/devicetree/bindings/mfd/atmel-smc.txt @@ -9,6 +9,7 @@ Required properties: "atmel,at91sam9260-smc", "syscon" "atmel,sama5d3-smc", "syscon" "atmel,sama5d2-smc", "syscon" + "microchip,sam9x60-smc", "syscon" - reg: Contains offset/length value of the SMC memory region. |