From patchwork Mon Aug 31 03:34:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 1354091 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=IXhvw3a+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BfwmX6jxKz9sTF for ; Mon, 31 Aug 2020 13:34:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9AC4781BF1; Mon, 31 Aug 2020 05:34:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IXhvw3a+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C5EC808B2; Mon, 31 Aug 2020 05:34:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7FDC9808B2 for ; Mon, 31 Aug 2020 05:34:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=a.heider@gmail.com Received: by mail-wm1-x341.google.com with SMTP id b79so3969001wmb.4 for ; Sun, 30 Aug 2020 20:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CnmZiYsWiGvWgYON12hNPYx9JNoP5Gj1Bv0mv1vl6fU=; b=IXhvw3a+cFBQ6eGoCL2OC41Q6nY1fNhjL5cxDEglknWjpzwsb0GlOt/EaDNqXfOvR3 HtnqfoT7GdX7mHwU/6l+c522Y5a7fbHjicy7jT4IV/mEBC5KcTNccQxzsbUv4ohT239o NBOHCCZjZY4VKQte6i5dVbMpJs4fUFm6aMxQSm9DJipWbmpggdOtyFI926p6zvr+8YSv du67h9RQcIWPjZNZdGn2vl4LKWUiQRX8Nr35xLlt6RVZSHbpqV7FUAQRSkrgEzyF0R46 +4YrGRimNNE9hFTm2GQaN77yTqUeuoiBpHz3IFe1my7k6Z8kPyiA9hEN09bCkxaN2Sr/ F+Kg== 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:mime-version :content-transfer-encoding; bh=CnmZiYsWiGvWgYON12hNPYx9JNoP5Gj1Bv0mv1vl6fU=; b=nsQHF35t4Xn89jIoUfEsVsM1Eokh5uIUgRYruWC28kXjbFoy9xMrmHX/bhntx+7euf N0AtSAKYEqmgB2SWBmzjyoSIs/uY08zTb7m+FNd4ivGxHpoJArUs38NTs2WzZ9XRq5uD qiUdo11c+40zvMMZb+fr6kbmGEVyKp7MrraEmlWp06gz2br/dljVpDXzbOkv4V2qAyiK m0URL/XMG/9JLfl3TFWYS6eqXLzMli1/Gn3aqL5viOv43ySUTD4TZtI4PytoxXPnWPZl nLTXhEOviaQxjDdfuv0DEc32k3lQurz4sjilGIJnw1e5S+BVVhQP2palU69+zXgJG3le qiOA== X-Gm-Message-State: AOAM532B1kZbzK85AI0TRmOrX9fhKHXoPzSeMqQFeUFO2jIAu17DLHMb 2MQs3a3jAsWLoAHK5eeK26yfeusQ/GKxng== X-Google-Smtp-Source: ABdhPJzxKxyOfKZZCSt+ZTupoXhnavRnZgz4lYFX3k0p64b2li6qeIcYG3ArtmlVa8wylhkJ2dFKLA== X-Received: by 2002:a1c:4d14:: with SMTP id o20mr8769191wmh.115.1598844850115; Sun, 30 Aug 2020 20:34:10 -0700 (PDT) Received: from localhost.localdomain (a89-183-75-181.net-htp.de. [89.183.75.181]) by smtp.gmail.com with ESMTPSA id l18sm10148233wrm.52.2020.08.30.20.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 20:34:09 -0700 (PDT) From: Andre Heider To: Stefan Roese , Konstantin Porotchkin Cc: =?utf-8?q?Pali_Roh=C3=A1r?= , u-boot@lists.denx.de Subject: [PATCH 1/2] arm64: dts: armada-3720-espressobin: sync with downstream Date: Mon, 31 Aug 2020 05:34:07 +0200 Message-Id: <20200831033408.467699-1-a.heider@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean This adds the disabled eMMC node. Signed-off-by: Andre Heider Reviewed-by: Stefan Roese --- arch/arm/dts/armada-3720-espressobin.dts | 63 +++++++++--------------- 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts index 4534f5ff29..a66ab814eb 100644 --- a/arch/arm/dts/armada-3720-espressobin.dts +++ b/arch/arm/dts/armada-3720-espressobin.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Device Tree file for Marvell Armada 3720 community board * (ESPRESSOBin) @@ -5,53 +6,15 @@ * * Gregory CLEMENT * Konstantin Porotchkin - * - * 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 , 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. */ - /dts-v1/; #include "armada-372x.dtsi" / { model = "Marvell Armada 3720 Community Board ESPRESSOBin"; - compatible = "marvell,armada-3720-espressobin", "marvell,armada3720", "marvell,armada3710"; + compatible = "marvell,armada-3720-espressobin", + "marvell,armada3720", "marvell,armada3710"; chosen { stdout-path = "serial0:115200n8"; @@ -121,6 +84,7 @@ status = "okay"; }; +/* J1 */ &sdhci0 { pinctrl-names = "default"; pinctrl-0 = <&sdio_pins>; @@ -130,6 +94,25 @@ status = "okay"; }; +/* U11 */ +&sdhci1 { + non-removable; + bus-width = <8>; + mmc-ddr-1_8v; + mmc-hs400-1_8v; + marvell,pad-type = "fixed-1-8v"; + pinctrl-names = "default"; + pinctrl-0 = <&mmc_pins>; + status = "disabled"; + + #address-cells = <1>; + #size-cells = <0>; + mmccard: mmccard@0 { + compatible = "mmc-card"; + reg = <0>; + }; +}; + &spi0 { status = "okay"; pinctrl-names = "default";