summaryrefslogtreecommitdiff
path: root/arch/arm/dts/sun5i-r8-chip.dts
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2016-08-18 18:51:12 (GMT)
committerHans de Goede <hdegoede@redhat.com>2016-08-26 14:58:36 (GMT)
commit860fbdd41f010348757926ca8f9c65dd00616d1e (patch)
treeeb92453773199d5077ced5b2fa53f3c79769ba67 /arch/arm/dts/sun5i-r8-chip.dts
parenta1243f78519f91ec4da7dd70daccfdfae9100cd0 (diff)
downloadu-boot-860fbdd41f010348757926ca8f9c65dd00616d1e.tar.xz
sunxi: Sync dts files with upstream kernel
Sync dts files with the current (Aug 18th 2016) state of Maxime's linux/sunxi/for-next repo. Note this commit also updates configs/MSI_Primo81_defconfig, adding: "# CONFIG_REQUIRE_SERIAL_CONSOLE is not set", this is necessary because the tablet does not have a reachable uart so the dts sync drops its serial0 alias. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/dts/sun5i-r8-chip.dts')
-rw-r--r--arch/arm/dts/sun5i-r8-chip.dts29
1 files changed, 13 insertions, 16 deletions
diff --git a/arch/arm/dts/sun5i-r8-chip.dts b/arch/arm/dts/sun5i-r8-chip.dts
index b1b62d5..7a8cc27 100644
--- a/arch/arm/dts/sun5i-r8-chip.dts
+++ b/arch/arm/dts/sun5i-r8-chip.dts
@@ -52,7 +52,7 @@
/ {
model = "NextThing C.H.I.P.";
- compatible = "nextthing,chip", "allwinner,sun5i-r8";
+ compatible = "nextthing,chip", "allwinner,sun5i-r8", "allwinner,sun5i-a13";
aliases {
i2c0 = &i2c0;
@@ -78,6 +78,10 @@
};
};
+&be0 {
+ status = "okay";
+};
+
&codec {
status = "okay";
};
@@ -142,21 +146,6 @@
status = "okay";
};
-&nfc {
- pinctrl-names = "default";
- pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
- status = "okay";
-
- nand@0 {
- #address-cells = <2>;
- #size-cells = <2>;
- reg = <0>;
- allwinner,rb = <0>;
- nand-ecc-mode = "hw";
- nand-on-flash-bbt;
- };
-};
-
&ohci0 {
status = "okay";
};
@@ -240,6 +229,14 @@
status = "okay";
};
+&tcon0 {
+ status = "okay";
+};
+
+&tve0 {
+ status = "okay";
+};
+
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>;