From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71AF7C43381 for ; Mon, 25 Mar 2019 16:20:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B9B120828 for ; Mon, 25 Mar 2019 16:20:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PvJxVCVs"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="N25Gji3P" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B9B120828 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=FA1zNiK8DQsCZHr5qA8aHyUnpiB3JNnHlJifTR+vm14=; b=PvJxVCVsp4p0gD 5XcZ/6NDnir7erXpDHfGGCZFtEW+Wpob2Hz5dUWSbozw2kUIbqQHZcpbKw8OK2BBJGsgO7lE9X6Wz yYfBekzLs1o1XpkxjZumedlyw+YsytaTN6SkCr4hgyxMwiCRNyRWdhxJq9cAbvw79taR3JLzdU8Fb XsDNOWAQv3HE2hq34XKFygjtdhC0Ho4Q/obxUB63d4ZH6Mu+5tTsT+IRdnjo/CuPWM3KSTuNzWqMa HWfYtmtHvDTu0mwKufAHIjLEtAOwbJsvhRcJblUKyLIHjLHoWFhAEycBht10vzEfoNHR/9zHyD47x nrfLwMZh6P0NOa8IkX5Q==; 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 1h8SL4-0006Rp-HD; Mon, 25 Mar 2019 16:20:42 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8SL0-0006P0-7a for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2019 16:20:39 +0000 Received: by mail-pg1-x544.google.com with SMTP id u9so6818118pgo.7 for ; Mon, 25 Mar 2019 09:20:37 -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=s7WBFUEAwkJi0o1jPPxS3zdZOhVo3u43RFQYy4wF/y+S9kIPqWmFVPb4lFkimY7Mky aD0gCp8ZNxsgzSk+DLPScqlQRLrQV8mofaq8d/eFFGbec2eDJQ5/vqcjZJGH7BmAEihI HtP3/gyCyxe7yu5HhRSV8TYivGPH6No41I0ZHFn1XjMfN8gocXrQTmQguMF00Oy0TtB/ oGNbsQ/jYUx3i9B//m9EgoKeZuEW2vjoJ6XU/jGR675gX/gGLX1rWDWX2VZDNWjObWv4 NfF2Ae4x5nsmAhXZdqP04fkbdmk3A2IFPFZ75xjgZFgUcPYksz2OKcdZVSfA0gVKVg5s U9lw== X-Gm-Message-State: APjAAAWhP9fcSBVHtGPiS2079yisXyCfKmzp8hptvDoO1RzMZhPdTw60 K7NAVYw9gx3njg2FmOR9FcniYQ== 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_092038_266005_4C3C0EBF X-CRM114-Status: GOOD ( 16.81 ) 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: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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>; + }; + }; +}; -- 2.21.0.392.gf8f6787159e-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel