From patchwork Mon Mar 25 16:20:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10869571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E9F8A925 for ; Mon, 25 Mar 2019 16:20:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D141B28EB5 for ; Mon, 25 Mar 2019 16:20:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C507D29184; Mon, 25 Mar 2019 16:20:46 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 5BF2728EB5 for ; Mon, 25 Mar 2019 16:20:46 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=H+V7UEUztjzeoBw2/V+k3hy+Q/od5Gbp0npnKi2zNbo=; b=jZQ0NPkEw8yKDu 0iw6pkhGIYruNVvMbBgHhQIaaXhU0o9nAXIJHy9ZPzd25n3TBSJL+khjj4fDGNKcw0AVHRB3ix3v9 Yy8dTU9KA0Jvn187sTrOZZhkg6M2G2J8uXwABlNRczUz3JT4oAuHTm0HiQfcJDg4l38JKQ/Nb+P25 QUCzc6mPSc5npwCGBinoIuCje/3SDOwdAX3O56q3vRHvhrRU1Z0stA8VeVzNINMXybYX04UlN2Pdj tUpxWybWHCT0bCeJCkrdr70VGA5/ovaeYo+iHUeyHSA6ZSaz5yYEMF8SKB2J8IFld+g9qZuFloQ/S ujypqYSUPHs2TBnBtZfw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8SL3-0006RT-JR; Mon, 25 Mar 2019 16:20:41 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8SKy-0006P1-IH for linux-rockchip@lists.infradead.org; Mon, 25 Mar 2019 16:20:39 +0000 Received: by mail-pg1-x541.google.com with SMTP id g8so6846135pgf.2 for ; Mon, 25 Mar 2019 09:20:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vSR/BJWg/GVA0u+GWLzSUPGYC9skUYYpoMZYhOu6/oc=; b=N25Gji3PX/XwSmld2CZjvweB/dcsuNKfA/8ms5a6bsh+fXclgRvybEgQ7JPl9nUJnK U8Ns7s09/F5Q1r8igHNZ3Ql2ThqVn/pXIsV9kcd/6WdY8CmZ801/Hr7UA2Jp1k6RUTWp ZJFi5TXViB4pT7ft5WMlpuDAF6J2AK+I4zRU4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vSR/BJWg/GVA0u+GWLzSUPGYC9skUYYpoMZYhOu6/oc=; b=V28t3OE4AzURAe9DIkgq0Pxoh8z8wQKz/i3l10NK0yOa6jHJ1idRyFonkp/mf4bX1a Fo8xFguzK1bZcmZjKzoVDDox+1Wwlc2306pDQcghqeNPC3SfIGtrV6B6IRp6hf8X1LFf UxewE2nPe4JCII3/FqK52aQt8UNCuLr5fC5JaXf4efbYp8llX6oy2j85r9gmQ1U02AIp vPZjrTDtywZGkkq+p/IY4m5Yfv1o2hfvOtZHp3MHIkFBcNpSaGdJZoK0T1TsV508dlx1 EMMd/Pjqi93+w3DMv+n+/1CJg0lfAXPnJWxNIo7LApWbhwvhipCM9Kl+q3KeZhdfSO04 lzrw== X-Gm-Message-State: APjAAAVAOwNic8lscmzuVXhaw5+ucXxVrOiq9dzamg/NlYJoM7AZvDXn w/+l8cby47Bj4J74+OR542bmDA== X-Google-Smtp-Source: APXvYqxbIvFdYlStTXS4UWl4r2Ys0A0AkTMbMG1ALe5MXedLmKoM1Ld7O2ONFYZzyaHCycvQ7krYOg== X-Received: by 2002:aa7:8615:: with SMTP id p21mr1778635pfn.98.1553530835263; Mon, 25 Mar 2019 09:20:35 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id d12sm25879790pfh.168.2019.03.25.09.20.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 09:20:34 -0700 (PDT) From: Douglas Anderson To: Heiko Stuebner Subject: [PATCH v2 2/2] ARM: dts: rockchip: Add device tree for rk3288-veyron-mighty Date: Mon, 25 Mar 2019 09:20:05 -0700 Message-Id: <20190325162005.99391-2-dianders@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190325162005.99391-1-dianders@chromium.org> References: <20190325162005.99391-1-dianders@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190325_092036_611402_509BCE50 X-CRM114-Status: GOOD ( 15.56 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Douglas Anderson , Rob Herring , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, mka@chromium.org, ryandcase@chromium.org, linux-arm-kernel@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Mighty is basically the same Chromebook as Jaq but it has a full-sized SD slot and some different (slightly more rugged) plastics around it. Like Jaq, Mighty may show up with various different brandings but all of them have the same board inside. In the downstream kernel Mighty and Jaq share a "dtsi" and Mighty just adds the SD write protect (needed for a full-sized SD slot). We'll do this upstream by just including the Jaq dts and make the changes. Signed-off-by: Douglas Anderson --- Changes in v2: - Directly include the jaq dts and just specify diffs. arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/rk3288-veyron-mighty.dts | 34 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 arch/arm/boot/dts/rk3288-veyron-mighty.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f4f5aeaf3298..48282ebfb3da 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -909,6 +909,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-veyron-jaq.dtb \ rk3288-veyron-jerry.dtb \ rk3288-veyron-mickey.dtb \ + rk3288-veyron-mighty.dtb \ rk3288-veyron-minnie.dtb \ rk3288-veyron-pinky.dtb \ rk3288-veyron-speedy.dtb \ diff --git a/arch/arm/boot/dts/rk3288-veyron-mighty.dts b/arch/arm/boot/dts/rk3288-veyron-mighty.dts new file mode 100644 index 000000000000..f640857cbdae --- /dev/null +++ b/arch/arm/boot/dts/rk3288-veyron-mighty.dts @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Veyron Mighty Rev 1+ board device tree source + * + * Copyright 2015 Google, Inc + */ + +/dts-v1/; + +#include "rk3288-veyron-jaq.dts" + +/ { + model = "Google Mighty"; + compatible = "google,veyron-mighty-rev5", "google,veyron-mighty-rev4", + "google,veyron-mighty-rev3", "google,veyron-mighty-rev2", + "google,veyron-mighty-rev1", "google,veyron-mighty", + "google,veyron", "rockchip,rk3288"; +}; + +&sdmmc { + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd_disabled &sdmmc_cd_gpio + &sdmmc_wp_gpio &sdmmc_bus4>; + wp-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>; + + /delete-property/ disable-wp; +}; + +&pinctrl { + sdmmc { + sdmmc_wp_gpio: sdmmc-wp-gpio { + rockchip,pins = <7 10 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; +};