From patchwork Thu Apr 18 12:27:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10907183 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 417E217E0 for ; Thu, 18 Apr 2019 12:28:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24E3428ADC for ; Thu, 18 Apr 2019 12:28:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1904A28AEC; Thu, 18 Apr 2019 12:28:12 +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 9F23128ADC for ; Thu, 18 Apr 2019 12:28:11 +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=dCUMTpY+iU4sT/sCtvPkXQGhJpm1pGIk3SEYeWVYkt4=; b=AwV9FRKoToZC+K 7t4z/vnxlkWMQMcIeqKbMb6Fnb8F1ARQJqkf/QVSd9Jl+sYS9o0MpVi8OW+daoGNmRekngU022Wzp tSQgU18ny594Am+wVyJ8vB95xongFUO7adIGnl0ko3kjiBd3X27oQZLMl8exyGRmh/jdO/hsW/pyN h2p1EzQyMwxzG8s0AhBYm2EsJIrDt62bsuWZ6EYnLxG3UfFn/fvXtOAUiHA9ME6YPt+I8gP9RG0sT dOAiR+wnMJVT5QFj7O3Dv2mnvNQ8GuDW9IkCjq5QsQCoCsSwJf6dBbfKw3HzJ6y1KH74qSW1ZbEtu lOxyd0YnkEjHRcnksgOg==; 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 1hH699-0001Cu-2g; Thu, 18 Apr 2019 12:28:07 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hH68X-0000Ph-B5 for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2019 12:27:31 +0000 Received: by mail-wm1-x344.google.com with SMTP id h18so2701909wml.1 for ; Thu, 18 Apr 2019 05:27:29 -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=LXGEYk4K+okXhUn64svYw/ZBNWm7+B5TLkuBGuWEQmA=; b=gQit15oCYCC9aWPcHOhHKKq+TSn9uItSjSTA6OObWkDQ6MEBWHd/m1QPoG256ZkGoz Frt5mO6C0+knz97SDHm74ZizOfUjqLyji7x6a2zQHFbGMflOfyEMNzZdmMT66+xK9wxW CbdHcTwoY/YjAzRM0u4zjbJgSUdZn0Yfqf7ANivLUQSkH0es9QZLtusveCVpJaEEAwhu QGrG+S6nJL8pR5dn2JLiJZ0eK241KEMpkWz9VS+KsRk8bUhQQrGaqGFI7mENdMoD23ei M6vPmeO5txu4izoVyUEp9MxeUh2cY+dQs+7nT36UTqNSZ8NfZIWlPr3IchNpoYCEG5qN Uw/g== 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=LXGEYk4K+okXhUn64svYw/ZBNWm7+B5TLkuBGuWEQmA=; b=QzTNHtUKWLVR1fmoCbxNfJdgCrB4G+aDcx0d8D7Pm320b303+QjikcIBodFNPFxVUr Nzbcbxb5GfpWeLuaDWCoDaW2v+vlEvfXk2ISRJKcncX598urivTjWeeS9sxYC0wBHfek U4wPMyx+3teRD+0qomWcjaqC40xURJTu8pCqu6S99gka5yv6WLOGlT5V3Aaz0gpQp+Im 8DHudAVCSoVUHTHCuvpFgCwEpUgfQYG4j3kGasUbGJaPShU8h4rWZ3Rw8sHwj6FQp3y1 JnasbmyWG4dnLS+0LzlDL34LWm0hcLFZRi10JJ/QiK1Xdjf6YpBjzmUFnnoxxCGm2dgT Dkow== X-Gm-Message-State: APjAAAUvZNkhhRz3kHyjrbY5E2sK54XvN0k/Yr0rTMri0KPIgpTh7GE+ L5LaLRIVcpN2qDWwZTvIfQaePg== X-Google-Smtp-Source: APXvYqwtakNaqLOOMAKuhZh+uKmy0xZsJBRCTHmeLiRCf6P5QShKy9weKWWCDyem162jB3wg2OpF+A== X-Received: by 2002:a1c:e185:: with SMTP id y127mr3135773wmg.76.1555590447577; Thu, 18 Apr 2019 05:27:27 -0700 (PDT) Received: from boomer.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id z14sm1510110wro.81.2019.04.18.05.27.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2019 05:27:26 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman Subject: [PATCH 3/6] arm64: dts: meson: fix mmc pin bias Date: Thu, 18 Apr 2019 14:27:11 +0200 Message-Id: <20190418122714.30805-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190418122714.30805-1-jbrunet@baylibre.com> References: <20190418122714.30805-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190418_052729_589089_AEE0FE65 X-CRM114-Status: GOOD ( 12.45 ) 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: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, patchwork-bot+notify@kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Clk pin does not require bias, data strobe should be pulled low. The rest of the pin (data and cmd) are pulled up. Signed-off-by: Jerome Brunet --- .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 +-- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 31 ++++++++++++---- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 35 +++++++++++++------ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 35 +++++++++++++------ 4 files changed, 76 insertions(+), 29 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index 75fe1a2c49d0..4cd2d5951822 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -482,8 +482,8 @@ /* emmc storage */ &sd_emmc_c { - status = "disabled"; - pinctrl-0 = <&emmc_pins>; + status = "okay"; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; pinctrl-1 = <&emmc_clk_gate_pins>; pinctrl-names = "default", "clk-gate"; diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 34704fecf756..38169c85e91f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -299,7 +299,7 @@ }; emmc_pins: emmc { - mux { + mux-0 { groups = "emmc_nand_d0", "emmc_nand_d1", "emmc_nand_d2", @@ -308,14 +308,26 @@ "emmc_nand_d5", "emmc_nand_d6", "emmc_nand_d7", - "emmc_clk", - "emmc_cmd", - "emmc_ds"; + "emmc_cmd"; + function = "emmc"; + bias-pull-up; + }; + + mux-1 { + groups = "emmc_clk"; function = "emmc"; bias-disable; }; }; + emmc_ds_pins: emmc_ds { + mux { + groups = "emmc_ds"; + function = "emmc"; + bias-pull-down; + }; + }; + emmc_clk_gate_pins: emmc_clk_gate { mux { groups = "BOOT_8"; @@ -559,13 +571,18 @@ }; sdio_pins: sdio { - mux { + mux-0 { groups = "sdio_d0", "sdio_d1", "sdio_d2", "sdio_d3", - "sdio_cmd", - "sdio_clk"; + "sdio_cmd"; + function = "sdio"; + bias-pull-up; + }; + + mux-1 { + groups = "sdio_clk"; function = "sdio"; bias-disable; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index a60d3652beee..f734faaf7b78 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -381,10 +381,15 @@ }; emmc_pins: emmc { - mux { + mux-0 { groups = "emmc_nand_d07", - "emmc_cmd", - "emmc_clk"; + "emmc_cmd"; + function = "emmc"; + bias-pull-up; + }; + + mux-1 { + groups = "emmc_clk"; function = "emmc"; bias-disable; }; @@ -394,7 +399,7 @@ mux { groups = "emmc_ds"; function = "emmc"; - bias-disable; + bias-pull-down; }; }; @@ -436,13 +441,18 @@ }; sdcard_pins: sdcard { - mux { + mux-0 { groups = "sdcard_d0", "sdcard_d1", "sdcard_d2", "sdcard_d3", - "sdcard_cmd", - "sdcard_clk"; + "sdcard_cmd"; + function = "sdcard"; + bias-pull-up; + }; + + mux-1 { + groups = "sdcard_clk"; function = "sdcard"; bias-disable; }; @@ -457,13 +467,18 @@ }; sdio_pins: sdio { - mux { + mux-0 { groups = "sdio_d0", "sdio_d1", "sdio_d2", "sdio_d3", - "sdio_cmd", - "sdio_clk"; + "sdio_cmd"; + function = "sdio"; + bias-pull-up; + }; + + mux-1 { + groups = "sdio_clk"; function = "sdio"; bias-disable; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 3093ae421b17..c959456bacc6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -326,10 +326,15 @@ }; emmc_pins: emmc { - mux { + mux-0 { groups = "emmc_nand_d07", - "emmc_cmd", - "emmc_clk"; + "emmc_cmd"; + function = "emmc"; + bias-pull-up; + }; + + mux-1 { + groups = "emmc_clk"; function = "emmc"; bias-disable; }; @@ -339,7 +344,7 @@ mux { groups = "emmc_ds"; function = "emmc"; - bias-disable; + bias-pull-down; }; }; @@ -381,13 +386,18 @@ }; sdcard_pins: sdcard { - mux { + mux-0 { groups = "sdcard_d0", "sdcard_d1", "sdcard_d2", "sdcard_d3", - "sdcard_cmd", - "sdcard_clk"; + "sdcard_cmd"; + function = "sdcard"; + bias-pull-up; + }; + + mux-1 { + groups = "sdcard_clk"; function = "sdcard"; bias-disable; }; @@ -402,13 +412,18 @@ }; sdio_pins: sdio { - mux { + mux-0 { groups = "sdio_d0", "sdio_d1", "sdio_d2", "sdio_d3", - "sdio_cmd", - "sdio_clk"; + "sdio_cmd"; + function = "sdio"; + bias-pull-up; + }; + + mux-1 { + groups = "sdio_clk"; function = "sdio"; bias-disable; };