From patchwork Sun Nov 4 20:37:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10667161 X-Patchwork-Delegate: horms@verge.net.au 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 E84F213B5 for ; Sun, 4 Nov 2018 20:37:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB2A8295F2 for ; Sun, 4 Nov 2018 20:37:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFC6F29635; Sun, 4 Nov 2018 20:37:20 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F10FD295F2 for ; Sun, 4 Nov 2018 20:37:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729117AbeKEFxd (ORCPT ); Mon, 5 Nov 2018 00:53:33 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46576 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726269AbeKEFxd (ORCPT ); Mon, 5 Nov 2018 00:53:33 -0500 Received: by mail-wr1-f67.google.com with SMTP id 74-v6so7234041wrb.13; Sun, 04 Nov 2018 12:37:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7ZtmSa777H0j5NkjKuhyMTQ7W94sC/zQbwIbPYCqRMM=; b=pq9eqF8pS/sr9c2EZvVp31hzRwpEnTIRioVxQt5pbyl1bP8mgxS1aa6Mh2BYiUnyA+ JunXWwg/NNavlEIzumWi3um3JU1+oq242I12RXtgsOyhsBY9uxf5nbemfShJkweiiQz3 h8q2LtMPPfbwQy5VOn74VM4wG4gZRHYUc7yyMvWk5YpUI1t92xTfBT5Bur8G/+TxCPaA v01Qj7sliNICYeNYROWpCGODNbsVt41fpiHlFmWrtZxOxogprWI1f+KZUHE40/itM6WZ 5SKbosik5SwGZKrotOWKbPnvPpaeGTbXVh4occeTTz7Gu6awDt8svPcUdLliKQmmUl7p n+gQ== 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; bh=7ZtmSa777H0j5NkjKuhyMTQ7W94sC/zQbwIbPYCqRMM=; b=CU1dDZ3GB6nYggckxEoig7D15lYl+2lARuxsAggOgHE5SkbvMtnd7On6v80sVkhdpi rzNTiqY3sI3F3buqBCMfAl78Ejj/vPR3ZbTa3LahLJSkimO9Ti5UuZkSRJS+J9RJS77V Flmq2SblpT+iLXw4OEPbwQIDMKu0UetKpFAq92yF7fSk71alXJOlJVa6k372Ht8KC8Hd +QQe8Jzf07SGq/P6lix2JUoo3Oz6s1jHhJMM1MVedQn6iui/VHIFd9lc7S88E5z18zal Qb9+eyDMQX9GPoF2NI5i2cLAWbFwkwkURF4jAQW/1XL6xQTtx/SMR6iIVc/renOfFb6w LcMQ== X-Gm-Message-State: AGRZ1gLFufcjN9DDxqMsbttCQKDyQdtFVzCpnwl6MMcS8W3RP1LTsv53 dVAPVoebJJmhDAHX0TzHuEoJcJno X-Google-Smtp-Source: AJdET5dNCHv8W3xCwDvZMsLEKrJPvNGHgETSdgr8/Ne5s/xShlvDZGBtNs+urpPqDzxKvGRoF48/gg== X-Received: by 2002:a5d:6b4f:: with SMTP id x15-v6mr16705479wrw.304.1541363834741; Sun, 04 Nov 2018 12:37:14 -0800 (PST) Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz. [86.49.110.70]) by smtp.gmail.com with ESMTPSA id g10-v6sm1319599wrs.95.2018.11.04.12.37.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Nov 2018 12:37:13 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: devicetree@vger.kernel.org Cc: Marek Vasut , Geert Uytterhoeven , Simon Horman , Wolfram Sang , Yoshihiro Shimoda , linux-renesas-soc@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH V2] arm64: dts: renesas: Switch eMMC bus to 1V8 on Salvator-X and ULCB Date: Sun, 4 Nov 2018 21:37:07 +0100 Message-Id: <20181104203707.20996-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.18.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The eMMC card has two supplies, VCC and VCCQ. The VCC supplies the NAND array and the VCCQ supplies the bus. On Salvator-X and ULCB, the VCC is connected to 3.3V rail, while the VCCQ is connected to 1.8V rail. Adjust the pinmux to match the bus, which is always operating in 1.8V mode. While at it, deduplicate the pinmux entries, which are now the same for both default and UHS modes. We still need the two pinctrl entries to match the bindings though. Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Simon Horman Cc: Wolfram Sang Cc: Yoshihiro Shimoda Cc: linux-renesas-soc@vger.kernel.org Cc: linux-mmc@vger.kernel.org Reviewed-by: Wolfram Sang Tested-by: Wolfram Sang --- V2: - Squash patches for multiple boards together - Deduplicate pinmux entries --- arch/arm64/boot/dts/renesas/salvator-common.dtsi | 8 +------- arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi index 7f91ff524109..69775a201b4d 100644 --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi @@ -605,12 +605,6 @@ }; sdhi2_pins: sd2 { - groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds"; - function = "sdhi2"; - power-source = <3300>; - }; - - sdhi2_pins_uhs: sd2_uhs { groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds"; function = "sdhi2"; power-source = <1800>; @@ -760,7 +754,7 @@ &sdhi2 { /* used for on-board 8bit eMMC */ pinctrl-0 = <&sdhi2_pins>; - pinctrl-1 = <&sdhi2_pins_uhs>; + pinctrl-1 = <&sdhi2_pins>; pinctrl-names = "default", "state_uhs"; vmmc-supply = <®_3p3v>; diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi index 89daca7356df..de694fdae067 100644 --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi @@ -330,12 +330,6 @@ }; sdhi2_pins: sd2 { - groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds"; - function = "sdhi2"; - power-source = <3300>; - }; - - sdhi2_pins_uhs: sd2_uhs { groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds"; function = "sdhi2"; power-source = <1800>; @@ -426,7 +420,7 @@ &sdhi2 { /* used for on-board 8bit eMMC */ pinctrl-0 = <&sdhi2_pins>; - pinctrl-1 = <&sdhi2_pins_uhs>; + pinctrl-1 = <&sdhi2_pins>; pinctrl-names = "default", "state_uhs"; vmmc-supply = <®_3p3v>;