From patchwork Mon Jun 3 10:03:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10972697 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 3CF7E6C5 for ; Mon, 3 Jun 2019 10:04:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B9E5288DC for ; Mon, 3 Jun 2019 10:04:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F88A2890C; Mon, 3 Jun 2019 10:04:40 +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=ham 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 C10DE288DC for ; Mon, 3 Jun 2019 10:04:39 +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=f+0GuHXU7yaOMPLsApJPeBzNwFsEXofMXH7vqPtV3VA=; b=kH2O2JwqSfMdyf 7lQMldki9ptyoHXIy/FLvCQFpdrsxlMa47StO5NvbB5YlqUDfWYgut0gLwZMVA4qJjizHelugrmYQ ExdwcrvXJTQ67ZJ/CywuA73HEtUcBqGaMEaeo+vV67/MCjqVIv3Q9VRAcIos84lCP0+iEQqJF4kFU Mo7sl4RV4puiK+R2UdqdxuYEX1OqMeTc95X1XxXscOUvhNL418wfzWpjrvGBgOlxm7Q3rFlZUkEMf /Be9/5rOE4QgKjttfaRDFiVMywXSlJeSHoQuASFg1OlaU0Exqqd7z8ScJFWrWAJkB0+ARNF3EcdSp KitV9s1mmPJkE6LRgsrw==; 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 1hXjpU-0007Je-Qs; Mon, 03 Jun 2019 10:04:36 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hXjow-0006Tz-Bg for linux-amlogic@lists.infradead.org; Mon, 03 Jun 2019 10:04:04 +0000 Received: by mail-wr1-x444.google.com with SMTP id b18so11321624wrq.12 for ; Mon, 03 Jun 2019 03:04:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4v96Sj0Qqu2ejZctq3FfqZCKiRWA7yMLpPyqtKhrPu8=; b=mQjf4XGRiMhjsw15YSdxSbc4D532wGUB1SC1JiM96Iuh4ExSD4X4vMaXYztqMT1xUc GF6Ez8SgjvVVD5eP6GKe87SrgMMDrTJdO5e7VKnX5hWXYkhlc3lDcX5AIlILYf8wtePK +m/w6M19ox54sQdzt6EZzaeMP/cf3NbfmpaZG4J3VWjt2DC61rKdAevIQkt2oVk61GO0 kSWAeo/ulhesWM/Zea3Y7cxS4r/umA3QotghlhN8CTOCJc1Rr6S76lp9WahxPiDbfgDV OiEy/ZsnSjOMCbwzHzpaRJm2oT1flAJO5GVRcASt9aG2JmOHpgK36PdkZChnqsqGt94T +hqQ== 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=4v96Sj0Qqu2ejZctq3FfqZCKiRWA7yMLpPyqtKhrPu8=; b=OQ7geEP1fUydXxVNbkGw8flLgBGJmzHN6r1hVM7Mcml5M7lBORx8wxqHN4f6yySMfv Tnxjzdktozu+bI/UruGiIho30Ag5tr8l3zsDdhsJlIW5g2xwqaIi6IziVczV6rsRTjAM 5iRBrnk0lTh3nppHQqYEweYrPbGEybwK4YuQNXvGmAhhI0Qa3esM16xznbmFEdQ0P7ZM 3vexpVc1nn3ewr6HtxobDMAaW3F12OTZWt1OR/u1iC3UJk+05cNfgW2i9mH4a64h1bA9 DzrAom41QEYyDjrdGkx76YQwPpageGooPIyOuTC7AYBLkZOytfjwsoX8lRh1cetz3NIz vJag== X-Gm-Message-State: APjAAAV7nyXBffgYsuLTkLsgbBBHi5MecIWwuCUhmxbwfjRxtzZEJmwj bhCIB2Rce+dSN3+pSxVs8u0/+g== X-Google-Smtp-Source: APXvYqzlpNzQaH9IoXOQExNqojzpEeThG85jB71pNzHO58lbsxgDEDHdv44UZx74BlqdIfJdRiKwtw== X-Received: by 2002:a5d:6b12:: with SMTP id v18mr15831689wrw.306.1559556240934; Mon, 03 Jun 2019 03:04:00 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id o3sm11282098wrv.94.2019.06.03.03.04.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Jun 2019 03:04:00 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 2/4] arm64: dts: meson-g12a-x96-max: add support for sdcard and emmc Date: Mon, 3 Jun 2019 12:03:55 +0200 Message-Id: <20190603100357.16799-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190603100357.16799-1-narmstrong@baylibre.com> References: <20190603100357.16799-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190603_030402_468338_C47C4834 X-CRM114-Status: GOOD ( 11.14 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, Guillaume La Roque , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guillaume La Roque Add nodes to support SDCard and onboard eMMC on the X96 Max. Signed-off-by: Guillaume La Roque Signed-off-by: Neil Armstrong Reviewed-by: Martin Blumenstingl --- .../boot/dts/amlogic/meson-g12a-x96-max.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts index 5cdc263b03e6..69aae6c03dc5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts @@ -45,6 +45,11 @@ }; }; + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; + }; + flash_1v8: regulator-flash_1v8 { compatible = "regulator-fixed"; regulator-name = "FLASH_1V8"; @@ -172,3 +177,38 @@ status = "okay"; dr_mode = "host"; }; + +/* SD card */ +&sd_emmc_b { + status = "okay"; + pinctrl-0 = <&sdcard_c_pins>; + pinctrl-1 = <&sdcard_clk_gate_c_pins>; + pinctrl-names = "default", "clk-gate"; + + bus-width = <4>; + cap-sd-highspeed; + max-frequency = <100000000>; + disable-wp; + + cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&vddao_3v3>; +}; + +/* eMMC */ +&sd_emmc_c { + status = "okay"; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; + + bus-width = <8>; + cap-mmc-highspeed; + max-frequency = <100000000>; + non-removable; + disable-wp; + + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&flash_1v8>; +};