diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 06:47:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 06:47:46 -0700 |
| commit | 77f236978918822dc4af1fd010eff1f791b1cf58 (patch) | |
| tree | 12b599a2e9fb518f6c0544f40539c39985622383 /Documentation | |
| parent | a43315e3ddc31d55fe6f9cabac734d145d03d0b4 (diff) | |
| parent | d3df1ec06353e51fc44563d2e7e18d42811af290 (diff) | |
| download | linux-77f236978918822dc4af1fd010eff1f791b1cf58.tar.gz linux-77f236978918822dc4af1fd010eff1f791b1cf58.tar.bz2 linux-77f236978918822dc4af1fd010eff1f791b1cf58.zip | |
Merge tag 'at91-ab-4.12-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
DT for 4.12:
- Add SFRBU on sama5d2
- DT improvements for sama5d2_xplained, sama5d3_xplained, at91sam9x5ek and
Axentia TSE-850
* tag 'at91-ab-4.12-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91: sama5d3_xplained: not all ADC channels are available
ARM: dts: at91: sama5d3_xplained: fix ADC vref
ARM: dts: at91: add envelope detector mux to the Axentia TSE-850
ARM: dts: at91: Disable SPI on at91sam9x5ek to allow MCI1 to work.
ARM: dts: at91: Fix matrix compatible
ARM: dts: at91: sama5d2_xplained: enable RTC wakeup
ARM: dts: at91: sama5d2: add sfrbu
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/atmel-at91.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt index 29737b9b616e..799af90dd75b 100644 --- a/Documentation/devicetree/bindings/arm/atmel-at91.txt +++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt @@ -217,7 +217,8 @@ memory, bridge implementations, processor and other functionality not controlled elsewhere. required properties: -- compatible: Should be "atmel,<chip>-sfr", "syscon". +- compatible: Should be "atmel,<chip>-sfr", "syscon" or + "atmel,<chip>-sfrbu", "syscon" <chip> can be "sama5d3", "sama5d4" or "sama5d2". - reg: Should contain registers location and length |