From patchwork Sun Dec 8 09:19:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019743 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m3z1BKWz1yQl for ; Mon, 9 Dec 2024 00:26:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BD4F2895E3; Sun, 8 Dec 2024 14:25:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 65FA789578; Sun, 8 Dec 2024 10:21:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20704.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::704]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1016989525 for ; Sun, 8 Dec 2024 10:21:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CZ78FiNsVscNhU4r2kXLM2A5us5AqhWqz1jUYMDPY/eWr/tLzQpOWwd/RTkP6UV6oDFogem17mSBUo7RycJ0nOhMJv6uhunw8gCaoYOgCTluIEuaSx3lGtjMxpuyHY9kpiAIPCDKzJ63Qv+4axZpDG3TKlI0fav8zbNT3kqa6/wxvOtsybK1iuc2fIttVBS9wvHJl03hqWfLDrL49m2ePe++naQG3RpShfGvFDqBYszGVTb0ZWTIEc14cS/Sbb8Za1FiL2/zINkz9BYXBkRjf5+CoTBVe1BE4QxOYAaiA78oJ0htelCP26WZal3kFLPcnQoGJGUAQPv1PDsdv/QICg== 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=YV52RMkfx4nh6gszEgKnFx2llid6KWoP5RGRDAyOY0M=; b=Gb6NQFkN0N0CWrDkxeBPIh1W7qzPz5MM/HHzZbIqE3W9N5wREp4LkdkFW5+R0EbNiyqy9Urf2JiS3XkAFftkElfzCIxyZ3npOfB4lhhoDC3R5o6w0ZyO0wYAGqPd612gQp4un1OizwSRJ49gi7lVPk50Z+HZmO1U6ISc6ejiyaFsp2gtgiDaV02n10UgiIujSp8jNq07tHuimOXvNXOpniNLs/yxLM+q74j4vyvlH72V8VdUtnqXQW/ZNw4m9SDwEngsmqDp6KdmVH5VoZPQFnVCmncsdw4B5wCia9nGiI53b677b/mXISWJwqX3UMRN3MXrV5BxgA6tyjuTOzXolQ== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:33 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:33 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 01/12] dts: starfive: Switch to using upstream DT Date: Sun, 8 Dec 2024 17:19:31 +0800 Message-ID: <20241208091942.47298-2-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: a7e2d038-9fe6-4dbe-6d26-08dd1769b517 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: KGmzSJ+sZzYLecFyDYidFLWIhUfaFWPq/jUPeeplEWmyHuMzk22QwUwCBV+NVq+lHUZwrpZX522CpaIZsAhyMHpNW4i/rejsMnbyh1fYrnmJPpEbubaPZDIs6rDVNRATs9bt4epizNkpxtsjYwGyWna6xJPRC0NChcjycsauJZsYGpM/nhGhgFfrcbvZUJt5tpbkKioJ+zqmDc7EWJWRdCcll8jMVSe/eE62+uiGLUmG+CGhpnXMSFVCmx2/i93DaACn7lzrTWSE5SQ2am8B5dmjWVh8HWXXNqff6Sz05XRNzd4PWte6QxFJTGMiLGa0r9xd37polMu/pk2i8ICYXbb1/PG3Kv3sTWyYlIGdWPAQbuv+CBfWBiF8SbaIGioZ/0HDV8wlj9g5SVY4SDICiagiGE89e4JW9VEMuXpntfYTZrzfF7NHY5lK+OTZhQUOdsm53NCYjdP2SH17X+x5tEXhAHeQvqHvk4PSq6Jn6THKWqXKMmqr+PqmrCLVG9UiguHLu/FZTdPN9JbowURomUw0R/DkBPxmbb76sws149CWTcpFLDP+Zq154bv2ogfJvHLRHz0ngbvJRYdbuHX2bkoTUEMk3ORRtUw9QgGyNf4NqLvrW0fyyeZ/uVB/6Pe/w2pOGyXd/lAtaTjHbGGMmg== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PSOkCVnKqDJzQv3+znVDar0p26FB5C0XB+J1L9mBSLLWLxKaussfaoUyuRVwA+yeEtpsEi2srCqVrZWniB3jqRoRtBGx3tPAmf//vaqLRcqHTk0eSk8qHfd2qyixvmsOQCZVOV8dyyFbi/T8RqFHsJVvp/wirRrVTjLzWrBJPkoGR84Cd/4XNh51ZIjBQ53hyRj1u04tYwzEhmkMreqxDrEWtkaZDNAkY1jP0Wnu5IeoNvf7uK6CsCLruptc1KF6tx7b1+ixO0QTh4yNdGrDsMC4AEJLdQsNTaiPQzW3r+1s/MM+ATvxK6q9+wzL2N8+Y5kgnlYXc4OnEFpUdoHTMXvHB6aeQfutg0fjy84274pJELmgD0K+Tj4iNH1vEIqRmSmj1dGRHf/hQBLJvY4duWHsFXzwCUFmHH3VAbbgto+HXyYtvzLGXg5sBDdS6fxE6ijiBcmtrpJ35xrvUJRQUqKWQ9vVdhKaLeOgCYC72PSEPO96M0f5wUAYIABEuJqzNM8CUf0wjhUINE9VG676bl0Le0oVnmIg94MZQSaK+FG/WJuQ04mssDy8fJn6Wyfa40IFq6OkzGPhmKaY1VyWuJhqy1il5bywa8UYr1w/fAjqS160Ynt08c0wwR6DiV79qVB9vEGhN2XeWDgnGBxK9+Vtv+i6i9cM+M4Zmom2MuFWhmt1AjgHk/tc6FkjS8W/Kd2X9vTRZ0RidhxTSTZizC5H6bRlXEL8aUkyvzUz4v1htQA8hsJD58DUUNFPotYvponkAH+cab+hFw7DNyCZAETOz0UPkd/2arkWcUCf0lnqieEUOXd5s2HieyZ5nAAvQ+6e6Y0RHX8dVQXZSjOPvtaPTLKueYHQWfcAzidnKkSchNo5hVkBe7v7VV8jKjdVoCABaiAhJ4LIwCW/VNWZV46xEzcgRKDHFhmuWHxvVKkKhKUdEHg7OaAeVj6ufmo1J351cuWs9aK+63rI68W8yBZFko3Hp1WgqweB30MSy21OtqWG8gT8hbBU913rr30bxfOGnWL8vt+yFD3JLWkukYl/i7cWAy0uaVXwJShfDqtFJIfAyN9mKmSv+Gxu2J+YfFJ+vQDKC45NxnKE5KZAmfMaa7KQMrnMXf8SCyI14bLJq3mWuxON6h26n9+hiaXo19x8ES8DnYvzqWA4k2xbiJZXGcdW8lwQKJtry/sWuYmUs5aIzSiaEoAsZmwjiFYKRJbHTnzftYdAGTq8WVGoblXAp5Bu3wtOSlUKqtVopzZ2UOBQ8w29wAX/m+/BlS8AGaNJHhdT8jTovbh1BlYTPyOX3gEsaZ1qkx19RmVjYx21f9vnwBTTI25rNj66kf8QkBr77KoTkFVdzEN1GN01JeLYNzYbCUnQMM4QBWdd4krOlQ5f02UVfAkZjZDdMEcYqN+BWIMawyN6MDwrdEfG0eVEB9B+SAbF5yF95kY273Rqtm5Mn5MjXWeA8wacuAgFJDftnpMDmCHTeUu2iSATog46+JyqSkDK8jNYR3/55mVnK5RQOFPhVwEkKFYQsvQt9nX91CbqbxxRGBYX+4+ih+1UgREwdgxGUFhoNbeKQ/dx9PjlGuHOfkqa3RiIyCtblbDnxKI4Z7nWCF3JA33wgw== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7e2d038-9fe6-4dbe-6d26-08dd1769b517 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:33.5893 (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: DNKQdB42fO313Pdx5+Do89fqE4Sxiuo+ssbv3MBgM5UDZyIp2vs3fk9319FnJjHENiOsmhIKZkKKjdVSRV64lL+B1b28fxosIQBGh2g0YwU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Enable OF_UPSTREAM to use upstream DT and add starfive/ prefix to the DEFAULT_DEVICE_TREE. Rename jh7110-starfive-visionfive-2-u-boot.dtsi to jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi and set the v1.3b device tree as the default device tree. Drop redundant DT files from arch/riscv/dts/ and redundant clock and reset definitions from include/dt-bindings/. Since the old clock definitions is a little different from those in upstream Linux, update the clock definitions in clock drivers accordingly. Tested-by: Anand Moon Tested-by: E Shattow Acked-by: Sumit Garg Signed-off-by: Hal Feng --- arch/riscv/cpu/jh7110/Kconfig | 1 + arch/riscv/dts/Makefile | 1 - ...0-starfive-visionfive-2-v1.3b-u-boot.dtsi} | 0 .../dts/jh7110-starfive-visionfive-2.dts | 11 - .../dts/jh7110-starfive-visionfive-2.dtsi | 380 --------- arch/riscv/dts/jh7110-u-boot.dtsi | 2 +- arch/riscv/dts/jh7110.dtsi | 761 ------------------ configs/starfive_visionfive2_defconfig | 2 +- drivers/clk/starfive/clk-jh7110-pll.c | 6 +- drivers/clk/starfive/clk-jh7110.c | 44 +- .../dt-bindings/clock/starfive,jh7110-crg.h | 258 ------ .../dt-bindings/reset/starfive,jh7110-crg.h | 183 ----- 12 files changed, 28 insertions(+), 1621 deletions(-) rename arch/riscv/dts/{jh7110-starfive-visionfive-2-u-boot.dtsi => jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi} (100%) delete mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2.dts delete mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi delete mode 100644 arch/riscv/dts/jh7110.dtsi delete mode 100644 include/dt-bindings/clock/starfive,jh7110-crg.h delete mode 100644 include/dt-bindings/reset/starfive,jh7110-crg.h diff --git a/arch/riscv/cpu/jh7110/Kconfig b/arch/riscv/cpu/jh7110/Kconfig index e5549a01b8..9904a60ddd 100644 --- a/arch/riscv/cpu/jh7110/Kconfig +++ b/arch/riscv/cpu/jh7110/Kconfig @@ -19,6 +19,7 @@ config STARFIVE_JH7110 imply MMC imply MMC_BROKEN_CD imply MMC_SPI + imply OF_UPSTREAM imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) imply SIFIVE_CACHE imply SIFIVE_CCACHE diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile index de356584bf..07ebe530bd 100644 --- a/arch/riscv/dts/Makefile +++ b/arch/riscv/dts/Makefile @@ -7,7 +7,6 @@ dtb-$(CONFIG_TARGET_OPENPITON_RISCV64) += openpiton-riscv64.dtb dtb-$(CONFIG_TARGET_SIFIVE_UNLEASHED) += hifive-unleashed-a00.dtb dtb-$(CONFIG_TARGET_SIFIVE_UNMATCHED) += hifive-unmatched-a00.dtb dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb -dtb-$(CONFIG_TARGET_STARFIVE_VISIONFIVE2) += jh7110-starfive-visionfive-2.dtb dtb-$(CONFIG_TARGET_TH1520_LPI4A) += th1520-lichee-pi-4a.dtb dtb-$(CONFIG_TARGET_XILINX_MBV) += xilinx-mbv32.dtb dtb-$(CONFIG_TARGET_XILINX_MBV) += xilinx-mbv64.dtb diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi similarity index 100% rename from arch/riscv/dts/jh7110-starfive-visionfive-2-u-boot.dtsi rename to arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2.dts b/arch/riscv/dts/jh7110-starfive-visionfive-2.dts deleted file mode 100644 index 288ea39493..0000000000 --- a/arch/riscv/dts/jh7110-starfive-visionfive-2.dts +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT -/* - * Copyright (C) 2023 StarFive Technology Co., Ltd. - */ - -/dts-v1/; -#include "jh7110-starfive-visionfive-2.dtsi" - -/ { - compatible = "starfive,visionfive-2-v1.3b", "starfive,jh7110"; -}; diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi deleted file mode 100644 index e11babc1cd..0000000000 --- a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi +++ /dev/null @@ -1,380 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT -/* - * Copyright (C) 2022 StarFive Technology Co., Ltd. - */ - -/dts-v1/; - -#include "jh7110.dtsi" -#include -#include -/ { - aliases { - serial0 = &uart0; - spi0 = &qspi; - mmc0 = &mmc0; - mmc1 = &mmc1; - i2c0 = &i2c0; - i2c2 = &i2c2; - i2c5 = &i2c5; - i2c6 = &i2c6; - ethernet0 = &gmac0; - ethernet1 = &gmac1; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - cpus { - timebase-frequency = <4000000>; - }; - - memory@40000000 { - device_type = "memory"; - reg = <0x0 0x40000000 0x2 0x0>; - }; - - gpio-restart { - compatible = "gpio-restart"; - gpios = <&sysgpio 35 GPIO_ACTIVE_HIGH>; - }; -}; - -&osc { - clock-frequency = <24000000>; -}; - -&rtc_osc { - clock-frequency = <32768>; -}; - -&gmac0_rmii_refin { - clock-frequency = <50000000>; -}; - -&gmac0_rgmii_rxin { - clock-frequency = <125000000>; -}; - -&gmac1_rmii_refin { - clock-frequency = <50000000>; -}; - -&gmac1_rgmii_rxin { - clock-frequency = <125000000>; -}; - -&i2stx_bclk_ext { - clock-frequency = <12288000>; -}; - -&i2stx_lrck_ext { - clock-frequency = <192000>; -}; - -&i2srx_bclk_ext { - clock-frequency = <12288000>; -}; - -&i2srx_lrck_ext { - clock-frequency = <192000>; -}; - -&tdm_ext { - clock-frequency = <49152000>; -}; - -&mclk_ext { - clock-frequency = <12288000>; -}; - -&uart0 { - reg-offset = <0>; - current-speed = <115200>; - clock-frequency = <24000000>; - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins>; - status = "okay"; -}; - -&i2c0 { - clock-frequency = <100000>; - i2c-sda-hold-time-ns = <300>; - i2c-sda-falling-time-ns = <510>; - i2c-scl-falling-time-ns = <510>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; - status = "okay"; -}; - -&i2c2 { - clock-frequency = <100000>; - i2c-sda-hold-time-ns = <300>; - i2c-sda-falling-time-ns = <510>; - i2c-scl-falling-time-ns = <510>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; - status = "okay"; -}; - -&i2c5 { - clock-frequency = <100000>; - i2c-sda-hold-time-ns = <300>; - i2c-sda-falling-time-ns = <510>; - i2c-scl-falling-time-ns = <510>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c5_pins>; - status = "okay"; - - pmic@36 { - compatible = "x-powers,axp15060"; - reg = <0x36>; - }; - - eeprom@50 { - compatible = "atmel,24c04"; - reg = <0x50>; - pagesize = <16>; - }; -}; - -&i2c6 { - clock-frequency = <100000>; - i2c-sda-hold-time-ns = <300>; - i2c-sda-falling-time-ns = <510>; - i2c-scl-falling-time-ns = <510>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c6_pins>; - status = "okay"; -}; - -&sysgpio { - status = "okay"; - uart0_pins: uart0-0 { - tx-pins { - pinmux = ; - bias-disable; - drive-strength = <12>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - - rx-pins { - pinmux = ; - bias-disable; /* external pull-up */ - drive-strength = <2>; - input-enable; - input-schmitt-enable; - slew-rate = <0>; - }; - }; - - i2c0_pins: i2c0-0 { - i2c-pins { - pinmux = , - ; - bias-disable; /* external pull-up */ - input-enable; - input-schmitt-enable; - }; - }; - - i2c2_pins: i2c2-0 { - i2c-pins { - pinmux = , - ; - bias-disable; /* external pull-up */ - input-enable; - input-schmitt-enable; - }; - }; - - i2c5_pins: i2c5-0 { - i2c-pins { - pinmux = , - ; - bias-disable; /* external pull-up */ - input-enable; - input-schmitt-enable; - }; - }; - - i2c6_pins: i2c6-0 { - i2c-pins { - pinmux = , - ; - bias-disable; /* external pull-up */ - input-enable; - input-schmitt-enable; - }; - }; - - mmc0_pins: mmc0-pins { - mmc0-pins-rest { - pinmux = ; - bias-pull-up; - drive-strength = <12>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - }; - - mmc1_pins: mmc1-pins { - mmc1-pins0 { - pinmux = ; - bias-pull-up; - drive-strength = <12>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - - mmc1-pins1 { - pinmux = , - , - , - , - ; - bias-pull-up; - drive-strength = <12>; - input-enable; - input-schmitt-enable; - slew-rate = <0>; - }; - }; -}; - -&mmc0 { - compatible = "snps,dw-mshc"; - max-frequency = <100000000>; - bus-width = <8>; - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; - 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 { - compatible = "snps,dw-mshc"; - max-frequency = <100000000>; - bus-width = <4>; - pinctrl-names = "default"; - pinctrl-0 = <&mmc1_pins>; - no-sdio; - no-mmc; - cd-gpios = <&sysgpio 41 GPIO_ACTIVE_LOW>; - cap-sd-highspeed; - post-power-on-delay-ms = <200>; - status = "okay"; -}; - -&qspi { - spi-max-frequency = <250000000>; - status = "okay"; - - nor-flash@0 { - compatible = "jedec,spi-nor"; - reg=<0>; - spi-max-frequency = <100000000>; - cdns,tshsl-ns = <1>; - cdns,tsd2d-ns = <1>; - cdns,tchsh-ns = <1>; - cdns,tslch-ns = <1>; - }; -}; - -&pcie0 { - reset-gpios = <&sysgpio 26 GPIO_ACTIVE_LOW>; - status = "okay"; -}; - -&pcie1 { - reset-gpios = <&sysgpio 28 GPIO_ACTIVE_LOW>; - status = "okay"; -}; - -&syscrg { - assigned-clocks = <&syscrg JH7110_SYSCLK_CPU_ROOT>, - <&syscrg JH7110_SYSCLK_BUS_ROOT>, - <&syscrg JH7110_SYSCLK_PERH_ROOT>, - <&syscrg JH7110_SYSCLK_QSPI_REF>; - assigned-clock-parents = <&pllclk JH7110_SYSCLK_PLL0_OUT>, - <&pllclk JH7110_SYSCLK_PLL2_OUT>, - <&pllclk JH7110_SYSCLK_PLL2_OUT>, - <&syscrg JH7110_SYSCLK_QSPI_REF_SRC>; - assigned-clock-rates = <0>, <0>, <0>, <0>; -}; - -&aoncrg { - assigned-clocks = <&aoncrg JH7110_AONCLK_APB_FUNC>; - assigned-clock-parents = <&osc>; - assigned-clock-rates = <0>; -}; - -&gmac0 { - phy-handle = <&phy0>; - phy-mode = "rgmii-id"; - status = "okay"; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - compatible = "snps,dwmac-mdio"; - - phy0: ethernet-phy@0 { - reg = <0>; - }; - }; -}; - -&gmac1 { - phy-handle = <&phy1>; - phy-mode = "rgmii-id"; - status = "okay"; - - mdio { - #address-cells = <1>; - #size-cells = <0>; - compatible = "snps,dwmac-mdio"; - - phy1: ethernet-phy@1 { - reg = <0>; - }; - }; -}; diff --git a/arch/riscv/dts/jh7110-u-boot.dtsi b/arch/riscv/dts/jh7110-u-boot.dtsi index 2f560e7296..52c1d60859 100644 --- a/arch/riscv/dts/jh7110-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-u-boot.dtsi @@ -62,7 +62,7 @@ <&syscrg JH7110_SYSRST_DDR_OSC>, <&syscrg JH7110_SYSRST_DDR_APB>; reset-names = "axi", "osc", "apb"; - clocks = <&syscrg JH7110_SYSCLK_PLL1_OUT>; + clocks = <&syscrg JH7110_PLLCLK_PLL1_OUT>; clock-names = "pll1_out"; clock-frequency = <2133>; }; diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi deleted file mode 100644 index 2cdc683d49..0000000000 --- a/arch/riscv/dts/jh7110.dtsi +++ /dev/null @@ -1,761 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT -/* - * Copyright (C) 2022 StarFive Technology Co., Ltd. - */ - -/dts-v1/; -#include -#include - -/ { - compatible = "starfive,jh7110"; - #address-cells = <2>; - #size-cells = <2>; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - S7_0: cpu@0 { - compatible = "sifive,s7", "riscv"; - reg = <0>; - device_type = "cpu"; - i-cache-block-size = <64>; - i-cache-sets = <64>; - i-cache-size = <16384>; - next-level-cache = <&ccache>; - riscv,isa = "rv64imac_zba_zbb"; - status = "disabled"; - - cpu0_intc: interrupt-controller { - compatible = "riscv,cpu-intc"; - interrupt-controller; - #interrupt-cells = <1>; - }; - }; - - U74_1: cpu@1 { - compatible = "sifive,u74-mc", "riscv"; - reg = <1>; - d-cache-block-size = <64>; - d-cache-sets = <64>; - d-cache-size = <32768>; - d-tlb-sets = <1>; - d-tlb-size = <40>; - device_type = "cpu"; - i-cache-block-size = <64>; - i-cache-sets = <64>; - i-cache-size = <32768>; - i-tlb-sets = <1>; - i-tlb-size = <40>; - mmu-type = "riscv,sv39"; - next-level-cache = <&ccache>; - riscv,isa = "rv64imafdc_zba_zbb"; - tlb-split; - - cpu1_intc: interrupt-controller { - compatible = "riscv,cpu-intc"; - interrupt-controller; - #interrupt-cells = <1>; - }; - }; - - U74_2: cpu@2 { - compatible = "sifive,u74-mc", "riscv"; - reg = <2>; - d-cache-block-size = <64>; - d-cache-sets = <64>; - d-cache-size = <32768>; - d-tlb-sets = <1>; - d-tlb-size = <40>; - device_type = "cpu"; - i-cache-block-size = <64>; - i-cache-sets = <64>; - i-cache-size = <32768>; - i-tlb-sets = <1>; - i-tlb-size = <40>; - mmu-type = "riscv,sv39"; - next-level-cache = <&ccache>; - riscv,isa = "rv64imafdc_zba_zbb"; - tlb-split; - - cpu2_intc: interrupt-controller { - compatible = "riscv,cpu-intc"; - interrupt-controller; - #interrupt-cells = <1>; - }; - }; - - U74_3: cpu@3 { - compatible = "sifive,u74-mc", "riscv"; - reg = <3>; - d-cache-block-size = <64>; - d-cache-sets = <64>; - d-cache-size = <32768>; - d-tlb-sets = <1>; - d-tlb-size = <40>; - device_type = "cpu"; - i-cache-block-size = <64>; - i-cache-sets = <64>; - i-cache-size = <32768>; - i-tlb-sets = <1>; - i-tlb-size = <40>; - mmu-type = "riscv,sv39"; - next-level-cache = <&ccache>; - riscv,isa = "rv64imafdc_zba_zbb"; - tlb-split; - - cpu3_intc: interrupt-controller { - compatible = "riscv,cpu-intc"; - interrupt-controller; - #interrupt-cells = <1>; - }; - }; - - U74_4: cpu@4 { - compatible = "sifive,u74-mc", "riscv"; - reg = <4>; - d-cache-block-size = <64>; - d-cache-sets = <64>; - d-cache-size = <32768>; - d-tlb-sets = <1>; - d-tlb-size = <40>; - device_type = "cpu"; - i-cache-block-size = <64>; - i-cache-sets = <64>; - i-cache-size = <32768>; - i-tlb-sets = <1>; - i-tlb-size = <40>; - mmu-type = "riscv,sv39"; - next-level-cache = <&ccache>; - riscv,isa = "rv64imafdc_zba_zbb"; - tlb-split; - - cpu4_intc: interrupt-controller { - compatible = "riscv,cpu-intc"; - interrupt-controller; - #interrupt-cells = <1>; - }; - }; - - cpu-map { - cluster0 { - core0 { - cpu = <&S7_0>; - }; - - core1 { - cpu = <&U74_1>; - }; - - core2 { - cpu = <&U74_2>; - }; - - core3 { - cpu = <&U74_3>; - }; - - core4 { - cpu = <&U74_4>; - }; - }; - }; - }; - - timer { - compatible = "riscv,timer"; - interrupts-extended = <&cpu0_intc 5>, - <&cpu1_intc 5>, - <&cpu2_intc 5>, - <&cpu3_intc 5>, - <&cpu4_intc 5>; - }; - - osc: oscillator { - compatible = "fixed-clock"; - clock-output-names = "osc"; - #clock-cells = <0>; - }; - - rtc_osc: rtc-oscillator { - compatible = "fixed-clock"; - clock-output-names = "rtc_osc"; - #clock-cells = <0>; - }; - - gmac0_rmii_refin: gmac0-rmii-refin-clock { - compatible = "fixed-clock"; - clock-output-names = "gmac0_rmii_refin"; - #clock-cells = <0>; - }; - - gmac0_rgmii_rxin: gmac0-rgmii-rxin-clock { - compatible = "fixed-clock"; - clock-output-names = "gmac0_rgmii_rxin"; - #clock-cells = <0>; - }; - - gmac1_rmii_refin: gmac1-rmii-refin-clock { - compatible = "fixed-clock"; - clock-output-names = "gmac1_rmii_refin"; - #clock-cells = <0>; - }; - - gmac1_rgmii_rxin: gmac1-rgmii-rxin-clock { - compatible = "fixed-clock"; - clock-output-names = "gmac1_rgmii_rxin"; - #clock-cells = <0>; - }; - - i2stx_bclk_ext: i2stx-bclk-ext-clock { - compatible = "fixed-clock"; - clock-output-names = "i2stx_bclk_ext"; - #clock-cells = <0>; - }; - - i2stx_lrck_ext: i2stx-lrck-ext-clock { - compatible = "fixed-clock"; - clock-output-names = "i2stx_lrck_ext"; - #clock-cells = <0>; - }; - - i2srx_bclk_ext: i2srx-bclk-ext-clock { - compatible = "fixed-clock"; - clock-output-names = "i2srx_bclk_ext"; - #clock-cells = <0>; - }; - - i2srx_lrck_ext: i2srx-lrck-ext-clock { - compatible = "fixed-clock"; - clock-output-names = "i2srx_lrck_ext"; - #clock-cells = <0>; - }; - - tdm_ext: tdm-ext-clock { - compatible = "fixed-clock"; - clock-output-names = "tdm_ext"; - #clock-cells = <0>; - }; - - mclk_ext: mclk-ext-clock { - compatible = "fixed-clock"; - clock-output-names = "mclk_ext"; - #clock-cells = <0>; - }; - - stmmac_axi_setup: stmmac-axi-config { - snps,lpi_en; - snps,wr_osr_lmt = <4>; - snps,rd_osr_lmt = <4>; - snps,blen = <256 128 64 32 0 0 0>; - }; - - soc { - compatible = "simple-bus"; - interrupt-parent = <&plic>; - #address-cells = <2>; - #size-cells = <2>; - ranges; - - clint: timer@2000000 { - compatible = "starfive,jh7110-clint", "sifive,clint0"; - reg = <0x0 0x2000000 0x0 0x10000>; - interrupts-extended = <&cpu0_intc 3>, <&cpu0_intc 7>, - <&cpu1_intc 3>, <&cpu1_intc 7>, - <&cpu2_intc 3>, <&cpu2_intc 7>, - <&cpu3_intc 3>, <&cpu3_intc 7>, - <&cpu4_intc 3>, <&cpu4_intc 7>; - }; - - plic: interrupt-controller@c000000 { - compatible = "starfive,jh7110-plic", "sifive,plic-1.0.0"; - reg = <0x0 0xc000000 0x0 0x4000000>; - interrupts-extended = <&cpu0_intc 11>, - <&cpu1_intc 11>, <&cpu1_intc 9>, - <&cpu2_intc 11>, <&cpu2_intc 9>, - <&cpu3_intc 11>, <&cpu3_intc 9>, - <&cpu4_intc 11>, <&cpu4_intc 9>; - interrupt-controller; - #interrupt-cells = <1>; - #address-cells = <0>; - riscv,ndev = <136>; - }; - - ccache: cache-controller@2010000 { - compatible = "starfive,jh7110-ccache", "sifive,ccache0", "cache"; - reg = <0x0 0x2010000 0x0 0x4000>; - interrupts = <1>, <3>, <4>, <2>; - cache-block-size = <64>; - cache-level = <2>; - cache-sets = <2048>; - cache-size = <2097152>; - cache-unified; - }; - - uart0: serial@10000000 { - compatible = "snps,dw-apb-uart"; - reg = <0x0 0x10000000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_UART0_CORE>, - <&syscrg JH7110_SYSCLK_UART0_APB>; - clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART0_APB>, - <&syscrg JH7110_SYSRST_UART0_CORE>; - interrupts = <32>; - reg-io-width = <4>; - reg-shift = <2>; - status = "disabled"; - }; - - uart1: serial@10010000 { - compatible = "snps,dw-apb-uart"; - reg = <0x0 0x10010000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_UART1_CORE>, - <&syscrg JH7110_SYSCLK_UART1_APB>; - clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART1_APB>, - <&syscrg JH7110_SYSRST_UART1_CORE>; - interrupts = <33>; - reg-io-width = <4>; - reg-shift = <2>; - status = "disabled"; - }; - - uart2: serial@10020000 { - compatible = "snps,dw-apb-uart"; - reg = <0x0 0x10020000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_UART2_CORE>, - <&syscrg JH7110_SYSCLK_UART2_APB>; - clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART2_APB>, - <&syscrg JH7110_SYSRST_UART2_CORE>; - interrupts = <34>; - reg-io-width = <4>; - reg-shift = <2>; - status = "disabled"; - }; - - i2c0: i2c@10030000 { - compatible = "snps,designware-i2c"; - reg = <0x0 0x10030000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_I2C0_APB>; - clock-names = "ref"; - resets = <&syscrg JH7110_SYSRST_I2C0_APB>; - interrupts = <35>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - i2c1: i2c@10040000 { - compatible = "snps,designware-i2c"; - reg = <0x0 0x10040000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_I2C1_APB>; - clock-names = "ref"; - resets = <&syscrg JH7110_SYSRST_I2C1_APB>; - interrupts = <36>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - i2c2: i2c@10050000 { - compatible = "snps,designware-i2c"; - reg = <0x0 0x10050000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_I2C2_APB>; - clock-names = "ref"; - resets = <&syscrg JH7110_SYSRST_I2C2_APB>; - interrupts = <37>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - stgcrg: clock-controller@10230000 { - compatible = "starfive,jh7110-stgcrg"; - reg = <0x0 0x10230000 0x0 0x10000>; - #clock-cells = <1>; - #reset-cells = <1>; - }; - - stg_syscon: stg_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>; - clocks = <&syscrg JH7110_SYSCLK_UART3_CORE>, - <&syscrg JH7110_SYSCLK_UART3_APB>; - clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART3_APB>, - <&syscrg JH7110_SYSRST_UART3_CORE>; - interrupts = <45>; - reg-io-width = <4>; - reg-shift = <2>; - status = "disabled"; - }; - - uart4: serial@12010000 { - compatible = "snps,dw-apb-uart"; - reg = <0x0 0x12010000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_UART4_CORE>, - <&syscrg JH7110_SYSCLK_UART4_APB>; - clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART4_APB>, - <&syscrg JH7110_SYSRST_UART4_CORE>; - interrupts = <46>; - reg-io-width = <4>; - reg-shift = <2>; - status = "disabled"; - }; - - uart5: serial@12020000 { - compatible = "snps,dw-apb-uart"; - reg = <0x0 0x12020000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_UART5_CORE>, - <&syscrg JH7110_SYSCLK_UART5_APB>; - clock-names = "baudclk", "apb_pclk"; - resets = <&syscrg JH7110_SYSRST_UART5_APB>, - <&syscrg JH7110_SYSRST_UART5_CORE>; - interrupts = <47>; - reg-io-width = <4>; - reg-shift = <2>; - status = "disabled"; - }; - - i2c3: i2c@12030000 { - compatible = "snps,designware-i2c"; - reg = <0x0 0x12030000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_I2C3_APB>; - clock-names = "ref"; - resets = <&syscrg JH7110_SYSRST_I2C3_APB>; - interrupts = <48>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - i2c4: i2c@12040000 { - compatible = "snps,designware-i2c"; - reg = <0x0 0x12040000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_I2C4_APB>; - clock-names = "ref"; - resets = <&syscrg JH7110_SYSRST_I2C4_APB>; - interrupts = <49>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - i2c5: i2c@12050000 { - compatible = "snps,designware-i2c"; - reg = <0x0 0x12050000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_I2C5_APB>; - clock-names = "ref"; - resets = <&syscrg JH7110_SYSRST_I2C5_APB>; - interrupts = <50>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - i2c6: i2c@12060000 { - compatible = "snps,designware-i2c"; - reg = <0x0 0x12060000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_I2C6_APB>; - clock-names = "ref"; - resets = <&syscrg JH7110_SYSRST_I2C6_APB>; - interrupts = <51>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - power-controller@17030000 { - compatible = "starfive,jh7110-pmu"; - reg = <0x0 0x17030000 0x0 0x10000>; - interrupts = <111>; - }; - - qspi: spi@13010000 { - compatible = "cdns,qspi-nor"; - reg = <0x0 0x13010000 0x0 0x10000 - 0x0 0x21000000 0x0 0x400000>; - clocks = <&syscrg JH7110_SYSCLK_QSPI_REF>; - clock-names = "clk_ref"; - resets = <&syscrg JH7110_SYSRST_QSPI_APB>, - <&syscrg JH7110_SYSRST_QSPI_AHB>, - <&syscrg JH7110_SYSRST_QSPI_REF>; - reset-names = "rst_apb", "rst_ahb", "rst_ref"; - cdns,fifo-depth = <256>; - cdns,fifo-width = <4>; - #address-cells = <1>; - #size-cells = <0>; - }; - - syscrg: clock-controller@13020000 { - compatible = "starfive,jh7110-syscrg"; - reg = <0x0 0x13020000 0x0 0x10000>; - clocks = <&osc>, <&gmac1_rmii_refin>, - <&gmac1_rgmii_rxin>, - <&i2stx_bclk_ext>, <&i2stx_lrck_ext>, - <&i2srx_bclk_ext>, <&i2srx_lrck_ext>, - <&tdm_ext>, <&mclk_ext>, - <&pllclk JH7110_SYSCLK_PLL0_OUT>, - <&pllclk JH7110_SYSCLK_PLL1_OUT>, - <&pllclk JH7110_SYSCLK_PLL2_OUT>; - clock-names = "osc", "gmac1_rmii_refin", - "gmac1_rgmii_rxin", - "i2stx_bclk_ext", "i2stx_lrck_ext", - "i2srx_bclk_ext", "i2srx_lrck_ext", - "tdm_ext", "mclk_ext", - "pll0_out", "pll1_out", "pll2_out"; - #clock-cells = <1>; - #reset-cells = <1>; - }; - - sys_syscon: sys_syscon@13030000 { - compatible = "starfive,jh7110-sys-syscon","syscon", "simple-mfd"; - reg = <0x0 0x13030000 0x0 0x1000>; - - pllclk: clock-controller { - compatible = "starfive,jh7110-pll"; - clocks = <&osc>; - #clock-cells = <1>; - }; - }; - - sysgpio: pinctrl@13040000 { - compatible = "starfive,jh7110-sys-pinctrl"; - reg = <0x0 0x13040000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_IOMUX_APB>; - resets = <&syscrg JH7110_SYSRST_IOMUX_APB>; - interrupts = <86>; - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - #gpio-cells = <2>; - }; - - watchdog@13070000 { - compatible = "starfive,jh7110-wdt"; - reg = <0x0 0x13070000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_WDT_APB>, - <&syscrg JH7110_SYSCLK_WDT_CORE>; - clock-names = "apb", "core"; - resets = <&syscrg JH7110_SYSRST_WDT_APB>, - <&syscrg JH7110_SYSRST_WDT_CORE>; - }; - - 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"; - }; - - gmac0: ethernet@16030000 { - compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20"; - reg = <0x0 0x16030000 0x0 0x10000>; - clocks = <&aoncrg JH7110_AONCLK_GMAC0_AXI>, - <&aoncrg JH7110_AONCLK_GMAC0_AHB>, - <&syscrg JH7110_SYSCLK_GMAC0_PTP>, - <&aoncrg JH7110_AONCLK_GMAC0_TX_INV>, - <&syscrg JH7110_SYSCLK_GMAC0_GTXC>; - clock-names = "stmmaceth", "pclk", "ptp_ref", - "tx", "gtx"; - resets = <&aoncrg JH7110_AONRST_GMAC0_AXI>, - <&aoncrg JH7110_AONRST_GMAC0_AHB>; - reset-names = "stmmaceth", "ahb"; - interrupts = <7>, <6>, <5>; - interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; - snps,multicast-filter-bins = <64>; - snps,perfect-filter-entries = <8>; - rx-fifo-depth = <2048>; - tx-fifo-depth = <2048>; - snps,fixed-burst; - snps,no-pbl-x8; - snps,force_thresh_dma_mode; - snps,axi-config = <&stmmac_axi_setup>; - snps,tso; - snps,en-tx-lpi-clockgating; - snps,txpbl = <16>; - snps,rxpbl = <16>; - starfive,syscon = <&aon_syscon 0xc 0x12>; - status = "disabled"; - }; - - gmac1: ethernet@16040000 { - compatible = "starfive,jh7110-dwmac", "snps,dwmac-5.20"; - reg = <0x0 0x16040000 0x0 0x10000>; - clocks = <&syscrg JH7110_SYSCLK_GMAC1_AXI>, - <&syscrg JH7110_SYSCLK_GMAC1_AHB>, - <&syscrg JH7110_SYSCLK_GMAC1_PTP>, - <&syscrg JH7110_SYSCLK_GMAC1_TX_INV>, - <&syscrg JH7110_SYSCLK_GMAC1_GTXC>; - clock-names = "stmmaceth", "pclk", "ptp_ref", - "tx", "gtx"; - resets = <&syscrg JH7110_SYSRST_GMAC1_AXI>, - <&syscrg JH7110_SYSRST_GMAC1_AHB>; - reset-names = "stmmaceth", "ahb"; - interrupts = <78>, <77>, <76>; - interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; - snps,multicast-filter-bins = <64>; - snps,perfect-filter-entries = <8>; - rx-fifo-depth = <2048>; - tx-fifo-depth = <2048>; - snps,fixed-burst; - snps,no-pbl-x8; - snps,force_thresh_dma_mode; - snps,axi-config = <&stmmac_axi_setup>; - snps,tso; - snps,en-tx-lpi-clockgating; - snps,txpbl = <16>; - snps,rxpbl = <16>; - starfive,syscon = <&sys_syscon 0x90 0x2>; - status = "disabled"; - }; - - rng: rng@1600c000 { - compatible = "starfive,jh7110-trng"; - reg = <0x0 0x1600C000 0x0 0x4000>; - clocks = <&stgcrg JH7110_STGCLK_SEC_HCLK>, - <&stgcrg JH7110_STGCLK_SEC_MISCAHB>; - clock-names = "hclk", "ahb"; - resets = <&stgcrg JH7110_STGRST_SEC_TOP_HRESETN>; - interrupts = <30>; - }; - - aoncrg: clock-controller@17000000 { - compatible = "starfive,jh7110-aoncrg"; - reg = <0x0 0x17000000 0x0 0x10000>; - clocks = <&osc>, <&rtc_osc>, - <&gmac0_rmii_refin>, <&gmac0_rgmii_rxin>, - <&syscrg JH7110_SYSCLK_STG_AXIAHB>, - <&syscrg JH7110_SYSCLK_APB_BUS>, - <&syscrg JH7110_SYSCLK_GMAC0_GTXCLK>; - clock-names = "osc", "rtc_osc", "gmac0_rmii_refin", - "gmac0_rgmii_rxin", "stg_axiahb", - "apb_bus", "gmac0_gtxclk"; - #clock-cells = <1>; - #reset-cells = <1>; - }; - - aon_syscon: aon_syscon@17010000 { - compatible = "starfive,jh7110-aon-syscon","syscon"; - reg = <0x0 0x17010000 0x0 0x1000>; - }; - - aongpio: pinctrl@17020000 { - compatible = "starfive,jh7110-aon-pinctrl"; - reg = <0x0 0x17020000 0x0 0x10000>; - resets = <&aoncrg JH7110_AONRST_IOMUX>; - interrupts = <85>; - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - #gpio-cells = <2>; - }; - - pcie0: pcie@2b000000 { - compatible = "starfive,jh7110-pcie"; - reg = <0x0 0x2b000000 0x0 0x1000000 - 0x9 0x40000000 0x0 0x10000000>; - reg-names = "reg", "config"; - #address-cells = <3>; - #size-cells = <2>; - #interrupt-cells = <1>; - ranges = <0x82000000 0x0 0x30000000 0x0 0x30000000 0x0 0x08000000>, - <0xc3000000 0x9 0x00000000 0x9 0x00000000 0x0 0x40000000>; - interrupts = <56>; - interrupt-parent = <&plic>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; - interrupt-map = <0x0 0x0 0x0 0x1 &plic 0x1>, - <0x0 0x0 0x0 0x2 &plic 0x2>, - <0x0 0x0 0x0 0x3 &plic 0x3>, - <0x0 0x0 0x0 0x4 &plic 0x4>; - msi-parent = <&plic>; - device_type = "pci"; - starfive,stg-syscon = <&stg_syscon 0xc0 0xc4 0x130 0x1b8>; - bus-range = <0x0 0xff>; - clocks = <&syscrg JH7110_SYSCLK_NOC_BUS_STG_AXI>, - <&stgcrg JH7110_STGCLK_PCIE0_TL>, - <&stgcrg JH7110_STGCLK_PCIE0_AXI>, - <&stgcrg JH7110_STGCLK_PCIE0_APB>; - clock-names = "noc", "tl", "axi", "apb"; - resets = <&stgcrg JH7110_STGRST_PCIE0_MST0>, - <&stgcrg JH7110_STGRST_PCIE0_SLV0>, - <&stgcrg JH7110_STGRST_PCIE0_SLV>, - <&stgcrg JH7110_STGRST_PCIE0_BRG>, - <&stgcrg JH7110_STGRST_PCIE0_CORE>, - <&stgcrg JH7110_STGRST_PCIE0_APB>; - reset-names = "mst0", "slv0", "slv", "brg", - "core", "apb"; - status = "disabled"; - }; - - pcie1: pcie@2c000000 { - compatible = "starfive,jh7110-pcie"; - reg = <0x0 0x2c000000 0x0 0x1000000 - 0x9 0xc0000000 0x0 0x10000000>; - reg-names = "reg", "config"; - #address-cells = <3>; - #size-cells = <2>; - #interrupt-cells = <1>; - ranges = <0x82000000 0x0 0x38000000 0x0 0x38000000 0x0 0x08000000>, - <0xc3000000 0x9 0x80000000 0x9 0x80000000 0x0 0x40000000>; - interrupts = <57>; - interrupt-parent = <&plic>; - interrupt-map-mask = <0x0 0x0 0x0 0x7>; - interrupt-map = <0x0 0x0 0x0 0x1 &plic 0x1>, - <0x0 0x0 0x0 0x2 &plic 0x2>, - <0x0 0x0 0x0 0x3 &plic 0x3>, - <0x0 0x0 0x0 0x4 &plic 0x4>; - msi-parent = <&plic>; - device_type = "pci"; - starfive,stg-syscon = <&stg_syscon 0x270 0x274 0x2e0 0x368>; - bus-range = <0x0 0xff>; - clocks = <&syscrg JH7110_SYSCLK_NOC_BUS_STG_AXI>, - <&stgcrg JH7110_STGCLK_PCIE1_TL>, - <&stgcrg JH7110_STGCLK_PCIE1_AXI>, - <&stgcrg JH7110_STGCLK_PCIE1_APB>; - clock-names = "noc", "tl", "axi", "apb"; - resets = <&stgcrg JH7110_STGRST_PCIE1_MST0>, - <&stgcrg JH7110_STGRST_PCIE1_SLV0>, - <&stgcrg JH7110_STGRST_PCIE1_SLV>, - <&stgcrg JH7110_STGRST_PCIE1_BRG>, - <&stgcrg JH7110_STGRST_PCIE1_CORE>, - <&stgcrg JH7110_STGRST_PCIE1_APB>; - reset-names = "mst0", "slv0", "slv", "brg", - "core", "apb"; - status = "disabled"; - }; - }; -}; diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig index 20f89ae679..cb86582fd6 100644 --- a/configs/starfive_visionfive2_defconfig +++ b/configs/starfive_visionfive2_defconfig @@ -9,7 +9,7 @@ CONFIG_SF_DEFAULT_SPEED=100000000 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0xf0000 CONFIG_SPL_DM_SPI=y -CONFIG_DEFAULT_DEVICE_TREE="jh7110-starfive-visionfive-2" +CONFIG_DEFAULT_DEVICE_TREE="starfive/jh7110-starfive-visionfive-2-v1.3b" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SPL_MMC=y diff --git a/drivers/clk/starfive/clk-jh7110-pll.c b/drivers/clk/starfive/clk-jh7110-pll.c index 6d2bfb3ecb..f8af17227c 100644 --- a/drivers/clk/starfive/clk-jh7110-pll.c +++ b/drivers/clk/starfive/clk-jh7110-pll.c @@ -374,13 +374,13 @@ static int jh7110_pll_clk_probe(struct udevice *dev) if (sysreg == FDT_ADDR_T_NONE) return -EINVAL; - clk_dm(JH7110_PLL_ID_TRANS(JH7110_SYSCLK_PLL0_OUT), + clk_dm(JH7110_PLL_ID_TRANS(JH7110_PLLCLK_PLL0_OUT), starfive_jh7110_pll("pll0_out", "oscillator", reg, (void __iomem *)sysreg, &starfive_jh7110_pll0)); - clk_dm(JH7110_PLL_ID_TRANS(JH7110_SYSCLK_PLL1_OUT), + clk_dm(JH7110_PLL_ID_TRANS(JH7110_PLLCLK_PLL1_OUT), starfive_jh7110_pll("pll1_out", "oscillator", reg, (void __iomem *)sysreg, &starfive_jh7110_pll1)); - clk_dm(JH7110_PLL_ID_TRANS(JH7110_SYSCLK_PLL2_OUT), + clk_dm(JH7110_PLL_ID_TRANS(JH7110_PLLCLK_PLL2_OUT), starfive_jh7110_pll("pll2_out", "oscillator", reg, (void __iomem *)sysreg, &starfive_jh7110_pll2)); diff --git a/drivers/clk/starfive/clk-jh7110.c b/drivers/clk/starfive/clk-jh7110.c index 191da75d7b..6387e949d5 100644 --- a/drivers/clk/starfive/clk-jh7110.c +++ b/drivers/clk/starfive/clk-jh7110.c @@ -495,37 +495,37 @@ static int jh7110_stgcrg_init(struct udevice *dev) { struct jh7110_clk_priv *priv = dev_get_priv(dev); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB_APB), + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB0_APB), starfive_clk_gate(priv->reg, "usb_apb", "apb_bus", - OFFSET(JH7110_STGCLK_USB_APB))); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB_UTMI_APB), + OFFSET(JH7110_STGCLK_USB0_APB))); + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB0_UTMI_APB), starfive_clk_gate(priv->reg, "usb_utmi_apb", "apb_bus", - OFFSET(JH7110_STGCLK_USB_UTMI_APB))); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB_AXI), + OFFSET(JH7110_STGCLK_USB0_UTMI_APB))); + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB0_AXI), starfive_clk_gate(priv->reg, "usb_axi", "stg_axiahb", - OFFSET(JH7110_STGCLK_USB_AXI))); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB_LPM), + OFFSET(JH7110_STGCLK_USB0_AXI))); + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB0_LPM), starfive_clk_gate_divider(priv->reg, "usb_lpm", "oscillator", - OFFSET(JH7110_STGCLK_USB_LPM), 2)); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB_STB), + OFFSET(JH7110_STGCLK_USB0_LPM), 2)); + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB0_STB), starfive_clk_gate_divider(priv->reg, "usb_stb", "oscillator", - OFFSET(JH7110_STGCLK_USB_STB), 3)); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB_APP_125), + OFFSET(JH7110_STGCLK_USB0_STB), 3)); + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB0_APP_125), starfive_clk_gate(priv->reg, "usb_app_125", "usb_125m", - OFFSET(JH7110_STGCLK_USB_APP_125))); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB_REFCLK), + OFFSET(JH7110_STGCLK_USB0_APP_125))); + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_USB0_REFCLK), starfive_clk_divider(priv->reg, "usb_refclk", "oscillator", - OFFSET(JH7110_STGCLK_USB_REFCLK), 2)); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_PCIE0_AXI), + OFFSET(JH7110_STGCLK_USB0_REFCLK), 2)); + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_PCIE0_AXI_MST0), starfive_clk_gate(priv->reg, "pcie0_axi", "stg_axiahb", - OFFSET(JH7110_STGCLK_PCIE0_AXI))); + OFFSET(JH7110_STGCLK_PCIE0_AXI_MST0))); clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_PCIE0_APB), starfive_clk_gate(priv->reg, "pcie0_apb", "apb_bus", @@ -534,10 +534,10 @@ static int jh7110_stgcrg_init(struct udevice *dev) starfive_clk_gate(priv->reg, "pcie0_tl", "stg_axiahb", OFFSET(JH7110_STGCLK_PCIE0_TL))); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_PCIE1_AXI), + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_PCIE1_AXI_MST0), starfive_clk_gate(priv->reg, "pcie1_axi", "stg_axiahb", - OFFSET(JH7110_STGCLK_PCIE1_AXI))); + OFFSET(JH7110_STGCLK_PCIE1_AXI_MST0))); clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_PCIE1_APB), starfive_clk_gate(priv->reg, "pcie1_apb", "apb_bus", @@ -548,14 +548,14 @@ static int jh7110_stgcrg_init(struct udevice *dev) OFFSET(JH7110_STGCLK_PCIE1_TL))); /* Security clocks */ - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_SEC_HCLK), + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_SEC_AHB), starfive_clk_gate(priv->reg, "sec_ahb", "stg_axiahb", - OFFSET(JH7110_STGCLK_SEC_HCLK))); - clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_SEC_MISCAHB), + OFFSET(JH7110_STGCLK_SEC_AHB))); + clk_dm(JH7110_STG_ID_TRANS(JH7110_STGCLK_SEC_MISC_AHB), starfive_clk_gate(priv->reg, "sec_misc_ahb", "stg_axiahb", - OFFSET(JH7110_STGCLK_SEC_MISCAHB))); + OFFSET(JH7110_STGCLK_SEC_MISC_AHB))); return 0; } diff --git a/include/dt-bindings/clock/starfive,jh7110-crg.h b/include/dt-bindings/clock/starfive,jh7110-crg.h deleted file mode 100644 index b51e3829ff..0000000000 --- a/include/dt-bindings/clock/starfive,jh7110-crg.h +++ /dev/null @@ -1,258 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2022 StarFive Technology Co., Ltd. - * - * Author: Yanhong Wang - */ - -#ifndef __DT_BINDINGS_CLOCK_STARFIVE_JH7110_H__ -#define __DT_BINDINGS_CLOCK_STARFIVE_JH7110_H__ - -#define JH7110_SYSCLK_PLL0_OUT 0 -#define JH7110_SYSCLK_PLL1_OUT 1 -#define JH7110_SYSCLK_PLL2_OUT 2 -#define JH7110_PLLCLK_END 3 - -#define JH7110_SYSCLK_CPU_ROOT 0 -#define JH7110_SYSCLK_CPU_CORE 1 -#define JH7110_SYSCLK_CPU_BUS 2 -#define JH7110_SYSCLK_GPU_ROOT 3 -#define JH7110_SYSCLK_PERH_ROOT 4 -#define JH7110_SYSCLK_BUS_ROOT 5 -#define JH7110_SYSCLK_NOCSTG_BUS 6 -#define JH7110_SYSCLK_AXI_CFG0 7 -#define JH7110_SYSCLK_STG_AXIAHB 8 -#define JH7110_SYSCLK_AHB0 9 -#define JH7110_SYSCLK_AHB1 10 -#define JH7110_SYSCLK_APB_BUS 11 -#define JH7110_SYSCLK_APB0 12 -#define JH7110_SYSCLK_PLL0_DIV2 13 -#define JH7110_SYSCLK_PLL1_DIV2 14 -#define JH7110_SYSCLK_PLL2_DIV2 15 -#define JH7110_SYSCLK_AUDIO_ROOT 16 -#define JH7110_SYSCLK_MCLK_INNER 17 -#define JH7110_SYSCLK_MCLK 18 -#define JH7110_SYSCLK_MCLK_OUT 19 -#define JH7110_SYSCLK_ISP_2X 20 -#define JH7110_SYSCLK_ISP_AXI 21 -#define JH7110_SYSCLK_GCLK0 22 -#define JH7110_SYSCLK_GCLK1 23 -#define JH7110_SYSCLK_GCLK2 24 -#define JH7110_SYSCLK_CORE 25 -#define JH7110_SYSCLK_CORE1 26 -#define JH7110_SYSCLK_CORE2 27 -#define JH7110_SYSCLK_CORE3 28 -#define JH7110_SYSCLK_CORE4 29 -#define JH7110_SYSCLK_DEBUG 30 -#define JH7110_SYSCLK_RTC_TOGGLE 31 -#define JH7110_SYSCLK_TRACE0 32 -#define JH7110_SYSCLK_TRACE1 33 -#define JH7110_SYSCLK_TRACE2 34 -#define JH7110_SYSCLK_TRACE3 35 -#define JH7110_SYSCLK_TRACE4 36 -#define JH7110_SYSCLK_TRACE_COM 37 -#define JH7110_SYSCLK_NOC_BUS_CPU_AXI 38 -#define JH7110_SYSCLK_NOC_BUS_AXICFG0_AXI 39 -#define JH7110_SYSCLK_OSC_DIV2 40 -#define JH7110_SYSCLK_PLL1_DIV4 41 -#define JH7110_SYSCLK_PLL1_DIV8 42 -#define JH7110_SYSCLK_DDR_BUS 43 -#define JH7110_SYSCLK_DDR_AXI 44 -#define JH7110_SYSCLK_GPU_CORE 45 -#define JH7110_SYSCLK_GPU_CORE_CLK 46 -#define JH7110_SYSCLK_GPU_SYS_CLK 47 -#define JH7110_SYSCLK_GPU_APB 48 -#define JH7110_SYSCLK_GPU_RTC_TOGGLE 49 -#define JH7110_SYSCLK_NOC_BUS_GPU_AXI 50 -#define JH7110_SYSCLK_ISP_TOP_CLK_ISPCORE_2X 51 -#define JH7110_SYSCLK_ISP_TOP_CLK_ISP_AXI 52 -#define JH7110_SYSCLK_NOC_BUS_ISP_AXI 53 -#define JH7110_SYSCLK_HIFI4_CORE 54 -#define JH7110_SYSCLK_HIFI4_AXI 55 -#define JH7110_SYSCLK_AXI_CFG1_DEC_MAIN 56 -#define JH7110_SYSCLK_AXI_CFG1_DEC_AHB 57 -#define JH7110_SYSCLK_VOUT_SRC 58 -#define JH7110_SYSCLK_VOUT_AXI 59 -#define JH7110_SYSCLK_NOC_BUS_DISP_AXI 60 -#define JH7110_SYSCLK_VOUT_TOP_CLK_VOUT_AHB 61 -#define JH7110_SYSCLK_VOUT_TOP_CLK_VOUT_AXI 62 -#define JH7110_SYSCLK_VOUT_TOP_CLK_HDMITX0_MCLK 63 -#define JH7110_SYSCLK_VOUT_TOP_CLK_MIPIPHY_REF 64 -#define JH7110_SYSCLK_JPEGC_AXI 65 -#define JH7110_SYSCLK_CODAJ12_AXI 66 -#define JH7110_SYSCLK_CODAJ12_CORE 67 -#define JH7110_SYSCLK_CODAJ12_APB 68 -#define JH7110_SYSCLK_VDEC_AXI 69 -#define JH7110_SYSCLK_WAVE511_AXI 70 -#define JH7110_SYSCLK_WAVE511_BPU 71 -#define JH7110_SYSCLK_WAVE511_VCE 72 -#define JH7110_SYSCLK_WAVE511_APB 73 -#define JH7110_SYSCLK_VDEC_JPG_ARB_JPG 74 -#define JH7110_SYSCLK_VDEC_JPG_ARB_MAIN 75 -#define JH7110_SYSCLK_NOC_BUS_VDEC_AXI 76 -#define JH7110_SYSCLK_VENC_AXI 77 -#define JH7110_SYSCLK_WAVE420L_AXI 78 -#define JH7110_SYSCLK_WAVE420L_BPU 79 -#define JH7110_SYSCLK_WAVE420L_VCE 80 -#define JH7110_SYSCLK_WAVE420L_APB 81 -#define JH7110_SYSCLK_NOC_BUS_VENC_AXI 82 -#define JH7110_SYSCLK_AXI_CFG0_DEC_MAIN_DIV 83 -#define JH7110_SYSCLK_AXI_CFG0_DEC_MAIN 84 -#define JH7110_SYSCLK_AXI_CFG0_DEC_HIFI4 85 -#define JH7110_SYSCLK_AXIMEM2_AXI 86 -#define JH7110_SYSCLK_QSPI_AHB 87 -#define JH7110_SYSCLK_QSPI_APB 88 -#define JH7110_SYSCLK_QSPI_REF_SRC 89 -#define JH7110_SYSCLK_QSPI_REF 90 -#define JH7110_SYSCLK_SDIO0_AHB 91 -#define JH7110_SYSCLK_SDIO1_AHB 92 -#define JH7110_SYSCLK_SDIO0_SDCARD 93 -#define JH7110_SYSCLK_SDIO1_SDCARD 94 -#define JH7110_SYSCLK_USB_125M 95 -#define JH7110_SYSCLK_NOC_BUS_STG_AXI 96 -#define JH7110_SYSCLK_GMAC1_AHB 97 -#define JH7110_SYSCLK_GMAC1_AXI 98 -#define JH7110_SYSCLK_GMAC_SRC 99 -#define JH7110_SYSCLK_GMAC1_GTXCLK 100 -#define JH7110_SYSCLK_GMAC1_RMII_RTX 101 -#define JH7110_SYSCLK_GMAC1_PTP 102 -#define JH7110_SYSCLK_GMAC1_RX 103 -#define JH7110_SYSCLK_GMAC1_RX_INV 104 -#define JH7110_SYSCLK_GMAC1_TX 105 -#define JH7110_SYSCLK_GMAC1_TX_INV 106 -#define JH7110_SYSCLK_GMAC1_GTXC 107 -#define JH7110_SYSCLK_GMAC0_GTXCLK 108 -#define JH7110_SYSCLK_GMAC0_PTP 109 -#define JH7110_SYSCLK_GMAC_PHY 110 -#define JH7110_SYSCLK_GMAC0_GTXC 111 -#define JH7110_SYSCLK_IOMUX_APB 112 -#define JH7110_SYSCLK_MAILBOX 113 -#define JH7110_SYSCLK_INT_CTRL_APB 114 -#define JH7110_SYSCLK_CAN0_APB 115 -#define JH7110_SYSCLK_CAN0_TIMER 116 -#define JH7110_SYSCLK_CAN0_CAN 117 -#define JH7110_SYSCLK_CAN1_APB 118 -#define JH7110_SYSCLK_CAN1_TIMER 119 -#define JH7110_SYSCLK_CAN1_CAN 120 -#define JH7110_SYSCLK_PWM_APB 121 -#define JH7110_SYSCLK_WDT_APB 122 -#define JH7110_SYSCLK_WDT_CORE 123 -#define JH7110_SYSCLK_TIMER_APB 124 -#define JH7110_SYSCLK_TIMER0 125 -#define JH7110_SYSCLK_TIMER1 126 -#define JH7110_SYSCLK_TIMER2 127 -#define JH7110_SYSCLK_TIMER3 128 -#define JH7110_SYSCLK_TEMP_APB 129 -#define JH7110_SYSCLK_TEMP_CORE 130 -#define JH7110_SYSCLK_SPI0_APB 131 -#define JH7110_SYSCLK_SPI1_APB 132 -#define JH7110_SYSCLK_SPI2_APB 133 -#define JH7110_SYSCLK_SPI3_APB 134 -#define JH7110_SYSCLK_SPI4_APB 135 -#define JH7110_SYSCLK_SPI5_APB 136 -#define JH7110_SYSCLK_SPI6_APB 137 -#define JH7110_SYSCLK_I2C0_APB 138 -#define JH7110_SYSCLK_I2C1_APB 139 -#define JH7110_SYSCLK_I2C2_APB 140 -#define JH7110_SYSCLK_I2C3_APB 141 -#define JH7110_SYSCLK_I2C4_APB 142 -#define JH7110_SYSCLK_I2C5_APB 143 -#define JH7110_SYSCLK_I2C6_APB 144 -#define JH7110_SYSCLK_UART0_APB 145 -#define JH7110_SYSCLK_UART0_CORE 146 -#define JH7110_SYSCLK_UART1_APB 147 -#define JH7110_SYSCLK_UART1_CORE 148 -#define JH7110_SYSCLK_UART2_APB 149 -#define JH7110_SYSCLK_UART2_CORE 150 -#define JH7110_SYSCLK_UART3_APB 151 -#define JH7110_SYSCLK_UART3_CORE 152 -#define JH7110_SYSCLK_UART4_APB 153 -#define JH7110_SYSCLK_UART4_CORE 154 -#define JH7110_SYSCLK_UART5_APB 155 -#define JH7110_SYSCLK_UART5_CORE 156 -#define JH7110_SYSCLK_PWMDAC_APB 157 -#define JH7110_SYSCLK_PWMDAC_CORE 158 -#define JH7110_SYSCLK_SPDIF_APB 159 -#define JH7110_SYSCLK_SPDIF_CORE 160 -#define JH7110_SYSCLK_I2STX0_APB 161 -#define JH7110_SYSCLK_I2STX0_BCLK_MST 162 -#define JH7110_SYSCLK_I2STX0_BCLK_MST_INV 163 -#define JH7110_SYSCLK_I2STX0_LRCK_MST 164 -#define JH7110_SYSCLK_I2STX0_BCLK 165 -#define JH7110_SYSCLK_I2STX0_BCLK_INV 166 -#define JH7110_SYSCLK_I2STX0_LRCK 167 -#define JH7110_SYSCLK_I2STX1_APB 168 -#define JH7110_SYSCLK_I2STX1_BCLK_MST 169 -#define JH7110_SYSCLK_I2STX1_BCLK_MST_INV 170 -#define JH7110_SYSCLK_I2STX1_LRCK_MST 171 -#define JH7110_SYSCLK_I2STX1_BCLK 172 -#define JH7110_SYSCLK_I2STX1_BCLK_INV 173 -#define JH7110_SYSCLK_I2STX1_LRCK 174 -#define JH7110_SYSCLK_I2SRX_APB 175 -#define JH7110_SYSCLK_I2SRX_BCLK_MST 176 -#define JH7110_SYSCLK_I2SRX_BCLK_MST_INV 177 -#define JH7110_SYSCLK_I2SRX_LRCK_MST 178 -#define JH7110_SYSCLK_I2SRX_BCLK 179 -#define JH7110_SYSCLK_I2SRX_BCLK_INV 180 -#define JH7110_SYSCLK_I2SRX_LRCK 181 -#define JH7110_SYSCLK_PDM_DMIC 182 -#define JH7110_SYSCLK_PDM_APB 183 -#define JH7110_SYSCLK_TDM_AHB 184 -#define JH7110_SYSCLK_TDM_APB 185 -#define JH7110_SYSCLK_TDM_INTERNAL 186 -#define JH7110_SYSCLK_TDM_CLK_TDM 187 -#define JH7110_SYSCLK_TDM_CLK_TDM_N 188 -#define JH7110_SYSCLK_JTAG_CERTIFICATION_TRNG 189 - -#define JH7110_SYSCLK_END 190 - -#define JH7110_AONCLK_OSC_DIV4 0 -#define JH7110_AONCLK_APB_FUNC 1 -#define JH7110_AONCLK_GMAC0_AHB 2 -#define JH7110_AONCLK_GMAC0_AXI 3 -#define JH7110_AONCLK_GMAC0_RMII_RTX 4 -#define JH7110_AONCLK_GMAC0_TX 5 -#define JH7110_AONCLK_GMAC0_TX_INV 6 -#define JH7110_AONCLK_GMAC0_RX 7 -#define JH7110_AONCLK_GMAC0_RX_INV 8 -#define JH7110_AONCLK_OTPC_APB 9 -#define JH7110_AONCLK_RTC_APB 10 -#define JH7110_AONCLK_RTC_INTERNAL 11 -#define JH7110_AONCLK_RTC_32K 12 -#define JH7110_AONCLK_RTC_CAL 13 - -#define JH7110_AONCLK_END 14 - -#define JH7110_STGCLK_HIFI4_CORE 0 -#define JH7110_STGCLK_USB_APB 1 -#define JH7110_STGCLK_USB_UTMI_APB 2 -#define JH7110_STGCLK_USB_AXI 3 -#define JH7110_STGCLK_USB_LPM 4 -#define JH7110_STGCLK_USB_STB 5 -#define JH7110_STGCLK_USB_APP_125 6 -#define JH7110_STGCLK_USB_REFCLK 7 -#define JH7110_STGCLK_PCIE0_AXI 8 -#define JH7110_STGCLK_PCIE0_APB 9 -#define JH7110_STGCLK_PCIE0_TL 10 -#define JH7110_STGCLK_PCIE1_AXI 11 -#define JH7110_STGCLK_PCIE1_APB 12 -#define JH7110_STGCLK_PCIE1_TL 13 -#define JH7110_STGCLK_PCIE01_MAIN 14 -#define JH7110_STGCLK_SEC_HCLK 15 -#define JH7110_STGCLK_SEC_MISCAHB 16 -#define JH7110_STGCLK_MTRX_GRP0_MAIN 17 -#define JH7110_STGCLK_MTRX_GRP0_BUS 18 -#define JH7110_STGCLK_MTRX_GRP0_STG 19 -#define JH7110_STGCLK_MTRX_GRP1_MAIN 20 -#define JH7110_STGCLK_MTRX_GRP1_BUS 21 -#define JH7110_STGCLK_MTRX_GRP1_STG 22 -#define JH7110_STGCLK_MTRX_GRP1_HIFI 23 -#define JH7110_STGCLK_E2_RTC 24 -#define JH7110_STGCLK_E2_CORE 25 -#define JH7110_STGCLK_E2_DBG 26 -#define JH7110_STGCLK_DMA1P_AXI 27 -#define JH7110_STGCLK_DMA1P_AHB 28 - -#define JH7110_STGCLK_END 29 - -#endif /* __DT_BINDINGS_CLOCK_STARFIVE_JH7110_H__ */ diff --git a/include/dt-bindings/reset/starfive,jh7110-crg.h b/include/dt-bindings/reset/starfive,jh7110-crg.h deleted file mode 100644 index 1d596581da..0000000000 --- a/include/dt-bindings/reset/starfive,jh7110-crg.h +++ /dev/null @@ -1,183 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2022 StarFive Technology Co., Ltd. - * - * Author: Yanhong Wang - */ - -#ifndef __DT_BINDINGS_RESET_STARFIVE_JH7110_H__ -#define __DT_BINDINGS_RESET_STARFIVE_JH7110_H__ - -/* SYSCRG resets */ -#define JH7110_SYSRST_JTAG2APB 0 -#define JH7110_SYSRST_SYSCON 1 -#define JH7110_SYSRST_IOMUX_APB 2 -#define JH7110_SYSRST_BUS 3 -#define JH7110_SYSRST_DEBUG 4 -#define JH7110_SYSRST_CORE0 5 -#define JH7110_SYSRST_CORE1 6 -#define JH7110_SYSRST_CORE2 7 -#define JH7110_SYSRST_CORE3 8 -#define JH7110_SYSRST_CORE4 9 -#define JH7110_SYSRST_CORE0_ST 10 -#define JH7110_SYSRST_CORE1_ST 11 -#define JH7110_SYSRST_CORE2_ST 12 -#define JH7110_SYSRST_CORE3_ST 13 -#define JH7110_SYSRST_CORE4_ST 14 -#define JH7110_SYSRST_TRACE0 15 -#define JH7110_SYSRST_TRACE1 16 -#define JH7110_SYSRST_TRACE2 17 -#define JH7110_SYSRST_TRACE3 18 -#define JH7110_SYSRST_TRACE4 19 -#define JH7110_SYSRST_TRACE_COM 20 -#define JH7110_SYSRST_GPU_APB 21 -#define JH7110_SYSRST_GPU_DOMA 22 -#define JH7110_SYSRST_NOC_BUS_APB_BUS 23 -#define JH7110_SYSRST_NOC_BUS_AXICFG0_AXI 24 -#define JH7110_SYSRST_NOC_BUS_CPU_AXI 25 -#define JH7110_SYSRST_NOC_BUS_DISP_AXI 26 -#define JH7110_SYSRST_NOC_BUS_GPU_AXI 27 -#define JH7110_SYSRST_NOC_BUS_ISP_AXI 28 -#define JH7110_SYSRST_NOC_BUS_DDRC 29 -#define JH7110_SYSRST_NOC_BUS_STG_AXI 30 -#define JH7110_SYSRST_NOC_BUS_VDEC_AXI 31 - -#define JH7110_SYSRST_NOC_BUS_VENC_AXI 32 -#define JH7110_SYSRST_AXI_CFG1_DEC_AHB 33 -#define JH7110_SYSRST_AXI_CFG1_DEC_MAIN 34 -#define JH7110_SYSRST_AXI_CFG0_DEC_MAIN 35 -#define JH7110_SYSRST_AXI_CFG0_DEC_MAIN_DIV 36 -#define JH7110_SYSRST_AXI_CFG0_DEC_HIFI4 37 -#define JH7110_SYSRST_DDR_AXI 38 -#define JH7110_SYSRST_DDR_OSC 39 -#define JH7110_SYSRST_DDR_APB 40 -#define JH7110_SYSRST_DOM_ISP_TOP_N 41 -#define JH7110_SYSRST_DOM_ISP_TOP_AXI 42 -#define JH7110_SYSRST_DOM_VOUT_TOP_SRC 43 -#define JH7110_SYSRST_CODAJ12_AXI 44 -#define JH7110_SYSRST_CODAJ12_CORE 45 -#define JH7110_SYSRST_CODAJ12_APB 46 -#define JH7110_SYSRST_WAVE511_AXI 47 -#define JH7110_SYSRST_WAVE511_BPU 48 -#define JH7110_SYSRST_WAVE511_VCE 49 -#define JH7110_SYSRST_WAVE511_APB 50 -#define JH7110_SYSRST_VDEC_JPG_ARB_JPG 51 -#define JH7110_SYSRST_VDEC_JPG_ARB_MAIN 52 -#define JH7110_SYSRST_AXIMEM0_AXI 53 -#define JH7110_SYSRST_WAVE420L_AXI 54 -#define JH7110_SYSRST_WAVE420L_BPU 55 -#define JH7110_SYSRST_WAVE420L_VCE 56 -#define JH7110_SYSRST_WAVE420L_APB 57 -#define JH7110_SYSRST_AXIMEM1_AXI 58 -#define JH7110_SYSRST_AXIMEM2_AXI 59 -#define JH7110_SYSRST_INTMEM 60 -#define JH7110_SYSRST_QSPI_AHB 61 -#define JH7110_SYSRST_QSPI_APB 62 -#define JH7110_SYSRST_QSPI_REF 63 - -#define JH7110_SYSRST_SDIO0_AHB 64 -#define JH7110_SYSRST_SDIO1_AHB 65 -#define JH7110_SYSRST_GMAC1_AXI 66 -#define JH7110_SYSRST_GMAC1_AHB 67 -#define JH7110_SYSRST_MAILBOX 68 -#define JH7110_SYSRST_SPI0_APB 69 -#define JH7110_SYSRST_SPI1_APB 70 -#define JH7110_SYSRST_SPI2_APB 71 -#define JH7110_SYSRST_SPI3_APB 72 -#define JH7110_SYSRST_SPI4_APB 73 -#define JH7110_SYSRST_SPI5_APB 74 -#define JH7110_SYSRST_SPI6_APB 75 -#define JH7110_SYSRST_I2C0_APB 76 -#define JH7110_SYSRST_I2C1_APB 77 -#define JH7110_SYSRST_I2C2_APB 78 -#define JH7110_SYSRST_I2C3_APB 79 -#define JH7110_SYSRST_I2C4_APB 80 -#define JH7110_SYSRST_I2C5_APB 81 -#define JH7110_SYSRST_I2C6_APB 82 -#define JH7110_SYSRST_UART0_APB 83 -#define JH7110_SYSRST_UART0_CORE 84 -#define JH7110_SYSRST_UART1_APB 85 -#define JH7110_SYSRST_UART1_CORE 86 -#define JH7110_SYSRST_UART2_APB 87 -#define JH7110_SYSRST_UART2_CORE 88 -#define JH7110_SYSRST_UART3_APB 89 -#define JH7110_SYSRST_UART3_CORE 90 -#define JH7110_SYSRST_UART4_APB 91 -#define JH7110_SYSRST_UART4_CORE 92 -#define JH7110_SYSRST_UART5_APB 93 -#define JH7110_SYSRST_UART5_CORE 94 -#define JH7110_SYSRST_SPDIF_APB 95 - -#define JH7110_SYSRST_PWMDAC_APB 96 -#define JH7110_SYSRST_PDM_DMIC 97 -#define JH7110_SYSRST_PDM_APB 98 -#define JH7110_SYSRST_I2SRX_APB 99 -#define JH7110_SYSRST_I2SRX_BCLK 100 -#define JH7110_SYSRST_I2STX0_APB 101 -#define JH7110_SYSRST_I2STX0_BCLK 102 -#define JH7110_SYSRST_I2STX1_APB 103 -#define JH7110_SYSRST_I2STX1_BCLK 104 -#define JH7110_SYSRST_TDM_AHB 105 -#define JH7110_SYSRST_TDM_CORE 106 -#define JH7110_SYSRST_TDM_APB 107 -#define JH7110_SYSRST_PWM_APB 108 -#define JH7110_SYSRST_WDT_APB 109 -#define JH7110_SYSRST_WDT_CORE 110 -#define JH7110_SYSRST_CAN0_APB 111 -#define JH7110_SYSRST_CAN0_CORE 112 -#define JH7110_SYSRST_CAN0_TIMER 113 -#define JH7110_SYSRST_CAN1_APB 114 -#define JH7110_SYSRST_CAN1_CORE 115 -#define JH7110_SYSRST_CAN1_TIMER 116 -#define JH7110_SYSRST_TIMER_APB 117 -#define JH7110_SYSRST_TIMER0 118 -#define JH7110_SYSRST_TIMER1 119 -#define JH7110_SYSRST_TIMER2 120 -#define JH7110_SYSRST_TIMER3 121 -#define JH7110_SYSRST_INT_CTRL_APB 122 -#define JH7110_SYSRST_TEMP_APB 123 -#define JH7110_SYSRST_TEMP_CORE 124 -#define JH7110_SYSRST_JTAG_CERTIFICATION 125 - -#define JH7110_SYSRST_END 126 - -/* AONCRG resets */ -#define JH7110_AONRST_GMAC0_AXI 0 -#define JH7110_AONRST_GMAC0_AHB 1 -#define JH7110_AONRST_IOMUX 2 -#define JH7110_AONRST_PMU_APB 3 -#define JH7110_AONRST_PMU_WKUP 4 -#define JH7110_AONRST_RTC_APB 5 -#define JH7110_AONRST_RTC_CAL 6 -#define JH7110_AONRST_RTC_32K 7 - -#define JH7110_AONRST_END 8 - -/* STGCRG resets */ -#define JH7110_STGRST_SYSCON_PRESETN 0 -#define JH7110_STGRST_HIFI4_CORE 1 -#define JH7110_STGRST_HIFI4_AXI 2 -#define JH7110_STGRST_SEC_TOP_HRESETN 3 -#define JH7110_STGRST_E24_CORE 4 -#define JH7110_STGRST_DMA1P_AXI 5 -#define JH7110_STGRST_DMA1P_AHB 6 -#define JH7110_STGRST_USB_AXI 7 -#define JH7110_STGRST_USB_APB 8 -#define JH7110_STGRST_USB_UTMI_APB 9 -#define JH7110_STGRST_USB_PWRUP 10 -#define JH7110_STGRST_PCIE0_MST0 11 -#define JH7110_STGRST_PCIE0_SLV0 12 -#define JH7110_STGRST_PCIE0_SLV 13 -#define JH7110_STGRST_PCIE0_BRG 14 -#define JH7110_STGRST_PCIE0_CORE 15 -#define JH7110_STGRST_PCIE0_APB 16 -#define JH7110_STGRST_PCIE1_MST0 17 -#define JH7110_STGRST_PCIE1_SLV0 18 -#define JH7110_STGRST_PCIE1_SLV 19 -#define JH7110_STGRST_PCIE1_BRG 20 -#define JH7110_STGRST_PCIE1_CORE 21 -#define JH7110_STGRST_PCIE1_APB 22 - -#define JH7110_STGRST_END 23 - -#endif /* __DT_BINDINGS_RESET_STARFIVE_JH7110_H__ */ From patchwork Sun Dec 8 09:19:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019738 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m375KPTz1yQl for ; Mon, 9 Dec 2024 00:25:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BB7A488B0A; Sun, 8 Dec 2024 14:25:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id F419A89502; Sun, 8 Dec 2024 10:21:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20706.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2DB8189502 for ; Sun, 8 Dec 2024 10:21:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SW/l/rTSc0YI7rZclaGo7BZRWSYTrzqUKDkXDPAzlwyTxjDQ7iGo6dVdKOrwFJcqHiQGxFWB0V5Ma035JeLb53I/v+CAROQt1eiaqAccWp3gufcYLkGJOO380X/axycMY8sUevTd6BANCJv7/qDD/WtCPuZKGdCUMRZDmonmxri8zdSaIzfHGI+NC3skbvWhO8AHjk7a8ADaatPSPqgJfqM/MEks8OPYo9m3zzG1BqLVv7rzSQU8HgQ+GPeTsRB0DaPMEdxyJTwEyHiXxml4Is1JWetKI4Uj2KOOeWrTx4m6QuquE3THOoo9dD9VjFGoqvM6nt4Q2zCu51KqAUuGKA== 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=GZAH0jCr3ds01+BCCzH8mhzYqVdJGvcKImfYC8L2xWo=; b=auoK7GPsVPPGSHivtU0vi9RhieN4h6T9HDvJwIl2l9ARykTwlwnAnnn9xhRPttaArM2fwfod3BbNCkbRJslbWpy2o0uvuGWWsnF8ZYRWUw9jEQ4iTRXx5TEg3k7zrHVev8j4BizcPdfXA4U2BX/1igTjKHDkbEAfWczttMY+iA53kuk2tPcHrrT9hYWP/BHsXJSk2P19v4fyAxV466Qc1KRNTt8G25y57oH9YuCqyoPuiAm8LoNeV62cKF2ktczIH/76RHrW5JEgqFJq8J7QoS75X0ND7zdX4WSyuFL9P9bvrRQaFDHaRBUaahGWglt9b39LG/+fs87LApFKpNuUcg== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:34 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:34 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 02/12] riscv: dts: jh7110: Make u-boot device trees adapting to upstream DT Date: Sun, 8 Dec 2024 17:19:32 +0800 Message-ID: <20241208091942.47298-3-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: d2004e9e-33ee-42f8-33e4-08dd1769b5ec X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: nzli/eTUL2IKyWAIyq92I5Xe2++fiqUttY5wMhEoM3leeV5c9PMHipeBWtlp8uNPw9E1iZ5mVFT+cEeOa0gv8Kw3rOqdPPgkU0PqvmU53i5fwMFiIopKxExq247hBCj7v33om1ULWmZz2c76gL8fq8lrA9b2qN37134O+HdVpFkZd/Fwv1SsSMi8GHw5fTcgQN0KYSQV5t/Ppj51fJJE4ymfl9+HympXDil/qxHXHwFo6LBIX9FHQFubsJLgeJtbWJ3JoD0lmOwOUUHJgJdd9p/pzJoXPQGr/5n/r1IiL/bhPnGZCJ24T7ZKEJlC3jr+Aaf1SCwNjXsvCjarB6qXHXkKrkAGjl80gayunn86qaNnpgnxs5BXlp79ZyTz6k9G01uUEPkw/HhvT9FKDqu5DDt5gqGi8lPrpwLBgOMeylUKkaUsdLHqn52hZiChCSooXzi/g3jl4j1y6++pS6KwT0h9rDqMMzs0pQBIDSHF1e+SnsM+TX6AGbi8HuereLTerHWjXYEzVaqW8B49vUa2Vgo8If7V/L8aEQE80cqIX1XtNWEXEbJ+BqlmNO3uS9tCoCALILjS+0QLkckf2wS4/3+RyPf84D3mOmclNWcUCI9i04z+w1KVzyXJxb8g8lk705Tv6ankU6CcYI0/P8Pdgg== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KOEcCwo9T0zlc545zRVDUwj+2mbwraWwe82C8mToPqVCM2Dwcriq1yF+MaWt5AVrlFEeyMwMcaE3usNmfL1K+VMslDCYmLKqVwiX/xAqU9QGarAmhl3ChbLUM42ZBhQjrKKyewzpySwIIQkUonhcCDMMiARNDINsEDqtmQycyAPAEae6kz0iel6zNntZx/kiQxuBML1C3gV0KtnRRpPq/yY0fShPshTFH6eznfTX8PQ3/rAwUmu1a6IQ6a/5RD7PBvS9N3U5RBp23fuRl/9kRTvtDgXd/H2+14N6qNz0ae6rmXDPeieUCzg5jsWFoZ93N8oKG/bd7+HwksPIPjtMsg7c8w7YYcYjg+A75AMbdygw9UN7xVZDldDA0yW+wSxM/TVCTOQAV1tacqi5FSIj422dcX7wmQhkxHfOWRigjUilyPMd/z/npH/OD2sSYCAwJR52xSspjin30c/RxnhojSePpm+I90jsedUzcHWXXTfPiLg7++mpcCerC6PbJihHmBd2kx5uM+fOIIg6jxRByURf14TRCpYvxczBIuRVJufONqpkXTDZ6sdoZ/xn4s2+qNrvD2ed+ODabIv4xCyRL1QOVrAGBALJW3ruP0egsAJdLV8DzPQwD0iM4xQwqRX7KTDg7ZiZoxjVi5lfDH0X4B9wOBm5ic4XvNmgi9SDylBCz/NVAElh8ws1yQW4xG82RM43CgIVZtmDJes7384jdqutJ9WNg+tb1E2OChWztieQVN/rYj9ebgXGRwcCKRYU2M5MOvWcAqTwY20FVA+m9r7peeYRbWRad/xzg+MGb3wl+tltDbOppwWcQkcyXxf0I7VlzwF5zsfLncOhBrl1jkIMMUh+hnE7TaENCwfUG4uym0tZaR4nbyL6fwI2TPiTYemshjwx1WeWNYnwWBsbrQyBA0ndCoUe2fLPzHczoljwy+xXfe/Px1qAbCDe+up8bdXt34iY6PsBz0PBiqsuxtAjzlLE1jHZfII0nALn6lAb5pTSJ1pvaTXexlrB5fSiG+V4KH/R+S4CCYel8s46oY7lt5jpL9FOskNlNVeqiikX2xZleFc20mNjZPKcpWPkohPBrqPv8SMZa6pq5dDh5fY+Mgnmrtme46lGJ1DsKX2sSNiM8YAaLjqVgsA/iwjOz6g0SH5FifZevHUUu+aTUG61zog3Rzf3c95TsF9C0GGxRFzps2qouX7plJF9M62KM1Ao4n5fvwx3e58ZxYeaLqiKS1Hr+e6OB7q+ZQp1S9o6vyvgAM9auJLHMez5B6sAEH1g1RRMEhcd/kaXjbHa+PScTEneme12JeQBEXYOX1kjFBj+d93k/uExxYaJg5k4rzohgyRgHQEy5Ymi73ROfulcEkVQNPDB+a7OBdhEsJ/lMc++oQDVwXcXnJLr+xALr/X2/1V1iDWdeyvM2gp6HiSvg1h7/Gg/Iz+iTAzCcDfVS6cK2wu7/CjlFubnjP2c/YtGQ1c71e7LQaDWoswBzeDTqrBpFSnLNgpQMCyJcXWSf2j8skIpk7fa5Ejna1CohKW0vI7oX+zgm9SSdUih7nPE6MKEr97AeINKGWh+1iJ12cH1qOgvHXQf8hFEVmnrw1+9wEQJvMyIHqWPiPhtsg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2004e9e-33ee-42f8-33e4-08dd1769b5ec X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:34.8939 (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: yXSTkdz+x9TdyYa6C0OiURfg976vIsLBX/X1p6/gasaw3Gx7UYAqna7/+4R1lHRl8f5DDHX9XV9G+PRJYBuC9oO9F5a08LIPf8Xf1JpvqGs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Add u-boot features to the U-Boot device tree. Tested-by: Anand Moon Tested-by: E Shattow Reviewed-by: E Shattow Acked-by: Sumit Garg Signed-off-by: Hal Feng --- ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 32 ++++++++++++++++--- arch/riscv/dts/jh7110-u-boot.dtsi | 25 ++++++++++++--- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi index 3012466b30..45fada34d2 100644 --- a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi @@ -6,6 +6,10 @@ #include "binman.dtsi" #include "jh7110-u-boot.dtsi" / { + aliases { + spi0 = &qspi; + }; + chosen { bootph-pre-ram; }; @@ -27,6 +31,9 @@ &uart0 { bootph-pre-ram; + reg-offset = <0>; + current-speed = <115200>; + clock-frequency = <24000000>; }; &mmc0 { @@ -40,29 +47,43 @@ &qspi { bootph-pre-ram; - nor-flash@0 { + flash@0 { bootph-pre-ram; + cdns,read-delay = <2>; + spi-max-frequency = <100000000>; }; }; +&syscrg { + assigned-clocks = <&syscrg JH7110_SYSCLK_CPU_ROOT>, + <&syscrg JH7110_SYSCLK_BUS_ROOT>, + <&syscrg JH7110_SYSCLK_PERH_ROOT>, + <&syscrg JH7110_SYSCLK_QSPI_REF>; + assigned-clock-parents = <&pllclk JH7110_PLLCLK_PLL0_OUT>, + <&pllclk JH7110_PLLCLK_PLL2_OUT>, + <&pllclk JH7110_PLLCLK_PLL2_OUT>, + <&syscrg JH7110_SYSCLK_QSPI_REF_SRC>; + assigned-clock-rates = <0>, <0>, <0>, <0>; +}; + &sysgpio { bootph-pre-ram; }; &mmc0_pins { bootph-pre-ram; - mmc0-pins-rest { + rst-pins { bootph-pre-ram; }; }; &mmc1_pins { bootph-pre-ram; - mmc1-pins0 { + clk-pins { bootph-pre-ram; }; - mmc1-pins1 { + mmc-pins { bootph-pre-ram; }; }; @@ -78,6 +99,9 @@ bootph-pre-ram; eeprom@50 { bootph-pre-ram; + compatible = "atmel,24c04"; + reg = <0x50>; + pagesize = <16>; }; }; diff --git a/arch/riscv/dts/jh7110-u-boot.dtsi b/arch/riscv/dts/jh7110-u-boot.dtsi index 52c1d60859..ce7d9e1696 100644 --- a/arch/riscv/dts/jh7110-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-u-boot.dtsi @@ -46,6 +46,15 @@ }; }; + timer { + compatible = "riscv,timer"; + interrupts-extended = <&cpu0_intc 5>, + <&cpu1_intc 5>, + <&cpu2_intc 5>, + <&cpu3_intc 5>, + <&cpu4_intc 5>; + }; + soc { bootph-pre-ram; @@ -73,10 +82,22 @@ bootph-pre-ram; }; +&gmac0_rgmii_rxin { + bootph-pre-ram; +}; + &gmac0_rmii_refin { bootph-pre-ram; }; +&gmac1_rgmii_rxin { + bootph-pre-ram; +}; + +&gmac1_rmii_refin { + bootph-pre-ram; +}; + &aoncrg { bootph-pre-ram; }; @@ -92,7 +113,3 @@ &sys_syscon { bootph-pre-ram; }; - -&S7_0 { - status = "okay"; -}; From patchwork Sun Dec 8 09:19:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019742 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m3p1zmMz1yQl for ; Mon, 9 Dec 2024 00:26:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4A23A895B9; Sun, 8 Dec 2024 14:25:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 4746D8952E; Sun, 8 Dec 2024 10:21:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20706.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C4BA689516 for ; Sun, 8 Dec 2024 10:21:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jCHfNIt2Hri5dZnt+UMr8xGEXONac4KnOFebsU7RNOXuZptSVYAsWOb8XyduzMimNtdxQf63vGD7cNOmXGOBUgVfWtMr3lQOYu22xuuvaH73A9ps16anvjGxdHsiosAErYbXZgcRJR7z7WtaV0Rdl8WhONo+onS7jVPYDS02OB1zjmsbh//fmUuN5cZni0BCimFNv173zkgh+RGhz+mTg8PoZCJC3VDbLvK4XOlU4wyInnY85nkv46poVCBw6bZewqbLIsQM5kRpu2lusFiX77keyhnZfcpLTxdwSy4ZmFZBozgT7RlAgvVsoqmFbsiJ0fS5uKN72Y9fKhi7SUEJLw== 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=0PhfK1Aez38T8B8hwbTPB1trx4DL2yc9VSWaZWnMtEc=; b=AOqIaSlGMZhf/y3z2QdYBo/7f6X0FSNPIySGzGygXGApjB5HbiSk3UDODMMK6lMaK7mmef42E/TMvbKKfiNzGew3Ev0uzxzMagU4knL+TGa0N8ZMU/YQ9vs4aAEaUQkNA6CGtykYUA6LJ5M28aG/pz7zYJjI2gSzlJi2RGGUSAg5UHGkChuDv4r1dZIERERbYO3NRSpzjxUoigs+HrtHhCk9xChc2+0GULwzaolX7tkvcwkm7FoP3t/6RplPFyo6UtQ7eI1B01UV55uIS+k0Z7RKdCCTKaG1GBZHrddq9ix++SmER6Uir9xuE7gaPUJI/67nikyzyeMlHuf9DmLiHA== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:36 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:36 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 03/12] mmc: dw_mmc: Add "starfive, jh7110-mmc" compatible to match upstream DT Date: Sun, 8 Dec 2024 17:19:33 +0800 Message-ID: <20241208091942.47298-4-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: 87e82ab4-5666-4a68-8346-08dd1769b6b2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: b9XavESy4E0Lb+m3uRFt2dtqpt469xVRy2lNkUsgZggxPnJGRD/YV6r2YxkP8nsdMTNj6eUf6gK3+faaqKZDvoeVgLPEyUis4mHc7UvscQS1MjiTIpeVPSFJmX1G0M3piq8yIk72VoVcT8PCaGqqdYuqmptY8GzMIPPtqShHSt6p6u4BoYNvW0h54GoeRqKJGP9mc/neXSRgFv+20YVASakuH5L8koxSGEQ6hMWp3A7stkx4tMNInwSMuZc0NxmFcLf84C9Rszq7oyh+fxsrXV12nGObQ1yPmMb/gVgbrOJypA+ALT9r0xuJe5e3ALvfU5elvs/YhJnkiW91C0hwaMqbX8IWklKKFNlfQy10/kvlquJWYfDoNF70rpkMIcnsrr/hCtk2pmunDeGVBSHbMGxr1ImOBIX6dIpCs0QlMhQmZsQzTrNvT931V1h2o455eM74G4xnHUkGAmenGe2rL2M2Ym7/JFlA4TMANTNnITrTTeh+Ecd/XYo4JJgjLPmwoGJCEKB88kA86ZPT4ESGmK5zZiY8kPmFGZSULRG871haQvsmfvQPeVFTZXyQ2fjlnwKxbC/7K7VPtmmgWFPXfOgqXgdBfeGwB++nL0UQkPhVKYY7qNRDwLvUdWyoujrFHSgG/R6QtjPOuqT8AedESw== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MU93m1+PfUJs0Yol/LnmoZB3m++y7ErxhckB/Y+K8HWXLcuSIyDXRvy8a56r7/FSjS7s9nzZCh5PgVEsXfJFjFz/Z2aE7jyagtESbXYLv8pPSCbyB6cRXMaatIK20s9zUkhiwWPMdJrC/PtSKoRnwPOK9dWNK694uk0Zi/SOMu//3SeQAFVIofEbHMjOnt65xwDL8moTJmgMepAm0kafBzt4z3PzWdUIQENMFwcD9lZrsdZg4pb9HH2pRXErZEw6e8AYp9kqamWhhTa9oA/EqS+OPUYny/13qZuoXuerixbz8Ferq08NN63KhYmCtmCr0no6bfzcATETlxP3qkrRvMo2mgzM86Cm64YWA/7Ip9TMl7yVahzd7DFJ7D4toU4ACDsbyHl1rsc7NyNOQ92/Kxd2n3PGWpi8/eVE39kr1SN0lJMUt4NMeDzpf43pU31w7j9TlveJTAurtjMAhD1wbsMA6lc8pAD+AhvdrMPXmDIsr4UQcrcQ1tRG58IP3KFjdNgy99JrNpvw7JMGLLV+6Qvhixp8D/E20YUy3R98R/b2132rPzfrBYCOiqPRuBugDnoXOH47qQFYzHVqXmT9bVYKrM6AEEcx+VPscmsIVmW1LC0RTw2NrEcCOij1zMi5F4IvsF6UmgamoOXMq6Vh0mFdo4dOE1V4BUNbxXyzh/dWjCGkLFIhnnptX/gzcoRcfdcNFWzv+EYI4zM5F7X0Y5NCj24ThPPgWX1bY5pbXqh/VcQYqfqTbmC5ty/d+lJvbHlVMkqaHdqRhq4v/FsoqgQ1r4eNbh9L6ditE5ZCEJfCf2JG6nyDjUf0jLoiBf73CpUaI7BtQEEgFketH3lYc7YNJpthS7gbtOm1thhimKEk4a+5JRe6g996nd+BaXopnAnLj5yW7EAQaFz7++9gJVinQuQ7GS0RY6dHpyZtoHzYz0j0hg2M+mqNF6cPMSeOEjZZBra8Mn/n9tSJ22RWI2Fd97hxXGrb9rXuhitldFv5q/cUIrBrv2YFPiXKXEHL5ckCb5/FQwOdPIBPYTwOPT2cSeKA3oCkKdBj///GWiYPTNRfGI5l6foSXerLRBaER7hvbYfIzSxBEkmaThvHWd/breFzjF91NZkf/ae5nFacWoEkULhuppIkTNibZXIetmpKCnHRx7X5cVp0IpQ8S3e6BqJVXP/dVkUSwCGwyC98J3rICd8PrI7tBmGSsqHznX/9NEYAztVr+VI/lzvHiq0m0v1VvcSUwwI7AXT2+7mpf2fKVaH8UUbDeWf3xELVCq+2rTzVdF/h2o7cyFHc4JBhIao2mEJW+Ys+za3lNplPpse8UI27jRlMVffvqg6U00bOAuQfMF+VolrAOUSYwiCq7xTIYSp0uXBRbL7zdbJt3eAIE4VRVcQe7PNxLJsKNOe3SuYiJztXDOwNe/G6Lk6tiUvJaGia5I55zzqnsUfUG8E/jX+tQFHwYqunEFNSo8/llmDeXuydoQ56R6WjfKJZKnO5/9u5rF7JP1DgutjSYQOoQtQK4g3GrS1nR9bzU0Ft7F8AGLQjYawJQWtPCxbIXQC76O+KXiKr3JOyh59bQ4hbX3p+VOqzkKN1NS+7tYIN896wVYuhLC2rF/gQtg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87e82ab4-5666-4a68-8346-08dd1769b6b2 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:36.2129 (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: 12Q7y9mt5CHL0tAmOVDd8bpgOSULeIvnf3eL7MKVr3lzdK1RvuhIfKnc6HKyA3VYtdlARYI/sJXtFH7XMTl3gGVg5lz75UFwpi5HCUFis+4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Make the U-Boot JH7110 MMC driver compatible with upstream DT. Reviewed-by: Jaehoon Chung Signed-off-by: Hal Feng --- drivers/mmc/snps_dw_mmc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/snps_dw_mmc.c b/drivers/mmc/snps_dw_mmc.c index 47ab5654bd..92880e0ed8 100644 --- a/drivers/mmc/snps_dw_mmc.c +++ b/drivers/mmc/snps_dw_mmc.c @@ -186,6 +186,7 @@ static int snps_dwmmc_bind(struct udevice *dev) static const struct udevice_id snps_dwmmc_ids[] = { { .compatible = "snps,dw-mshc" }, + { .compatible = "starfive,jh7110-mmc" }, { } }; From patchwork Sun Dec 8 09:19:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019740 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m3Q1Sndz1yQl for ; Mon, 9 Dec 2024 00:26:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 80E2089575; Sun, 8 Dec 2024 14:25:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 2859989578; Sun, 8 Dec 2024 10:21:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20706.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6A16389520 for ; Sun, 8 Dec 2024 10:21:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QouhqWSKEx6zI7XxnFnRnfz7piYljk1bKf2IKPRKzdA26GF9H6CGxPM5ByW9uR+BQ4S3jGbHQub00cOIrZD9gZ1XDZsfwus0saviAx8L4TKFzbHLKabJ1+DEhsewPs7fxecz9lrY3Bdhmc/SQEc3C+1ECmgdVKPnbiQWoItaO0UfHgxxBRFr9cqEyAiV4Zr2RECpkZ1BXDVm27/i6/h7n9uJT4ncWRDvIjEU38C0E7PFK3VjL/DZfJG8AIMmeG6dZjcUA7WlJ7l4jl5MuOSMx2X11p1gdTMDRm8dXoU0RSDl6yiZD7xeHHlOVaQoKEYwPjXpS8LEiubWJN8MgjE60Q== 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=ScSLtFgidFrWyO59oiDbFIyhTH83sUZZslp/0ty3fS0=; b=WyK8m1rwlYC+yZhgdXTRoVzSDiQdwTjjYGxLBDMgUspRDRQQc92U7UkJFH1rT8Msg+/LTuSoT7YhXThbAArW6QBTj871r6DADWbkwZo4u6cwieoISJEB8E3qH43MvOCrM2/YFumc0nVYMdohNZ+C5QpsQ8DCXOSks0LFiE+uZE6JQRZL7QQEv52/WcC4XgHW2PRATj0kAaYMgV7orYokhzx2j7ClTV6PH+ogvVxCdcs45EcZWI3iKg9+m5ShCxekU1C+NWGilgnM6qXLwu3rkTZaqEnlfCX9c27Oa90rhPPfifsc/i27LTvE0/Xxherw2ifBQZ+pAc2G225967DVnQ== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:37 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:37 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 04/12] pcie: starfive: Make the driver compatible with upstream DT Date: Sun, 8 Dec 2024 17:19:34 +0800 Message-ID: <20241208091942.47298-5-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: d16f7663-e1ac-4db4-dbf9-08dd1769b77b X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: pQ0+yw8n7KK8owN4EAiwVrFCrSulJVr7nB+Dflv3TIFaqgISQehHULB3/EndV4aCsvvqEm+UaISFDq6ACijU0Zp8s+o3/5jw6hI2FA/7DZG94Wefab1q1U6abJQsRgJ8ECFUvby6BhKay+UgS9Ou2zWQu1sEAr35q0jVxkvPwe7FDMBgfUTvEvpF2vKiwjkHbPKpZnrhvx+GGXPeMbUVLp0+X+3s3aP1YAPVBKRerbsGS2xVL5zWy6ATRVrC8GmZgHI5vZKKXM8Gf91grlfzXTf0V1Q9qMWRzs1oJzP7GqidUPEdRjDOqcM3FFqTrZAfokHZmeGUfJ4HYkYHG5vAzaZF71Bvp8fWR1vY2szul+vVUwqN0KTcHiUFMd+CbU7lOqujyBkMA2n189sEHqs49s4TAX4khCV7ES1ApD640gjDeI4a/rrnxq18EC3D8YbgwZoU8P6W/DoqiWciTX8wSMQDZtob/Q9GY+wmEPcAQIVwKjlBoB2+7lE9/aV/87QqQ2Y3uat0O475NZc1DalSce5nvO7G/J7Lealgci9RftKi5qZ3z6PBLIBRhZNRWN+WMdkzNbj74C1GLcoPjmlLazCuGBLUxzYnRvR9Jy4jq0d2efXi55y6HdjUGAFVi5Wwka+E2z9M6O6Rc6sf09CR2Q== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AHUEXCGyEilHvDZ/H2xwBwJOj4/5gcchH6hVnDoLDdAxFKHvZUck/RqANi6WcknVhaKRpKbz+NK4BfxUaswXZ4SJis1ZaTuUMDZvUXFopWXUEbZx62IxLY1QaYcgGriQqdJ4/6Wjm5h7N2E2bN6KSWrgY6/3SvlxOVGkxKoyhrG/3GTFaUtAZk0sI6Aun3avR4f7CkoX4CYxldGQipTWZV3hVJqIhbVo4NlY7L1eeSUJa7vrCbBAoVrCilZ5YhuywQpkHvGVcy/fbQVvvBHXcGHe38ui6gs6qMp0AenhTQ1gNVfTTw+ogANETdqjRVVs+TK1vGzzuvTj8bPLPhkdXMzXzKd64AEvMv8nLusspPiNGN6exTBo8E+F+o1CVcMuRe12fouXnCDikFs8W3+pr+DKnSY4fosQJc5JE+KuiCgcl5eTdgy4kmZ2W4GbEyB9mOstdMejaVCJeR0aVkvGhOEVJm0j+egv9iN6eL360JjjgykfYwDg+aglI9S7018OfUJ1zL87M+7WcASrmZ+RSlw1l8ewdK7iYB6P56PCF027v9JssE+kaXSVDzjpqyYrgCoGSgNFd5Aqf7jk4pfhS26uZczt9vTSr+eJpIDL2B2gtnBXOxZdUWsVrCG1/bCLmEFYlzZUKHmAPxt+FPafdPP3tk6FbjBKc5VfDZvxuh4TQsO7ndN9jwSO69UZ4mWxzAWjeJI0wM1uWRT4RPmkdSM+n+w/0AE0cfSr6VOMUZsGml13pXmtlrCDCW/CPruAKPlIM1Yp4xVQlez4UaI+pzav+QNuL1XNTVQcjjrcuZW2LPt+doZFVYCvINUoskX2wpYDpbq5/lGniMwWjJiylpx85i16Oi2b0hzvy85dBYtdYzpGh3HVJTvih5/C4lZYIb7lwMRXgfWuWcNsgIIs6manLJB6eJPEbN8p+fq9z6gxZt4sQpBHCqmJSdrfeqncjnE62gQbSLUot/psvxFYWBILMELc1Y3yXLDUOfHI1cNCSaVguu5LXrhdxJ1xtJGOZ35L62DvmJDvUFCfhRBmM4YwSQpezu/9lmWSKy57rsalWxZbbEf832db4q2jeGQmytY5qJVgNi2U4E0UxoUDf/bwAFo08Gx677gx+78oMguYSSFE6Vbuqk9Grf35z553Rk8ZrRwSSM6fzrKD88Xm3JrL+D0ue7u7RQN3u3Ha+UXfmufr3P1m11b6uYDHXn09dvofYdT8elMOF3nHLIa6d4e4EOC7yj5bCPNMiPRRsiU7a2jc15BBT7KCIgdnSyFiYn6ZTM1U8WIptVEnvjZfx1IHv81yijfn5Pg17ncT8yyiE5So/wlf/SHvlGfbDA/zOdXbeLp4IRN2vo3SSFZo5u6ylZyIxD2oGydyyhzGDV8OwgElN9p/fJdXquEwU6+ETvM7QJ9/jg3uJaItJIL2Rn1sUwukE5TtuFEl8gN/iG80q3EFP0dpmyvVXROtBAkmJsU2M1rRNMcL1TZe3f7EhIvI8P4aVIQA1U8sUIxaUa7yTyAJAPvvEl9Kncqw7MjyIYR1LSFIrnPJLJtRJxsnINRo3DgGE9tUaRtSSu8PwRt0+lTlrABa+8LrtfbwZ4AAf6m+atoSGLt62wGHnDul4Q== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: d16f7663-e1ac-4db4-dbf9-08dd1769b77b X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:37.4926 (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: 3AvSHgjczcBsNW8FVWMcS+hZiJSO5OVnpoAqWRzKcfcUMGDyMFkwkbTE0/JIIXH8afBforoMhYHNPITrOKv0STXASowc4JTTsF43feTgAgo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean There are difference between upstream DT and the old DT in terms of reg base, reset gpio and syscon. Make the driver compatible with upstream DT. Tested-by: Anand Moon Tested-by: E Shattow Signed-off-by: Hal Feng --- drivers/pci/pcie_starfive_jh7110.c | 59 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/drivers/pci/pcie_starfive_jh7110.c b/drivers/pci/pcie_starfive_jh7110.c index 569fbfd35c..51aca7359f 100644 --- a/drivers/pci/pcie_starfive_jh7110.c +++ b/drivers/pci/pcie_starfive_jh7110.c @@ -25,13 +25,19 @@ #include "pcie_plda_common.h" /* system control */ -#define STG_SYSCON_K_RP_NEP_MASK BIT(8) +#define STG_SYSCON_PCIE0_BASE 0x48 +#define STG_SYSCON_PCIE1_BASE 0x1f8 + +#define STG_SYSCON_AR_OFFSET 0x78 #define STG_SYSCON_AXI4_SLVL_ARFUNC_MASK GENMASK(22, 8) #define STG_SYSCON_AXI4_SLVL_ARFUNC_SHIFT 8 +#define STG_SYSCON_AW_OFFSET 0x7c #define STG_SYSCON_AXI4_SLVL_AWFUNC_MASK GENMASK(14, 0) #define STG_SYSCON_CLKREQ_MASK BIT(22) #define STG_SYSCON_CKREF_SRC_SHIFT 18 #define STG_SYSCON_CKREF_SRC_MASK GENMASK(19, 18) +#define STG_SYSCON_RP_NEP_OFFSET 0xe8 +#define STG_SYSCON_K_RP_NEP_MASK BIT(8) DECLARE_GLOBAL_DATA_PTR; @@ -41,9 +47,7 @@ struct starfive_pcie { struct reset_ctl_bulk rsts; struct gpio_desc reset_gpio; struct regmap *regmap; - u32 stg_arfun; - u32 stg_awfun; - u32 stg_rp_nep; + unsigned int stg_pcie_base; }; static int starfive_pcie_atr_init(struct starfive_pcie *priv) @@ -92,7 +96,6 @@ static int starfive_pcie_get_syscon(struct udevice *dev) struct starfive_pcie *priv = dev_get_priv(dev); struct udevice *syscon; struct ofnode_phandle_args syscfg_phandle; - u32 cells[4]; int ret; /* get corresponding syscon phandle */ @@ -117,20 +120,6 @@ static int starfive_pcie_get_syscon(struct udevice *dev) return -ENODEV; } - /* get syscon register offset */ - ret = dev_read_u32_array(dev, "starfive,stg-syscon", - cells, ARRAY_SIZE(cells)); - if (ret) { - dev_err(dev, "Get syscon register err %d\n", ret); - return -EINVAL; - } - - dev_dbg(dev, "Get syscon values: %x, %x, %x\n", - cells[1], cells[2], cells[3]); - priv->stg_arfun = cells[1]; - priv->stg_awfun = cells[2]; - priv->stg_rp_nep = cells[3]; - return 0; } @@ -138,8 +127,9 @@ static int starfive_pcie_parse_dt(struct udevice *dev) { struct starfive_pcie *priv = dev_get_priv(dev); int ret; + u32 domain_nr; - priv->plda.reg_base = (void *)dev_read_addr_name(dev, "reg"); + priv->plda.reg_base = (void *)dev_read_addr_name(dev, "apb"); if (priv->plda.reg_base == (void __iomem *)FDT_ADDR_T_NONE) { dev_err(dev, "Missing required reg address range\n"); return -EINVAL; @@ -147,7 +137,7 @@ static int starfive_pcie_parse_dt(struct udevice *dev) priv->plda.cfg_base = (void *)dev_read_addr_size_name(dev, - "config", + "cfg", &priv->plda.cfg_size); if (priv->plda.cfg_base == (void __iomem *)FDT_ADDR_T_NONE) { dev_err(dev, "Missing required config address range"); @@ -172,7 +162,18 @@ static int starfive_pcie_parse_dt(struct udevice *dev) return ret; } - ret = gpio_request_by_name(dev, "reset-gpios", 0, &priv->reset_gpio, + ret = dev_read_u32(dev, "linux,pci-domain", &domain_nr); + if (ret) { + dev_err(dev, "Can't get pci domain: %d\n", ret); + return ret; + } + + if (domain_nr == 0) + priv->stg_pcie_base = STG_SYSCON_PCIE0_BASE; + else + priv->stg_pcie_base = STG_SYSCON_PCIE1_BASE; + + ret = gpio_request_by_name(dev, "perst-gpios", 0, &priv->reset_gpio, GPIOD_IS_OUT); if (ret) { dev_err(dev, "Can't get reset-gpio: %d\n", ret); @@ -208,12 +209,12 @@ static int starfive_pcie_init_port(struct udevice *dev) /* Disable physical functions except #0 */ for (i = 1; i < PLDA_FUNC_NUM; i++) { regmap_update_bits(priv->regmap, - priv->stg_arfun, + priv->stg_pcie_base + STG_SYSCON_AR_OFFSET, STG_SYSCON_AXI4_SLVL_ARFUNC_MASK, (i << PLDA_PHY_FUNC_SHIFT) << STG_SYSCON_AXI4_SLVL_ARFUNC_SHIFT); regmap_update_bits(priv->regmap, - priv->stg_awfun, + priv->stg_pcie_base + STG_SYSCON_AW_OFFSET, STG_SYSCON_AXI4_SLVL_AWFUNC_MASK, i << PLDA_PHY_FUNC_SHIFT); @@ -222,11 +223,11 @@ static int starfive_pcie_init_port(struct udevice *dev) /* Disable physical functions */ regmap_update_bits(priv->regmap, - priv->stg_arfun, + priv->stg_pcie_base + STG_SYSCON_AR_OFFSET, STG_SYSCON_AXI4_SLVL_ARFUNC_MASK, 0); regmap_update_bits(priv->regmap, - priv->stg_awfun, + priv->stg_pcie_base + STG_SYSCON_AW_OFFSET, STG_SYSCON_AXI4_SLVL_AWFUNC_MASK, 0); @@ -273,17 +274,17 @@ static int starfive_pcie_probe(struct udevice *dev) return ret; regmap_update_bits(priv->regmap, - priv->stg_rp_nep, + priv->stg_pcie_base + STG_SYSCON_RP_NEP_OFFSET, STG_SYSCON_K_RP_NEP_MASK, STG_SYSCON_K_RP_NEP_MASK); regmap_update_bits(priv->regmap, - priv->stg_awfun, + priv->stg_pcie_base + STG_SYSCON_AW_OFFSET, STG_SYSCON_CKREF_SRC_MASK, 2 << STG_SYSCON_CKREF_SRC_SHIFT); regmap_update_bits(priv->regmap, - priv->stg_awfun, + priv->stg_pcie_base + STG_SYSCON_AW_OFFSET, STG_SYSCON_CLKREQ_MASK, STG_SYSCON_CLKREQ_MASK); From patchwork Sun Dec 8 09:19:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019741 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m3b4JYdz1yQl for ; Mon, 9 Dec 2024 00:26:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D0A1B895A7; Sun, 8 Dec 2024 14:25:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 3E88F89529; Sun, 8 Dec 2024 10:21:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20706.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8B7F48952E for ; Sun, 8 Dec 2024 10:21:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bEIAzmmWvD15sRBRaNzpStSRjVwlZyD0YnAu7+1KeNfjlbwaCshYHF+DoR5Nw1SX0SpEdOY3gV2OLDZd7IHPmdFqLNbZwL6kALjiz85zRZWqUwGxEh6TpINpexxBaHJTymUDvHk6ywhJoWp4BbVBPRE5PUzcTsLjh4tIhOAMGDWl/5Aye3rqoCByO0gjlhn9YMO2y0HfTE18wAXUe/T/B15koh6bjsJYud9W+Oo0L8uQXIYf0u8qED0m0Axg8gny92ng++obYAuH7mg7ZMO2nxRnsIwiq7iypHQTJhCkRh4sA+hR/kODyTDVNbSGBa9x8JsZbC6DyXzB6pmq9tpc9Q== 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=LRTE7cB2DzFcIQf5p+pv+rgW74O9cAjSNANU9SIMAgQ=; b=gZgJXhLfI8x3CJr7EQD0FnEfrTGGL+lFGaT+T/4b1iSo1PUEqpKamLiX8EOoR5fLeNiYOpp+JkiPw0GMurplcCSvp+Sr2167ik/9KETaht5Mv7KcfzqU77IdxMqBnurLXsFNsvMh4QtLlbgfWfJ9ZoK/Msw+rJtnM3Rg1yEljbKeH3EFZonHT8GYx5qeLkoE2VHM/bIHCVjUDoB21NMUOW1E+Soi1duTzQ19Pb4o1FGY+ikjz2Wg4s7RQuL8j8mJXfcBp5ddsDT/LB2iDtpdGpmkngNy2Ogu57Q94DsUzP2Y+TE1rPm1x8oT7jbUjgN4vyJumrP04+3aHENRnvKUMg== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:38 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:38 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 05/12] riscv: dts: jh7110: Move common code to the new jh7110-common-u-boot.dtsi Date: Sun, 8 Dec 2024 17:19:35 +0800 Message-ID: <20241208091942.47298-6-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: f904e102-2afb-43e9-b6ad-08dd1769b83f X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: qK+MiW9VkP/mDcKJ3IoiawFYtTNzE9cVEJqycZ/Jt2dME4QNXCBq6zercxV+tLiM8DGEFbrnhoxg4miiTWrt8ZrYmPUSuGFgs54O87NNzHrThHMV7GyRIIYTJNQWKYVlznq2YDgm7S4VTeN3kTJigGsp722Nsn+QANz09YPdS192jpMA7YE5/gnEX9eLSCVEhiSlfzvoc2IrO1Zb9ZAEbiUQDxd9BYdZrZVxFTKuclGl3kGPNI49Yme0NefEVJXToybN3m29+9WBH3bL36BKmMm+jjqkwTw6gkXx5mVGJvi7gfY7a+YFjCQI8n07oQCh/PhtT89YDAwCHDAacthEQHCW24cpZO0igUY5CI21YoQv7Mfj3ii23CS7DbEGB6828xbyQKun6ZNExbL54vzmq+vjJifotq6SKuQIldlRtw3wDWOGEKdDjw4ZUi9iioTZND1zuiLf/ClPvFn+j1CR1P/EbkhpOHgIt0sCo0htduBGAQy4od27hGz8yyUKGNv8e8jLseFeN5FScISRUWOmO+SFySO+Yzuf6GoIULJesLjLGHAEY5dRycy6FbKzQqcJGQpcx9Ijx7DhA4H7Tk/z/knWvDKmTOFB8VPHa2nuGKNMeLbqnIW79oYcsvPT8W7mBZJEeGFdIRVW+iEw69VhYw== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LnJHvhxcwp14Sd7FaK8kdbIlLb4bq2P76rO8z6YD6mbSPSbYuHvLXTdsPrvH4Qq1TAPt4yZzzURXcI5QVioOLF9NpzXAh70xtrdXqcL5hsQFsFjrY27HCnQltVPyyVuW7jFzJGEai0jAT9Tx5ovYsK1ZQBhffpacUR9nAC2zjv7drtnx83OyflYvfrKmMW7gGGvGvHn7BrM61u3KeNksZL5HsjoBiC/yLiyTd60SS1u4s5Zjx06xH6PspBuDfYmWC9LFe6E+ZOR49/7Ubxbg0JEiRu6icXOwoiEl7vZJleSLjYq24QoSQLfAS8wZR44EHDZOXMJjBldG8zMu3TspSYtsw3dWZWUjPySsgX3J7/8vv1ogjiYHxZ1KsjBnCs4109UaNCjkILMoKFuRzd2PnpVvuvbrS6998sAKRziiLi30PVOE6bLkQNio7lpLcnSk7O4418DxgJK3ITVVS6Eg3lxced97bp5dx8pP9NdMyvfaqdZgyeCGtpGFbPLVbRY2S43Ys/kIN+3MQ198PHldrzmiSJAm+i2mrL8fSrIFfUjLPl6Jy+tHXROei6IYg7EYhwFazIyfuEd/hvXluZU1n+6WeTF5px3Zqc+5dGFlWLMvwSQ5bf1PSHRoMVsiaegjamqJMjdrQ2QvkHqsNsnrmnlrJb6C02xXe6tYng4SMySnW8Z6mK/FWocIKb+uOMiaoGlWQyDEHsnTdKM2MVQvRMa3mEyMrdBRBpfZOJ1tf7tLEIuN2xCioTqXdkXrQuH3C63xTZOQQ33q+IsKm5QkLvvGcnxosBHCEw4wTCXPM1LDzRkQhOpS26/NcEIi3VYJMjzB9Ti5tZT3fvKtYrs9p0yHN1LkBZnXc4h+KAYaMh16V4qXkVepko6jNWMpXG3eEJHRA5UiwH3hZ4rhBfe9va8vHlHtk+oZCp4khcZyNQaPjWyQ1+OeepjLTqb/yazlEu8rMHgiQeX18Kx5HmvwGfgi9rxR7lwurkvH/QLF3gI8yj7PtkdknCFD2+Vit4VrFScnVRbTv6q1bJc50rREYCfgOUGWCUew2yBsMplDiKHiIa+k2RJxMDtDsmgKPZ6ijSCp4nvzscrKEDILgK901hDh6lkkbYXDs1P5ZuDlDF+7Jhrsc+tVy8qoqgUeGdcVdeWOFy5OWGTWTvuVw7L+RJDfVX5mqkI/VHETiKuNNN8T2XdbNj0cuqckF1EO23KBoOMVdYrNdbFxjJnkyhO3uNHOke55kXcKj9CpYfDoByap9wAFsBwWicolBTzXFz4MAFJVfrkXWoW8XizoEvzznGoIsHpS8dmv4YlAM5T3xhSRsrSZWYw0MG+EvshEJZKW7oLLk9VogRI6pPggTXorhh38NrOCYNEzPw8mFVl99U3wGRNUXkfJelL4vpFOCEu3lhRwYSG5oKFR7odTmQkP0eLm4kOgOZOZd3EK8jqDM2Pe/PpKA8nh1bd409p+ljfXmWUQ5fTQEI9g2RPcRp+VZhT5uC5oC9ZOvBwip6E0zUlo83Sn898B3xKuDzV3qWRCLcQDiegnEeKYLw8ATCvveZvAPfq3oEbJwMS4+4kMXRVDPR9XlRiKhTm5VZ7gKO4CizWCGUqv1SPniO9e8TwbBA== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: f904e102-2afb-43e9-b6ad-08dd1769b83f X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:38.7798 (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: M4KrPuAFLoQJKzUENF5wxsu214WGd391uoEyceV/IbKwvblYu8ZIrmJxA3pCF80PTcXt1TN8K2cY7qp9JWJ/1fHWEtiGk1RvlXstQn+A5Fk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean To support JH7110 based boards besides v1.3B, add a common dtsi and add common code to it. Tested-by: Anand Moon Tested-by: E Shattow Reviewed-by: E Shattow Signed-off-by: Hal Feng --- arch/riscv/dts/jh7110-common-u-boot.dtsi | 141 ++++++++++++++++++ ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 137 +---------------- 2 files changed, 142 insertions(+), 136 deletions(-) create mode 100644 arch/riscv/dts/jh7110-common-u-boot.dtsi diff --git a/arch/riscv/dts/jh7110-common-u-boot.dtsi b/arch/riscv/dts/jh7110-common-u-boot.dtsi new file mode 100644 index 0000000000..45fada34d2 --- /dev/null +++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi @@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2023 StarFive Technology Co., Ltd. + */ + +#include "binman.dtsi" +#include "jh7110-u-boot.dtsi" +/ { + aliases { + spi0 = &qspi; + }; + + chosen { + bootph-pre-ram; + }; + + firmware { + spi0 = &qspi; + bootph-pre-ram; + }; + + config { + bootph-pre-ram; + u-boot,spl-payload-offset = <0x100000>; + }; + + memory@40000000 { + bootph-pre-ram; + }; +}; + +&uart0 { + bootph-pre-ram; + reg-offset = <0>; + current-speed = <115200>; + clock-frequency = <24000000>; +}; + +&mmc0 { + bootph-pre-ram; +}; + +&mmc1 { + bootph-pre-ram; +}; + +&qspi { + bootph-pre-ram; + + flash@0 { + bootph-pre-ram; + cdns,read-delay = <2>; + spi-max-frequency = <100000000>; + }; +}; + +&syscrg { + assigned-clocks = <&syscrg JH7110_SYSCLK_CPU_ROOT>, + <&syscrg JH7110_SYSCLK_BUS_ROOT>, + <&syscrg JH7110_SYSCLK_PERH_ROOT>, + <&syscrg JH7110_SYSCLK_QSPI_REF>; + assigned-clock-parents = <&pllclk JH7110_PLLCLK_PLL0_OUT>, + <&pllclk JH7110_PLLCLK_PLL2_OUT>, + <&pllclk JH7110_PLLCLK_PLL2_OUT>, + <&syscrg JH7110_SYSCLK_QSPI_REF_SRC>; + assigned-clock-rates = <0>, <0>, <0>, <0>; +}; + +&sysgpio { + bootph-pre-ram; +}; + +&mmc0_pins { + bootph-pre-ram; + rst-pins { + bootph-pre-ram; + }; +}; + +&mmc1_pins { + bootph-pre-ram; + clk-pins { + bootph-pre-ram; + }; + + mmc-pins { + bootph-pre-ram; + }; +}; + +&i2c5_pins { + bootph-pre-ram; + i2c-pins { + bootph-pre-ram; + }; +}; + +&i2c5 { + bootph-pre-ram; + eeprom@50 { + bootph-pre-ram; + compatible = "atmel,24c04"; + reg = <0x50>; + pagesize = <16>; + }; +}; + +&binman { + itb { + fit { + images { + fdt-1 { + description = "NAME"; + load = <0x40400000>; + compression = "none"; + + uboot_fdt_blob: blob-ext { + filename = "u-boot.dtb"; + }; + }; + }; + + configurations { + conf-1 { + fdt = "fdt-1"; + }; + }; + }; + }; + + spl-img { + filename = "spl/u-boot-spl.bin.normal.out"; + + mkimage { + args = "-T sfspl"; + + u-boot-spl { + }; + }; + }; +}; diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi index 45fada34d2..e6bc6630dc 100644 --- a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi @@ -3,139 +3,4 @@ * Copyright (C) 2023 StarFive Technology Co., Ltd. */ -#include "binman.dtsi" -#include "jh7110-u-boot.dtsi" -/ { - aliases { - spi0 = &qspi; - }; - - chosen { - bootph-pre-ram; - }; - - firmware { - spi0 = &qspi; - bootph-pre-ram; - }; - - config { - bootph-pre-ram; - u-boot,spl-payload-offset = <0x100000>; - }; - - memory@40000000 { - bootph-pre-ram; - }; -}; - -&uart0 { - bootph-pre-ram; - reg-offset = <0>; - current-speed = <115200>; - clock-frequency = <24000000>; -}; - -&mmc0 { - bootph-pre-ram; -}; - -&mmc1 { - bootph-pre-ram; -}; - -&qspi { - bootph-pre-ram; - - flash@0 { - bootph-pre-ram; - cdns,read-delay = <2>; - spi-max-frequency = <100000000>; - }; -}; - -&syscrg { - assigned-clocks = <&syscrg JH7110_SYSCLK_CPU_ROOT>, - <&syscrg JH7110_SYSCLK_BUS_ROOT>, - <&syscrg JH7110_SYSCLK_PERH_ROOT>, - <&syscrg JH7110_SYSCLK_QSPI_REF>; - assigned-clock-parents = <&pllclk JH7110_PLLCLK_PLL0_OUT>, - <&pllclk JH7110_PLLCLK_PLL2_OUT>, - <&pllclk JH7110_PLLCLK_PLL2_OUT>, - <&syscrg JH7110_SYSCLK_QSPI_REF_SRC>; - assigned-clock-rates = <0>, <0>, <0>, <0>; -}; - -&sysgpio { - bootph-pre-ram; -}; - -&mmc0_pins { - bootph-pre-ram; - rst-pins { - bootph-pre-ram; - }; -}; - -&mmc1_pins { - bootph-pre-ram; - clk-pins { - bootph-pre-ram; - }; - - mmc-pins { - bootph-pre-ram; - }; -}; - -&i2c5_pins { - bootph-pre-ram; - i2c-pins { - bootph-pre-ram; - }; -}; - -&i2c5 { - bootph-pre-ram; - eeprom@50 { - bootph-pre-ram; - compatible = "atmel,24c04"; - reg = <0x50>; - pagesize = <16>; - }; -}; - -&binman { - itb { - fit { - images { - fdt-1 { - description = "NAME"; - load = <0x40400000>; - compression = "none"; - - uboot_fdt_blob: blob-ext { - filename = "u-boot.dtb"; - }; - }; - }; - - configurations { - conf-1 { - fdt = "fdt-1"; - }; - }; - }; - }; - - spl-img { - filename = "spl/u-boot-spl.bin.normal.out"; - - mkimage { - args = "-T sfspl"; - - u-boot-spl { - }; - }; - }; -}; +#include "jh7110-common-u-boot.dtsi" From patchwork Sun Dec 8 09:19:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019744 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m4913Rnz1yQl for ; Mon, 9 Dec 2024 00:26:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2809189606; Sun, 8 Dec 2024 14:25:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 3457B894F4; Sun, 8 Dec 2024 10:21:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20704.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::704]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7796589515 for ; Sun, 8 Dec 2024 10:21:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KFkLW7t9xyPidvY90d6qlm4++qTu6QMi3mDxcUfGsnG3TyLeQMuejHk+c/chlobSMiWSqXCVWCb2polfPOMlZ4GaBHuYaOvL4yLe+Soy/Vxl7I4C59GJv3VC0yezxfgNSPFyHpzPsiLwiEHOO63vw7kf4B7ETGMsWHL0TRAwDQYiU/sV9FGt8KpK+1TsnVAE2CoZ0bxqPIZHWTKD5utGT660N7lBLBgtEOIBbW0PQU2Wy1AfliTMx1OcwsCDoqlrE2OZPrTn3k5rVrQJnqBPS8AgKsDQaLndLVxks11iHNs5CDGGRDvX+hW0Rtx3XUAuMn51snI/v1Opx2BAtDzBGw== 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=GJj8xDVhJZMwrvXOFmLNuUFxFv07Dm+AYRTvMJ4dmoc=; b=XPv1atVh3SY1rjv5ATXHWB6WQIeHR/sgvZ6wid34NWLoXFJpyLVnDnZi4YhnR2raO69cyPiC8AxxoU4RTnCb7djp3bdgdutVW6/6y2Q8K7FEF6vFLKh4A++DkG0rL3mQDPExUFHvr8Pvwla6+mQYsARSTCwe/NZm7zRMy33dsjXYsmyEjXG6gjzmISoXIULKoyZ5Nfbky6bQK2y+L9dpeWrTplmtw5Tw53pk4ETw3lIE0ibfv/FpJadrTycsIaXlqdNGMC1Ot+dAleENjYmfzfnGqr14EUP2iq8MUk5PeOzMqEvqQuBcWUbC+0OuvAYuWTVJrybc8bwnbz7UKiw4sQ== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:40 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:40 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 06/12] riscv: dts: jh7110: Add u-boot device tree for JH7110 based boards Date: Sun, 8 Dec 2024 17:19:36 +0800 Message-ID: <20241208091942.47298-7-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: 9315057f-d81d-4424-7b29-08dd1769b905 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: kQOjKgauQVc0OBuuCXxmgG/6piU5yKdwy9jkGZdEimUP9OovDV5v39m3gp+MzN1GrJrZEcaW2vd5wxpPwmF3L35bbSSoHL1gnLrAyEfoJzl88epdyDgrRtbQEkEoO3TviXt1MYz2w2IGBPz62VKffLDK4c2e/iN/vnJze2L32nCR/2YHQ0XGMF7XGFsruQ5ERywHnIZduMy7tchCE1IbqudUnNT2jWrbIgFZxavk7tDPPsyDrCpSqVjJOJqRlfboeRDIwBevDL4dWc1kAGzUgNgkhc7ZMMKLIX8ojpZpeiYDTPFYLSDSSL44P4bUe93b+wL6uw/hzUszduiCSkHgPsgnnES5FaZbn/HIaDN4vxJuAfvNO2drw9Wy8zhW6k2hcb5z9kj9hsNaPORQTVuu3CLsCATdSJXsiqtffjsice1249ah9dUcTxgg0hMYMSlLfK04tQIYXZ7z97XnlWqotqZ+1SqZB0bXPX/UmeS+xqYS2F7Bxnnr3ghH5rdO89v7u46PK9rtcOBABPIamEs9fYVXP9Sj439Pu5zLqhjzPy7cltv4E0/04YSKQg4H0LLrZhcMPfpfRegoDSLqPYOh1OnwNvDlubvhw+esLiMLk5Jy5qzS4ngU4HULMgEwXLtaaRTyvgkmJ6MB0rrWPsls3Q== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: w/itLwLF599l5oiZSDDsBmzgwnWzxr/FX0RAJOdNs2T71Bxf/iOIO6D7HdKhsXdBxZGBtjSXpSVHkvh+U2PGchngXbPJiCgO/2jWqjTR0b5rfYIb8zvWUWgtfzjn/tDEOqgkKkLIObp46KL5L1puAHND3Zijwo1QwOKQBfZXIz0030sDyyJiPS0HfN/PBAFhVYHFJragMbxw/PCXr/lrNrx4ZUkIQvrBhbkVVSpdwugpe/fz2xwHGj+k8cgSV+QMIxfytZZr9bUV/F1KeN+E7EiRak5QEtrjg6S9Xe8kZ6IT0BwKrx2pk560c+VgKN4BmfsYGEW9Nsf8oMjS0WylIhTIuky6DHl9hEsKqL6yvCsdr7dTaET01AEZyU8sBPl6APA3jFRCoz9m2kdcuUNOI/8qKCN/GxeU4McC7BIMzps43CRi1TCSBe7fclizkDWFl+RqHRGvHBrhPay2DBpGy0Lms7LA+h94K2qGyxiohsmfSSldY4rQykbOuoQEVXYi3o3lbCYRKSvO/vVnmPijsWkuhI60bVDOeswU8Q1PBLf1gdBg82loz66LaJO5/suENbQbt9we8aKCTzCeoxobiMOZczwjvjA/cPYRzXl8Mo3rW3CCrWWMDRlQ46fgX5XPKogiNZXgBuB+QhmB+Xl/VzRdY+1/tEQuGRiKV85FW6Mr2IrgFRbI7PrOWKqOV0CAGxHIQrhxB6efL+x7qwFV5W+5V7948oKdmJiyvmP/3UhfOxSPD+Sd6dclBEy/RGnH0Yzhiphb988JLbQdNfinAZNVliu3DQispfdE3mB/KCuoDdLVPdJA0DmM3QaMpRjSS09rYCPRYpPvpbMKGsB3ijRuISJq6vrkgDE7jPU8IRIEQbCNGszZxdAlFZrC9nhThqvQ2uCwI/xcNE53sf1/kaSMhw2F0cqAkkHGQTClLoFV43GKssRPZlSAITcz9ihxqeeoHv3w2EMhMuK5F6MYP8NxOdfdFr+6WU2QF4I68VlibqYJF+IpEY7UVxllOsDiqZOgcMt1QQRswil/p05Xln/ZpYmFXBcXIlccSanhcc1ON37D4lDXVG6tfVY2BDPfCFobpmBETO6nILqjrgV6qHAjUPbRajUV62ZFQb1IzO6nU99G6v89MBnPzVBXgKY2uzMAMZrNh1JsKtzLTHiguKRJbtTSltAp0KZFEPsg2md+6YqXLj9AaRtIDl0Pwm3C7EfkHpa8uCIx+JtopVjd47KomgeR2LoFcaXpTJ4CDE2VWakGtm18LBda0JSZ+30sMevH1dHqX6oBp/kf2Hq394LPve1RU9IMcsgHhc92dRMuCDdMNYtTlb8y/jVed3ZwchmJOdAxwzyh28OoNg9B7MmpMn/WSG0AzSq1wpNwPcABC0yePaPvkwFfImTLEvqxXGISw2Ui7KZQ8XJVr0qi0/0RXAekbe4Wx3oS/JwrlCOFmqOSgWQ8X7tDJb6SRw4gJ9nL+RLzs+OtjVFimfPgUJg9JLOgD7tithVokqtNYaFpt73WCOLNsoTU8COIP34XqhZczL1aojFOHG1yEDUbQS6CDeyXxTxfiA0LoPLR6wPaFye9OywSRX58pYamYiy8n9L8YJConC2MuRs9Gz7j2A== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9315057f-d81d-4424-7b29-08dd1769b905 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:40.0732 (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: T7k1VLMQr7QTg5OLDrxgjF7BGawsqrtU0GbjO2JG5EjDjJmZJDdl7QZ0bdMwo91aRPMOscOoNoHfgy+tk2XXK6C7Eq3lrmXnHc0mKThqYnc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean To support the other JH7110 based boards, add u-boot device tree for them. Tested-by: Anand Moon Tested-by: E Shattow Reviewed-by: E Shattow Cc: Heinrich Schuchardt Cc: H Bell Signed-off-by: Hal Feng --- arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi | 6 ++++++ arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi | 6 ++++++ .../dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi | 6 ++++++ 3 files changed, 18 insertions(+) create mode 100644 arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi create mode 100644 arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi create mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi diff --git a/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi b/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi new file mode 100644 index 0000000000..9df1e5db55 --- /dev/null +++ b/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2024 StarFive Technology Co., Ltd. + */ + +#include "jh7110-common-u-boot.dtsi" diff --git a/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi b/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi new file mode 100644 index 0000000000..9df1e5db55 --- /dev/null +++ b/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2024 StarFive Technology Co., Ltd. + */ + +#include "jh7110-common-u-boot.dtsi" diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi new file mode 100644 index 0000000000..9df1e5db55 --- /dev/null +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2024 StarFive Technology Co., Ltd. + */ + +#include "jh7110-common-u-boot.dtsi" From patchwork Sun Dec 8 09:19:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019747 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m4h0LSzz1yQl for ; Mon, 9 Dec 2024 00:27:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 51DC08971E; Sun, 8 Dec 2024 14:25:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 81AB789515; Sun, 8 Dec 2024 10:21:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20706.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7776089502 for ; Sun, 8 Dec 2024 10:21:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l6TxLHHYmQ8mzf52iDTm+M/aOGqpVjJrVaphJQLaxjLdj/Myz/L7Re7bCK+n/Nt/V7nHio/BCGHXljpRxHS4AMQEOGb2moewH3Kk2/6m2jn0HxxyEyDTOLUjp8i6589oeCVRcyFpfQbwX3U93n0RnBb9evZvMo/UAfJbZMeu1CXn+aT/Klie2IR0krGc/Zm9PV53oLSmTNGVW0v6cobueTjZGR6TZCiQqez/IEYWklhesuYUE/uqtAhFsYfUdAKzkT0XFQ60g8dHBLmZMxqX/QvBI0g+2Zw2Ci/o371Bmvz1C3IgKVkHUljO7MBIJ7ezDAUmuqowTjIHA1gNKL1v7w== 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=agswTGsNWw/lFEda9W0e8bCFGQpen07619X6C0/7Npc=; b=HDBtVSjFrY9Kmi4s6QZvIhB7bkNdtoJBzAxXvop/+JoTlTcVN54IFp+MYnuoNHjGsrMOss61X8z3YWbX86Wf1wdk0wJWFfVu6YVNNr4GGD6vhdditE8ettrNtBttYzIzxCIloUD37XQUS+2nyuU3rDYEKAe5PmfeggYbophUZyjadvuwmokj4gteR5ZTC1GSZNrb/T2ttuZ6W7lO3QNkt3ieR+VZAfVdWQBBvgwOWm4y0Nvll2CEBAhSrH1DceYlSDmVHeGtGtARS+ym4Tu+MwTD7x6cnZDTeiu1lZvnPz0mm9aYC8aUMwDXPWT8qrTndEwyf89gd1Nn8bwa3B2JYg== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:41 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:41 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 07/12] board: starfive: spl: Drop the unneeded DT modification code Date: Sun, 8 Dec 2024 17:19:37 +0800 Message-ID: <20241208091942.47298-8-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: 1cf878eb-babf-44cd-cba7-08dd1769b9c9 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: ZEgNdH0jb7Uv89F6S1GWVtQHCYvXInkiid3TZNWH/vaVzAjkNerJX6j+uYOUMJu7Tt6YrAJ5IhduvTs+C2PHsh8X1tpKnaxn2B9pISnZtpo/rGNbE+jOB3ApwQJyqPP17ug1RE2S0aniDCkNBLHjvw1vccsCJCfIGaC9WzE2eHvvvP+PxlSz8tkW3JK1PWJ8+oqk1Zs1U5lMtP441Gg1DoNdlq92MtsIRZXyxWbdoJgAGRkGlJ5+eysdGsYzyBA02C0QsFDhNlmSO8wgMf4R5E9llghqTgIWtCAa7JvArxCYIO8WeVzsSH+wF1Y0whT52KVDoZO7ylod2IS6ZVd0I+qIbqep9wRYn+aodSgufILq0S7ODzkrcyXAgDCc6k3sOcnVa91QCZoIr7/m5MQzmgJNfTzXZJ8I+J3+Tx4Nq8P3ibP54jv+ifT1RpHkzZakcexfjsUqwmwMpxQ3XzN62Z+aHf67i8Q/0m6NUUV/AWxA36bwJPapLZLjvn9Fb9j8cEZ1ht+zr6le9TS653Zmn/5qllRZ3osCSg6YkLQOjbw1UDbXbEAOOKRd3GuIfwhwgfGZgIFBgHpJ/enzkksGW/xE2bT7NSmhpH7LLhol+ESKwsNNi4vlsX3bwNGZohak83Q4OV2R8no3dWfj2oDwWg== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8161ciazkkQIW5ddTUyKMCRo4B4VM/WI37IzHktRYkPAEObTUiSn1dCorRDzxmO9IDLdRX4lxnOYiTnsaXzbdF+hlTjC/eVJZ2rOHDKny64sHgB2i0cpt2+4yFQSzr/3LvptB5vZK6fWZ1ZLs53X/Q3SE0twmUZy1ad4Vd0pFqhV+d2cfFSDzgpwjQ9O+fLa07LujhLjmziNgtgMOUq5G/g46D3REYA3v9owyde5XNZo3dV1txRrcJzDWAVqAa1MfYK+8/Cm4pXK99Y0vziIcv+XS6XkywJoMPOisdDQ5o/xSo02gVNkGWMgufp6lsBzAXk0ogH09pqkhC4NhrRo6M5kJFRDOQJv/va6Ho7aHxt1izAmG5uHnx1ltLUKfjokCR1wrE5sIeLR1/Qj8uUaHraY4F6aeDN52q8yCyJ8trx14878g/P6rvLz+rcApDovFSpHEdcTbWTjfhloqloO8W7DKFtHAspH8mLb7LdjmlekYriHdfSd5in25E0/sPU/zO5/bUSxTxfRwLMLCVL+Oqka9c6jt6SGffEYJMsPfYMmiiyqAe9ATzftivqRumMZdYVBLHfWEnXXudbYdUEEwjVl4RuIytiobdHn/KyVVt7RtIbKMgfnGqxLs6kcuoBLVQ//L4sFTn7hO1cU7jX7rTrzVtanrRq0o8iblK8Iyu3VBbLOAYnTo/5cJ9+kDWzIlQZAbciycpcKRwNKZ0ntckAQEq8UIUnZ1w+YJYmt+7/LAh4f+VYu4v7dlPmQqqzd1NSpd4qSh3EQfzrLDJuuBt6NEI9+F0KMpmBPnJLncr0W2WN0EwX2u/Kld1qlhsv1AeuOD1ozjZkWNLgOZdlPsVRwR0EvbIuCf7DRY9uIDSxVMpqIgOPU71Sk9i6EjToYLUgO3klaYImKnlAmdylHg57vwzEzd3mhhK+bYH5/FUmNR1p+ZkVjzWznomVccExdJZZ/ppC88iHZBZ8NzNYRZIv5aYfd1exAvMK/YAsZrvbLq8rqdgtfTTS5XEM71EQfj0WkxjVGVsOUda+5AX4bjcyUucYAHDhuW5yadWZoiOEJPotbTYOCm4cFQsoZKKpJy3a7GuaYZ9vRsGqcmHXbRvdjHXJwWnSKv/yHbeRICitTfBXApOvQYQcvg5Tg4B4XvKfwAMZ3ZMfPnyGTmqx4N2l9uCBrhTtVsqS2kFHAlKbK1C9P/ue9wYvj//9Ro63F2Qj3Vm2uWDnHTZCOLaZ7NBtlV6CmkH4Tkb1cEZQUqTENbyefOVGg+Tu5JEucxYPqVq1NBXJlcRYlJKjad2KTqcG1yRITVcRYiR4JmE8zzlAlpLqnZQUT7vY8IoTg/rZjBQM7WZ5hQdCP0VQfbbVWLjKN/mWTrZy8xanE2NOsTaNHdG9CmpJs0cl0Wnpus+Jqo5Bd3AOD654JryWf99Mj4UYVba0JbukiUcjEfo3vIp96TPk6pHdiIWbw+z1Z20ishM76Lbu766ni6rjL0wapKL4GjpjB13ixqAm7NyTsfzZRpS91l4RChzmGS6beDIFIf5l6lv60GYeqQn+sOzxBz/0NmQys61copQLVrOTVkB6FmUKEM1+94KVnE0pG7XMPFObSpTYi9eiq2Na8ebqBhg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cf878eb-babf-44cd-cba7-08dd1769b9c9 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:41.3597 (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: 3TX75UMH8BXBj9bf4M5Xlc72PEL2tIYy/xMQnMx7na6k5ZhKMsO4U19V/dT6MNIu24U4BvO3i8uKLlzpelKJIBambFkKqnN0XN6LohSrWqM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean As OF_UPSTREAM is implemented, these code are redundant. Tested-by: Anand Moon Tested-by: E Shattow Signed-off-by: Hal Feng --- board/starfive/visionfive2/spl.c | 356 ------------------------------- 1 file changed, 356 deletions(-) diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c index 3fd535e7cf..38132ecccd 100644 --- a/board/starfive/visionfive2/spl.c +++ b/board/starfive/visionfive2/spl.c @@ -20,364 +20,8 @@ DECLARE_GLOBAL_DATA_PTR; #define JH7110_CLK_CPU_ROOT_SHIFT 24 #define JH7110_CLK_CPU_ROOT_MASK GENMASK(29, 24) -struct starfive_vf2_pro { - const char *path; - const char *name; - const char *value; -}; - -static const struct starfive_vf2_pro milk_v_mars[] = { - {"/soc/ethernet@16030000", "starfive,tx-use-rgmii-clk", NULL}, - {"/soc/ethernet@16040000", "starfive,tx-use-rgmii-clk", NULL}, - - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-adj-enabled", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-100-inverted", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-1000-inverted", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,rx-clk-drv-microamp", "3970"}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,rx-data-drv-microamp", "2910"}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "rx-internal-delay-ps", "1500"}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "tx-internal-delay-ps", "1500"}, -}; - -static const struct starfive_vf2_pro starfive_vera[] = { - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", "rx-internal-delay-ps", - "1900"}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", "tx-internal-delay-ps", - "1350"} -}; - -static const struct starfive_vf2_pro starfive_verb[] = { - {"/soc/ethernet@16030000", "starfive,tx-use-rgmii-clk", NULL}, - {"/soc/ethernet@16040000", "starfive,tx-use-rgmii-clk", NULL}, - - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-adj-enabled", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-100-inverted", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-1000-inverted", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,rx-clk-drv-microamp", "3970"}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,rx-data-drv-microamp", "2910"}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "rx-internal-delay-ps", "1500"}, - - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "motorcomm,tx-clk-adj-enabled", NULL}, - { "/soc/ethernet@16040000/mdio/ethernet-phy@1", - "motorcomm,tx-clk-100-inverted", NULL}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "motorcomm,rx-clk-drv-microamp", "3970"}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "motorcomm,rx-data-drv-microamp", "2910"}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "rx-internal-delay-ps", "0"}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "tx-internal-delay-ps", "0"}, -}; - -static const struct starfive_vf2_pro star64_pine64[] = { - {"/soc/ethernet@16030000", "starfive,tx-use-rgmii-clk", NULL}, - {"/soc/ethernet@16040000", "starfive,tx-use-rgmii-clk", NULL}, - - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-adj-enabled", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-10-inverted", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-100-inverted", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,tx-clk-1000-inverted", NULL}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,rx-clk-drv-microamp", "2910"}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "motorcomm,rx-data-drv-microamp", "2910"}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "rx-internal-delay-ps", "1900"}, - {"/soc/ethernet@16030000/mdio/ethernet-phy@0", - "tx-internal-delay-ps", "1500"}, - - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "motorcomm,tx-clk-adj-enabled", NULL}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "motorcomm,tx-clk-10-inverted", NULL}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "motorcomm,tx-clk-100-inverted", NULL}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "motorcomm,rx-clk-drv-microamp", "2910"}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "motorcomm,rx-data-drv-microamp", "2910"}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "rx-internal-delay-ps", "0"}, - {"/soc/ethernet@16040000/mdio/ethernet-phy@1", - "tx-internal-delay-ps", "300"}, -}; - -void spl_fdt_fixup_mars(void *fdt) -{ - static const char compat[] = "milkv,mars\0starfive,jh7110"; - u32 phandle; - u8 i; - int offset; - int ret; - - fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); - fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", - "Milk-V Mars"); - - /* gmac0 */ - offset = fdt_path_offset(fdt, "/soc/clock-controller@17000000"); - phandle = fdt_get_phandle(fdt, offset); - offset = fdt_path_offset(fdt, "/soc/ethernet@16030000"); - - fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_AONCLK_GMAC0_TX); - fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", - JH7110_AONCLK_GMAC0_RMII_RTX); - - /* gmac1 */ - fdt_setprop_string(fdt, fdt_path_offset(fdt, "/soc/ethernet@16040000"), - "status", "disabled"); - - for (i = 0; i < ARRAY_SIZE(milk_v_mars); i++) { - offset = fdt_path_offset(fdt, milk_v_mars[i].path); - - if (milk_v_mars[i].value) - ret = fdt_setprop_u32(fdt, offset, milk_v_mars[i].name, - dectoul(milk_v_mars[i].value, NULL)); - else - ret = fdt_setprop_empty(fdt, offset, milk_v_mars[i].name); - - if (ret) { - pr_err("%s set prop %s fail.\n", __func__, milk_v_mars[i].name); - break; - } - } -} - -void spl_fdt_fixup_mars_cm(void *fdt) -{ - const char *compat; - const char *model; - int compat_size; - - spl_fdt_fixup_mars(fdt); - - if (!get_mmc_size_from_eeprom()) { - int offset; - static const char - compat_cm_lite[] = "milkv,mars-cm-lite\0starfive,jh7110"; - - model = "Milk-V Mars CM Lite"; - compat = compat_cm_lite; - compat_size = sizeof(compat_cm_lite); - - offset = fdt_path_offset(fdt, "/soc/pinctrl/mmc0-pins/mmc0-pins-rest"); - /* GPIOMUX(22, GPOUT_SYS_SDIO0_RST, GPOEN_ENABLE, GPI_NONE) */ - fdt_setprop_u32(fdt, offset, "pinmux", 0xff130016); - } else { - static const char - compat_cm[] = "milkv,mars-cm\0starfive,jh7110"; - - model = "Milk-V Mars CM"; - compat = compat_cm; - compat_size = sizeof(compat_cm); - } - fdt_setprop(fdt, fdt_path_offset(fdt, "/"), - "compatible", compat, compat_size); - fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", model); -} - -void spl_fdt_fixup_version_a(void *fdt) -{ - static const char compat[] = "starfive,visionfive-2-v1.2a\0starfive,jh7110"; - u32 phandle; - u8 i; - int offset; - int ret; - - fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); - fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", - "StarFive VisionFive 2 v1.2A"); - - offset = fdt_path_offset(fdt, "/soc/clock-controller@13020000"); - phandle = fdt_get_phandle(fdt, offset); - offset = fdt_path_offset(fdt, "/soc/ethernet@16040000"); - - fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_TX); - fdt_appendprop_u32(fdt, offset, "assigned-clocks", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_RX); - - fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", - JH7110_SYSCLK_GMAC1_RMII_RTX); - fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", - JH7110_SYSCLK_GMAC1_RMII_RTX); - - fdt_setprop_string(fdt, fdt_path_offset(fdt, "/soc/ethernet@16040000"), - "phy-mode", "rmii"); - - for (i = 0; i < ARRAY_SIZE(starfive_vera); i++) { - offset = fdt_path_offset(fdt, starfive_vera[i].path); - - if (starfive_vera[i].value) - ret = fdt_setprop_u32(fdt, offset, starfive_vera[i].name, - dectoul(starfive_vera[i].value, NULL)); - else - ret = fdt_setprop_empty(fdt, offset, starfive_vera[i].name); - - if (ret) { - pr_err("%s set prop %s fail.\n", __func__, starfive_vera[i].name); - break; - } - } -} - -void spl_fdt_fixup_version_b(void *fdt) -{ - static const char compat[] = "starfive,visionfive-2-v1.3b\0starfive,jh7110"; - u32 phandle; - u8 i; - int offset; - int ret; - - fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); - fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", - "StarFive VisionFive 2 v1.3B"); - - /* gmac0 */ - offset = fdt_path_offset(fdt, "/soc/clock-controller@17000000"); - phandle = fdt_get_phandle(fdt, offset); - offset = fdt_path_offset(fdt, "/soc/ethernet@16030000"); - - fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_AONCLK_GMAC0_TX); - fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", - JH7110_AONCLK_GMAC0_RMII_RTX); - - /* gmac1 */ - offset = fdt_path_offset(fdt, "/soc/clock-controller@13020000"); - phandle = fdt_get_phandle(fdt, offset); - offset = fdt_path_offset(fdt, "/soc/ethernet@16040000"); - - fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_TX); - fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", - JH7110_SYSCLK_GMAC1_RMII_RTX); - - for (i = 0; i < ARRAY_SIZE(starfive_verb); i++) { - offset = fdt_path_offset(fdt, starfive_verb[i].path); - - if (starfive_verb[i].value) - ret = fdt_setprop_u32(fdt, offset, starfive_verb[i].name, - dectoul(starfive_verb[i].value, NULL)); - else - ret = fdt_setprop_empty(fdt, offset, starfive_verb[i].name); - - if (ret) { - pr_err("%s set prop %s fail.\n", __func__, starfive_verb[i].name); - break; - } - } -} - -void spl_fdt_fixup_star64(void *fdt) -{ - static const char compat[] = "pine64,star64\0starfive,jh7110"; - u32 phandle; - u8 i; - int offset; - int ret; - - fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); - fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", - "Pine64 Star64"); - - /* gmac0 */ - offset = fdt_path_offset(fdt, "/soc/clock-controller@17000000"); - phandle = fdt_get_phandle(fdt, offset); - offset = fdt_path_offset(fdt, "/soc/ethernet@16030000"); - - fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_AONCLK_GMAC0_TX); - fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", - JH7110_AONCLK_GMAC0_RMII_RTX); - - /* gmac1 */ - offset = fdt_path_offset(fdt, "/soc/clock-controller@13020000"); - phandle = fdt_get_phandle(fdt, offset); - offset = fdt_path_offset(fdt, "/soc/ethernet@16040000"); - - fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_TX); - fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); - fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", - JH7110_SYSCLK_GMAC1_RMII_RTX); - - for (i = 0; i < ARRAY_SIZE(star64_pine64); i++) { - offset = fdt_path_offset(fdt, star64_pine64[i].path); - - if (star64_pine64[i].value) - ret = fdt_setprop_u32(fdt, offset, star64_pine64[i].name, - dectoul(star64_pine64[i].value, NULL)); - else - ret = fdt_setprop_empty(fdt, offset, star64_pine64[i].name); - - if (ret) { - pr_err("%s set prop %s fail.\n", __func__, star64_pine64[i].name); - break; - } - } -} - void spl_perform_fixups(struct spl_image_info *spl_image) { - u8 version; - const char *product_id; - - product_id = get_product_id_from_eeprom(); - if (!product_id) { - pr_err("Can't read EEPROM\n"); - return; - } - if (!strncmp(product_id, "MARC", 4)) { - spl_fdt_fixup_mars_cm(spl_image->fdt_addr); - } else if (!strncmp(product_id, "MARS", 4)) { - spl_fdt_fixup_mars(spl_image->fdt_addr); - } else if (!strncmp(product_id, "VF7110", 6)) { - version = get_pcb_revision_from_eeprom(); - switch (version) { - case 'a': - case 'A': - spl_fdt_fixup_version_a(spl_image->fdt_addr); - break; - - case 'b': - case 'B': - default: - spl_fdt_fixup_version_b(spl_image->fdt_addr); - break; - }; - } else if (!strncmp(product_id, "STAR64", 6)) { - spl_fdt_fixup_star64(spl_image->fdt_addr); - } else { - pr_err("Unknown product %s\n", product_id); - }; - /* Update the memory size which read from eeprom or DT */ fdt_fixup_memory(spl_image->fdt_addr, 0x40000000, gd->ram_size); } From patchwork Sun Dec 8 09:19:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019745 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m4L0LVCz1yQl for ; Mon, 9 Dec 2024 00:26:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 864AB8961E; Sun, 8 Dec 2024 14:25:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 3FD4689525; Sun, 8 Dec 2024 10:21:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20704.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::704]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 121208954B for ; Sun, 8 Dec 2024 10:21:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a3Z7plLdOea/ywFBaUJb0sTtquXxBjK92SLwd+Cf3hSl/ZIqsJr+jjvrGVoFs1nNmGq8vUTcIHAafjT7IfccC+ggD6nlcMwWwhhlrRBfUw1tcpQECRCd0Pvh9zZI9LVatxWisvZkrHDq600zgx2CAaOAkQndZCR+G6FXz5NAuX9sMl4a8eY79JXsX2LLitcNdEJ2fUvB7UcthzFuGOR20Ux4TX41W42torLaBQySywRv7Ik9V/iIyGT9rlCGgmT7ZVOv365bH0hlZXr0ae87jhzIbo9UO2MbjinbKvymuUJuPPDcSNnrSj9MomA6qPthDadW4ZO/gYlx3kDuFBJB2w== 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=I12eEPpsQktD/5fxoVPqGGDFUlgy7n5sj/9ld1kQZ+g=; b=TKZ+JgeEB7JzceNtBvPJpd5SWLakB1xzLTZbSt+61dRpBZRpuv0pk+V5SZwSxFHLpVfWvh5QkbaAvrW0jSuMubwRTz39RoKySVqP5n0NcA3+De50Xve0lyLoGBERV0DlZR+6AXkPJfvly7+FEkgmBZFsEv/ZJgWM8XHiYibfgN0IvTCBLd802a1Bvx+Oe2VOiPF43A45Fwu8BKSjsSA7t3V11Yr7S/lhFhMhift40Lfkv+rPOv5V86xI/S1ypMBcykNLigPHhS5jO4ZlM0A8jSdlJahDSH5BhCjzj8Q4wrTPWCJRIMDxegSqR2Xj/ifPII0YXi1uWtV3KSbcps+0eg== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:42 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:42 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 08/12] configs: visionfive2: Enable MULTI_DTB_FIT for JH7110 based board DT Date: Sun, 8 Dec 2024 17:19:38 +0800 Message-ID: <20241208091942.47298-9-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: 63d188a5-3a7a-4819-362a-08dd1769ba8f X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: fRpanDbE3FPn7poJI2k7y6WLsioiiy+TIIe5qfJ2WS22UpomUIx/POehw84WCWE1MUm8fex5135JSVr8VMSpLsJXgRUkgfYzSuVvUKFTRBZ4/LazRfHyIgLqyEIZk9c2P66FbPOnfm1RL2nd+X7CEdzJRDjKn8k8+hP3/Pr2NBgyNL+AzeDrYRo5y+hQ3hUpjzCksGX50jK3Yzqvy6EdTzsbaSwYRgHvpWb6bliInc0hLPDfLzcICGG6LtyRu/uHIzlCE9sj+YEhUN1gRMS5/xwZjLe2/1ux3EBioXDaRq1uW0+mOFef6aumGPKeYDyR1qsLdvROaCwD9CIaDRVtuZkTRzXS3JJjtdAZg/NTTb6XznmMjyMMgGyghAnz+FEtZogykV97qTmZh8Y9KVmS13RfXQIw65WXUwe1iY/W0LdLzb9Q9rbSUR3IMQL0AEAxMjGD3Lc1zN+OTAARC07AjuU4OaTChZMbCvBhIJo22U4YubNvh42wUejjOEInXtwFBUbSwgAYDRS15BZ4Y4qJlVKkxE4yiVEwjQF9WBM3MsyNs1bTw5dIM4eOicPGbUkf985Ztokc4L3UKrtXzs3DxdB0ucoxXXuaKpcqTNrHHn5OflHtlCcuBU0Hco1TCz7byIjcVD7emI9jFD8Knt4PTw== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GdGBrRmz/nN/6UccxnQxYQgjNWeIYL38ikgx1vLlqtmACKOWPUZQWaPjZ+DH6bjzPyXxYxrR3RY5rra/h7vhg89OmogtpXi+Hglrl+c2YJUFQgH7qycZVwEN3ra7M6kamON6JEHaMIEGY9qm0qOqwoWqM/gA5EOsOeqEIzFxsK5qldc51++G7sIjMCrae5UTw7bD69WDteQJWprCXJH+zxJIUCZ/piOr75E3pbHrp9AI4jXqfgLFE1rwsalVuM28uhHaaVhTApJOYTTjPZaIKfufbFYr2l293YKMlH0Z+TeurMfiEFWNTb1OL7PqDU+4iC/PilQhweFNv3XtouzUSKK1WhYvEPqI2vk4eirUhWI/HSWnkHQWhMaCLhz/FQXfq6MxaIPh1flinudsoTYSMzSb/Gsi5xcZQY0GZHdh3KgIhcr7OGKY39BvdXd4BY2BeMC8h3sJjrPWmYdduNg3iD3CmFA1MMi1rDjkovmX3yX7Kj2H+5a/tWWSaDjZswQr1oTnvkUfIG8/gWOeitm3X7+wcN3pWoP0m5Vxnj97bxtQyTsu9FjUOhIh2FgG4CHhR5f1lY6k/7MCUDqfLXkYQOo9T5CB+D/1LzVWpm0Ih3FtdLhs922bdGqQZrLzk8Sc3w/s3KtAaQ5Wgh2nsxR83HrbJkVSQnh0B6PKFbcJel87/vdiXjyByLrWGldYlzVfyuM0VDHLT73BaLihfd6GuSAxG1qlxTCZYL49vYD3/yYg0XAMXVHfVeFHIMAA+iXUQuCw9BltHkTeX67sFZ9UiTdobcew0oqD/kX7fsKmsy6cWSRJWi/a76AtRu/t7MXLopYEV0SX2xvGHLnFWG7mVarKEhftf5x2WzPJC1/Sf6rY3hJHMdMsp0Rcq8ymfR7t7Lw/uVdBkBfYIrtNIeBA6y/JBW2qp05LNVLhZnplaO9aeNatmoZLOQWUywwGf5mpUDSAJsxAYztoekdBQdwJhCzVJk5+bFxA4lZ/JcFHM/0E6bzJ5SVIPoKXYuCfSWuZms1i1NDqhmz/1W0R+fTOgPEAFJSjOz5f2nIAO+6Q2zAGJ4wGTKiuiYnVVK2cnffKd0ZJ0F9cT5v5tKV1ztoyEPv7ne252UT4rVpn8iopm38GYEibU9AJki0qxEe2TYXTszvtGF2D1Oyh/FaQ/usmBbN+KQIjYks38euZ90N0nYT7b51DBaRDspWT3sUiWx+zQ/hPtSAP9Xb6mjisoU/gcrwzWYfGFCNliYpm/nSKVbSkGwn6RfmS8tNc9Epzrt/ht7SyQpQA2zT6aEDiMXJUaAbGWzrwvwY8HP4++KA8ojpeyOX01YEiOcg7wCmyI6XpiQLKzrRM/S4CGorFcXSe5Jk3oYiwEAQ3PRTyGJZaYgs/Ywncl/EIRILF688/85ioVSnsmVDGMkol3R2O7J/UHnJxLE6BTT6amRBthI9m/UKA+eDjOe9Ug8i4DaYqa7qfrCGL7KlqZEfV7BDs+iBKgFuMEeX6sSIZclYzCCR1nTrYLObyhsYqyOWoEmp42HTatSMi9G2rg2ZgtlrpXN20hqj/8FpHhetU9F9BfLW318JJRq9kYbBu+WWr2aNW8GWV5SSYXZh2uI168Tr4unPyWw== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63d188a5-3a7a-4819-362a-08dd1769ba8f X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:42.6898 (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: udLLayV2DwWQZOXEicIRQKyV4kMZhJrbhAoY/F68cO3FZvoIrdPqzyCPyoeAeljf5L+VS+SnV7vDRuRGdxhKolPvEIo356AA44846jf5zt0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean So JH7110 based boards can select their own DT at runtime. Tested-by: Anand Moon Tested-by: E Shattow Reviewed-by: E Shattow Signed-off-by: Hal Feng --- configs/starfive_visionfive2_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig index cb86582fd6..96056c50c8 100644 --- a/configs/starfive_visionfive2_defconfig +++ b/configs/starfive_visionfive2_defconfig @@ -79,6 +79,8 @@ CONFIG_CMD_WDT=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_BOOTSTAGE=y CONFIG_OF_BOARD=y +CONFIG_OF_LIST="starfive/jh7110-milkv-mars starfive/jh7110-pine64-star64 starfive/jh7110-starfive-visionfive-2-v1.2a starfive/jh7110-starfive-visionfive-2-v1.3b" +CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_SECT_SIZE_AUTO=y From patchwork Sun Dec 8 09:19:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019746 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m4V5bR2z1yQl for ; Mon, 9 Dec 2024 00:27:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E31BE89650; Sun, 8 Dec 2024 14:25:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 43D2A89515; Sun, 8 Dec 2024 10:21:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20706.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 11D6689541 for ; Sun, 8 Dec 2024 10:21:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GlVZ0P6xC7+uci6QEiZ4PoPxuUKyZdAl66Xm2rjYkrmX5A03krVbRl61BGDkyxUwxlQ4NC+QRstJ7Fv9xRHBEwojwonPISEDoRVtcHegwazi9LTAcGSAcO3BiarI+PHM4RzzQcRzgW1qH68nwDCfslnpL50L0tyAFwcbBT4mVuZbi8jJGezSbdfvLrq46kj15pie3tVGQTwyLhrnHjcMVxEOUiohIuCXo7YVMD+zw8FDik7NeLod33eZi7exwpr3C3dImMPUHk8CPSWsbB0kr7ZA0XlO0BBteHIfIKHNzH7TaPNHYxkDQ6rxDEk8HoQS9texJOu/AOWUzFp2A4QuYw== 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=DiZRv1ymOMJxuLr+Y0O4LaQi8IZNMWMDSlgcUSXg9Xk=; b=ipOfrtrBe0mxcxHsMSt1AhCAVJpe/TzTvyjE4FRe3prcjeUGlRvjHU8XITxK8+4ZsD1db4yAhRARmzjlzKlNuqd9L1H+3Jc9/Iu6/howqLyr/+py8biXJfbsL2dPszxROmvTuZ3XQRCq8jNYIb8VBc6LSLEk1b7vIQfhQh1FZBZvMisvfhlaMM6YhXZVG7gmkwU0jFykatk8FtzEwwIJFq1WWUOLfEF4KfcR7iU3IeMC9+OxAIl+EYi7BDSPDlCt8p3kazphv1JU0onz8w86B6t7inVwmITO+41Edw3TBPaLQladwhofOXb47G0kt5S93ZCWU4k6t2n1CnWxIvVQ8g== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:44 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:44 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 09/12] riscv: dts: jh7110: Support multiple DTBs in a Fit image Date: Sun, 8 Dec 2024 17:19:39 +0800 Message-ID: <20241208091942.47298-10-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: cbd8e9b1-db3e-48d2-376c-08dd1769bb59 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: HmVbVfnSGu7HqmQ3egNGxFi+nyKaf3lOKl+1T++mBppTqcS/55s/RpCPrsj8YNZ+flHXaV0wIRAY4RVQ2NbiuugEoRb+FcLJuq1LgkIu6pgIDn3r9mlATSX3mgVspiwT+E/KUXfHmZ0i0aVD6hTM5IzQZiDqnKxeLwjdjFhA4d+BOtZSnH06+lfODYMX0NttN5LYK+5S61P6Q8ZO0rfS9binQUkcJmkteyx5B6xMGWdsjDeX7R0blXh761zwzCLHK44bCZwcLT0YySdLCoWotwkCBlawyInGTTSihLukuZf5KfpB5u7/dAs226UwNf4HMMcLEeIZ0ZVCuMKxlo0lJJ/M30iVrnFDCc6Gj5DGrqIv9qbyILZv1ZLqAjO80f3rtkOgQ5ZBnYXHhPiLSIcVUHDWt8G2MBLChEseqh8GW3MVAr4DhBCxvCiDRVfkY9djb/EAWvaSaCZUk8Psg+DsN069Ff/u/EvJjfz3eRVy4qDgJdoLvXVSzV+QAaCbWdCZbRNSERMnbVZM2M8TNlNjduIO3xOoMWG2KAhQIEIN8SKfp8ECo3+CN+2+lXTOY9PDf2MHTE2pmaw94tz/TjM4WOG2GwEk9/Y/zBKr8fhi5a2gB31SzJnJ3gs2wzLVPmxXbMsmjb+un1167TkbFu9EoQ== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RD+jL14q0dZjQpAjccpwctW/x2c2GTDC0KTQD9Q2u/nyCl0ovEe5WSdeF5t5y9n50/PZkI81n5vKnYu2t+ztIPe5rz8WHdYCABFkPQwoFqTSwIsMw3AlS8L9CH140qRTPpcUA5T4tyG3GWysjV1ptPdDEoIi6CL05mzYftjileR/HxaJ/bTIFmVho9mWb+0S6ffiDDbSzNZXopmTT9Vp6Be3Xmzhb3FWDsZUaK//L6HokV/Nw/VcF8R9t7L6YD413iLXrrUBXax9tFLi4S1Drn71tEwU1fb6ypZbmrvNx4yK6dPXaN67JxFQNjMZi+jhfhBEQEpjavDkMa2jUZs2wwHW0hwI5YS3uzxANcvBd0WPPEC4P3iSofrl0CfyMpZTsBeXqMYlAn4fnatmmW8FI8190sB9h0SdQKZneRNxsqy3we9TM/17wDAoT35ofb0EH4oBgeWGvoMzbeHP6LEIv65uTifPa9SWAdiUXX8GuQh0QjPsgXfZ8pP0RnwFMNPaKLnQk0H1ninJeTCd8IIDsFY2rKDrOshc33TeqaBoKdkwRGVpVKNm/5KIvr8UnN3yqcRUDSgpfl4SU2OjPSkjs6tQ74mHboJB5QHS8c0lAAjOwoVIddSlW13tQ1/UpwQ4lvJr9wIDe6i0ZDVXohdHAyjzE+0g4NWhS8KG9hxb8aerONFDp5EJ4NeNJZq8FjhMIUQJl8I2RQKazktgKeE0TdL3X2XsyX55NutkC1qbsAIuXxwJfYmZGu/gsLIszSA2lMtw0lSpGRZQtz82S3nTL8zYl9VoS1pkgdYHnIO3+2pmMbdvIfQ1EN13m0h0j1IkBkvi9IqYtwzyfGmdfndpjObkPt46yaVMmXPc5CiREHFXcSMgiL5lSmpt/OB98uWMop9FyoHAJ3/SFvglLxrVjHltw4G6Wy6pXPqSgLTTPCDG+1m5hKn1UQNABcT5rqPL93oFe2SSqTonoG7zVQQmby9UrFSrd9y4xtHNI8qKQz1kbVF1PC0zli//0V5jQj+8Q7o2zNXuPwm7AfCfJyV4cPOZ6O7mxV/TV1omn6UT8A3laXRlORhNH2Q/Q686rbUepFkWCWMGDn2wZLjmGuGFr+jeoRfxcBpGTKrEBNLvSpHrk0LCZcgGZjfdnDb4TuVnrgyuBwKYhueYegtFJZZDz5kgoTv5pgB/PWH3rcXgnpLoqxh3bg+lB+yS122t9ymzB9a7zUExXDP6gSapoFUMLjspLrHyqwQa266Ybn+2WzDkxLe0jsfF2hRbm0pAbHgRPi2SWOHaVuaQuNkTA/Bgp2ynPpXj0ftFdn7K0UuA07uE8M8WAOzj+eB3z/ZvCLxNZX684dsTjAbedYKlvts7Wx8TsEErw/GmQEZUPOHua/3oUnLENhnqsImu1KCpAruHmZ7l9J0rhlbGk7hncY2jwweik4HGI8P7jVPLpkk3nV+eKvGhZ6IboeIGZB/SX5xnT8A9UyvcXHS0OR5BjUOUEt6J2qhzo4uc+tl/BtIat+sreezX1/kNT6OHDTZL+EgqtysKhlWRnIoYKdMMgFukNtedLgpnlphmU29yc9drCIMsybwSYAGgw+3EHr1/5icHiwij0jIWF5ronVPlNNhMOQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: cbd8e9b1-db3e-48d2-376c-08dd1769bb59 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:44.0031 (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: kwHp4QYY4Ql9g2cQOtKYLlChKrAWX5xpdeb+zZKCv0oH0FHt1ghzxE5h9Jr6qQ6QstRFkvOoGIbDJjz6YFiWkJBhbiCwQV8ft6yj6Iq5Gbc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Support multiple DTBs for JH7110 based boards, so they can select the correct DT at runtime. Tested-by: Anand Moon Tested-by: E Shattow Reviewed-by: E Shattow Signed-off-by: Hal Feng --- arch/riscv/dts/jh7110-common-u-boot.dtsi | 66 +++++++++++++++++++++--- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/arch/riscv/dts/jh7110-common-u-boot.dtsi b/arch/riscv/dts/jh7110-common-u-boot.dtsi index 45fada34d2..7871294e90 100644 --- a/arch/riscv/dts/jh7110-common-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi @@ -109,20 +109,74 @@ itb { fit { images { - fdt-1 { - description = "NAME"; + fdt-jh7110-milkv-mars { + description = "jh7110-milkv-mars"; load = <0x40400000>; compression = "none"; - uboot_fdt_blob: blob-ext { - filename = "u-boot.dtb"; + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb"; + }; + }; + + fdt-jh7110-pine64-star64 { + description = "jh7110-pine64-star64"; + load = <0x40400000>; + compression = "none"; + + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb"; + }; + }; + + fdt-jh7110-starfive-visionfive-2-v1.2a { + description = "jh7110-starfive-visionfive-2-v1.2a"; + load = <0x40400000>; + compression = "none"; + + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.2a.dtb"; + }; + }; + + fdt-jh7110-starfive-visionfive-2-v1.3b { + description = "jh7110-starfive-visionfive-2-v1.3b"; + load = <0x40400000>; + compression = "none"; + + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"; }; }; }; configurations { - conf-1 { - fdt = "fdt-1"; + conf-jh7110-milkv-mars { + description = "jh7110-milkv-mars"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-jh7110-milkv-mars"; + }; + + conf-jh7110-pine64-star64 { + description = "jh7110-pine64-star64"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-jh7110-pine64-star64"; + }; + + conf-jh7110-starfive-visionfive-2-v1.2a { + description = "jh7110-starfive-visionfive-2-v1.2a"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-jh7110-starfive-visionfive-2-v1.2a"; + }; + + conf-jh7110-starfive-visionfive-2-v1.3b { + description = "jh7110-starfive-visionfive-2-v1.3b"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-jh7110-starfive-visionfive-2-v1.3b"; }; }; }; From patchwork Sun Dec 8 09:19:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019748 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m4r2tPlz1yQl for ; Mon, 9 Dec 2024 00:27:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B970F8974A; Sun, 8 Dec 2024 14:25:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 5D23A89525; Sun, 8 Dec 2024 10:21:24 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20706.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A052289555 for ; Sun, 8 Dec 2024 10:21:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OlrokTFWl6F17hD1mpFTNzKVQJ4BTZfNxQScTivehDbSzOHavYMVFFvWyg/F4g4Fgs81ODNO6jKE8I+7kII0veRwl4JxoIGvD4VRmbonKKBYsnTbEexd74/prrUJpuAXjkiZlsvk52KSt0EkF465WZtPK7CAo639IhDpyfK55XWClgBpOtTOzK0Hrvs4xxYVP1KoczjmnjD8xp+r0aC2X5sxayhA+y/nL5NI+34UMHX/UDPx+dbd6veL5CWgyDYudA8o3kIUd4T/o0fs8pxf7Iv31ohBUuI5eW4u/vvX9wDFJwGkNUV7lGiRtDnRsG8qFen0VAkp3CKUmrChMfk14A== 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=N1cxM2UKLtAU8lbAWkChSJjw/JyGpRvuwVT4mQuAAyQ=; b=BEYR4LGbgsmWQLmK3FEi0Oy/sOpA+hqHp7DQ4oXonhpUM76q9YrGybuvzrROP+z95krB5F0qyKTAgwOJHLJl+VMMO8vxQPtKv09WZ19pbBPwliHvYX8VM0eqdYX3Us7PD03uluL4vIrZWvsqSvvQ2b3DokEpvtDy7i+gMA3dunkSPhqUS9/Yz39YxS9d+LC+MieGFB4Z+tIjAGuu6tf+49dYn9tB5xXVjQMa3D7zlUsYkMOH1XhueVMFi7V5R5DmNfXe8kPT22hSHEvAwKHJunKkYg8/EdBbmkm08Jh0Uoc7lF+bxhH57lQVRGG5XtohR8zjBqYx1lF9k3pD3t0sCQ== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:45 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:45 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 10/12] board: starfive: spl: Fix the wrong use of CONFIG_IS_ENABLED() Date: Sun, 8 Dec 2024 17:19:40 +0800 Message-ID: <20241208091942.47298-11-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: b8c9203f-ee4a-40d6-a736-08dd1769bc20 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: Vb7VSBe+8DTzCD2aJRMT7SYv+vMXwfH9NLLCvlgJ1W6dGPfie37wm97Fn4ZbKfCAVog7S1Uh4gJHR1xD/fz/G1wTkBRJpKmgHboSeLblN0Ty3oP7hrVtjff6PZL9pW9tRbpOTLdRFBNJ50ZoDiyYZs9d8Np9C6azmkD4kIO2qB4rmcudiHTuRLiSbocC2mCm7eVYkoEFz4DBAJUO1/0ojT33gntK4f5tSLqoYqE2aivzqHz8gew0jDm2nmebFkUm5HlT038kC9EejVYmKYhVIUxbQDMrNPH5woFG41lDE0sY9mRz6skAA3KU3+AwEHVhdHYtueXIslqiGn36wH18ccRW88ArH9Fj6oRPvlXsDDwdWQFKbN2VaeSSanLjHPc5/XaQMAikHNN/PetlPc1l5H5aEeGLX1j8YdclnskWNEpWku1XsFeBXy9cp8eF5J/gOid0P8dJujy2mISpAboS/w456k8cj+//eNvp7Hg4FPEuIgNcIgTClg4SsaoQoLcfNMBfROG1V1nnVrNE9aVhoYPjV952XMFPcXXuJsmwgzsM2BKPBDKqReTxnMur0NqYZE2HIIIZxjq7YT/o3LpTtWxC6LPC3kX6f7O1MonT8eSvDWeh7Z4Dfvcvuk1XSNd6GTbxW2KO1h60eVNY7z3EUA== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H5Ex+P9qvH2hnPMTZZD3WLOxyTkF4nUeBGSnna4bviuhUqRt0nm6BWlcgCfPiFUAVanzjRKXhaxojJ0St/ICmOeFurSLe/7PM2ebPPCAWJyPcZMOUw6LmVbObuwayK3MJg9ZE0t9Vt3L3tg3/4oMSgrTMNyAeWbfy8vjOHOzN47daYPqWAr5U6txGR53Hn95a58nkgd+LbzZVpag3A1XxzadBrlADNYDAWU9qWfCjcxqEnoPyNOkjT5sToz49suBL5SDJ4bh0TJ14MKnUR+Aujm7zdev31riKOGQvkrDxsHYM7P1nFr/ML3AzoM6SSORSFF0guu89MANiS4IX/TXckqWrV+mWRinXxz4rdme5R623E7/8QHomgpgTiI4VbNnSoQ9vhVVcB+CirMOBFSugCFKMeNdMIUbygtDAj4i1eLaBbtD5os1s/K7YPF+3WpkHSGif4DL9L9Kaj/p8mpioYu5Ieac7GgX0SdhfzqPNf7wVu/9r701faLWnuZYFrvpijs2SWDXBdSJkJJNjccFS4dIscvDkgjdf3sOSxYIeeqnj1RM0EEj+zCHjOTlWK8YOTCRHw7K1kidi+dM/ml6zs7QQKy2CDuUQlJH0r/7bY4wuoTKqVq9r8Zuny9xZ5CtSM5b7l9AH71wd7JWNcI+yCyCPH1H0IPAbCiTAuD/Bt0HlFGkOyLhkpF5Od9UmtMbjFOoT/26Z9BWKCPCGSfK7Du77sYyq28OVzL3GvrSbux0XJpYz9QWUpZ93XBgHXU/pMqNnrmLljmakFr1W45KcHYurRjTJ1UhDkQm++mUJ1t1W0LOL+qBgOjANARNBC5ZtSqItbupjg8S8UWb2NKX/eDdfxiAnPkhKMVBtZAie/W+uKiSeE4Je4XpS6/Y5HcC0xSK12f4/9VvbkwN7TODYBnj3kH+2SKOEyEjs3sT8k5ya+hld1TBeq4YmChx2AIrhaMqxMJ6/hziYT5x77Rf2HeJiyacAk+Y5x74u+zYbX9fInaB3byYEEPJlK6007Krb6ptRylndXbV1IbNTBo7Tl38SWgkEhsHfHyWNf7xxeBB3kzZvDy4soiSeYSjjCfngx+FCEsPZphU6HZhScOhf1GmWAVgY84q+bqBS7+7eRdTtLVKnQIJbimc+ixnCS2q99Wjg96FoHgEMDbk43U3fxo6DOD84bUo6QzEPoKguf0ttfuoAZPJ/VvNZAk1JtILYq8LZJLtfIDVAELVvr1hGNrtyS3SJ/nPIW5DMbTMK82m0RHBh8itbWna5O4WcOlLXxG9xRt2fUmxPb91GfvYMpBreTdP9vp/QhgSPsSVgekwyjIcihYRxMFfi6bzQ7gZl9O243PKVxD7FlYBG2mN0B3mKj57s9YgRhm19ZE+jp55SXXNssTf5QXyjBQaHgdkg79hYEwtK8xRKbSHm+giu7KQj/dK9zE0mWm0pMPhqUc5vI/i5ZCl720UOPjauMgGGntA6XVqdsq0AP0mEbyrIMNvt0JQGP44IAP66tRaMTm6JF+rbcX5q0jlMbtTPsl5WZ95q45n2T1X89U3ijsPyVs3hKCiFkGcJEspobnqZvDtfHxoj176BEnhIcSwMnLfp1jT28Q3l/QFiult71Cb3Q== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8c9203f-ee4a-40d6-a736-08dd1769bc20 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:45.3100 (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: 0EITP5Y35x6Jr0+UpxRogkthgCgATJRQvDrU7yZRflhClibL8/hYAL4ogjv051arhSWz6EclGzdDIH/B9gxcTm+DICGeERlly3TckZSb9/o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The prefix "SPL_" is not needed when using CONFIG_IS_ENABLED(). Tested-by: Anand Moon Tested-by: E Shattow Reviewed-by: Heinrich Schuchardt Fixes: 5ecf9b0b8a75 ("board: starfive: add StarFive VisionFive v2 board support") Signed-off-by: Hal Feng --- board/starfive/visionfive2/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c index 38132ecccd..cf7f39d5c5 100644 --- a/board/starfive/visionfive2/spl.c +++ b/board/starfive/visionfive2/spl.c @@ -110,7 +110,7 @@ void board_init_f(ulong dummy) } } -#if CONFIG_IS_ENABLED(SPL_LOAD_FIT) +#if CONFIG_IS_ENABLED(LOAD_FIT) int board_fit_config_name_match(const char *name) { /* boot using first FIT config */ From patchwork Sun Dec 8 09:19:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019750 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m594Bt1z1yQl for ; Mon, 9 Dec 2024 00:27:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 879B58975D; Sun, 8 Dec 2024 14:25:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 7204B89529; Sun, 8 Dec 2024 10:21:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20704.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::704]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A0EAA89575 for ; Sun, 8 Dec 2024 10:21:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DC8oCQEbkPeYJDcA5gVkUYA3mVUqNsIdg8Ja1MTvX2IAkwPEUJBwmOQyItPUAnzIa6PIlaEKUqYAzQUC9rzWXhJ70SWQxuj3zWeonXxXv/sWl3esRdcgIvnmzuyI2AkCaWf1tCArGnfVkvOPx01YjSxQ42HWW1ZFCqxWGzr7YoDKFB4EB5dJ3Tv3vg0JRrNppzAOyd8LTLs9teFJGNHZEnR3V7P22mZClyxvrgKMuofI0ctxYwNJDaFU6Dd0GD9kvyqmGNkUyhGn93GnSfDl0QKuZzSOVy12zqPRKL62Q1s+/QF7hSmSAlA3SuFKoJbCKoiH4YZnGoX6vrST2ThR/Q== 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=bpPejiiLjHxv9Rcx0mbLmTc7fjIK3AHzaReEZeJzXiY=; b=MqbZgLt4F2pwRJzC5echomNT0Z/fMJarVQFw5QHx1JUfrXHKzxs/YCnV9czpW1mjIPSrrKdl4txaEJKrZzb7HkBgKdahDQ9BcHx9vEf0ki/kGhAzXsYpQEjPGCElPPx8kTKmHmVd0uHOfGMFOa6uO/VYvfE+il6iZFPd7rnd87sW5VJa4AsxfppYGQTI0W3z99ikCOffHtL4DlkR9mXcvaV2DX0CxRgpT7DydrC0PtJXF/QNRDnr8OenHMFwt55c9SybmQGMBXRBzx0uLDbZwB6MrliFYw68dgkiIek0ByP3hg4QZtIz5s+GaHZvPognUB6Dt4Uw6IBBnkVTKJH5HQ== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:46 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:46 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 11/12] board: starfive: spl: Support multiple DTBs for JH7110 based boards Date: Sun, 8 Dec 2024 17:19:41 +0800 Message-ID: <20241208091942.47298-12-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: 329d669b-20ec-440f-65a8-08dd1769bce9 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: Vwh/pkidnwwmT2GF5pyx68eHMSZJEXXiiGsAlmTd4JPK3Bqh0XlQR5qc3TLDP3nFLl3ICTv/OGRtvW+hTzNZ1L0nO1kNyX5keKs6wGKZg1EQFBZmFvzeZQWI7W+BTg2w67gq5FIDCFQn0wNaSBhmcdsXaa3TKbOm2pJG3xOHxcBc98HDe440XB2RWXoQRav62TxhDZHSiS/VpzdEQpQ2XfrICZP6jrNMNkw2qLEM6+N680Uamk1xZexKTpZe2Lyoo7g+R1plmwTjt4ypXH8Tq9t2XkSCP633CQtJE1zO6vE7XYltTdH6CiOWcSoyaJwZXaxUzmEt6RDj6QX/WGYasmOvkDZ8PfiPpNmpzQgYSSYZ4u7rUIdYmn/fz2yo016ooKtY0mHZTamhiviosOSmozGMHtNxNRcjKhenpN9JV4rXIMumyqvULRkqpSRONwncFhkIf0V8vcMXBPkpoJ+L37DKNqW1EUJaDI6uZ9wqqhjm9wxvpCb4xobCGz7EGcClOMiw5qF72p2WLF08KzdGivt8h4KdoMhRm6cFFd4IuzZrGdfUHBz8g5Ka7Fsi/iNmi1nnXJmhriA/qYP9KLNQePHquMPfXXODItrWFur662DTkr7QVks9sZs3BWqbTPINBmGenAIo/lKSy6pLuUTnrA== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: u9ddsaJDiyRhC5BgQvWF0/vkk9IgbiQYnxeYW1JgQWkUBAkRCIQzloZpeyJcXlss7nSuZfjuxHlWcwGI0qzIpfz9TBo7ocW+61CSf7tNHjHktuFdx790UA1EkCVPHvX0/n6jRIRpOY/BGa48gVnkcjUqlE0V3sLR4xAgmMD1wqnZVv59Uou4koRqSVFUQo8L8EOmZgnc7J34QNDzyBrG+XCbNVXAtMeSUyxoZwY0WW9L77cg1dhzqpCtkNoF7Jn5/kfT2JrpxSMmpeBM8Gknd6ccKJdmBRDU2hkP6A0EDYUhUDSJId0wBRD/hWGdAS1xnHLK88XfyhU8rniAwbmR43R+yohocKXj0zWlLtV5WjU4FgGhIpgG6ogm1vMRg15FCwucSH9yOXQnjgjLcmbluaanyWTuPzR45A6m/fDvlsMHxZzNP7Rz/EaqXbHMRgTCjMcJJrLAcDfbmaIcey1No7llc6NT7phmFd9BdMcIvchvxw6Az3RQ+0vGPbMMg3w61TgQlhRtg9fsj4ZFZsD5Oh+png1bxd4NnrscCeFmnmqESJKTU9M4mnKNSytTGAV0AUpDX8vX0LD0LCtwvvM9ZPXTzFrIwRIBt75lj7ap/FvHqyasj29226FxuC+YzQVGSMl6AR6lM9gy6KwiY3lmZTPV66xCorz75w6jSaRP1ypCP691JB2MPt0BiIw8j6SfbwmI+yWTFlssWdcyEjW2mlV5BB9hPCD7YUWaDCkyIJ5Z9RbWrd2ICaui8ZgCBvhEx3BndFY9cc7Wqost8cbvl8odTwcoVjnWCCMHMwdOnPTI+NuMPBqW7l9ZIHZNT50sAA8F25rWGCFlF/9ReP74RLyRJs8MGprgn4VRcB6NDXLJAh1+wa3zoix8rx/A0W9YsbyXLVJnpMcwYAQkoHu1p6VIXI1caXhsfy1Y58yYqt5tId4irsIcp2O7xSpY8KsedbxsSWD0DOtxrAdi7Ytxa/8p2IOb2gh+GGOrIU9DIV6H8zqkPsA5aHR8zLkRcK+00OGq1S1czekZE/K9vybXu0OgEoS+Uik1qU8IkijYFMAnPBPyUnPV59vCoVYRANsXwqw4skeAUOGPlRseTn2QOmIUKjW8uFoL8m1rnYoYoBL96o1wrA0GBc03Vsr24/pYdXHFm6yU9+FP2wQTE9VKD9/FECWFiyKKenhsTd4X9FUpkdYJFp+iBGqW7wIzeL1ZwOb8VYffeSfbid5M77vos7KwGvRRxrEPgxjxOEcmaRfTCLFHwUeQTRV6KNMItM3f+OncjybthVhVrPItLtgoCvYYeRMDUXQmjX09G5hqcMEpqPwUjg0X/m578y2H+SJbTBWbZnAWI7ybhO+GfviRv8GWHJKRRxq20SIHeAlI7PnJRU9toShCdYDlshay0rOdD0PoXZrYWkoBrCYoLARpVOiXGQbHsDVW/Qz9It3ByXIhmSi4ziQZRIQ8ipgN6CrTRcrEJRegezB1nuCGCDapfHeGGfR+nDOEvg7NAZPs3o56OkM54uNzBHbUlqga8NRWLrLhQysPcAs2dLtnvSQx7dkS/iGhJt2uGKoVHIhoZJspTIXEiEJ252L/Ms4y0VCHzKSkgRm9JpOsn6XIuiFp+A== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 329d669b-20ec-440f-65a8-08dd1769bce9 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:46.5930 (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: 3zxKE1qsqhOiRFdn0MwvYqZF3iyp/k4dVJLXaoyBYjGwObXIsQ89cSyMuHGdjq+kLeoL/0MWRaOX45LMfts4ijIczCEw+B8A6WvcmZf/Cg4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Get product ID and the other information from EEPROM, use them to select the correct DTB. Tested-by: Anand Moon Tested-by: E Shattow Reviewed-by: Heinrich Schuchardt Signed-off-by: Hal Feng --- board/starfive/visionfive2/spl.c | 33 ++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c index cf7f39d5c5..22afd76c6b 100644 --- a/board/starfive/visionfive2/spl.c +++ b/board/starfive/visionfive2/spl.c @@ -113,7 +113,36 @@ void board_init_f(ulong dummy) #if CONFIG_IS_ENABLED(LOAD_FIT) int board_fit_config_name_match(const char *name) { - /* boot using first FIT config */ - return 0; + const char *product_id; + u8 version; + + product_id = get_product_id_from_eeprom(); + + if (!strncmp(product_id, "VF7110", 6)) { + version = get_pcb_revision_from_eeprom(); + if ((version == 'b' || version == 'B') && + !strcmp(name, "jh7110-starfive-visionfive-2-v1.3b")) + return 0; + + if ((version == 'a' || version == 'A') && + !strcmp(name, "jh7110-starfive-visionfive-2-v1.2a")) + return 0; + } else if (!strncmp(product_id, "MARS", 4) && + !strcmp(name, "jh7110-milkv-mars")) { + return 0; + } else if (!strncmp(product_id, "MARC", 4)) { + if (!get_mmc_size_from_eeprom()) { + if (!strcmp(name, "jh7110-milkv-mars-cm-lite")) + return 0; + } else { + if (!strcmp(name, "jh7110-milkv-mars-cm")) + return 0; + } + } else if (!strncmp(product_id, "STAR64", 6) && + !strcmp(name, "jh7110-pine64-star64")) { + return 0; + } + + return -EINVAL; } #endif From patchwork Sun Dec 8 09:19:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2019749 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Y5m5138gNz1yQl for ; Mon, 9 Dec 2024 00:27:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2AFF889756; Sun, 8 Dec 2024 14:25:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 69B5089586; Sun, 8 Dec 2024 10:21:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20704.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::704]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B52B789529 for ; Sun, 8 Dec 2024 10:21:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CQcNt7z6bKn5xuinx4nWgTo3QsWTSayrK6rNq5qKPXyXjPpesZP0HY3hI1Bn5l3KtJnYx8n8BFxSUmOmjOIZ3qEBiaupk4dd1XIMJrGyHZRyl7YWOZIEt5L9mcFPf5LHkpcODzJ/hUJWrOh+MYmBXtXl2sLbiBPs0tEKqUkejMO0mgPCHG4bTT2QFQz4Nac1oNOtv9geLJwB/UXADpodusdL2smWnXe6imAWx5KYtGs/p64YN4t37vnGRETMT106lnONt+XzgQBmCdzjQNclr9geVw6EpQV4RpIIGF+5zYgMjXroFlGGSir9knKy0AdRhy/PiHQekMGruwv1cHKW+w== 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=bfTlD5yDg0zYGzBkVPFfhKsQq/RX7M38ybUeRG8Sp9E=; b=gar3d9p4MQnnWdpbWsZosW/tL6SKntYetpbPKDODAtD6OKzUmZjBhxXz7d3twIfUxahBy6spa7C+F1JnAiS2GHw00zyFbbqDGr/Ji0WuRRS51H87tPwTgsLC7j6XvGyItxN7Xbdl/k2uKmZ2LhMoBaTNfb5XuZ/nlACNutioOvhDRqT1tl6X5T/3KDYH6iqfG9Bpvus0eGR31sLxTET68IrUgxdbw6qt3ZDoL8OIh7seI/bP0rIEqSRD74d0CcwnIgnpjfOWb3pYoROfRn5z7MdlTHMqcCHWt5S46E3QjQBC1ZIwNCTfkI6oKac6E6Ij/cr+rfg8IXmF+Zb2c0kfmw== 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 ZQ2PR01MB1226.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.6; Sun, 8 Dec 2024 09:21:47 +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%7]) with mapi id 15.20.8230.000; Sun, 8 Dec 2024 09:21:47 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , Eugeniy Paltsev , Peng Fan , Jaehoon Chung , Heinrich Schuchardt , H Bell , E Shattow , Conor Dooley , Nam Cao , Bo Gan Cc: Emil Renner Berthing , Minda Chen , Hal Feng , u-boot@lists.denx.de Subject: [PATCH v8 12/12] riscv: cpu: jh7110: Sort the list of imply statements Date: Sun, 8 Dec 2024 17:19:42 +0800 Message-ID: <20241208091942.47298-13-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241208091942.47298-1-hal.feng@starfivetech.com> References: <20241208091942.47298-1-hal.feng@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0031.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::14) To ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ2PR01MB1307:EE_|ZQ2PR01MB1226:EE_ X-MS-Office365-Filtering-Correlation-Id: d26312fc-3fbe-4185-a4c2-08dd1769bdae X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|7416014|41320700013|366016|1800799024|38350700014|921020; X-Microsoft-Antispam-Message-Info: DYxdBNg1K1vIsAXA+nnBOWNUkIAsM7pG1a+jpZtf7gpCgi+esRI5UvstiNAFPnSmTDFAjOxuE/uy5IWQEN/QuRLzUXmOZF6gPxE6khj50d+Y+myHmsDfIYgVw8B4YK09T2xayiMYuMpbMnwdqC9r96tNoaY2pqgweSq/agDXxAEhErPGIo32xEZ335MJPaVAK5aaTD0xps6S49C3t7UzW/2p4ioit0eSWV3p7wTgNfxP4VwNY9CLRUn+82tg7XB2kpFT1GmtpovHYIAj5fj/jA40lMP8dh0XY3+3M3IAtGj+2IBKpnpX8IfIea0RLuH0ixjaGgX/utXk+Kh7wJTCKvTzdXzqYNAd6MpOiVkokLQKMtIsryZjte5Kok58jj5QW1CPGvmC66Y2jE9r9H9gEuyWs9JkauIZU/JIsUtk7z1DWZcCO23GV3rQTM4WTd8TlC3wzJG6cEpnZMp6eI5Z84FgNiKzfT9vS7XJU5siar7vyfSL+IK/bLY5sP5kFwRYEacmKXKrH/8gAWp/mPFE3L5BAU69eco13QIwX2dgwM30yptDUgOGcRj3Uatd3obVOps3k5/2EmgdjFw/uNOUjqHc3dyoo3mv7yTIpuAJxrG3DwmbnWCW3OYNuQhkqwNp8/70UAcLp6Vm3gmVU7EE4Q== 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)(52116014)(7416014)(41320700013)(366016)(1800799024)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xbXOoS/lJdEjd0blhysmtrDvs7gc8OSdnGa/KkKbBFdWMa2M7rtDrG5BLVW5radeZQyLfTP3qxcZW+htXMKTimt1CywYVrNlkXBmCQ59Ff39powo4RUMyhf5t7MgWP1xNhiZLWDgzC9EM51rJpyXMu1MCd+zHQ/X6kJIRdzJyUfIVMC2+3yFT4CTc44Rd/+N/kenTjydNxajpgSKIWfN2C4gpv3nqezS8nOZdpk6eGbsUb17G3EM9YTmMsNW8jUeiC1JkxSW1rfzfAfXSy1wSy3CJYiP6ZpZMrHiJcxOwCtj6aPnWohHFCyQyBZwQfqiXyG62cTPMC+y5odw7eYkpE5PtxJ8hMQg4NPBSCulfsM/7J3d52JqQUhzjiXGcXWVzP8XACTIKpimj2QnuCh0NBR298B7J8+eFo0VmRHzod0LXwqdTHKCPRRbkfA05hwcZ5UTWWdi8sNQyqwJxqSRyXwx4K1L9GV8wFPoeeZeHlYU+LsdJJcOZuCgmTPwau+Cee9De4R3w7c+j090v7fsBROOqE4lNtNzImWdP1Q34BORTPXmf15ejFbVuUXe5gcissDC9ooXBO1t9JFRVMUA1jQOeYybyTxqbVRpZl5q7vN7vrfrM2YuljEbDA3D3hG50/FOT9mmHIORWMg7ZGqv7+hNRo2YHSGO7FArSmDwVaowQOf9qqxSM4ZNrFOWqrpLuUkAO/dLvu78Q1y0p3vZFIPY/vPVF4hQulk93md7gbYYsQa94ZwsTLaUEjsAkxO/q6cpBw+GJEumj7R0OhDD+msL1GZ0sDx4p+Dh1A2E4UJN4utS2s1AcTaCN9kiQF0heNYjEPaayd/ox2czJEoZAD1Mvp2iFm++9JYgPkAm0VCNVwV8RYUFhHQ+PfQuVS+oscIY6lQwcG3YUd/Le3KXPrx1V3e1S0IqagVzzyQGrs3XnubiPIKJr5CQ1py+yCDkLA9HP2sh3EdfLoxd3gP/ArcvM5h1UrfxnUIXWQMsrTDrE5xIr5AwPrw9BmTrKkFa1eeymJQZbhKF+glVDJJwjz3j6aQuPVUs7pzyzjNftnGRrLST5ViFieEs+jUjlNm+VfQMe7jVASTN6x0+8cAYLknKIXA9RCPS9j04Z26ZgjlL8Apn6HwdPw/sPwyJr+gE8r7+I2RJQlNh99w5Dvm0RT588fdVM/r5SPW4MZzXYh1K8EIXHSCuALB3AaDFjULBz6ydew0wAqPsgZsIoyGf0RtPk6EThUjZbc1sjcc2U79IJQhTeEDXRick2ugTCUGKhphXRiV8t4d6QfKB1UZYsN9+MS3npxOSfR2G4Ku0n3nrLQjWPjbcnxWGY6q7C4EKcM0vVfpJpJlq3tzn1XsOawLwdqoLRj7WYf+PQ4odjjoTIZA7dhv6srBscL3tLiPYo4Dp+4D+NdizFiRfg8qyglGAyRr77bATFvuUIbw5iF+WmuaJUidzp9ckir4WtFnMa5nPyMEKb+mLqR+WlWjX2e5KmTLQ+QnaEPr83qu/+WoXGO6V4BfRoVnqqV+pFVtbKxFken07UQ4vpPB34+1dHoOino4FZP+Gh5DnuOft5PlXh9VEybJm/j75DIys8mZu0P6Poo/TG2HzP5Osg/4fBg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: d26312fc-3fbe-4185-a4c2-08dd1769bdae X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2024 09:21:47.9239 (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: 57z1KIApdRGCLMKjKneFPkkuedNKAjs+sWYXjpw8QCj4o1zaKg1cshIWe+cfDCagighpaslEME1fSI/AUDPcDJItxJuCdwIC2JHfffUHwL8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1226 X-Mailman-Approved-At: Sun, 08 Dec 2024 14:25:45 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The imply statements should be sorted in the sequence of appearance in .config. Tested-by: Anand Moon Tested-by: E Shattow Suggested-by: Heinrich Schuchardt Signed-off-by: Hal Feng --- arch/riscv/cpu/jh7110/Kconfig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/riscv/cpu/jh7110/Kconfig b/arch/riscv/cpu/jh7110/Kconfig index 9904a60ddd..fa47e55226 100644 --- a/arch/riscv/cpu/jh7110/Kconfig +++ b/arch/riscv/cpu/jh7110/Kconfig @@ -16,17 +16,17 @@ config STARFIVE_JH7110 select SYS_CACHE_SHIFT_6 select SPL_ZERO_MEM_BEFORE_USE select PINCTRL_STARFIVE_JH7110 + imply SMP + imply SPL_RISCV_ACLINT + imply SIFIVE_CACHE + imply SPL_SYS_MALLOC_CLEAR_ON_INIT + imply SPL_LOAD_FIT + imply SPL_CPU + imply SPL_OPENSBI + imply OF_UPSTREAM + imply SIFIVE_CCACHE imply MMC imply MMC_BROKEN_CD imply MMC_SPI - imply OF_UPSTREAM - imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) - imply SIFIVE_CACHE - imply SIFIVE_CCACHE - imply SMP imply SPI - imply SPL_CPU - imply SPL_LOAD_FIT - imply SPL_OPENSBI - imply SPL_RISCV_ACLINT - imply SPL_SYS_MALLOC_CLEAR_ON_INIT + imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE)