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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 1A26AC43215 for ; Tue, 3 Dec 2019 23:07:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDD6D2073B for ; Tue, 3 Dec 2019 23:07:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575414449; bh=WszExPIIwxHba7R4ODtPaqd+zT5cyG2VdXTU71sfmK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=opJBvnZY6fCM9TAhFVFavTWtIf7w93IdxCEBm7OGIAsRzUgc9qoo8Ja40iessEtUw xc05hT/5O1Q5keYpr61QNy6xuq11KVG2linJBoC1K+DXh3QlKKRmCjy/Ae0Z34LRA+ JrIrVNayjpL0UxbRZxmfBte1wmrTFu/ZRLBdYWM0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729274AbfLCWrM (ORCPT ); Tue, 3 Dec 2019 17:47:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:37304 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729270AbfLCWrM (ORCPT ); Tue, 3 Dec 2019 17:47:12 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4D1F420803; Tue, 3 Dec 2019 22:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413231; bh=WszExPIIwxHba7R4ODtPaqd+zT5cyG2VdXTU71sfmK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fGvCCoJuv5oSQmD+D46VHHVucCjbjs9Z9TGVlp9vaaMvfS0y9QG9GfYXabb8f6T4D vle0jJqADDCWPKf7ns8M7++aYwSQ8KnwgnzTJwm8FmsqjsPOvjrk/zaHx8StAymeNT QoEeKGz3O0zXy/x5Qba7KBpep1n/qriYROwJSJ2U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ding Tao , Gregory CLEMENT , Sasha Levin Subject: [PATCH 4.19 050/321] arm64: dts: marvell: armada-37xx: Enable emmc on espressobin Date: Tue, 3 Dec 2019 23:31:56 +0100 Message-Id: <20191203223429.766142978@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ding Tao [ Upstream commit 43ebc7c1b3ed8198b9acf3019eca16e722f7331c ] The ESPRESSObin board has a emmc interface available on U11: declare it and let the bootloader enable it if the emmc is present. [gregory.clement@bootlin.com: disable the emmc by default] Signed-off-by: Ding Tao Signed-off-by: Gregory CLEMENT Signed-off-by: Sasha Levin --- .../dts/marvell/armada-3720-espressobin.dts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts index 3ab25ad402b90..846003bb480cd 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts @@ -60,9 +60,31 @@ cd-gpios = <&gpionb 3 GPIO_ACTIVE_LOW>; marvell,pad-type = "sd"; vqmmc-supply = <&vcc_sd_reg1>; + + pinctrl-names = "default"; + pinctrl-0 = <&sdio_pins>; status = "okay"; }; +/* U11 */ +&sdhci0 { + non-removable; + bus-width = <8>; + mmc-ddr-1_8v; + mmc-hs400-1_8v; + marvell,xenon-emmc; + marvell,xenon-tun-count = <9>; + marvell,pad-type = "fixed-1-8v"; + + pinctrl-names = "default"; + pinctrl-0 = <&mmc_pins>; +/* + * This eMMC is not populated on all boards, so disable it by + * default and let the bootloader enable it, if it is present + */ + status = "disabled"; +}; + &spi0 { status = "okay"; -- 2.20.1