diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-21 16:24:22 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-21 16:24:22 -0700 |
| commit | fe870ae70bda4bb19ae6920a62e7d05f1dde9b2b (patch) | |
| tree | 5d4aef6d341f84aef6c09a8025004c954fd3f792 /Documentation | |
| parent | f7b29518c33a0fe48cf13b7e2eb04a5fdb11293d (diff) | |
| parent | d18fd9445b18c4adf56cfc58c378c702c8edd0da (diff) | |
| download | op-kernel-dev-fe870ae70bda4bb19ae6920a62e7d05f1dde9b2b.zip op-kernel-dev-fe870ae70bda4bb19ae6920a62e7d05f1dde9b2b.tar.gz | |
Merge tag 'sunxi-core-for-3.12-2' of https://github.com/mripard/linux into next/soc
Allwinner sunXi core additions for 3.12, take 2
These patches add machine support for the Allwinner A20 and A31 SoCs
* tag 'sunxi-core-for-3.12-2' of https://github.com/mripard/linux:
ARM: sunxi: Introduce Allwinner A20 support
ARM: sun6i: Add restart code for the A31
ARM: sunxi: Add the Allwinner A31 compatible to the machine definition
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt (renamed from Documentation/devicetree/bindings/watchdog/sun4i-wdt.txt) | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/sun4i-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt index ecd650a..e39cb26 100644 --- a/Documentation/devicetree/bindings/watchdog/sun4i-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt @@ -1,8 +1,9 @@ -Allwinner sun4i Watchdog timer +Allwinner SoCs Watchdog timer Required properties: -- compatible : should be "allwinner,sun4i-wdt" +- compatible : should be "allwinner,<soc-family>-wdt", the currently supported + SoC families being sun4i and sun6i - reg : Specifies base physical address and size of the registers. Example: |
