From patchwork Fri Mar 17 15:43:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 9630999 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3D76E60245 for ; Fri, 17 Mar 2017 15:46:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E79F286BF for ; Fri, 17 Mar 2017 15:46:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12835286C2; Fri, 17 Mar 2017 15:46:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 608EE286BF for ; Fri, 17 Mar 2017 15:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=EXuqGNqKFoZbODhMLGJWgMamh5zTVEHEQuq3T+X5sy4=; b=c7vIw/0du7+ubIqBpqmpRrQgFp cLWmlFST1rob28RmHwI3oh9aggUvK9qC/3v3YwTJEEQxLBoaSt+z/Q2gXzT+rXgK3ztDU3eH33f/p al/pZiJoWxXwjr2KseF3lQOoNDT9yZt45MKBHsuwrfOxDlFUiqmzZylWswJ06N6pAlRG8xR/JB56X Me2ixf5gJrPucG1cyZMxvqma3jbQjTeHuHg6T3xsy0trl1hvOw7S+2yeunVfy9B8QhMCTbYXLPOHi fO1x5oiJ7FXvrdh1AVljzhzfF4zBKaQkHFCfuKip873rFfkN6+PyVRq8K7OKZYMhmymD9eTfWLIZr lDvEEqZA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cou59-0006N0-45; Fri, 17 Mar 2017 15:46:23 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cou4y-0006EH-KV for linux-arm-kernel@bombadil.infradead.org; Fri, 17 Mar 2017 15:46:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=92GPjBZQBjQ5uydTffliF1gDq3gfeLrwKEf6s8kkzYE=; b=N5oGFJ78HV1LPnq9IsMZh92y4 rRmokzekQH3R2iaFcC0pY9KNY1a1wYk3B271PX5mN0mN/b7OfH2DA+Q741cgx4+70OBs1K2Ewqe2T rB9OOB+R88mTgda/0RlcEoiLMKZJt2TXxstd025OaJzEpPKosxQ9+H3pV8jZuL6SXhhnXtNxWinXA UXpSvSxH7+vB1y3Xt4cEN0P9JkDBpNU0sccsTmUNQxj85mYTfpYUFNBQUEGtI/8ICRRrxzWJU5l/R Hmtsli5dm+L/g/XmUD4TPICtPETS5C67mQ/yqBCYsL4JyPiVknc1l42Gwum3uVYmge7Khnld6hp+N UXNJqZNbA==; Received: from forward7m.cmail.yandex.net ([5.255.216.200]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cou4q-0004sT-4o for linux-arm-kernel@lists.infradead.org; Fri, 17 Mar 2017 15:46:09 +0000 Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::25]) by forward7m.cmail.yandex.net (Yandex) with ESMTP id 4818F21759; Fri, 17 Mar 2017 18:45:39 +0300 (MSK) Received: from smtp1o.mail.yandex.net (localhost.localdomain [127.0.0.1]) by smtp1o.mail.yandex.net (Yandex) with ESMTP id 81F921300480; Fri, 17 Mar 2017 18:45:35 +0300 (MSK) Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id GZLuIQXxam-jSZStvmW; Fri, 17 Mar 2017 18:45:33 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aosc.xyz; s=mail; t=1489765534; bh=92GPjBZQBjQ5uydTffliF1gDq3gfeLrwKEf6s8kkzYE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=plwMhIxinuafLHLbTl6V4mGm526SSYVF+uSQi2XqcbaeW+h5qSWS0qdA4kdAWjfIP HueN63clQ6f9S3iEL48Nw2V9oHUZlYDDqERUcwEcb2YOOHon3AaSZdC8hKRwDp4lBB nuBeI+h3z02qYe5GKlnkPirb6TnZnCvlEVztCUs4= Authentication-Results: smtp1o.mail.yandex.net; dkim=pass header.i=@aosc.xyz X-Yandex-ForeignMX: FR X-Yandex-Suid-Status: 1 0,1 0,1 0,1 0,1 0,1 0,1 1130000036118848 From: Icenowy Zheng To: Maxime Ripard , Chen-Yu Tsai Subject: [PATCH 3/3] ARM: dts: sun8i: add device tree for Lichee Pi Zero with Dock Date: Fri, 17 Mar 2017 23:43:43 +0800 Message-Id: <20170317154343.39921-4-icenowy@aosc.xyz> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170317154343.39921-1-icenowy@aosc.xyz> References: <20170317154343.39921-1-icenowy@aosc.xyz> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170317_114604_609017_6F54AE77 X-CRM114-Status: GOOD ( 16.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Lichee Pi Zero features a dock, which adds some functions, and should be soldered with the core board of Lichee Pi Zero. Add support for the dock as a new dts, as soldering is needed to make the dock usable and there's functions enabled on the dock that is unavailable at the 2.54mm pins of the core board. Signed-off-by: Icenowy Zheng --- arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 98 ++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 43c27b624f94..de52d403f818 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -878,7 +878,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-h3-orangepi-plus.dtb \ sun8i-h3-orangepi-plus2e.dtb \ sun8i-r16-parrot.dtb \ - sun8i-v3s-licheepi-zero.dtb + sun8i-v3s-licheepi-zero.dtb \ + sun8i-v3s-licheepi-zero-dock.dtb dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-optimus.dtb \ sun9i-a80-cubieboard4.dtb diff --git a/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts new file mode 100644 index 000000000000..956fa47fde53 --- /dev/null +++ b/arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2016 Icenowy Zheng + * + * 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-v3s-licheepi-zero.dts" + +#include + +/ { + model = "Lichee Pi Zero with Dock"; + compatible = "licheepi,licheepi-zero-dock", "licheepi,licheepi-zero", + "allwinner,sun8i-v3s"; +}; + +&leds { + /* The LEDs conflict with MMC1 slot */ + status = "disabled"; +}; + +&lradc { + vref-supply = <®_vcc3v0>; + status = "okay"; + + button@200 { + label = "Volume Up"; + linux,code = ; + channel = <0>; + voltage = <200000>; + }; + + button@400 { + label = "Volume Down"; + linux,code = ; + channel = <0>; + voltage = <400000>; + }; + + button@600 { + label = "Select"; + linux,code = ; + channel = <0>; + voltage = <600000>; + }; + + button@800 { + label = "Start"; + linux,code = ; + channel = <0>; + voltage = <800000>; + }; +}; + +&mmc1 { + pinctrl-0 = <&mmc1_pins>; + pinctrl-names = "default"; + broken-cd; + bus-width = <4>; + vmmc-supply = <®_vcc3v3>; + status = "okay"; +};