summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-18 20:40:35 -0700
committerOlof Johansson <olof@lixom.net>2017-06-18 20:40:35 -0700
commitbcab84fb9f359dcb63fed625f6793750d619f04e (patch)
tree8448ad815e580259ee68d69375ff8fd2ac670d17 /arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
parentada0cc63dcf7a1137c7e51234021ea8f17506d20 (diff)
parentd5e9edfd37fc32098349b7753637bc1c80a16003 (diff)
downloadop-kernel-dev-bcab84fb9f359dcb63fed625f6793750d619f04e.zip
op-kernel-dev-bcab84fb9f359dcb63fed625f6793750d619f04e.tar.gz
Merge tag 'sunxi-dt-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
Allwinner DT changes for 4.13 The usual chunk of patches. The most notable improvements are the power supplies improvements (battery and AC-IN), crypto support for the sun5i family, HDMI support for the A10s, plus a lot of new things for the V3S and the A83T. * tag 'sunxi-dt-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (47 commits) ARM: sun6i: a31s: primo81: Enable battery power supply ARM: sun6i: a31s: primo81: Change USB OTG to OTG mode ARM: sun8i: a83t: Add dt node for the syscon control module ARM: sun8i: a83t: Add device node for R_PIO ARM: sun8i: v3s: add device nodes for DE2 display pipeline ARM: dts: sunxi: add SoC specific compatibles for the crypto nodes ARM: sun5i: add a cryptographic engine node ARM: sun8i: a83t: Add device node for PRCM ARM: dts: sun8i: h3: Add initial NanoPi M1 Plus support ARM: dts: orange-pi-zero: add node for SPI NOR ARM: sun7i: a20: cubietruck: Tie AXP209's USB power supply to USB PHY ARM: sun6i: a31: hummingbird: Enable AXP221's ACIN power supply ARM: sun4i: a10: cubieboard: Enable AXP209's ACIN power supply ARM: sun7i: a20: bananapi-m1-plus: Enable AXP209's ACIN power supply ARM: sun7i: a20: cubieboard2: Enable AXP209's ACIN power supply ARM: sun7i: a20: cubieboard2: Move usb_otg node for alphabetical ordering ARM: sun8i: a83t: cubietruck-plus: Enable SPDIF output ARM: sun8i: a83t: cubietruck-plus: Add LED device nodes ARM: sun8i: a83t: Add device node for SPDIF transmitter ARM: sun8i: a83t: Add device node for DMA controller ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts')
-rw-r--r--arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts64
1 files changed, 64 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
new file mode 100644
index 0000000..8ddd1b2
--- /dev/null
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2017 Jagan Teki <jteki@openedev.com>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "sun8i-h3-nanopi.dtsi"
+
+/ {
+ model = "FriendlyArm NanoPi M1 Plus";
+ compatible = "friendlyarm,nanopi-m1-plus", "allwinner,sun8i-h3";
+};
+
+&ehci1 {
+ status = "okay";
+};
+
+&ehci2 {
+ status = "okay";
+};
+
+&ohci1 {
+ status = "okay";
+};
+
+&ohci2 {
+ status = "okay";
+};
OpenPOWER on IntegriCloud