diff options
author | Olof Johansson <olof@lixom.net> | 2018-12-12 22:51:29 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-12-12 22:51:29 +0100 |
commit | abd488c00194fb43abde35aad44fa134794fd5b4 (patch) | |
tree | 0471a82177521d551414963e224249b25a844aec /Documentation/devicetree/bindings/arm | |
parent | Merge tag 'davinci-for-v4.21/soc' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | dt-bindings: watchdog: Add Allwinner ARMv5 F1C100s wdt (diff) | |
download | linux-abd488c00194fb43abde35aad44fa134794fd5b4.tar.xz linux-abd488c00194fb43abde35aad44fa134794fd5b4.zip |
Merge tag 'sunxi-core-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/soc
Allwinner core changes for 4.21
A few patches to enable a new Allwinner SoC based on an armv5 CPU.
* tag 'sunxi-core-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
dt-bindings: watchdog: Add Allwinner ARMv5 F1C100s wdt
ARM: sunxi: add Allwinner ARMv5 SoCs
dt-bindings: arm: Add new Allwinner ARMv5 F1C100s SoC
ARM: Check ARCH_MULTI_V7 to differentiate ARMv5/v7 Allwinner SoCs
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
-rw-r--r-- | Documentation/devicetree/bindings/arm/sunxi.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt index e4beec3d9ad3..f9ddc05d32f0 100644 --- a/Documentation/devicetree/bindings/arm/sunxi.txt +++ b/Documentation/devicetree/bindings/arm/sunxi.txt @@ -18,4 +18,5 @@ using one of the following compatible strings: allwinner,sun8i-v3s allwinner,sun9i-a80 allwinner,sun50i-a64 + allwinner,suniv-f1c100s nextthing,gr8 |