From nobody Sat Oct 4 02:59:58 2025 Received: from CHN02-SH0-obe.outbound.protection.partner.outlook.cn (mail-sh0chn02on2118.outbound.protection.partner.outlook.cn [139.219.146.118]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF7F83090CF; Thu, 21 Aug 2025 12:43:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=139.219.146.118 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755780197; cv=fail; b=HdP24C+D8lkKhgJ5bphSyZs4Jie/0BcEXume85YT8FvpWctGKqWrMMUqofyppPtKgo+/OBIJIx+Ai/6rjNDDD6TFz3ayFF/cOW/pJFLnF+TRUKGvfVG/kU7GA8sqG41D+UBbGSGl433DywaSxdswSniLYc9JH9Nz+MYHxMHYCso= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755780197; c=relaxed/simple; bh=XJopp6jTgW9ZxtzhGnteDxhwUrDp60llzETws0q/9k8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=o2rUdHVuEeKRHodDNf0p0PmIrHfhj1nzFCPud6ZxVNEwpAlh6SeJRxfDAXwlomgoxC5N10wWvfT0bmWWQWCEfdkr4kxxXgcYcs4HrCg4EbZvqJA46JM79fVwHivEqCVeNmbHHTWoX3M4xcmPj6R3b8fhtwoxALa60CvMKq8iiEw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=starfivetech.com; spf=pass smtp.mailfrom=starfivetech.com; arc=fail smtp.client-ip=139.219.146.118 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=starfivetech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OIUAqDvuoPFdMxMZiLDloymZkYsiyuZeiM3Xn767Udxsx/9VtiekU+8S0Zjnalc1vdNUekvwxJsxbTb/bBliwP1ozJ+jG/buenu/Nh8iepaAYiAyPy3pOjuxMpTaGoeOGPctLEA0bss6/zcC5OWCOIiCvyRvrmH1OCTHUiAw2ZIDGkkj6wzZEShnL533bwUa/xxI8qNkt7TZul0tbiTwMpaMNIkmrJQdpItFLfZGKUOa7sbPW3DovMMSxJdNwTjpknqtXYeq8XhmX2yLn3UdekcDaxueLUj6G9bVOyIDU/eNDWJTStwAslip1y1knqxqmEgGEtpsh4rq8QSYoe9U4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tZQOGhEjxcvd92by1b2UFyqdE+RNHbUq7uEC9RxRPqs=; b=kvTQzH2bEbEI5FJBSD+OVP65wzofe+IPmXsdoXAs5kcSHaYJsBWE0fJ+M1iDRbycIwT+PaAWH06DcUgw9RXZctsh1jDK/OM8QUAmoiIMOInNnXQRDYq9JF5vRSQ1n0JRbiUbV+zXBujG7sTRBHlFSIOAc0MIfEtZ7MBtcJszYv6DYt8OKzFhtFDRl0bHS9/PzZTm4lBmLkpFtxrI1S2/SnPuz/9I1FTlc4ZiSWhkrWkRsAewznQo6/KoUscYh7f5B0RrACs3PYBQ/mFIPyhvNt4KoU/6b31TmDkrHUqM4cinNDBmTtl2xxB3TACI6hgQxZMu7zyj34hDg5a00P1AWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=starfivetech.com; dmarc=pass action=none header.from=starfivetech.com; dkim=pass header.d=starfivetech.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=starfivetech.com; Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) by ZQ2PR01MB1241.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.25; Thu, 21 Aug 2025 10:10:29 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7%6]) with mapi id 15.20.9031.024; Thu, 21 Aug 2025 10:10:29 +0000 From: Hal Feng To: Conor Dooley , Emil Renner Berthing , Heinrich Schuchardt , Rob Herring , Krzysztof Kozlowski , Palmer Dabbelt , Paul Walmsley , Albert Ou Cc: Hal Feng , devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC 2/3] riscv: dts: starfive: jh7110-common: Move out some nodes to the board dts Date: Thu, 21 Aug 2025 18:09:29 +0800 Message-ID: <20250821100930.71404-3-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20250821100930.71404-1-hal.feng@starfivetech.com> References: <20250821100930.71404-1-hal.feng@starfivetech.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BJXPR01CA0057.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:12::24) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1241:EE_ X-MS-Office365-Filtering-Correlation-Id: a59bcdec-5827-4ac0-e76d-08dde09af4d7 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|52116014|366016|41320700013|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 6mmBT8dUD2qcnwUJqOTalhZuLuU7iG3CjzxQyTMjXvtjHyuGVskBVFiXOsGCJAvVbF40eeuRysUoO6j6qnDaWXqrAYplt8c10kSLV4cxg1dHvOiHrD8OD44Y6NH7bvxDPWsUpuzz7xY0l49n2DELZa0oya7bJ1CYY3HQTyEOo/ejY1W4xhO/mNbS/hWeTgAvR03ckQkPgcQ1fvtULVSveWb4wSUvGwH8ISQiwK7oxwVzYait6DwOKaXUe5UCWg/EvB6dbu7Oh/eA9GXpHz6CS4s8rwp6VA+/m3BUvbKFHZl7muK0zOs2umT+XiOW9YIj+/51x5WMipqBpJ2kaAtvqubiNYrYG6rNyrynipIvbhWWe2BYUUaeyFrtuCRyJTtIxntH3wQEGWkzDgF9en4CmB6fsodZ07X2ApXDv47SoiSPnMjJHKohRXoau0q/pKNBr1r5l6Z+7gLykVmuTbKXlMywsI2uIlJ/iDdtApRD71pezvvdYK+cYVxm254vJ2Ipc5A1YOL4BWeBGIQhM3eD657o+hSpqS2b7NnmaSlZ+3hl/l5sf7CRgKnuNRtwel17n6Qgn66f8XNEWX/31zOooA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn;PTR:;CAT:NONE;SFS:(13230040)(7416014)(52116014)(366016)(41320700013)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OkbV7iPlV+HD8EgF1CfbeshIQX2ZxEStGB7uwlm71xd6XrwlSm81jJvDTb6S?= =?us-ascii?Q?JItCySktTt6St9MWr0j1csf+iR8jJtwYpTIysQcIICPYESvjIXuy9Pp4IoYO?= =?us-ascii?Q?gLzyJs27iiIonjQlqXXMl80YfMx0NFnQrMjDKLTa55ctGU+OfZTH88vE4iyy?= =?us-ascii?Q?fJhp4lUk2651G3fFtMVLkABFA6GFASU53ISAuz8CpsromMIpXde63HHuvSBC?= =?us-ascii?Q?4nNxqt7U7rkvuu67gG8B7+6PnsSlGJiRSHrbRJgO5tE2RvvWZUuzhBY5lZR/?= =?us-ascii?Q?fiIl8tVhKmJGJHMhgZy21sTpcuuXJVBQilyCPbDG/830Rb2XE2NFawm1yWEj?= =?us-ascii?Q?f+bxTqS3EL9nE3dZCT/zH/qMuNI2RcxajKn0cUTa99NL+i//zo5O73EkOQ9x?= =?us-ascii?Q?xOsBx74JPxtQaYFhRt9mjEqXbBCG7vaBrTfU4jX1Wmduh5XUgU/buacdoTtL?= =?us-ascii?Q?nJJC/2s3aAQe7br4XM962W3/g2oteRiAVfm7E+fM70PJg0jqJ7cT0V6yuShl?= =?us-ascii?Q?3EOwfkTUveyItWnyNN/D0sgxy0k7zgmjM0HfZ1bD0MxI/ieaohBSZWlfCH8o?= =?us-ascii?Q?U/OuPX7fw5oczt49lIA5o3+66w01pb/gQIOgZK/h/No9bQkZprrEeOMHsTes?= =?us-ascii?Q?J/+jcWilVi60hnO15CQ7xynLqmON5fc1HJxR6moQOdM8NMTf9lr0kurvO9kV?= =?us-ascii?Q?wla3/lIIV6t6bkSInGhTd4su76A82CpokYrBVgQ0W9o+h4oGmzOHQDgX4eJi?= =?us-ascii?Q?EJH9stme28p4SEK890qmRQBELBmQPfj1dBuisdMjEcQlPaNGIXxqYMuQ4xv4?= =?us-ascii?Q?baR2KUxfnlfYEWCeoZ9p+lsw4lnqdch42yUtfuvlENhzGxuzxhpLwt9MsAUm?= =?us-ascii?Q?DLCBM64F0GSdlqBSlZ81NV4Vukcghq5cejqbyeyqij3fm1WF6cbPgAYxtSAI?= =?us-ascii?Q?KTeCz9Byz3gkuNoz39crDT6uYm/bW75T1TCPHGMGo3jqqPRn6mlE0vVSuwV3?= =?us-ascii?Q?WUnmaaQK8xf8uZkht13WRmkEspVXNvz3aUowc3/mzSI7y8NhokGhr9i6/6QR?= =?us-ascii?Q?7drqNs+l5tsSCyNfgzaiXSu6O95Saete1C9tAtbxXG3buOYLVNesSrcFbrvx?= =?us-ascii?Q?/i3MqoKle9/wR4xM9Fw1GBluSoKNzpRrg2HP1gqWRj/9XZYHrQ3Wsd5jfNd6?= =?us-ascii?Q?XjORU2lFoShti117DziCLIqHlGJyAEjMTdsvurP/hWzc5EJ5X2E4IqcVuuF7?= =?us-ascii?Q?sXcrHtFY+e3c2zTA4PqMyL4hNrbeXpb9QUcxwQzOc5cIdZuugu3uw6A1Aw25?= =?us-ascii?Q?+B7t1386kASb2tvgwzJ2EaEKkHXrPrKHHogTK50GXOHB4xYk5/2QRFWWqCxg?= =?us-ascii?Q?2A1udrJxunz8h2Q7bPOA61boxr6DhGmgEx5fPU80IcVsYAODYVFWCQsxU/JN?= =?us-ascii?Q?zCAFw9uAgEEDvcZ3z30M5l7HBlqA3Y4RU5vAnmIh/gY6/tVr8ITZ60ZBRe09?= =?us-ascii?Q?cBWdofLNUKFVaTVCmyGuuZ+76p/9Tb7TiQFTDeRP8xXsBtwz/ZhmYZrE5Fxa?= =?us-ascii?Q?J94QeU4NVDdhLrVW3qUXvAyCc9a431HmXzQpZtZw+jYdo+EY2hhQSHg02++I?= =?us-ascii?Q?DA=3D=3D?= X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: a59bcdec-5827-4ac0-e76d-08dde09af4d7 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2025 10:10:29.5083 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LxOsPeS1Qs9rM5pzgj4asy1pWpR4mxOWLXnkqEAkyKqPiQ6JbUMXxRG3JdqZPrVPCZf/2Kw0hPIfsWDlL4f1x3gJLlswXf7NNHh64XpxWkk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1241 Content-Type: text/plain; charset="utf-8" Some node in this file are not used by the upcoming VisionFive 2 Lite board. Move them to the board dts to prepare for adding the new VisionFive 2 Lite device tree. Signed-off-by: Hal Feng Reviewed-by: E Shattow --- .../boot/dts/starfive/jh7110-common.dtsi | 22 --------- .../jh7110-deepcomputing-fml13v01.dts | 49 +++++++++++++++++++ .../boot/dts/starfive/jh7110-milkv-mars.dts | 49 +++++++++++++++++++ .../dts/starfive/jh7110-pine64-star64.dts | 49 +++++++++++++++++++ .../jh7110-starfive-visionfive-2.dtsi | 46 +++++++++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 16 ------ 6 files changed, 193 insertions(+), 38 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/b= oot/dts/starfive/jh7110-common.dtsi index 2eaf01775ef5..8332622420ca 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi @@ -281,15 +281,9 @@ &mmc0 { assigned-clock-rates =3D <50000000>; bus-width =3D <8>; bootph-pre-ram; - cap-mmc-highspeed; - mmc-ddr-1_8v; - mmc-hs200-1_8v; - cap-mmc-hw-reset; post-power-on-delay-ms =3D <200>; pinctrl-names =3D "default"; pinctrl-0 =3D <&mmc0_pins>; - vmmc-supply =3D <&vcc_3v3>; - vqmmc-supply =3D <&emmc_vdd>; status =3D "okay"; }; =20 @@ -299,12 +293,7 @@ &mmc1 { assigned-clock-rates =3D <50000000>; bus-width =3D <4>; bootph-pre-ram; - no-sdio; - no-mmc; - cd-gpios =3D <&sysgpio 41 GPIO_ACTIVE_LOW>; - disable-wp; cap-sd-highspeed; - post-power-on-delay-ms =3D <200>; pinctrl-names =3D "default"; pinctrl-0 =3D <&mmc1_pins>; status =3D "okay"; @@ -448,17 +437,6 @@ GPOEN_SYS_I2C6_DATA, }; =20 mmc0_pins: mmc0-0 { - rst-pins { - pinmux =3D ; - bias-pull-up; - drive-strength =3D <12>; - input-disable; - input-schmitt-disable; - slew-rate =3D <0>; - }; - mmc-pins { pinmux =3D , , diff --git a/arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dts= b/arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dts index f2857d021d68..5a2a41a7e8c3 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-deepcomputing-fml13v01.dts @@ -11,6 +11,55 @@ / { compatible =3D "deepcomputing,fml13v01", "starfive,jh7110"; }; =20 +&cpu_opp { + opp-375000000 { + opp-hz =3D /bits/ 64 <375000000>; + opp-microvolt =3D <800000>; + }; + opp-500000000 { + opp-hz =3D /bits/ 64 <500000000>; + opp-microvolt =3D <800000>; + }; + opp-750000000 { + opp-hz =3D /bits/ 64 <750000000>; + opp-microvolt =3D <800000>; + }; + opp-1500000000 { + opp-hz =3D /bits/ 64 <1500000000>; + opp-microvolt =3D <1040000>; + }; +}; + +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply =3D <&vcc_3v3>; + vqmmc-supply =3D <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux =3D ; + bias-pull-up; + drive-strength =3D <12>; + input-disable; + input-schmitt-disable; + slew-rate =3D <0>; + }; +}; + +&mmc1 { + no-sdio; + no-mmc; + cd-gpios =3D <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; + post-power-on-delay-ms =3D <200>; +}; + &pcie1 { perst-gpios =3D <&sysgpio 21 GPIO_ACTIVE_LOW>; phys =3D <&pciephy1>; diff --git a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts b/arch/risc= v/boot/dts/starfive/jh7110-milkv-mars.dts index fdaf6b4557da..96f6b2f072d4 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts @@ -11,6 +11,25 @@ / { compatible =3D "milkv,mars", "starfive,jh7110"; }; =20 +&cpu_opp { + opp-375000000 { + opp-hz =3D /bits/ 64 <375000000>; + opp-microvolt =3D <800000>; + }; + opp-500000000 { + opp-hz =3D /bits/ 64 <500000000>; + opp-microvolt =3D <800000>; + }; + opp-750000000 { + opp-hz =3D /bits/ 64 <750000000>; + opp-microvolt =3D <800000>; + }; + opp-1500000000 { + opp-hz =3D /bits/ 64 <1500000000>; + opp-microvolt =3D <1040000>; + }; +}; + &gmac0 { assigned-clocks =3D <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents =3D <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>; @@ -22,6 +41,36 @@ &i2c0 { status =3D "okay"; }; =20 +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply =3D <&vcc_3v3>; + vqmmc-supply =3D <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux =3D ; + bias-pull-up; + drive-strength =3D <12>; + input-disable; + input-schmitt-disable; + slew-rate =3D <0>; + }; +}; + +&mmc1 { + no-sdio; + no-mmc; + cd-gpios =3D <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; + post-power-on-delay-ms =3D <200>; +}; + &pcie0 { status =3D "okay"; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts b/arch/r= iscv/boot/dts/starfive/jh7110-pine64-star64.dts index 31e825be2065..c9677aef9ff0 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts @@ -14,6 +14,25 @@ aliases { }; }; =20 +&cpu_opp { + opp-375000000 { + opp-hz =3D /bits/ 64 <375000000>; + opp-microvolt =3D <800000>; + }; + opp-500000000 { + opp-hz =3D /bits/ 64 <500000000>; + opp-microvolt =3D <800000>; + }; + opp-750000000 { + opp-hz =3D /bits/ 64 <750000000>; + opp-microvolt =3D <800000>; + }; + opp-1500000000 { + opp-hz =3D /bits/ 64 <1500000000>; + opp-microvolt =3D <1040000>; + }; +}; + &gmac0 { starfive,tx-use-rgmii-clk; assigned-clocks =3D <&aoncrg JH7110_AONCLK_GMAC0_TX>; @@ -44,6 +63,36 @@ &i2c0 { status =3D "okay"; }; =20 +&mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply =3D <&vcc_3v3>; + vqmmc-supply =3D <&emmc_vdd>; +}; + +&mmc0_pins { + rst-pins { + pinmux =3D ; + bias-pull-up; + drive-strength =3D <12>; + input-disable; + input-schmitt-disable; + slew-rate =3D <0>; + }; +}; + +&mmc1 { + no-sdio; + no-mmc; + cd-gpios =3D <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; + post-power-on-delay-ms =3D <200>; +}; + &pcie1 { status =3D "okay"; }; 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 5f14afb2c24d..d1e4206f1251 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -13,6 +13,25 @@ aliases { }; }; =20 +&cpu_opp { + opp-375000000 { + opp-hz =3D /bits/ 64 <375000000>; + opp-microvolt =3D <800000>; + }; + opp-500000000 { + opp-hz =3D /bits/ 64 <500000000>; + opp-microvolt =3D <800000>; + }; + opp-750000000 { + opp-hz =3D /bits/ 64 <750000000>; + opp-microvolt =3D <800000>; + }; + opp-1500000000 { + opp-hz =3D /bits/ 64 <1500000000>; + opp-microvolt =3D <1040000>; + }; +}; + &gmac0 { status =3D "okay"; }; @@ -38,9 +57,36 @@ &i2c0 { }; =20 &mmc0 { + cap-mmc-highspeed; + cap-mmc-hw-reset; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + vmmc-supply =3D <&vcc_3v3>; + vqmmc-supply =3D <&emmc_vdd>; non-removable; }; =20 +&mmc0_pins { + rst-pins { + pinmux =3D ; + bias-pull-up; + drive-strength =3D <12>; + input-disable; + input-schmitt-disable; + slew-rate =3D <0>; + }; +}; + +&mmc1 { + no-sdio; + no-mmc; + cd-gpios =3D <&sysgpio 41 GPIO_ACTIVE_LOW>; + disable-wp; + post-power-on-delay-ms =3D <200>; +}; + &pcie0 { status =3D "okay"; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts= /starfive/jh7110.dtsi index 0ba74ef04679..d2463399b959 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -200,22 +200,6 @@ core4 { cpu_opp: opp-table-0 { compatible =3D "operating-points-v2"; opp-shared; - opp-375000000 { - opp-hz =3D /bits/ 64 <375000000>; - opp-microvolt =3D <800000>; - }; - opp-500000000 { - opp-hz =3D /bits/ 64 <500000000>; - opp-microvolt =3D <800000>; - }; - opp-750000000 { - opp-hz =3D /bits/ 64 <750000000>; - opp-microvolt =3D <800000>; - }; - opp-1500000000 { - opp-hz =3D /bits/ 64 <1500000000>; - opp-microvolt =3D <1040000>; - }; }; =20 thermal-zones { --=20 2.43.2