| Message ID | 20230215113249.47727-4-william.qiu@starfivetech.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp142077wrn;
Wed, 15 Feb 2023 03:44:08 -0800 (PST)
X-Google-Smtp-Source:
AK7set/xS9KrZ2fwdZd4AcDr6Tn7toAYDmPCrm4sYa52RkYs2yK/JjuFYbBMmdABo8lTZfjgNevQ
X-Received: by 2002:aa7:dd0a:0:b0:4aa:ca81:a528 with SMTP id
i10-20020aa7dd0a000000b004aaca81a528mr1549267edv.40.1676461448282;
Wed, 15 Feb 2023 03:44:08 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1676461448; cv=none;
d=google.com; s=arc-20160816;
b=YDSRVaAHFYc0NdSFCbMgPtLEcBIix73VL87bRcpKdDheaiZpWMGIReiCFIySnUw2pc
kcHpDcwUdpKOdZ2EIJgmQdrH/6ekfz66S4u4JQdWL3OD0PJMrJkp490Ev3sQ9LUt8y0m
fuOINlBXNlenhmp36n3tfPWj6HUX6fBEtNI8LVyUGv5XYsGEku36R7YwoFNqXY4RgyWa
BMU5zlgmgqSaL5564rBLt2J4avjmYuDYLPlII33ulwsBXhu9YAxuj9ZNBqBP5RZ9GQsf
+H2fQMxHIyISWQuiDd91LfoerLpcIDG7YQB0+jn2zkOUFYzgY13M1nD/o1zoApPb142e
Ul/g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from;
bh=51sVrC7wEZg5ihHf6UeMTSDY7+mFdRP0pVD/NDijyQU=;
b=xBtKdbC1RkSBWS+s4scp13cXqTcuh47bde/aMiSFp72t43QML+K8bQULM47E5/fFx9
OCyQh3RJHgrlXug9YOpBpGXjzq6MbgWTZrMsKLNu7p0OLgTXv9Torj6tsWyLgzd8asuJ
5hb8X60N88gr6TFISkgUOTZmEik4yQFux8fyvME8hPgD4uEv4QJFYAPf9ccQPBm1VL5t
pbbz4YqaOyZUkQWsw2Z7TIb4dfY0Nsf5YbjPWD20DR1cDbDb8E4jr/7H51S2Hr5B3RW5
DUzk9RmztwN6Gv2mfPUGVdNX26djJ282gUeaNqCfrS6sjpyguBxYYyJDeaBh5rM7zcNf
tjGA==
ARC-Authentication-Results: i=1; mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
r3-20020a056402018300b004ab1bc47465si20590848edv.26.2023.02.15.03.43.45;
Wed, 15 Feb 2023 03:44:08 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S233551AbjBOLdA convert rfc822-to-8bit (ORCPT
<rfc822;tebrre53rla2o@gmail.com> + 99 others);
Wed, 15 Feb 2023 06:33:00 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35664 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S233137AbjBOLc6 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 15 Feb 2023 06:32:58 -0500
Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E2BDDBD2;
Wed, 15 Feb 2023 03:32:54 -0800 (PST)
Received: from EXMBX166.cuchost.com (unknown [175.102.18.54])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client CN "EXMBX166", Issuer "EXMBX166" (not verified))
by ex01.ufhost.com (Postfix) with ESMTP id E5B1724E15D;
Wed, 15 Feb 2023 19:32:52 +0800 (CST)
Received: from EXMBX068.cuchost.com (172.16.6.68) by EXMBX166.cuchost.com
(172.16.6.76) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 15 Feb
2023 19:32:52 +0800
Received: from williamqiu-virtual-machine.starfivetech.com (171.223.208.138)
by EXMBX068.cuchost.com (172.16.6.68) with Microsoft SMTP Server (TLS) id
15.0.1497.42; Wed, 15 Feb 2023 19:32:52 +0800
From: William Qiu <william.qiu@starfivetech.com>
To: <linux-riscv@lists.infradead.org>, <devicetree@vger.kernel.org>,
<linux-mmc@vger.kernel.org>
CC: Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Jaehoon Chung <jh80.chung@samsung.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
William Qiu <william.qiu@starfivetech.com>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v4 3/4] riscv: dts: starfive: Add mmc node
Date: Wed, 15 Feb 2023 19:32:48 +0800
Message-ID: <20230215113249.47727-4-william.qiu@starfivetech.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20230215113249.47727-1-william.qiu@starfivetech.com>
References: <20230215113249.47727-1-william.qiu@starfivetech.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [171.223.208.138]
X-ClientProxiedBy: EXCAS064.cuchost.com (172.16.6.24) To EXMBX068.cuchost.com
(172.16.6.68)
X-YovoleRuleAgent: yovoleflag
Content-Transfer-Encoding: 8BIT
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE,
SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1757897239772498189?=
X-GMAIL-MSGID: =?utf-8?q?1757897239772498189?=
|
| Series | StarFive's SDIO/eMMC driver support | |
Commit Message
William Qiu
Feb. 15, 2023, 11:32 a.m. UTC
Add the mmc node for the StarFive JH7110 SoC.
Set mmco node to emmc and set mmc1 node to sd.
Signed-off-by: William Qiu <william.qiu@starfivetech.com>
---
.../jh7110-starfive-visionfive-2.dtsi | 23 +++++++++
arch/riscv/boot/dts/starfive/jh7110.dtsi | 47 +++++++++++++++++++
2 files changed, 70 insertions(+)
Comments
On Wed, 15 Feb 2023 at 12:35, William Qiu <william.qiu@starfivetech.com> wrote: > > Add the mmc node for the StarFive JH7110 SoC. > Set mmco node to emmc and set mmc1 node to sd. > > Signed-off-by: William Qiu <william.qiu@starfivetech.com> > --- > .../jh7110-starfive-visionfive-2.dtsi | 23 +++++++++ > arch/riscv/boot/dts/starfive/jh7110.dtsi | 47 +++++++++++++++++++ > 2 files changed, 70 insertions(+) > > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > index c60280b89c73..e1a0248e907f 100644 > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > @@ -42,6 +42,29 @@ &rtc_osc { > clock-frequency = <32768>; > }; > > +&mmc0 { > + max-frequency = <100000000>; > + bus-width = <8>; > + cap-mmc-highspeed; > + mmc-ddr-1_8v; > + mmc-hs200-1_8v; > + non-removable; > + cap-mmc-hw-reset; > + post-power-on-delay-ms = <200>; > + status = "okay"; > +}; > + > +&mmc1 { > + max-frequency = <100000000>; > + bus-width = <4>; > + no-sdio; > + no-mmc; > + broken-cd; > + cap-sd-highspeed; > + post-power-on-delay-ms = <200>; > + status = "okay"; > +}; > + > &gmac0_rmii_refin { > clock-frequency = <50000000>; > }; > diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi > index 64d260ea1f29..17f7b3ee6ca3 100644 > --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi > +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi > @@ -314,6 +314,11 @@ uart2: serial@10020000 { > status = "disabled"; > }; > > + stg_syscon: syscon@10240000 { > + compatible = "starfive,jh7110-stg-syscon", "syscon"; > + reg = <0x0 0x10240000 0x0 0x1000>; > + }; > + > uart3: serial@12000000 { > compatible = "snps,dw-apb-uart"; > reg = <0x0 0x12000000 0x0 0x10000>; > @@ -370,6 +375,11 @@ syscrg: clock-controller@13020000 { > #reset-cells = <1>; > }; > > + sys_syscon: syscon@13030000 { > + compatible = "starfive,jh7110-sys-syscon", "syscon"; > + reg = <0x0 0x13030000 0x0 0x1000>; > + }; > + > gpio: gpio@13040000 { > compatible = "starfive,jh7110-sys-pinctrl"; > reg = <0x0 0x13040000 0x0 0x10000>; > @@ -397,6 +407,11 @@ aoncrg: clock-controller@17000000 { > #reset-cells = <1>; > }; > > + aon_syscon: syscon@17010000 { > + compatible = "starfive,jh7110-aon-syscon", "syscon"; > + reg = <0x0 0x17010000 0x0 0x1000>; > + }; > + > gpioa: gpio@17020000 { > compatible = "starfive,jh7110-aon-pinctrl"; > reg = <0x0 0x17020000 0x0 0x10000>; > @@ -407,5 +422,37 @@ gpioa: gpio@17020000 { > gpio-controller; > #gpio-cells = <2>; > }; > + > + mmc0: mmc@16010000 { > + compatible = "starfive,jh7110-mmc"; > + reg = <0x0 0x16010000 0x0 0x10000>; > + clocks = <&syscrg JH7110_SYSCLK_SDIO0_AHB>, > + <&syscrg JH7110_SYSCLK_SDIO0_SDCARD>; > + clock-names = "biu","ciu"; > + resets = <&syscrg JH7110_SYSRST_SDIO0_AHB>; > + reset-names = "reset"; > + interrupts = <74>; > + fifo-depth = <32>; > + fifo-watermark-aligned; > + data-addr = <0>; > + starfive,sysreg = <&sys_syscon 0x14 0x1a 0x7c000000>; > + status = "disabled"; > + }; > + > + mmc1: mmc@16020000 { > + compatible = "starfive,jh7110-mmc"; > + reg = <0x0 0x16020000 0x0 0x10000>; > + clocks = <&syscrg JH7110_SYSCLK_SDIO1_AHB>, > + <&syscrg JH7110_SYSCLK_SDIO1_SDCARD>; > + clock-names = "biu","ciu"; > + resets = <&syscrg JH7110_SYSRST_SDIO1_AHB>; > + reset-names = "reset"; > + interrupts = <75>; > + fifo-depth = <32>; > + fifo-watermark-aligned; > + data-addr = <0>; > + starfive,sysreg = <&sys_syscon 0x9c 0x1 0x3e>; > + status = "disabled"; > + }; Hi William, These nodes still don't seem to be sorted by address, eg. by the number after the @ Also please move the dt-binding patch before this one, so dtb_check won't fail no matter where git bisect happens to land. /Emil > }; > }; > -- > 2.34.1 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
On Wed, 15 Feb 2023 at 13:12, Emil Renner Berthing <emil.renner.berthing@canonical.com> wrote: > > On Wed, 15 Feb 2023 at 12:35, William Qiu <william.qiu@starfivetech.com> wrote: > > > > Add the mmc node for the StarFive JH7110 SoC. > > Set mmco node to emmc and set mmc1 node to sd. > > > > Signed-off-by: William Qiu <william.qiu@starfivetech.com> > > --- > > .../jh7110-starfive-visionfive-2.dtsi | 23 +++++++++ > > arch/riscv/boot/dts/starfive/jh7110.dtsi | 47 +++++++++++++++++++ > > 2 files changed, 70 insertions(+) > > > > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > > index c60280b89c73..e1a0248e907f 100644 > > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > > @@ -42,6 +42,29 @@ &rtc_osc { > > clock-frequency = <32768>; > > }; > > > > +&mmc0 { > > + max-frequency = <100000000>; > > + bus-width = <8>; > > + cap-mmc-highspeed; > > + mmc-ddr-1_8v; > > + mmc-hs200-1_8v; > > + non-removable; > > + cap-mmc-hw-reset; > > + post-power-on-delay-ms = <200>; > > + status = "okay"; > > +}; > > + > > +&mmc1 { > > + max-frequency = <100000000>; > > + bus-width = <4>; > > + no-sdio; > > + no-mmc; > > + broken-cd; > > + cap-sd-highspeed; > > + post-power-on-delay-ms = <200>; > > + status = "okay"; > > +}; These nodes are also still oddly placed in the middle of the external clocks. Again please keep the external clocks at the top and then order the nodes alphabetically to have some sort of system. > > &gmac0_rmii_refin { > > clock-frequency = <50000000>; > > }; > > diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi > > index 64d260ea1f29..17f7b3ee6ca3 100644 > > --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi > > +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi > > @@ -314,6 +314,11 @@ uart2: serial@10020000 { > > status = "disabled"; > > }; > > > > + stg_syscon: syscon@10240000 { > > + compatible = "starfive,jh7110-stg-syscon", "syscon"; > > + reg = <0x0 0x10240000 0x0 0x1000>; > > + }; > > + > > uart3: serial@12000000 { > > compatible = "snps,dw-apb-uart"; > > reg = <0x0 0x12000000 0x0 0x10000>; > > @@ -370,6 +375,11 @@ syscrg: clock-controller@13020000 { > > #reset-cells = <1>; > > }; > > > > + sys_syscon: syscon@13030000 { > > + compatible = "starfive,jh7110-sys-syscon", "syscon"; > > + reg = <0x0 0x13030000 0x0 0x1000>; > > + }; > > + > > gpio: gpio@13040000 { > > compatible = "starfive,jh7110-sys-pinctrl"; > > reg = <0x0 0x13040000 0x0 0x10000>; > > @@ -397,6 +407,11 @@ aoncrg: clock-controller@17000000 { > > #reset-cells = <1>; > > }; > > > > + aon_syscon: syscon@17010000 { > > + compatible = "starfive,jh7110-aon-syscon", "syscon"; > > + reg = <0x0 0x17010000 0x0 0x1000>; > > + }; > > + > > gpioa: gpio@17020000 { > > compatible = "starfive,jh7110-aon-pinctrl"; > > reg = <0x0 0x17020000 0x0 0x10000>; > > @@ -407,5 +422,37 @@ gpioa: gpio@17020000 { > > gpio-controller; > > #gpio-cells = <2>; > > }; > > + > > + mmc0: mmc@16010000 { > > + compatible = "starfive,jh7110-mmc"; > > + reg = <0x0 0x16010000 0x0 0x10000>; > > + clocks = <&syscrg JH7110_SYSCLK_SDIO0_AHB>, > > + <&syscrg JH7110_SYSCLK_SDIO0_SDCARD>; > > + clock-names = "biu","ciu"; > > + resets = <&syscrg JH7110_SYSRST_SDIO0_AHB>; > > + reset-names = "reset"; > > + interrupts = <74>; > > + fifo-depth = <32>; > > + fifo-watermark-aligned; > > + data-addr = <0>; > > + starfive,sysreg = <&sys_syscon 0x14 0x1a 0x7c000000>; > > + status = "disabled"; > > + }; > > + > > + mmc1: mmc@16020000 { > > + compatible = "starfive,jh7110-mmc"; > > + reg = <0x0 0x16020000 0x0 0x10000>; > > + clocks = <&syscrg JH7110_SYSCLK_SDIO1_AHB>, > > + <&syscrg JH7110_SYSCLK_SDIO1_SDCARD>; > > + clock-names = "biu","ciu"; > > + resets = <&syscrg JH7110_SYSRST_SDIO1_AHB>; > > + reset-names = "reset"; > > + interrupts = <75>; > > + fifo-depth = <32>; > > + fifo-watermark-aligned; > > + data-addr = <0>; > > + starfive,sysreg = <&sys_syscon 0x9c 0x1 0x3e>; > > + status = "disabled"; > > + }; > > Hi William, > > These nodes still don't seem to be sorted by address, eg. by the > number after the @ > Also please move the dt-binding patch before this one, so dtb_check > won't fail no matter where git bisect happens to land. > > /Emil > > > }; > > }; > > -- > > 2.34.1 > > > > > > _______________________________________________ > > linux-riscv mailing list > > linux-riscv@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-riscv
On 2023/2/15 20:12, Emil Renner Berthing wrote: > On Wed, 15 Feb 2023 at 12:35, William Qiu <william.qiu@starfivetech.com> wrote: >> >> Add the mmc node for the StarFive JH7110 SoC. >> Set mmco node to emmc and set mmc1 node to sd. >> >> Signed-off-by: William Qiu <william.qiu@starfivetech.com> >> --- >> .../jh7110-starfive-visionfive-2.dtsi | 23 +++++++++ >> arch/riscv/boot/dts/starfive/jh7110.dtsi | 47 +++++++++++++++++++ >> 2 files changed, 70 insertions(+) >> >> diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> index c60280b89c73..e1a0248e907f 100644 >> --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> @@ -42,6 +42,29 @@ &rtc_osc { >> clock-frequency = <32768>; >> }; >> >> +&mmc0 { >> + max-frequency = <100000000>; >> + bus-width = <8>; >> + cap-mmc-highspeed; >> + mmc-ddr-1_8v; >> + mmc-hs200-1_8v; >> + non-removable; >> + cap-mmc-hw-reset; >> + post-power-on-delay-ms = <200>; >> + status = "okay"; >> +}; >> + >> +&mmc1 { >> + max-frequency = <100000000>; >> + bus-width = <4>; >> + no-sdio; >> + no-mmc; >> + broken-cd; >> + cap-sd-highspeed; >> + post-power-on-delay-ms = <200>; >> + status = "okay"; >> +}; >> + >> &gmac0_rmii_refin { >> clock-frequency = <50000000>; >> }; >> diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi >> index 64d260ea1f29..17f7b3ee6ca3 100644 >> --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi >> +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi >> @@ -314,6 +314,11 @@ uart2: serial@10020000 { >> status = "disabled"; >> }; >> >> + stg_syscon: syscon@10240000 { >> + compatible = "starfive,jh7110-stg-syscon", "syscon"; >> + reg = <0x0 0x10240000 0x0 0x1000>; >> + }; >> + >> uart3: serial@12000000 { >> compatible = "snps,dw-apb-uart"; >> reg = <0x0 0x12000000 0x0 0x10000>; >> @@ -370,6 +375,11 @@ syscrg: clock-controller@13020000 { >> #reset-cells = <1>; >> }; >> >> + sys_syscon: syscon@13030000 { >> + compatible = "starfive,jh7110-sys-syscon", "syscon"; >> + reg = <0x0 0x13030000 0x0 0x1000>; >> + }; >> + >> gpio: gpio@13040000 { >> compatible = "starfive,jh7110-sys-pinctrl"; >> reg = <0x0 0x13040000 0x0 0x10000>; >> @@ -397,6 +407,11 @@ aoncrg: clock-controller@17000000 { >> #reset-cells = <1>; >> }; >> >> + aon_syscon: syscon@17010000 { >> + compatible = "starfive,jh7110-aon-syscon", "syscon"; >> + reg = <0x0 0x17010000 0x0 0x1000>; >> + }; >> + >> gpioa: gpio@17020000 { >> compatible = "starfive,jh7110-aon-pinctrl"; >> reg = <0x0 0x17020000 0x0 0x10000>; >> @@ -407,5 +422,37 @@ gpioa: gpio@17020000 { >> gpio-controller; >> #gpio-cells = <2>; >> }; >> + >> + mmc0: mmc@16010000 { >> + compatible = "starfive,jh7110-mmc"; >> + reg = <0x0 0x16010000 0x0 0x10000>; >> + clocks = <&syscrg JH7110_SYSCLK_SDIO0_AHB>, >> + <&syscrg JH7110_SYSCLK_SDIO0_SDCARD>; >> + clock-names = "biu","ciu"; >> + resets = <&syscrg JH7110_SYSRST_SDIO0_AHB>; >> + reset-names = "reset"; >> + interrupts = <74>; >> + fifo-depth = <32>; >> + fifo-watermark-aligned; >> + data-addr = <0>; >> + starfive,sysreg = <&sys_syscon 0x14 0x1a 0x7c000000>; >> + status = "disabled"; >> + }; >> + >> + mmc1: mmc@16020000 { >> + compatible = "starfive,jh7110-mmc"; >> + reg = <0x0 0x16020000 0x0 0x10000>; >> + clocks = <&syscrg JH7110_SYSCLK_SDIO1_AHB>, >> + <&syscrg JH7110_SYSCLK_SDIO1_SDCARD>; >> + clock-names = "biu","ciu"; >> + resets = <&syscrg JH7110_SYSRST_SDIO1_AHB>; >> + reset-names = "reset"; >> + interrupts = <75>; >> + fifo-depth = <32>; >> + fifo-watermark-aligned; >> + data-addr = <0>; >> + starfive,sysreg = <&sys_syscon 0x9c 0x1 0x3e>; >> + status = "disabled"; >> + }; > > Hi William, > > These nodes still don't seem to be sorted by address, eg. by the > number after the @ > Also please move the dt-binding patch before this one, so dtb_check > won't fail no matter where git bisect happens to land. > > /Emil > Hi Emil, I'll update it in next version. Best Regards William >> }; >> }; >> -- >> 2.34.1 >> >> >> _______________________________________________ >> linux-riscv mailing list >> linux-riscv@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-riscv
On 2023/2/15 20:22, Emil Renner Berthing wrote: > On Wed, 15 Feb 2023 at 13:12, Emil Renner Berthing > <emil.renner.berthing@canonical.com> wrote: >> >> On Wed, 15 Feb 2023 at 12:35, William Qiu <william.qiu@starfivetech.com> wrote: >> > >> > Add the mmc node for the StarFive JH7110 SoC. >> > Set mmco node to emmc and set mmc1 node to sd. >> > >> > Signed-off-by: William Qiu <william.qiu@starfivetech.com> >> > --- >> > .../jh7110-starfive-visionfive-2.dtsi | 23 +++++++++ >> > arch/riscv/boot/dts/starfive/jh7110.dtsi | 47 +++++++++++++++++++ >> > 2 files changed, 70 insertions(+) >> > >> > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> > index c60280b89c73..e1a0248e907f 100644 >> > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> > @@ -42,6 +42,29 @@ &rtc_osc { >> > clock-frequency = <32768>; >> > }; >> > >> > +&mmc0 { >> > + max-frequency = <100000000>; >> > + bus-width = <8>; >> > + cap-mmc-highspeed; >> > + mmc-ddr-1_8v; >> > + mmc-hs200-1_8v; >> > + non-removable; >> > + cap-mmc-hw-reset; >> > + post-power-on-delay-ms = <200>; >> > + status = "okay"; >> > +}; >> > + >> > +&mmc1 { >> > + max-frequency = <100000000>; >> > + bus-width = <4>; >> > + no-sdio; >> > + no-mmc; >> > + broken-cd; >> > + cap-sd-highspeed; >> > + post-power-on-delay-ms = <200>; >> > + status = "okay"; >> > +}; > > These nodes are also still oddly placed in the middle of the external > clocks. Again please keep the external clocks at the top and then > order the nodes alphabetically to have some sort of system. > Hi Emil, I'll update it in next version. Best Regards William >> > &gmac0_rmii_refin { >> > clock-frequency = <50000000>; >> > }; >> > diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi >> > index 64d260ea1f29..17f7b3ee6ca3 100644 >> > --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi >> > +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi >> > @@ -314,6 +314,11 @@ uart2: serial@10020000 { >> > status = "disabled"; >> > }; >> > >> > + stg_syscon: syscon@10240000 { >> > + compatible = "starfive,jh7110-stg-syscon", "syscon"; >> > + reg = <0x0 0x10240000 0x0 0x1000>; >> > + }; >> > + >> > uart3: serial@12000000 { >> > compatible = "snps,dw-apb-uart"; >> > reg = <0x0 0x12000000 0x0 0x10000>; >> > @@ -370,6 +375,11 @@ syscrg: clock-controller@13020000 { >> > #reset-cells = <1>; >> > }; >> > >> > + sys_syscon: syscon@13030000 { >> > + compatible = "starfive,jh7110-sys-syscon", "syscon"; >> > + reg = <0x0 0x13030000 0x0 0x1000>; >> > + }; >> > + >> > gpio: gpio@13040000 { >> > compatible = "starfive,jh7110-sys-pinctrl"; >> > reg = <0x0 0x13040000 0x0 0x10000>; >> > @@ -397,6 +407,11 @@ aoncrg: clock-controller@17000000 { >> > #reset-cells = <1>; >> > }; >> > >> > + aon_syscon: syscon@17010000 { >> > + compatible = "starfive,jh7110-aon-syscon", "syscon"; >> > + reg = <0x0 0x17010000 0x0 0x1000>; >> > + }; >> > + >> > gpioa: gpio@17020000 { >> > compatible = "starfive,jh7110-aon-pinctrl"; >> > reg = <0x0 0x17020000 0x0 0x10000>; >> > @@ -407,5 +422,37 @@ gpioa: gpio@17020000 { >> > gpio-controller; >> > #gpio-cells = <2>; >> > }; >> > + >> > + mmc0: mmc@16010000 { >> > + compatible = "starfive,jh7110-mmc"; >> > + reg = <0x0 0x16010000 0x0 0x10000>; >> > + clocks = <&syscrg JH7110_SYSCLK_SDIO0_AHB>, >> > + <&syscrg JH7110_SYSCLK_SDIO0_SDCARD>; >> > + clock-names = "biu","ciu"; >> > + resets = <&syscrg JH7110_SYSRST_SDIO0_AHB>; >> > + reset-names = "reset"; >> > + interrupts = <74>; >> > + fifo-depth = <32>; >> > + fifo-watermark-aligned; >> > + data-addr = <0>; >> > + starfive,sysreg = <&sys_syscon 0x14 0x1a 0x7c000000>; >> > + status = "disabled"; >> > + }; >> > + >> > + mmc1: mmc@16020000 { >> > + compatible = "starfive,jh7110-mmc"; >> > + reg = <0x0 0x16020000 0x0 0x10000>; >> > + clocks = <&syscrg JH7110_SYSCLK_SDIO1_AHB>, >> > + <&syscrg JH7110_SYSCLK_SDIO1_SDCARD>; >> > + clock-names = "biu","ciu"; >> > + resets = <&syscrg JH7110_SYSRST_SDIO1_AHB>; >> > + reset-names = "reset"; >> > + interrupts = <75>; >> > + fifo-depth = <32>; >> > + fifo-watermark-aligned; >> > + data-addr = <0>; >> > + starfive,sysreg = <&sys_syscon 0x9c 0x1 0x3e>; >> > + status = "disabled"; >> > + }; >> >> Hi William, >> >> These nodes still don't seem to be sorted by address, eg. by the >> number after the @ >> Also please move the dt-binding patch before this one, so dtb_check >> won't fail no matter where git bisect happens to land. >> >> /Emil >> >> > }; >> > }; >> > -- >> > 2.34.1 >> > >> > >> > _______________________________________________ >> > linux-riscv mailing list >> > linux-riscv@lists.infradead.org >> > http://lists.infradead.org/mailman/listinfo/linux-riscv
On Wed, 15 Feb 2023 at 13:26, William Qiu <william.qiu@starfivetech.com> wrote: > On 2023/2/15 20:22, Emil Renner Berthing wrote: > > On Wed, 15 Feb 2023 at 13:12, Emil Renner Berthing > > <emil.renner.berthing@canonical.com> wrote: > >> > >> On Wed, 15 Feb 2023 at 12:35, William Qiu <william.qiu@starfivetech.com> wrote: > >> > > >> > Add the mmc node for the StarFive JH7110 SoC. > >> > Set mmco node to emmc and set mmc1 node to sd. > >> > > >> > Signed-off-by: William Qiu <william.qiu@starfivetech.com> > >> > --- > >> > .../jh7110-starfive-visionfive-2.dtsi | 23 +++++++++ > >> > arch/riscv/boot/dts/starfive/jh7110.dtsi | 47 +++++++++++++++++++ > >> > 2 files changed, 70 insertions(+) > >> > > >> > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > >> > index c60280b89c73..e1a0248e907f 100644 > >> > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > >> > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi > >> > @@ -42,6 +42,29 @@ &rtc_osc { > >> > clock-frequency = <32768>; > >> > }; > >> > > >> > +&mmc0 { > >> > + max-frequency = <100000000>; > >> > + bus-width = <8>; > >> > + cap-mmc-highspeed; > >> > + mmc-ddr-1_8v; > >> > + mmc-hs200-1_8v; > >> > + non-removable; > >> > + cap-mmc-hw-reset; > >> > + post-power-on-delay-ms = <200>; > >> > + status = "okay"; > >> > +}; > >> > + > >> > +&mmc1 { > >> > + max-frequency = <100000000>; > >> > + bus-width = <4>; > >> > + no-sdio; > >> > + no-mmc; > >> > + broken-cd; > >> > + cap-sd-highspeed; > >> > + post-power-on-delay-ms = <200>; > >> > + status = "okay"; > >> > +}; > > > > These nodes are also still oddly placed in the middle of the external > > clocks. Again please keep the external clocks at the top and then > > order the nodes alphabetically to have some sort of system. > > > > > Hi Emil, > > I'll update it in next version. Hi William, It seems the mmc nodes are still missing from the upstream device tree. The sysreg nodes have been added in Conors riscv-dt-for-next[1] branch, so I don't see any missing dependencies. Could you please update and send a new version of this? [1]: https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/log/?h=riscv-dt-for-next /Emil > Best Regards > William > > >> > &gmac0_rmii_refin { > >> > clock-frequency = <50000000>; > >> > }; > >> > diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi > >> > index 64d260ea1f29..17f7b3ee6ca3 100644 > >> > --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi > >> > +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi > >> > @@ -314,6 +314,11 @@ uart2: serial@10020000 { > >> > status = "disabled"; > >> > }; > >> > > >> > + stg_syscon: syscon@10240000 { > >> > + compatible = "starfive,jh7110-stg-syscon", "syscon"; > >> > + reg = <0x0 0x10240000 0x0 0x1000>; > >> > + }; > >> > + > >> > uart3: serial@12000000 { > >> > compatible = "snps,dw-apb-uart"; > >> > reg = <0x0 0x12000000 0x0 0x10000>; > >> > @@ -370,6 +375,11 @@ syscrg: clock-controller@13020000 { > >> > #reset-cells = <1>; > >> > }; > >> > > >> > + sys_syscon: syscon@13030000 { > >> > + compatible = "starfive,jh7110-sys-syscon", "syscon"; > >> > + reg = <0x0 0x13030000 0x0 0x1000>; > >> > + }; > >> > + > >> > gpio: gpio@13040000 { > >> > compatible = "starfive,jh7110-sys-pinctrl"; > >> > reg = <0x0 0x13040000 0x0 0x10000>; > >> > @@ -397,6 +407,11 @@ aoncrg: clock-controller@17000000 { > >> > #reset-cells = <1>; > >> > }; > >> > > >> > + aon_syscon: syscon@17010000 { > >> > + compatible = "starfive,jh7110-aon-syscon", "syscon"; > >> > + reg = <0x0 0x17010000 0x0 0x1000>; > >> > + }; > >> > + > >> > gpioa: gpio@17020000 { > >> > compatible = "starfive,jh7110-aon-pinctrl"; > >> > reg = <0x0 0x17020000 0x0 0x10000>; > >> > @@ -407,5 +422,37 @@ gpioa: gpio@17020000 { > >> > gpio-controller; > >> > #gpio-cells = <2>; > >> > }; > >> > + > >> > + mmc0: mmc@16010000 { > >> > + compatible = "starfive,jh7110-mmc"; > >> > + reg = <0x0 0x16010000 0x0 0x10000>; > >> > + clocks = <&syscrg JH7110_SYSCLK_SDIO0_AHB>, > >> > + <&syscrg JH7110_SYSCLK_SDIO0_SDCARD>; > >> > + clock-names = "biu","ciu"; > >> > + resets = <&syscrg JH7110_SYSRST_SDIO0_AHB>; > >> > + reset-names = "reset"; > >> > + interrupts = <74>; > >> > + fifo-depth = <32>; > >> > + fifo-watermark-aligned; > >> > + data-addr = <0>; > >> > + starfive,sysreg = <&sys_syscon 0x14 0x1a 0x7c000000>; > >> > + status = "disabled"; > >> > + }; > >> > + > >> > + mmc1: mmc@16020000 { > >> > + compatible = "starfive,jh7110-mmc"; > >> > + reg = <0x0 0x16020000 0x0 0x10000>; > >> > + clocks = <&syscrg JH7110_SYSCLK_SDIO1_AHB>, > >> > + <&syscrg JH7110_SYSCLK_SDIO1_SDCARD>; > >> > + clock-names = "biu","ciu"; > >> > + resets = <&syscrg JH7110_SYSRST_SDIO1_AHB>; > >> > + reset-names = "reset"; > >> > + interrupts = <75>; > >> > + fifo-depth = <32>; > >> > + fifo-watermark-aligned; > >> > + data-addr = <0>; > >> > + starfive,sysreg = <&sys_syscon 0x9c 0x1 0x3e>; > >> > + status = "disabled"; > >> > + }; > >> > >> Hi William, > >> > >> These nodes still don't seem to be sorted by address, eg. by the > >> number after the @ > >> Also please move the dt-binding patch before this one, so dtb_check > >> won't fail no matter where git bisect happens to land. > >> > >> /Emil > >> > >> > }; > >> > }; > >> > -- > >> > 2.34.1 > >> > > >> > > >> > _______________________________________________ > >> > linux-riscv mailing list > >> > linux-riscv@lists.infradead.org > >> > http://lists.infradead.org/mailman/listinfo/linux-riscv
On 2023/8/5 21:14, Emil Renner Berthing wrote: > On Wed, 15 Feb 2023 at 13:26, William Qiu <william.qiu@starfivetech.com> wrote: >> On 2023/2/15 20:22, Emil Renner Berthing wrote: >> > On Wed, 15 Feb 2023 at 13:12, Emil Renner Berthing >> > <emil.renner.berthing@canonical.com> wrote: >> >> >> >> On Wed, 15 Feb 2023 at 12:35, William Qiu <william.qiu@starfivetech.com> wrote: >> >> > >> >> > Add the mmc node for the StarFive JH7110 SoC. >> >> > Set mmco node to emmc and set mmc1 node to sd. >> >> > >> >> > Signed-off-by: William Qiu <william.qiu@starfivetech.com> >> >> > --- >> >> > .../jh7110-starfive-visionfive-2.dtsi | 23 +++++++++ >> >> > arch/riscv/boot/dts/starfive/jh7110.dtsi | 47 +++++++++++++++++++ >> >> > 2 files changed, 70 insertions(+) >> >> > >> >> > diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> >> > index c60280b89c73..e1a0248e907f 100644 >> >> > --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> >> > +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi >> >> > @@ -42,6 +42,29 @@ &rtc_osc { >> >> > clock-frequency = <32768>; >> >> > }; >> >> > >> >> > +&mmc0 { >> >> > + max-frequency = <100000000>; >> >> > + bus-width = <8>; >> >> > + cap-mmc-highspeed; >> >> > + mmc-ddr-1_8v; >> >> > + mmc-hs200-1_8v; >> >> > + non-removable; >> >> > + cap-mmc-hw-reset; >> >> > + post-power-on-delay-ms = <200>; >> >> > + status = "okay"; >> >> > +}; >> >> > + >> >> > +&mmc1 { >> >> > + max-frequency = <100000000>; >> >> > + bus-width = <4>; >> >> > + no-sdio; >> >> > + no-mmc; >> >> > + broken-cd; >> >> > + cap-sd-highspeed; >> >> > + post-power-on-delay-ms = <200>; >> >> > + status = "okay"; >> >> > +}; >> > >> > These nodes are also still oddly placed in the middle of the external >> > clocks. Again please keep the external clocks at the top and then >> > order the nodes alphabetically to have some sort of system. >> > >> >> >> Hi Emil, >> >> I'll update it in next version. > > Hi William, > > It seems the mmc nodes are still missing from the upstream device > tree. The sysreg nodes have been added in Conors riscv-dt-for-next[1] > branch, so I don't see any missing dependencies. Could you please > update and send a new version of this? > > [1]: https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/log/?h=riscv-dt-for-next > > /Emil > Hi Emil, I will start to do the upstream work of this part from this week. Since the mmc driver has some modifications, I will send a separate patch series. Best Regards, William >> Best Regards >> William >> >> >> > &gmac0_rmii_refin { >> >> > clock-frequency = <50000000>; >> >> > }; >> >> > diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi >> >> > index 64d260ea1f29..17f7b3ee6ca3 100644 >> >> > --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi >> >> > +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi >> >> > @@ -314,6 +314,11 @@ uart2: serial@10020000 { >> >> > status = "disabled"; >> >> > }; >> >> > >> >> > + stg_syscon: syscon@10240000 { >> >> > + compatible = "starfive,jh7110-stg-syscon", "syscon"; >> >> > + reg = <0x0 0x10240000 0x0 0x1000>; >> >> > + }; >> >> > + >> >> > uart3: serial@12000000 { >> >> > compatible = "snps,dw-apb-uart"; >> >> > reg = <0x0 0x12000000 0x0 0x10000>; >> >> > @@ -370,6 +375,11 @@ syscrg: clock-controller@13020000 { >> >> > #reset-cells = <1>; >> >> > }; >> >> > >> >> > + sys_syscon: syscon@13030000 { >> >> > + compatible = "starfive,jh7110-sys-syscon", "syscon"; >> >> > + reg = <0x0 0x13030000 0x0 0x1000>; >> >> > + }; >> >> > + >> >> > gpio: gpio@13040000 { >> >> > compatible = "starfive,jh7110-sys-pinctrl"; >> >> > reg = <0x0 0x13040000 0x0 0x10000>; >> >> > @@ -397,6 +407,11 @@ aoncrg: clock-controller@17000000 { >> >> > #reset-cells = <1>; >> >> > }; >> >> > >> >> > + aon_syscon: syscon@17010000 { >> >> > + compatible = "starfive,jh7110-aon-syscon", "syscon"; >> >> > + reg = <0x0 0x17010000 0x0 0x1000>; >> >> > + }; >> >> > + >> >> > gpioa: gpio@17020000 { >> >> > compatible = "starfive,jh7110-aon-pinctrl"; >> >> > reg = <0x0 0x17020000 0x0 0x10000>; >> >> > @@ -407,5 +422,37 @@ gpioa: gpio@17020000 { >> >> > gpio-controller; >> >> > #gpio-cells = <2>; >> >> > }; >> >> > + >> >> > + mmc0: mmc@16010000 { >> >> > + compatible = "starfive,jh7110-mmc"; >> >> > + reg = <0x0 0x16010000 0x0 0x10000>; >> >> > + clocks = <&syscrg JH7110_SYSCLK_SDIO0_AHB>, >> >> > + <&syscrg JH7110_SYSCLK_SDIO0_SDCARD>; >> >> > + clock-names = "biu","ciu"; >> >> > + resets = <&syscrg JH7110_SYSRST_SDIO0_AHB>; >> >> > + reset-names = "reset"; >> >> > + interrupts = <74>; >> >> > + fifo-depth = <32>; >> >> > + fifo-watermark-aligned; >> >> > + data-addr = <0>; >> >> > + starfive,sysreg = <&sys_syscon 0x14 0x1a 0x7c000000>; >> >> > + status = "disabled"; >> >> > + }; >> >> > + >> >> > + mmc1: mmc@16020000 { >> >> > + compatible = "starfive,jh7110-mmc"; >> >> > + reg = <0x0 0x16020000 0x0 0x10000>; >> >> > + clocks = <&syscrg JH7110_SYSCLK_SDIO1_AHB>, >> >> > + <&syscrg JH7110_SYSCLK_SDIO1_SDCARD>; >> >> > + clock-names = "biu","ciu"; >> >> > + resets = <&syscrg JH7110_SYSRST_SDIO1_AHB>; >> >> > + reset-names = "reset"; >> >> > + interrupts = <75>; >> >> > + fifo-depth = <32>; >> >> > + fifo-watermark-aligned; >> >> > + data-addr = <0>; >> >> > + starfive,sysreg = <&sys_syscon 0x9c 0x1 0x3e>; >> >> > + status = "disabled"; >> >> > + }; >> >> >> >> Hi William, >> >> >> >> These nodes still don't seem to be sorted by address, eg. by the >> >> number after the @ >> >> Also please move the dt-binding patch before this one, so dtb_check >> >> won't fail no matter where git bisect happens to land. >> >> >> >> /Emil >> >> >> >> > }; >> >> > }; >> >> > -- >> >> > 2.34.1 >> >> > >> >> > >> >> > _______________________________________________ >> >> > linux-riscv mailing list >> >> > linux-riscv@lists.infradead.org >> >> > http://lists.infradead.org/mailman/listinfo/linux-riscv
diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi index c60280b89c73..e1a0248e907f 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -42,6 +42,29 @@ &rtc_osc { clock-frequency = <32768>; }; +&mmc0 { + max-frequency = <100000000>; + bus-width = <8>; + cap-mmc-highspeed; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + non-removable; + cap-mmc-hw-reset; + post-power-on-delay-ms = <200>; + status = "okay"; +}; + +&mmc1 { + max-frequency = <100000000>; + bus-width = <4>; + no-sdio; + no-mmc; + broken-cd; + cap-sd-highspeed; + post-power-on-delay-ms = <200>; + status = "okay"; +}; + &gmac0_rmii_refin { clock-frequency = <50000000>; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 64d260ea1f29..17f7b3ee6ca3 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -314,6 +314,11 @@ uart2: serial@10020000 { status = "disabled"; }; + stg_syscon: syscon@10240000 { + compatible = "starfive,jh7110-stg-syscon", "syscon"; + reg = <0x0 0x10240000 0x0 0x1000>; + }; + uart3: serial@12000000 { compatible = "snps,dw-apb-uart"; reg = <0x0 0x12000000 0x0 0x10000>; @@ -370,6 +375,11 @@ syscrg: clock-controller@13020000 { #reset-cells = <1>; }; + sys_syscon: syscon@13030000 { + compatible = "starfive,jh7110-sys-syscon", "syscon"; + reg = <0x0 0x13030000 0x0 0x1000>; + }; + gpio: gpio@13040000 { compatible = "starfive,jh7110-sys-pinctrl"; reg = <0x0 0x13040000 0x0 0x10000>; @@ -397,6 +407,11 @@ aoncrg: clock-controller@17000000 { #reset-cells = <1>; }; + aon_syscon: syscon@17010000 { + compatible = "starfive,jh7110-aon-syscon", "syscon"; + reg = <0x0 0x17010000 0x0 0x1000>; + }; + gpioa: gpio@17020000 { compatible = "starfive,jh7110-aon-pinctrl"; reg = <0x0 0x17020000 0x0 0x10000>; @@ -407,5 +422,37 @@ gpioa: gpio@17020000 { gpio-controller; #gpio-cells = <2>; }; + + mmc0: mmc@16010000 { + compatible = "starfive,jh7110-mmc"; + reg = <0x0 0x16010000 0x0 0x10000>; + clocks = <&syscrg JH7110_SYSCLK_SDIO0_AHB>, + <&syscrg JH7110_SYSCLK_SDIO0_SDCARD>; + clock-names = "biu","ciu"; + resets = <&syscrg JH7110_SYSRST_SDIO0_AHB>; + reset-names = "reset"; + interrupts = <74>; + fifo-depth = <32>; + fifo-watermark-aligned; + data-addr = <0>; + starfive,sysreg = <&sys_syscon 0x14 0x1a 0x7c000000>; + status = "disabled"; + }; + + mmc1: mmc@16020000 { + compatible = "starfive,jh7110-mmc"; + reg = <0x0 0x16020000 0x0 0x10000>; + clocks = <&syscrg JH7110_SYSCLK_SDIO1_AHB>, + <&syscrg JH7110_SYSCLK_SDIO1_SDCARD>; + clock-names = "biu","ciu"; + resets = <&syscrg JH7110_SYSRST_SDIO1_AHB>; + reset-names = "reset"; + interrupts = <75>; + fifo-depth = <32>; + fifo-watermark-aligned; + data-addr = <0>; + starfive,sysreg = <&sys_syscon 0x9c 0x1 0x3e>; + status = "disabled"; + }; }; };