diff options
| author | Olof Johansson <olof@lixom.net> | 2019-05-16 20:05:11 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-05-16 20:05:11 +0200 |
| commit | faff3fcf01effe2be9a7efc165df5af2b5747b73 (patch) | |
| tree | 16821c07368b18549d9cd3c3c9612c56c2e68b2e /Documentation/devicetree | |
| parent | Merge tag 'at91-5.2-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | ARM: at91: pm: do not disable/enable PLLA for ULP modes (diff) | |
| download | linux-faff3fcf01effe2be9a7efc165df5af2b5747b73.tar.xz linux-faff3fcf01effe2be9a7efc165df5af2b5747b73.zip | |
Merge tag 'at91-5.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/late
AT91 SoC for 5.2
- PM changes for SAM9X60
* tag 'at91-5.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: at91: pm: do not disable/enable PLLA for ULP modes
ARM: at91: pm: disable RC oscillator in ULP0
ARM: at91: pm: add ULP1 support for SAM9X60
ARM: at91: pm: add support for per SoC wakeup source configuration
ARM: at91: pm: keep at91_pm_backup_init() only for SAMA5D2 SoCs
ARM: at91: pm: initial PM support for SAM9X60
dt-bindings: arm: atmel: add binding for SAM9X60 SoC
ARM: at91: pm: introduce at91_soc_pm structure
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/atmel-at91.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt index 4bf1b4da7659..99dee23c74a4 100644 --- a/Documentation/devicetree/bindings/arm/atmel-at91.txt +++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt @@ -25,6 +25,7 @@ compatible: must be one of: o "atmel,at91sam9n12" o "atmel,at91sam9rl" o "atmel,at91sam9xe" + o "microchip,sam9x60" * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific SoC family: o "atmel,sama5d2" shall be extended with the specific SoC compatible: |