diff options
author | Jagan Teki <jagan@amarulasolutions.com> | 2018-08-05 00:40:09 +0530 |
---|---|---|
committer | Jagan Teki <jagan@amarulasolutions.com> | 2018-09-28 22:09:24 +0530 |
commit | d1d4295aab97306454254989c8080f5093360af4 (patch) | |
tree | 60fe3196e8a0e3450c4d96af3e5eb4550774eea1 /arch/arm/dts/sun6i-a31s-cs908.dts | |
parent | 13b36face7adebd790c0b201792ec47b77d2fb0c (diff) |
ARM: dts: sun6i: Update A31/A31s dts(i) files from Linux-v4.18-rc3
Update all A31/A31s devicetree dtsi and dtsi files from
Linux-v4.18-rc3 with below commit:
commit b240b419db5d624ce7a5a397d6f62a1a686009ec
Merge: 9c2dd8405c0c 518d2f43c358
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu Apr 5 21:18:09 2018 -0700
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat (limited to 'arch/arm/dts/sun6i-a31s-cs908.dts')
-rw-r--r-- | arch/arm/dts/sun6i-a31s-cs908.dts | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/dts/sun6i-a31s-cs908.dts b/arch/arm/dts/sun6i-a31s-cs908.dts index 5e8f8c4f2b..75e578159c 100644 --- a/arch/arm/dts/sun6i-a31s-cs908.dts +++ b/arch/arm/dts/sun6i-a31s-cs908.dts @@ -43,8 +43,6 @@ /dts-v1/; #include "sun6i-a31s.dtsi" -#include <dt-bindings/pinctrl/sun4i-a10.h> - / { model = "CSQ CS908 top set box"; compatible = "csq,cs908", "allwinner,sun6i-a31s"; |