From patchwork Wed Sep 2 07:50:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 11750515 X-Patchwork-Delegate: iwamatsu@nigauri.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B49A14E5 for ; Wed, 2 Sep 2020 12:46:09 +0000 (UTC) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DAB7A2087D for ; Wed, 2 Sep 2020 12:46:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.cip-project.org header.i=@lists.cip-project.org header.b="ZO56CJdX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DAB7A2087D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bp.renesas.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+5364+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id fERuYY4521763xCyTjQc5FiT; Wed, 02 Sep 2020 05:46:08 -0700 X-Received: from relmlie6.idc.renesas.com (relmlie6.idc.renesas.com []) by mx.groups.io with SMTP id smtpd.web10.2331.1599033039663673523 for ; Wed, 02 Sep 2020 00:50:40 -0700 X-IronPort-AV: E=Sophos;i="5.76,381,1592838000"; d="scan'208";a="55947284" X-Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 02 Sep 2020 16:50:40 +0900 X-Received: from localhost.localdomain (unknown [172.29.51.133]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id BE2914007F44; Wed, 2 Sep 2020 16:50:38 +0900 (JST) From: Biju Das To: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu , Pavel Machek Cc: Chris Paterson , Biju Das , Prabhakar Mahadev Lad Subject: [cip-dev] [PATCH 4.4.y-cip 1/5] dt-bindings: mmc: renesas,sdhi: Document r8a7742 support Date: Wed, 2 Sep 2020 08:50:31 +0100 Message-Id: <20200902075035.4445-2-biju.das.jz@bp.renesas.com> In-Reply-To: <20200902075035.4445-1-biju.das.jz@bp.renesas.com> References: <20200902075035.4445-1-biju.das.jz@bp.renesas.com> Precedence: Bulk List-Unsubscribe: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Delivered-To: mailing list cip-dev@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: XX5hDPsWqJPuACG1l085mEnwx4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1599050768; bh=PLrsLVVlxc9lmyjBCWHhikDJspyhRlcAIMp+mq98a+c=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=ZO56CJdX/tYrSIFqc4NL9GPVhRs2eioVyuUQdqenAWTI6jqSXixeWB3Sz5xg1cFbH2A bA8/ZY60JM8j4dsWPtvbn3WkmlAq5VCc77HZ56g9mC90IXRrPIEItTytvrNZQcdkd9JlW J+CH2bB1DoNiNNEuDg6rTbq7RrUSMZXv/Q4= From: Lad Prabhakar commit 1f8153ee031d0d4756daa985788bf0a960e588a6 upstream. Document SDHI controller for RZ/G1H (R8A7742) SoC, which is compatible with R-Car Gen2 SoC family. Signed-off-by: Lad Prabhakar Reviewed-by: Marian-Cristian Rotariu Reviewed-by: Wolfram Sang Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/1589555337-5498-5-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com Signed-off-by: Ulf Hansson [biju: Ported the changes from renamed bindings file renesas,sdhi.txt to here] Signed-off-by: Biju Das --- Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt index 94bb00b0f4ef..874ffc99d798 100644 --- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt +++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt @@ -15,6 +15,7 @@ Required properties: "renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC "renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC "renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC + "renesas,sdhi-r8a7742" - SDHI IP on R8A7742 SoC "renesas,sdhi-r8a7743" - SDHI IP on R8A7743 SoC "renesas,sdhi-r8a7744" - SDHI IP on R8A7744 SoC "renesas,sdhi-r8a7745" - SDHI IP on R8A7745 SoC From patchwork Wed Sep 2 07:50:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 11750509 X-Patchwork-Delegate: iwamatsu@nigauri.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9E504138A for ; Wed, 2 Sep 2020 12:46:08 +0000 (UTC) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 78506206F0 for ; Wed, 2 Sep 2020 12:46:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.cip-project.org header.i=@lists.cip-project.org header.b="Y3xfNXJ1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 78506206F0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bp.renesas.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+5365+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id C29sYY4521763xYm9Gw0qOpb; Wed, 02 Sep 2020 05:46:08 -0700 X-Received: from relmlie5.idc.renesas.com (relmlie5.idc.renesas.com [210.160.252.171]) by mx.groups.io with SMTP id smtpd.web12.2368.1599033042858896831 for ; Wed, 02 Sep 2020 00:50:43 -0700 X-IronPort-AV: E=Sophos;i="5.76,381,1592838000"; d="scan'208";a="56163762" X-Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 02 Sep 2020 16:50:42 +0900 X-Received: from localhost.localdomain (unknown [172.29.51.133]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 968994004BA7; Wed, 2 Sep 2020 16:50:40 +0900 (JST) From: Biju Das To: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu , Pavel Machek Cc: Chris Paterson , Biju Das , Prabhakar Mahadev Lad Subject: [cip-dev] [PATCH 4.4.y-cip 2/5] ARM: dts: r8a7742: Add SDHI nodes Date: Wed, 2 Sep 2020 08:50:32 +0100 Message-Id: <20200902075035.4445-3-biju.das.jz@bp.renesas.com> In-Reply-To: <20200902075035.4445-1-biju.das.jz@bp.renesas.com> References: <20200902075035.4445-1-biju.das.jz@bp.renesas.com> Precedence: Bulk List-Unsubscribe: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Delivered-To: mailing list cip-dev@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: cmyDxHyNi0EemPGYTbi5WFnNx4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1599050768; bh=qcTJPxDcQq0rYP9SMPR0Z/ThBtJB5e9MXvVnXmLmN/M=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Y3xfNXJ19+lyQk9spfAfojVO0wYpe+MHFuEjmOY1QqiAHMd3XZgk1yvL8lTtTf9a50J USNjEMaZlxjsdX5UcItvH09UbZi9o9fAhFlOejF/oqlQk5uemfQo2aEpjxlC/cEF8fOrl Mkz2e2I+0Wruf6e6psE9bT8mPcxcXwsjRRo= From: Lad Prabhakar commit 3ab2ea5fd1ce3c61d67d7b737c361bec2ec6441f upstream. Add the SDHI device nodes to the R8A7742 device tree. Signed-off-by: Lad Prabhakar Reviewed-by: Marian-Cristian Rotariu Reviewed-by: Wolfram Sang Link: https://lore.kernel.org/r/1589555337-5498-7-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com Signed-off-by: Geert Uytterhoeven [biju: changed clocks and power-domains properties, removed resets property] Signed-off-by: Biju Das --- arch/arm/boot/dts/r8a7742.dtsi | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/arch/arm/boot/dts/r8a7742.dtsi b/arch/arm/boot/dts/r8a7742.dtsi index 1db3682a1deb..70dcd59b36ca 100644 --- a/arch/arm/boot/dts/r8a7742.dtsi +++ b/arch/arm/boot/dts/r8a7742.dtsi @@ -955,6 +955,62 @@ status = "disabled"; }; + sdhi0: sd@ee100000 { + compatible = "renesas,sdhi-r8a7742", + "renesas,rcar-gen2-sdhi"; + reg = <0 0xee100000 0 0x328>; + interrupts = ; + clocks = <&mstp3_clks R8A7742_CLK_SDHI0>; + dmas = <&dmac0 0xcd>, <&dmac0 0xce>, + <&dmac1 0xcd>, <&dmac1 0xce>; + dma-names = "tx", "rx", "tx", "rx"; + max-frequency = <195000000>; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + + sdhi1: sd@ee120000 { + compatible = "renesas,sdhi-r8a7742", + "renesas,rcar-gen2-sdhi"; + reg = <0 0xee120000 0 0x328>; + interrupts = ; + clocks = <&mstp3_clks R8A7742_CLK_SDHI1>; + dmas = <&dmac0 0xc9>, <&dmac0 0xca>, + <&dmac1 0xc9>, <&dmac1 0xca>; + dma-names = "tx", "rx", "tx", "rx"; + max-frequency = <195000000>; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + + sdhi2: sd@ee140000 { + compatible = "renesas,sdhi-r8a7742", + "renesas,rcar-gen2-sdhi"; + reg = <0 0xee140000 0 0x100>; + interrupts = ; + clocks = <&mstp3_clks R8A7742_CLK_SDHI2>; + dmas = <&dmac0 0xc1>, <&dmac0 0xc2>, + <&dmac1 0xc1>, <&dmac1 0xc2>; + dma-names = "tx", "rx", "tx", "rx"; + max-frequency = <97500000>; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + + sdhi3: sd@ee160000 { + compatible = "renesas,sdhi-r8a7742", + "renesas,rcar-gen2-sdhi"; + reg = <0 0xee160000 0 0x100>; + interrupts = ; + clocks = <&mstp3_clks R8A7742_CLK_SDHI3>; + dmas = <&dmac0 0xd3>, <&dmac0 0xd4>, + <&dmac1 0xd3>, <&dmac1 0xd4>; + dma-names = "tx", "rx", "tx", "rx"; + max-frequency = <97500000>; + power-domains = <&cpg_clocks>; + status = "disabled"; + }; + mmcif1: mmc@ee220000 { compatible = "renesas,mmcif-r8a7742", "renesas,sh-mmcif"; From patchwork Wed Sep 2 07:50:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 11750511 X-Patchwork-Delegate: iwamatsu@nigauri.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ADCB417D0 for ; Wed, 2 Sep 2020 12:46:08 +0000 (UTC) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 85DA22083B for ; Wed, 2 Sep 2020 12:46:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.cip-project.org header.i=@lists.cip-project.org header.b="IPpCpMfH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85DA22083B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bp.renesas.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+5367+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id RP8OYY4521763xgDJKAGrh6T; Wed, 02 Sep 2020 05:46:08 -0700 X-Received: from relmlie6.idc.renesas.com (relmlie6.idc.renesas.com []) by mx.groups.io with SMTP id smtpd.web10.2331.1599033039663673523 for ; Wed, 02 Sep 2020 00:50:46 -0700 X-IronPort-AV: E=Sophos;i="5.76,381,1592838000"; d="scan'208";a="55947289" X-Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 02 Sep 2020 16:50:45 +0900 X-Received: from localhost.localdomain (unknown [172.29.51.133]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 411A64004BA7; Wed, 2 Sep 2020 16:50:44 +0900 (JST) From: Biju Das To: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu , Pavel Machek Cc: Chris Paterson , Biju Das , Prabhakar Mahadev Lad Subject: [cip-dev] [PATCH 4.4.y-cip 4/5] ARM: dts: r8a7742-iwg21d-q7: Enable SDHI2 controller Date: Wed, 2 Sep 2020 08:50:34 +0100 Message-Id: <20200902075035.4445-5-biju.das.jz@bp.renesas.com> In-Reply-To: <20200902075035.4445-1-biju.das.jz@bp.renesas.com> References: <20200902075035.4445-1-biju.das.jz@bp.renesas.com> Precedence: Bulk List-Unsubscribe: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Delivered-To: mailing list cip-dev@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: bRqSM1Y5WxgfHZYnmLuLtZIqx4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1599050768; bh=P7pWFbKkdwlKL6DfHu7WNf+7OOxN9CNWO779wClPj9k=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=IPpCpMfH3vjgzHP/Aif7XEuQnY2PkQWdGChg60rxEA/QqfGv9zQIlH3rbnl8TzdmcEA KhCPIaUwNHFqiVxUAbj4GTN4zpBV9bdmI74MahYT1oTy1s2D6OHM/HRQyfnG6vq2R7i28 yuRsctDQvIOpnfoG90SYXpxeS0O65A7tgfw= From: Lad Prabhakar commit b3850cd90edc0baad2ec47293f4ec3c929de6f76 upstream. Enable the SDHI2 controller on iWave RZ/G1H carrier board. Signed-off-by: Lad Prabhakar Reviewed-by: Marian-Cristian Rotariu Link: https://lore.kernel.org/r/1590420129-7531-3-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com Signed-off-by: Geert Uytterhoeven [biju: removed sd-uhs-sdr50 property, since voltage switching is not supported in 4.4 kernel] Signed-off-by: Biju Das --- arch/arm/boot/dts/r8a7742-iwg21d-q7.dts | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/arch/arm/boot/dts/r8a7742-iwg21d-q7.dts b/arch/arm/boot/dts/r8a7742-iwg21d-q7.dts index 8ce82ad3d946..82abbb758046 100644 --- a/arch/arm/boot/dts/r8a7742-iwg21d-q7.dts +++ b/arch/arm/boot/dts/r8a7742-iwg21d-q7.dts @@ -21,6 +21,28 @@ bootargs = "ignore_loglevel root=/dev/mmcblk0p1 rw rootwait"; stdout-path = "serial2:115200n8"; }; + + vcc_sdhi2: regulator-vcc-sdhi2 { + compatible = "regulator-fixed"; + + regulator-name = "SDHI2 Vcc"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&gpio1 27 GPIO_ACTIVE_LOW>; + }; + + vccq_sdhi2: regulator-vccq-sdhi2 { + compatible = "regulator-gpio"; + + regulator-name = "SDHI2 VccQ"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; + gpios-states = <1>; + states = <3300000 1>, <1800000 0>; + }; }; &avb { @@ -48,6 +70,12 @@ groups = "scifa2_data_c"; function = "scifa2"; }; + + sdhi2_pins: sd2 { + groups = "sdhi2_data4", "sdhi2_ctrl"; + function = "sdhi2"; + power-source = <3300>; + }; }; &scifa2 { @@ -56,3 +84,14 @@ status = "okay"; }; + +&sdhi2 { + pinctrl-0 = <&sdhi2_pins>; + pinctrl-names = "default"; + + vmmc-supply = <&vcc_sdhi2>; + vqmmc-supply = <&vccq_sdhi2>; + cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; From patchwork Wed Sep 2 07:50:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 11750505 X-Patchwork-Delegate: iwamatsu@nigauri.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36296109B for ; Wed, 2 Sep 2020 12:46:08 +0000 (UTC) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F0C9206F0 for ; Wed, 2 Sep 2020 12:46:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.cip-project.org header.i=@lists.cip-project.org header.b="aWcT9Qjo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F0C9206F0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bp.renesas.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+5368+4520428+8129116@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id d97yYY4521763x5X8MB3IZcT; Wed, 02 Sep 2020 05:46:06 -0700 X-Received: from relmlie5.idc.renesas.com (relmlie5.idc.renesas.com []) by mx.groups.io with SMTP id smtpd.web12.2368.1599033042858896831 for ; Wed, 02 Sep 2020 00:50:48 -0700 X-IronPort-AV: E=Sophos;i="5.76,381,1592838000"; d="scan'208";a="56163770" X-Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 02 Sep 2020 16:50:47 +0900 X-Received: from localhost.localdomain (unknown [172.29.51.133]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 14C6D4004BA7; Wed, 2 Sep 2020 16:50:45 +0900 (JST) From: Biju Das To: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu , Pavel Machek Cc: Chris Paterson , Biju Das , Prabhakar Mahadev Lad Subject: [cip-dev] [PATCH 4.4.y-cip 5/5] ARM: dts: renesas: Fix SD Card/eMMC interface device node names Date: Wed, 2 Sep 2020 08:50:35 +0100 Message-Id: <20200902075035.4445-6-biju.das.jz@bp.renesas.com> In-Reply-To: <20200902075035.4445-1-biju.das.jz@bp.renesas.com> References: <20200902075035.4445-1-biju.das.jz@bp.renesas.com> Precedence: Bulk List-Unsubscribe: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Delivered-To: mailing list cip-dev@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: tydtZ4nRD6tE2YVPmlQOJQELx4520428AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1599050766; bh=+cgoGdOTgldtxKn6/ce3gNbXwym9sPeJ9yt1PswXIKQ=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=aWcT9QjoBF9Jrp3DDFcwmem6SiDJHtW6yOaUBFIXeWFWq8fo6UgRo707olsv1os5Jl/ xL7l24TROzR8x0fQd4xh2fu+7omHOS1vC+6UQyFLRoJL9YLT/lCBxhUsfZRnorIeTeYeg BnPPeYCkeAhi4rvvt3NcrtzJUc0g6QHn3DE= From: Yoshihiro Shimoda commit d8293670ae46e84973c974ea5745527e90a8afbb upstream. Fix the device node names as "mmc@". Fixes: 66474697923c ("ARM: dts: r7s72100: add sdhi to device tree") Fixes: a49f76cddaee ("ARM: dts: r7s9210: Add SDHI support") Fixes: 43304a5f5106 ("ARM: shmobile: r8a73a4: tidyup DT node naming") Fixes: 7d907894bfe3 ("ARM: shmobile: r8a7740: tidyup DT node naming") Fixes: 3ab2ea5fd1ce ("ARM: dts: r8a7742: Add SDHI nodes") Fixes: 63ce8a617b51 ("ARM: dts: r8a7743: Add SDHI controllers") Fixes: b591e323b271 ("ARM: dts: r8a7744: Add SDHI nodes") Fixes: d83010f87ab3 ("ARM: dts: r8a7744: Initial SoC device tree") Fixes: 7079131ef9b9 ("ARM: dts: r8a7745: Add SDHI controllers") Fixes: 0485da788028 ("ARM: dts: r8a77470: Add SDHI1 support") Fixes: 15aa5a95e820 ("ARM: dts: r8a77470: Add SDHI0 support") Fixes: f068cc816015 ("ARM: dts: r8a77470: Add SDHI2 support") Fixes: 14e1d9147d96 ("ARM: shmobile: r8a7778: tidyup DT node naming") Fixes: 2624705ceb7b ("ARM: shmobile: r8a7779: tidyup DT node naming") Fixes: b718aa448378 ("ARM: shmobile: r8a7790: tidyup DT node naming") Fixes: b7ed8a0dd4f1 ("ARM: shmobile: Add SDHI devices to r8a7791 DTSI") Fixes: ce01b14ecf19 ("ARM: dts: r8a7792: add SDHI support") Fixes: fc9ee228f500 ("ARM: dts: r8a7793: Add SDHI controllers") Fixes: b8e8ea127d00 ("ARM: shmobile: r8a7794: add SDHI DT support") Fixes: 33f6be3bf6b7 ("ARM: shmobile: sh73a0: tidyup DT node naming") Signed-off-by: Yoshihiro Shimoda Link: https://lore.kernel.org/r/1594382936-14114-1-git-send-email-yoshihiro.shimoda.uh@renesas.com Signed-off-by: Geert Uytterhoeven [biju: Ported the changes only for RZG1[HMNEC] SoC's] Signed-off-by: Biju Das --- arch/arm/boot/dts/r8a7742.dtsi | 8 ++++---- arch/arm/boot/dts/r8a7743.dtsi | 6 +++--- arch/arm/boot/dts/r8a7744.dtsi | 6 +++--- arch/arm/boot/dts/r8a7745.dtsi | 6 +++--- arch/arm/boot/dts/r8a77470.dtsi | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/r8a7742.dtsi b/arch/arm/boot/dts/r8a7742.dtsi index f4d571b4a4db..fd4da0d6269e 100644 --- a/arch/arm/boot/dts/r8a7742.dtsi +++ b/arch/arm/boot/dts/r8a7742.dtsi @@ -955,7 +955,7 @@ status = "disabled"; }; - sdhi0: sd@ee100000 { + sdhi0: mmc@ee100000 { compatible = "renesas,sdhi-r8a7742", "renesas,rcar-gen2-sdhi"; reg = <0 0xee100000 0 0x328>; @@ -969,7 +969,7 @@ status = "disabled"; }; - sdhi1: sd@ee120000 { + sdhi1: mmc@ee120000 { compatible = "renesas,sdhi-r8a7742", "renesas,rcar-gen2-sdhi"; reg = <0 0xee120000 0 0x328>; @@ -983,7 +983,7 @@ status = "disabled"; }; - sdhi2: sd@ee140000 { + sdhi2: mmc@ee140000 { compatible = "renesas,sdhi-r8a7742", "renesas,rcar-gen2-sdhi"; reg = <0 0xee140000 0 0x100>; @@ -997,7 +997,7 @@ status = "disabled"; }; - sdhi3: sd@ee160000 { + sdhi3: mmc@ee160000 { compatible = "renesas,sdhi-r8a7742", "renesas,rcar-gen2-sdhi"; reg = <0 0xee160000 0 0x100>; diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi index 9ea92a367e86..aff5ebbdb4bd 100644 --- a/arch/arm/boot/dts/r8a7743.dtsi +++ b/arch/arm/boot/dts/r8a7743.dtsi @@ -902,7 +902,7 @@ status = "disabled"; }; - sdhi0: sd@ee100000 { + sdhi0: mmc@ee100000 { compatible = "renesas,sdhi-r8a7743"; reg = <0 0xee100000 0 0x328>; interrupts = ; @@ -915,7 +915,7 @@ status = "disabled"; }; - sdhi1: sd@ee140000 { + sdhi1: mmc@ee140000 { compatible = "renesas,sdhi-r8a7743"; reg = <0 0xee140000 0 0x100>; interrupts = ; @@ -928,7 +928,7 @@ status = "disabled"; }; - sdhi2: sd@ee160000 { + sdhi2: mmc@ee160000 { compatible = "renesas,sdhi-r8a7743"; reg = <0 0xee160000 0 0x100>; interrupts = ; diff --git a/arch/arm/boot/dts/r8a7744.dtsi b/arch/arm/boot/dts/r8a7744.dtsi index 9e1885ce4948..079f46f17049 100644 --- a/arch/arm/boot/dts/r8a7744.dtsi +++ b/arch/arm/boot/dts/r8a7744.dtsi @@ -1360,7 +1360,7 @@ }; }; - sdhi0: sd@ee100000 { + sdhi0: mmc@ee100000 { compatible = "renesas,sdhi-r8a7744"; reg = <0 0xee100000 0 0x328>; interrupts = ; @@ -1373,7 +1373,7 @@ status = "disabled"; }; - sdhi1: sd@ee140000 { + sdhi1: mmc@ee140000 { compatible = "renesas,sdhi-r8a7744"; reg = <0 0xee140000 0 0x100>; interrupts = ; @@ -1386,7 +1386,7 @@ status = "disabled"; }; - sdhi2: sd@ee160000 { + sdhi2: mmc@ee160000 { compatible = "renesas,sdhi-r8a7744"; reg = <0 0xee160000 0 0x100>; interrupts = ; diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi index 54b556b34663..5f603d9eafea 100644 --- a/arch/arm/boot/dts/r8a7745.dtsi +++ b/arch/arm/boot/dts/r8a7745.dtsi @@ -1211,7 +1211,7 @@ }; }; - sdhi0: sd@ee100000 { + sdhi0: mmc@ee100000 { compatible = "renesas,sdhi-r8a7745"; reg = <0 0xee100000 0 0x328>; interrupts = ; @@ -1224,7 +1224,7 @@ status = "disabled"; }; - sdhi1: sd@ee140000 { + sdhi1: mmc@ee140000 { compatible = "renesas,sdhi-r8a7745"; reg = <0 0xee140000 0 0x100>; interrupts = ; @@ -1237,7 +1237,7 @@ status = "disabled"; }; - sdhi2: sd@ee160000 { + sdhi2: mmc@ee160000 { compatible = "renesas,sdhi-r8a7745"; reg = <0 0xee160000 0 0x100>; interrupts = ; diff --git a/arch/arm/boot/dts/r8a77470.dtsi b/arch/arm/boot/dts/r8a77470.dtsi index dc345754ce61..1057bff76cc8 100644 --- a/arch/arm/boot/dts/r8a77470.dtsi +++ b/arch/arm/boot/dts/r8a77470.dtsi @@ -664,7 +664,7 @@ status = "disabled"; }; - sdhi0: sd@ee100000 { + sdhi0: mmc@ee100000 { compatible = "renesas,sdhi-r8a77470", "renesas,rcar-gen2-sdhi"; reg = <0 0xee100000 0 0x328>; @@ -678,7 +678,7 @@ status = "disabled"; }; - sdhi1: sd@ee300000 { + sdhi1: mmc@ee300000 { compatible = "renesas,sdhi-mmc-r8a77470"; reg = <0 0xee300000 0 0x2000>; interrupts = ; @@ -688,7 +688,7 @@ status = "disabled"; }; - sdhi2: sd@ee160000 { + sdhi2: mmc@ee160000 { compatible = "renesas,sdhi-r8a77470", "renesas,rcar-gen2-sdhi"; reg = <0 0xee160000 0 0x328>;