From patchwork Tue Nov 19 02:04:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012992 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 4XsnxY68XJz1y0C for ; Tue, 19 Nov 2024 13:09:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C334894AC; Tue, 19 Nov 2024 03:08:52 +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 837628926F; Tue, 19 Nov 2024 03:06:02 +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-bjschn02on20723.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::723]) (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 DC5698931E for ; Tue, 19 Nov 2024 03:05:56 +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=NvBzkTxA1Ba323vSyYGzn2IpxWuCC+eYUXNFEY+jig2ro5YZ/nnZkVgoNxrYJxZfYYg4/CIRIMFFeVGvj/fK4H/uNROJW8MNy6k2P00J2PkPobTVaIOK9G73tvGlAM9XLDkwdFyF4Hvw9sziB6Y74Pod0SYkSGCPkf4dbLsNrDtEsFzKuAj/B3TiVyZBu/wmSo8GgDhBJ/8ct0vJ73St5/PqAfQg4N33GKlv7R1na0RYSxm2619INOJlmAWDe4C3Aw8Xmturf3RTwclNjcSbTOunLlwlCvSq1SXVmHfeVbnd5S20mL0J/Tqrt+mnYqCqFu8iRnvfqmn07PdrL5Djkw== 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=hVHkoJBPE1uiyl2gqcIeiXf3ojJPxDEgZrjf2TYDPxQ=; b=WbLL5QVYn+ivDYY1c6dAv7oJIkuexPPHnzzNlbe7/+aMQtiWcneRBR0LNT0sJXyRdb1dYEShn2JcvOebhIqe/NG170NymfDA2ROsOMWR7gaUhoJG1qYTA4Cbdhf0b8BnGThj+fgJdR1jFwQjDR2labvVJpcJkObC9DpVU8s+zo//ohSBaCi319r2qC5UzeRNx2lvHwiyJ+fF4eyBzKZwYAfjQIt/EVdS8Iwliy7kfpezW5Bv5FUDCLVvAUQBXHmTTEmyrA/OE4tKDMZEkom9R3gX9R4sFlNiUMfry//mgTPfLESDkjDdCjBBQDY7/UtriYqT+Yo/92Roukhr4Fpehg== 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 ZQ2PR01MB1275.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:10::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:02 +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.8158.023; Tue, 19 Nov 2024 02:06:02 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 01/11] dts: starfive: Switch to using upstream DT Date: Tue, 19 Nov 2024 10:04:15 +0800 Message-ID: <20241119020425.51989-2-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1275:EE_ X-MS-Office365-Filtering-Correlation-Id: a12ddbda-f6a1-4401-8146-08dd083eb7bf X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|1800799024|366016|41320700013|38350700014|921020; X-Microsoft-Antispam-Message-Info: qucXmrObnqJM0NX+CC/nbtTytNpODX8+oKMOH/dZ/2ucmNcsK5uLcVhGsoOljFadx8TFLUOpHBaPE2+X9jm459D0Hk0/qXXr1IT8qylEean16vrLuLyWhGtDtXsTP0gZQHG241CB0STIUJ2zZdJk9IAZtvPNkOyYi3dBqlyufDOU8V75ILIBIz4xaQ1hKVNY8Mdo4B6ZZ8OU0HzCI4urkp7Qndq+Rv1h9y2taaqZ0DJAD+b7V50L8wsYk+rkqETF9SmA/QBQ0UWcDdSrhkGZbRbsX/52+Z6E6HPhO6af7cZrRwqX12KP5LAiGIjPS1fdAlPqkDI3ThCsHlAmsbXkG9qGJgiazu9fVJovtUbTGe/wZt/Haowbnl2H7Rr/OOYD0Loybl/RR2ROgfbBt1350AJydrjDRymH4PNPoviW4N6A71oHdyRwd1ttmPuMkZILwM7aNIDQWM/NfFXSrmleFcUiaGBh8Lxin91X6r9o9b/TuttkLEfsnI8HP5LpLCZGsddTAC1ogs+JBlRGa/raH1RwahHbuMqhP8azFDPzJumZB75so38Mhy+mXHrmDyxLNjEuur5XwXEQRRxjLDDH65eOukVUQUjuRAkWFB+0tjnx1Xj62unR+JYgUZJf7R5IeWF1eXR0JwOYlSSGjvGIPg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(7416014)(52116014)(1800799024)(366016)(41320700013)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wZR7XVOu9TYQUqUX6FOjvssiCbxWPDgPmL2wPMQ1PbHcfyabyrfxSphcQeFIxHAn7yf654qm3OMj4saK4YYTmJpMSIoyD6gdjSu3NAxFf7ewbjUtqa8677xzZju8hYyJhk5OSbgZo0umSut9tcXc3sZXoxCzc36/6gpTi/1Eho6q2737Cry1RDlhB5qdK3xE7K77Xq6PMKlqKA7TnXSfGCnNMFVKN+c22zPlP8OCVExjEMI/bzZu2ML/jR6PfpjW5t4X5HrcvUPIL8RGAHfNow8NrCmcHb90MhgNNaUkBxdwyrmIEh3DIZNpPoAUhYTBb/iQoVZGrgdFML/EW3u8J/EKk8S8CviydrTd6eKXPRVbcYmZvBR6o2OM1bOKLrZFer4NgVQ93PAaNTEkpjhzRVbYb7yvKqI9miTJufeq4K3+4J1cXNJ04yqwsrZojVrp+kik3bdLVl2zV1RicnKBkPU2DNx6HQAyMGWuF/kRTjkwPUvv2R/vWCseg5XAyQwOP6wElYhUG1VuThOkUxvJdbndNndirK7Z1MZIiKb00JEJEgRJ7ppXJAkQhWhTSIDw0Pny30JiWKG3yI8iYXKM531deXR7r7P6V8mKTArriE3LTydAqpb8ZDEiwptkCr6mLnvYvuLxFlYcweQjYRKpZJ3hIyTRnXwH9Ptzd5C+WbEQD856KZUQcmvT+xeaON1ADXpaRu6EjbtTN5iiWYXfGNVkQ28Ggih7Iys+Bk422Bbr+qXD7g+Tw00FAPhIqLk/LiDCcGe6we7/bdTwiEGm0YuaE+qE7+VhUaED6dTR6+KzgVYhWyn5JQHVUxRWnKdH+yrkTfJBTLZtiFiPrt0W5fov9C12FyyZMioIlfxelIvIk1jNg2wdm+s0dxstlLCcFMovZavvURrkXAQH+RgBkSSaDfOdQNdIyZC7aaHZgqzsBIqtOyW29xf9RCXO3/gStHPICLMBkWLkQ8pC7sp7PApF3KMVXcpCK5Vwr7jFtyALHiFJcFlHBhcNX/Ock5CSwrw/pHNgXgskvJRdnNPkffgMUCKOuBAXQfpYcElL/pWdMFfv+46fcP0ObcncBF4VZPJZju8xmcf+BhOcJy36jeNhY+444U4WZ9tVpRDNc0vAW2G2C8LrPp2bC5d78/q3HzOXKWlUkLMzGpANlvn5yPqZpkdXdhaUu1ZAJTKV6ASst8MUDXaCuyvJ5kLuJGzyjaDW65nqCIzwlT1wrS9zcUetYRCfjLUHIL/QmflBXGnG0/vfLvsoA/OedAD6wSsA0w6NddPOeKHScolYMd/9A4k4pc+dfCh8MUMCvQVKTrCsU3bc6KEvKDPB8x++/buMnwxWJzxjI91WBDKSjPHAzWSFAPUa2VSop9CzO3ZQXNC/58dqd3VsADPHpoYjuU8YZsSnFnVnQPSVYi0QCsD7Tqy9pCEN7LjWo30FgCa4ToC28lOnlOVNpf3GqXi8tbr/eqmM9dtoV2sxtSpvErFjjrrd84Z8GQwOHUXFgi4BESQ32xcvmDbx0PK5Wl7YYhPXQfjLR8p3JBTZnD0PHxePEoheSnzwIQWg1DNLQwt38VIPYC6Sd+PBw6dx5M1O2eGi++wlTtTS25P+wY/InGnjbQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: a12ddbda-f6a1-4401-8146-08dd083eb7bf X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:02.3110 (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: u1RUcldReWAI6jJ2DNuzBP/1Hl8Q3klJ0h5E2cYfcKNmeHcphbM8LBYEsxa+GBEcgRNEZ9iE80GxL26vkGWGcmwtl93V2nX4f1baP0ZA99U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1275 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. Signed-off-by: Hal Feng Acked-by: Sumit Garg --- 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 1c70d1d4b7..389adb5e55 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 Tue Nov 19 02:04:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012988 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 4Xsnwl4NcHz1y0C for ; Tue, 19 Nov 2024 13:08:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F2AC1891CD; Tue, 19 Nov 2024 03:08: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 0964F89484; Tue, 19 Nov 2024 03:05:59 +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-bjschn02on20711.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::711]) (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 4259B8924B for ; Tue, 19 Nov 2024 03:05:55 +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=D/AU07xCkjVYC4RwLUBExjj+TXJezFc72DJmMIfCfHBUOmRDCIVAX0Z9n5uEZSE5V3RUKCXu3DtCANamLuEIGo5cJo5LytlqjrzoHlfHQ3fdlv+MH6C/WMgVNmXSizQwa3H+geERb76r9Io53MUfYuiBE5eSf+IFJ8qEXIdA4KFzNH9EdMVXs8kKHzraxQFBA/dZqFKkJgJYlH9N4ui7DB0MObki14zsF1QqOr39th9+P0omfdUzVX/JbOaaCGHf8ucScuZlTAL1E2kel/ksvAYG4HvGTcPEa+3F/n9LWBElDSLgHKwzMe8a2LqpNc867yYn+SLiOkp3CBfQJbSxrQ== 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=PE0s6y9EXVp0ASeC3jCAls3wNUR9El3OFNOE+x6PEg8=; b=mLykTNogJWA/O5BzS1Cu+HiBDExKBRbc4bSeotTGbae8DQSMYXgaGFx6dUSJ45XMwozYiivfqFjQKRmTsRhPN1H1PbEiu41TFcqT6h8Qjj64GpGRbgmNvqsAz+8cSgzf0hC4hnaVNxyqy4oMYQNYl8ApawtzzXoDfKnHeV4vGh/8hfhCh1khpoNUdNIlibp4gPJDymO8u1hUn2BbGrFkx9jteqziX2VRZ7WXvZ90ynkevOzgryPvbGJWA6mQGBEQ4mts/Ck605/XvIHSsqNW/nAVV9YSKcSuD5Yp7utvYROMNaQruyS6JdkUCUl8wUyYgHlIUzsj2tFLwM3EDjdwZQ== 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 ZQ2PR01MB1292.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:03 +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.8158.023; Tue, 19 Nov 2024 02:06:03 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 02/11] riscv: dts: jh7110: Make u-boot device trees adapting to upstream DT Date: Tue, 19 Nov 2024 10:04:16 +0800 Message-ID: <20241119020425.51989-3-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1292:EE_ X-MS-Office365-Filtering-Correlation-Id: b64e5265-d041-4985-9925-08dd083eb868 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|41320700013|52116014|7416014|38350700014|921020; X-Microsoft-Antispam-Message-Info: klncmZ90YHk2kZIuMJ0KRQLbNUZFoX6Vk0Zab4AYXAE3KwvdxdJB0/K43Th1tJqkoXp/76+IAo/jPboNVS6Xq0sqSZ+2sUieTAxiP2eZlJrutyryX9EhI5paxVDyarTgJN0Hn0WwyAJNpqAllkvVnEq0eB2U6lsh1UWSu8lyNEfRJwer4mF7GRilotFugNREyCyDdtP8ejcwU+RXvj59YZABc/B47A7yDtF27Alk20XbfZ+WC+U5sbJ7mS/1jIeyXcA4jXtrLBOPjf9HkZMZRsNBQ9yCSlfFX4N/BQ/PGpT6w3cGvhLQlMKYc5JYt4HMCu4UL4Z5kevLZt5t1CthjRolKudb4qTyDlxwYe6pgnSJOd6GRvn0VhJrrk1miOIvLc8HWd6gQdr/p0JXPxyR96CZ4yPtjhBN5dLw0ah6vcK8SBBu4H/r6ZyUHtL+GyRhr4ywTHKfbimLfcyYfb2MPRXE8E+nUAa6LuO0ojMJCX7xzi4kOS9/N8ci51hCzbqKvkBPZyhtwi/60fbJ66qYxCh+1D8Xv608LEQz9gHMh8CaYU1XG/WWObmDMUn8s/BVVfHmyl8W0T7CstinahRrwSF0Bb7F3u99X+C39QpZFTAXKMCa6c674HhWg2KbAQOrGv9XTmNcBENSoF3T//FfXQ== 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)(1800799024)(366016)(41320700013)(52116014)(7416014)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aOdk7F0bZ8owbqFM0Jjxl/9H/2JZ2IBuAHnVyjUAE44Dk60JjAO8XkNpQX4kOdK2ptv/3MYae435slWNlvkmbUQtf3TujFzE3MyHNT2nDQGR3mIjUB5k5/vNi1DhHiTzzTkshsBbVj11biLv2JEJ46QFD3kVTOIy1fNv1DaCHhXUjzM2qdug3tlndgPx3F3mHMUB668dD/IfcabcWFV+LV58ypnHrqXBE+yipkTvI5iZNrpQRtZx9KzwGePjNtD6WNGUwLN5L7v1QPrdmpD11zg/Y11JvhnC3zdK0+GKilpkH4i45+EwJjveyX5sXEzQbXmy4zkso6QJkNbQs4EQ/CE5WRII/7cMr5XFaOixR5DoLXjBEpZmzh85o/CQie4ne4KXNVaAqYLx5wd/PDtzbRqrHmJ4pqQozoJijiVz9D8kejDGFISD5oWXpdG8Q+V2nPfuJmN45lFL01WvzEbJKvkUjc1DSD5JuYW16WRZU/T0z8EUThj60WfOlLacMXi/AEtK1755nvB9vXXjYsOnAaVRduWtpTKRz3MZ1gg0ynY3cfcpMHQDYTd3FQ72qliIc7UlaQd73ejyh1+JZaMd9jyd4C5VWIocpBwLrEtcb7Em+GGLd2scbcXw4TRA4l6i3Q4r/scMUY4QWcn5/QZ+XfIZD7LZn0REgCk5m+UF83EIXq/vQlnV9Ehrm5OTRCV270iAUEKeTwnivnWmAF6HzBFvhBBbVNkSmZb+l+8FMORzBX5oYeAlvjfjTgh25CfDAv7+na5QVA5dHFfd92ihJbdSPeQ5SMi5nZ/nTE9DnGjjau/ocgXsSVdWRBP50Aw/jCFQU+CB0JG0+Ovgej/xcWW33Z5PlrM+pb+PBrb/Yk/5olZrShwimPANGT1J7GjCnDIPIwfd5D9My2z+cYOkLC/dumMl0GYd/X/i5rOLwiVw+bDRkeO5SHJMVDhVCHsHGbl59lLsSRj8GHFdG6doZ4plIyNn4BfgfersXltGWoDz13ljcUmJLVxUykCfhx9RhsFSmpV0ruKi+0Y02XIqUvS7o8qMlzqRsJCi4WzhLQrgxDMRZmKHknIg65vqKPr2rM69KHEHND2LOGnmySmOwfPD+yLqMvmyoETGR6DzMnuDVEpDfyOPJLwJ7NxIZXCMk1e47zgbhvOfGxcT81koAQ+jy8eGvxPkfiRgG86ruJhEQVSmmdUMgBfVcBPEkNS60nNLBsyn1s7aaI4wIdsR35/57rU+VoQKkin3JEwumOVgiatsFQs+0HBphl3k+eslxj27eYSw3guT/T0h+xaPOksJyfuv0qxsQSX6bjp89vcinoFUchk89IyUHIhnoBw9fPzV3pSxM5SVtFgQROGh3ZkYYrvWWJgsEEvZchAyQv+uNu66ekghknJZ5C7Lrd7aqifhvB42iHqQ+874ErbN7FoDss1zIwzIFP3SOd5wnk1DSmUOH4fKvXGiHwFaXXeO0M28vrKYzn+bSLmikMlZCLch3e7dKSIi81fMBYg8IVzg0OLncSvYDh89ku+5P7+oLTS6m3qVCl5tOOPFPWHhRZfkzbU/KFWJSZUSp8COIp8pnuV9elVU4ahzjEEEp3sl8nq8+NS4sbJhO+NYN9pVyQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: b64e5265-d041-4985-9925-08dd083eb868 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:03.2838 (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: j+jRwBFJt1fEEzpTQjTvjw6fNUXYxUNCVA1CHG0EmvUkaTXqpkBli9sDn+cj4AYULxlhnDMgIDBXmJ4GmzSYblx32Nuw3dEL31NJ5+D3DOQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1292 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. Signed-off-by: Hal Feng Acked-by: Sumit Garg --- ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 43 +++++++++++++++++-- arch/riscv/dts/jh7110-u-boot.dtsi | 34 +++++++++++++++ 2 files changed, 73 insertions(+), 4 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..fac9e16fb1 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,42 +31,70 @@ &uart0 { bootph-pre-ram; + reg-offset = <0>; + current-speed = <115200>; + clock-frequency = <24000000>; }; &mmc0 { bootph-pre-ram; + compatible = "snps,dw-mshc"; }; &mmc1 { bootph-pre-ram; + compatible = "snps,dw-mshc"; +}; + +&phy0 { + rx-internal-delay-ps = <1900>; +}; + +&phy1 { + rx-internal-delay-ps = <0>; }; &qspi { bootph-pre-ram; + spi-max-frequency = <250000000>; - nor-flash@0 { + flash@0 { bootph-pre-ram; + /delete-property/ cdns,read-delay; + 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 +110,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..21a2ab1789 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,35 @@ 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; +}; + +&stmmac_axi_setup { + snps,wr_osr_lmt = <4>; + snps,rd_osr_lmt = <4>; +}; + +&gmac0 { + snps,perfect-filter-entries = <8>; +}; + +&gmac1 { + snps,perfect-filter-entries = <8>; +}; + &aoncrg { bootph-pre-ram; }; From patchwork Tue Nov 19 02:04:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012990 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 4XsnxF5YG1z1y0C for ; Tue, 19 Nov 2024 13:09:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A69EA89442; Tue, 19 Nov 2024 03:08: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 2D5F889258; Tue, 19 Nov 2024 03:06:01 +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-bjschn02on20711.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::711]) (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 DAF16892EF for ; Tue, 19 Nov 2024 03:05:56 +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=YRlN9Xsn+cyR/0kgzwGA009KcXDo3oC7KgZryfQusu82A1OOxvHa5gJMyY6yuNF1Nt2736sO9SeUEJZjJGVEl3CoOV32bJZVH3VdDBFrchireTYtSZMzKkNnWyh6EQUlQDKd+fL0t2PX/0O3Q/eeJxO+BrR5QKW4DOctA7/4hj0YuxX1BvSOli/fv9DiZLqgwnDk0xSkjMuTET2mieM3tLD7xMeagSAjnAK/5RUs0c1BfZmqh6CCAkXjQ9nTkbMFyfast2TPQ2YIYfcLMcFiNOFQYvRuvvvGsTLlhVOMkwyHQjTPpPDLhKTcHqj1fvAh1yxbILJVS/f8KBApJwH7gg== 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=mMUGOskJCJMmK5wG40VxQMgyiWbSlG+yfT92NZdv5X8=; b=mlNTE/tUtY2tR1BxwQPG+i7pzdvdWSYDg0gEt7WzrMxx7OHd3cudwvuLhUdCV22y2+zvRqRymkjxwb4bxqX1lbAxJQTeZI17r34Da/9HRa0g3XntDjezYNzGyOqJ2ZvVvEE8qbBewy0SAgefjbwlTSGn3irS4GJlrmpWNJP/ZJvBzJgPIVUCbADnW0fTiWOK2wB1MvozFvPKEDMCVts6j7y+Lh4bdPq7PU/qV23MdJyKAwO+omCTMID7U15eP4jivqLk9kJv9jg2R30W9iW4sGipHgsMC4H4Z8gT8r4Fwc3CXKQXpILKYnCYqX7D6bfaSDX8xIbxdJXhhviDEswhcg== 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 ZQ2PR01MB1292.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:04 +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.8158.023; Tue, 19 Nov 2024 02:06:04 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 03/11] pcie: starfive: Make the driver compatible with upstream DT Date: Tue, 19 Nov 2024 10:04:17 +0800 Message-ID: <20241119020425.51989-4-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1292:EE_ X-MS-Office365-Filtering-Correlation-Id: 034d2c78-260d-4919-5ceb-08dd083eb8fc X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|41320700013|52116014|7416014|38350700014|921020; X-Microsoft-Antispam-Message-Info: kBWdPu951WJ/Rp8+N+efk7ze3wWnNrjg+jyJaNERwS5fDv9/d0nsvHPb7PQghNr2Dy6u+NXOoXhujdXdUEabSr40Xjs/v5B9wRNviz36cYtobC8SotBO/M41Hz5qOOL/m0VUcnlS2Dv8SG1Y9z69SAOq8h0jpGB+/dR92MiQSKiedVQlZfKQW+HJh9imxj/s0yJXkxFdxYaFBWLlunnskpMjm50klS+DVEBmUbu0Ih5ahupFXJo7Mm24LaN8CPXjVAP6ttPN5DvS4nuqFFBkeITssq4vUBYqNctWZgQSZ/VLq1rdu5aoSTizYGIF4EJVDz4hzTqcRDNUbaTQ4Iw3XlLgM0rQo2E1X8Xglemi6P+eBoB6lef8c20zK/LgEzbml282KL9vkfHiVf4kKDH+ypeBzTn1BcxwDWkbYtywz7urrMHlgezBdMfC7goR8UQRI2obfthlXl8BHV4mInUEjd6Gx3yVhqC+vuQonPuMEOPJmkhF3bwiiQBpYgT2LjgmzLu5+wxmeJSdJzRrZDdM8c/ZWqiao/YNA0DBaTd1F/RJ5BLL2UaGGcF5LSASyzCAm4uyktEie+JBR5jAbg3ALBEks5Cno0Tt6z4s23x65IqXYBY09KN6I7i2RMtJZ6FFBSBeujrYoZQ/EAMowkazOw== 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)(1800799024)(366016)(41320700013)(52116014)(7416014)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: erXGE81OOYS0qDQWv2sJyWxfYFIkdA06P/RKm/OnKYbzishqwd66OpT0t3wNxTfJuDDqaJKZEQnHAn3VVJKHeIpSxa0BfVUgbjhCtnc/K2S14KLzh3tvMpTqsyYffEjuEdlkL9mSndOrRXKqtHuN4HBHdnQv0YVJA3ECzB6w0ywoLowXs3Y4K/6OnUUykQnl3nXkXZ6/qhrgcyPrT83lTLF8sHLPWwjTLbnJIR0WFXlv4+xYmdL6d1q8rZmSUFlofwvfdLQcslWnWKTmQl9L/AVnxluQU+0hjNsV9YACoxaORk2r3u9zcVTgMKg6bE3J29W1gIYo6FyWk3QtKFmXcS2i7A+1PLYKGl6FanftztTHXceuxeHj8ajPv6ULd/XqlJHAZ9QiHSRIlEPohz/GpiGa2Uv3Gnu9yYCFptg4dFRPMSyed31oWtWAV7pMNuBl2j6RUVO98N67SQRtf996Nue37zJF/BX7fkebq/77V4CleVEBmTosVQHQjXjS33soxQspmLsSlALcZ9zgygfCpGyHkgQAW5Wxv8A3SplvJ+LVsQYljzGSrFURX1g/7j0Tzd5uejMnKB55R4zKYwGYZ63eamauYcksP2Bt8r2hVU36uHNhEGcG30aUceEr5R2AQGpMA7N0JggYkJhe1+fU21KauuzbNwd+wAL+iYeIwdYDc1KHDZBLp0qffx4QrlexgYJEdW8yk3OCjuqvTBlQlpbO5YD7Ak+SFWcsdxCn2MLpqGTsyypTOl4/jCjGohv6WfqFk1apao0rbP6ov+KSTV8nW6shoQh1/88vphTrBRmt4RheP/i+hbx9f6yllZdIaC4ReV/MM/45qtQyt7+nvKviiOdKYIR1yguc8N23QOdhd8jATaNb93DAam8kfTDGu0yg1us81YTeELN6gj4ch24T+66Z1MFoPWviXZkZuY0KM6N9V3BhmyxRNxag4fS+cuRFTlrHR09yA34uyrHwW2y1CIJVa9zYJgXDuZlNuXujILhwLV0hkFbYrFHX7b2v145CxcUYE2tlxXUkRYDzYFRvJp7Ygt+muoMkOE/9+A5CWfgkgGouqfL1NelBSGKjNbKlyAqrAj2t1QlpiImM063x6kFkrEDfr6iJf1mJz0DaSf20uru/wJd0Onn3Y27Y6J4GgG9IHKfL2QDsju1OMSDJjG/2DY1129CxzXM3GeD+xEk7KfzLdyZ84FD9TnWnEONuOMdGwdk4Fk0JBktAjnKpxWDAVaKszI/VZ66iL2kjXmKzGKsmWcKg0+kgt9Rn9JQmpCyk0duBhjsaU+FI7ZQ6zTxyZdW9k99NZ/4Og99p915rf1y0lT3I0KXnZoiU+U2K679VAZNt+7r7yvKPmvGsSLHgl747hIv6FFDecMlvd6iFQq6Xmq6m0Q5a4YLCzK9tYFPml9SeKhttbruDRSYdrxR265PLpcQ3ns8nnwk288zoveGmE8NulZG5VaeQzH+oL9YdazTFQCHfkbM8PZA/9kKGW8ocBIM2CeX7dt6oSciPdmhV7K6EoBgKXfJzc4xHNFEsi9RIRwNiiHEyVXHjjtrq2FOcmWrHWesVBoREDDgBNl4i+T8YvMo99lGPz3hXgeLoshaUlLMChLrPmw== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 034d2c78-260d-4919-5ceb-08dd083eb8fc X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:04.2273 (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: K+v7yqop1ZgLYnT9kHUek1fjsCZCSUSkkY9TATDLtiRXJgvXLg8Zai1zxfiQpMh5Li+2OhSkcX0e4UMSHTJPXGN2Dv16mxJ4Ei0fAhb0O2Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1292 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. 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 Tue Nov 19 02:04:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012991 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 4XsnxM6YLmz1y0C for ; Tue, 19 Nov 2024 13:09:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 309AC89484; Tue, 19 Nov 2024 03:08:52 +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 AF0948926F; Tue, 19 Nov 2024 03:06:01 +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-bjschn02on20711.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::711]) (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 C0DE789442 for ; Tue, 19 Nov 2024 03:05:57 +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=C+2lHgaWSfA8oVw8JZYYiR8d2lpfjiMSNBuzporyrziZraFQ0fPzjeLEpRjbEzWrdg2asGnb8beSM0ZqamrHpjj8kb/IkRpm0iFvccOn0v2oiyzvfEenxSJlVcPK0nG9a74Vvvma6zxs1qQVydir832kccjrC2w05iw5Nep+tQX59MhfwyEXyE757B0v/V5JDSqmml5F48Vz2ktSludGiV8NS46l/Wlx9sqNli4oUrCzFdZuH1kZ5orVfNyY7aeE3E3We/KnrKRRemcqvtPntRalEEPUSHzoOavQQvutS9yrGKZ0XzT/pf8Haag6sMiMrrtkIfYkR+sRY7f8vPfu/g== 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=8m0CEZEOvzaqfXNChygsnyHBXGVL+Shx2XX9Pp2obZY=; b=CfDGfw+L+ObdKHmIdtwe9J7VlTYTl+ZyoqSjao6RFaWIQANdstJkXVOg0UahKx9xIAEZo+rHE03IHsxvKuEPBJlAI7L9SdUEgOtNJ56mZoX9ZNJCR5iuXIxFKMBZ5bcYfa/mGC0ciOFS9tBqsBKlR7Gc5pliUWIcQMZPc6wt4aQRX2edNxSy4fpsjlg/wF7SsySmFOaDqt2tkuYsSQHVa4D+HwwkE6aLzk4o62sfKagPPKk3Heb+DLX3KuxKMmQm12B+ycURTEhFFaYB21LzGL4NUtVv7aKrYikapnNieUWVj8Q063HCDNAIqzByUGOgB8gCT8aHHkRkmbd4TYao3A== 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 ZQ2PR01MB1292.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:05 +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.8158.023; Tue, 19 Nov 2024 02:06:05 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 04/11] riscv: dts: jh7110: Move common code to the new jh7110-common-u-boot.dtsi Date: Tue, 19 Nov 2024 10:04:18 +0800 Message-ID: <20241119020425.51989-5-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1292:EE_ X-MS-Office365-Filtering-Correlation-Id: 68bbebd9-a5ea-408e-5138-08dd083eb98c X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|41320700013|52116014|7416014|38350700014|921020; X-Microsoft-Antispam-Message-Info: S/7prslXp3gSWGBuWkcknFafSE0J2l+WFjbWqI0VoDLy1st6zz7FOmmOnkG2XOeEDtVJb3zvjcECV+BbX8Yc7SYsKT1lNzhq8290lnXotrarJviea4CqaifnLsd7WeOepgXRPz/j5fRXAHLC/o8kiXY/oPQqn2BvAo63iFDiCyFe5683HvjHnpljdL5GLWM8t1c3StclrE6otO3s0c0Q+SdjGpkajHE+J83ZXsR/Iv1sMcNTUATWQuy6KCaxzAmojEe8PpKh5s59c1IY30zqklANB2n8CUgSl6OTva0uUjs6f+lDARVm0ErUB+UOF2cqNy2Q7qDj1Y0KqoD8uMX8dTiFWdDWm+AFyjhwdEgHzx/+t8BwZWgttqK27EgZ4z/4a80vHtnx54hecjXPtORcsIhA6PLvV42oyxo+JMaHCwPiVdWXq6EJlthRgqnnOa13X3NMNNtamFQdEd6qaX41PpGnltQk4x8Utj9NytBCbkadLDvw0C6PCQv6xRcjJ8cAMOJgUNjS2YxBSUr6h3DeUFgRX2YPjOWBJlZzRtiOrsMA0uZPfqud9f44ncw9+Y7DFKntUH3Al834X8n5b9ECYU1DKZP61tlvvnKdj7oWL7lBRKfZQajJjSGE5VnAF2Q1BiCUi1tWAtvNUWsPV0g4RQ== 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)(1800799024)(366016)(41320700013)(52116014)(7416014)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1o1RNHcmnrhPmjf3M8jpZVncxtOIXPo4NRuN9OtGLzjeuqAM/2hIv2oL+cQ4uJNNvhVa71MSg4gERvyQd8+eJ3+35T8wUasQ7grvQ+KUgChg94VR+KB0VhArh5uzbEZrBDCviWG8uUKcWGJ8o6aJg+wuH7s6m8hFb1d0UAUMCwwhvxGDGksyIXByZMWHYFBfru4IUqUfdjZpbn+/oC83MaNWgqtcGS/q34/AtzHHSaydWwP8t2gzDugmPwFqqm8uuEN0Evla+wlyd+pMGwthYxL704iTeFo9URxh5QkePH584dMys2UxG6ldjMBQNWJuDqDMGQkxbbDkAE+hzvF+kveG8xfrbGPiDAvDDQXaN1KvfDr1ludBkeY3m83do1qgIcozljepzQfqHdsXMKKIf6qha1ngcC3gxh1Pupz6xuJoRfGHCQRNSiXO4FSyCHGO5KS7rX7FtDw6PeW1PXokvjryp5tWCNtmYCH0GJ6Kev55qlxkP+FYo3FNvA6Eibs/JJo+TJyeNp9RGUDC2gZI9LgKVvfjmuTRiEKrAMA7hyBRn1lhJDBohwAuQVvqBCuxEE2f4H8HCEAbxyEt7xWuU6vDC3GaX3zQ3hUBW3ZP75t/kEiOXjaltRNJFyLo01JVOa5RT8NX5A0KwZ7x5Pn5mR8us7vAhnvTlgWnBFiHGks7d65Sj97yxpQ6kkHfcyGB43LhLA6RP287BjPmGzjwl/4I0OZ3jPhNUCkCMMaJ3j4IPVMNwkvIWDeQgZ0DLa1uMa7b5n/iByDcYNv+Szr6Nh31nI/QopILcMJ0pzdoi0ULCW9YqpHFhUEV3wZa9gMjgGxbfgDpYhCAu+arMbDA6x6gc0s1AbSXYq71Dy9CNNYVDmqR/o7u5adzDGpEgp+nTPkdG3hOIxMKV7WzabYT8aSGtWLWYg1GGBvVR9Z8PF1gkSpmMPeZhhlbZ5CkGL4N+i7gOcirycLv2N/sWtjdPNdB2417F+voWKqK4/AKhNhXSMf+N+6IlFMsFsDIv1vCgoWnarZ506HkassUePb8CXbo8o5IFbMZde39Lyuedh2aro7Y4AxSTtH/2nHt4imyPPt0nO8g5Lv2pNxWkzBJcfxW6FYOEaxP4rdBLTVFfoDT9aVJC0JKpcFEcQQGCiP2lYvd9HDx2JX+JzVE6K+QtK6jF2bne842l2G0DXPp321NyNTntOOiZjgugwi4wA1AqIpZ4TXud2MIUrQWFA5NdFuCLthYlCd90+R0bs7F66KB3HM4DRVmtqra7XbbiG0ATWlZsUrThVeYwHVYZFFPKY/buzZARGpgFjI2kMtZnX8sgEx7+fcrY3lv/t8row5eZ8mAt1hT/IVhZH4IvHwECpP21Gj6PV8I86kA2NeSzVOGDGB/xi1YyZypj7wwwBgAOGUZqkYs/fwrsR1gHSAsIsUgbqh3xf5/nenfcu2Dr3lQy/Q4iAkQWFHEPhhgsA7F9PhUVEptsEuS2TUFeuAa/cwzLhQ2MeILVz2are/wFFc0rAPnHLYBsDRs+hemaRQFfvJEm9ptXIfGeoebGMm836HoGM5q20nZN+HyHFTEr6mEtX1PRWPKG5Arp0umSk5cnm9BOk76MAoofQw9jMrhwQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68bbebd9-a5ea-408e-5138-08dd083eb98c X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:05.1662 (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: Umvv4eHfCvVP7Y1dm0qUF51L4KcDIuwuCQFdxK5gVOg7vc/EYowVjPiBo8QkgLNSQ7CQDpyLnlLzclKs6gJV+J42ZkIIDuS1zSW32hFMoOI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1292 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. Signed-off-by: Hal Feng --- arch/riscv/dts/jh7110-common-u-boot.dtsi | 144 ++++++++++++++++++ ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 140 +---------------- 2 files changed, 145 insertions(+), 139 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..c44553455e --- /dev/null +++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi @@ -0,0 +1,144 @@ +// 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; + compatible = "snps,dw-mshc"; +}; + +&mmc1 { + bootph-pre-ram; + compatible = "snps,dw-mshc"; +}; + +&qspi { + bootph-pre-ram; + spi-max-frequency = <250000000>; + + flash@0 { + bootph-pre-ram; + /delete-property/ cdns,read-delay; + 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 fac9e16fb1..f4807957ae 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,48 +3,7 @@ * 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; - compatible = "snps,dw-mshc"; -}; - -&mmc1 { - bootph-pre-ram; - compatible = "snps,dw-mshc"; -}; +#include "jh7110-common-u-boot.dtsi" &phy0 { rx-internal-delay-ps = <1900>; @@ -53,100 +12,3 @@ &phy1 { rx-internal-delay-ps = <0>; }; - -&qspi { - bootph-pre-ram; - spi-max-frequency = <250000000>; - - flash@0 { - bootph-pre-ram; - /delete-property/ cdns,read-delay; - 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 { - }; - }; - }; -}; From patchwork Tue Nov 19 02:04:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012998 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 4Xsnyh1B99z1xt3 for ; Tue, 19 Nov 2024 13:10:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 21278894F7; Tue, 19 Nov 2024 03:08:55 +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 B4455892EF; Tue, 19 Nov 2024 03:06:11 +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-bjschn02on20725.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::725]) (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 E2F0889484 for ; Tue, 19 Nov 2024 03:06:05 +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=K3NoWnWheNXnn1G+qId+oFoHYUO1D3X/Jp69IOHzo0esKPNl2AkajfmG2XuyNsS70Ohm/nv3AkVqhAPMIAA6QhrgzDrww32NaQtPAKOSkYW9w2kYlhipYAVT/8xDSmL9LJqJIpJRgpKL/Jo1BpBow5Ct7ccYge0Ow3tPYNTbSAq8ZpTkHOHlcDyXfCnmLIPMJeL5IDoUGSw8KrktlOL4bjI9WvcD0l+TUV3/mkaV5ztBbKZbyk6F5JLOkC4LcTevf0SdOpdoH920uetBzlbH7gGGhcSiNVdnhjap4g51ibrR06nWIuEAR6OJYt6FT40JYXUqzNa6tPV20L4MNtM+dw== 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=Teslqh+/7jTeja25hbVAVO5Lzf8DZypBF5iTfAG71IA=; b=TvGBGKX9Nss9pK9FSeboHTlGmKosDA6kbZaNv3yvtz/4/+59BRm1KAqnA6i3TvZadgrOve+0eRL/9znzqHZPul20NLf9I0rOtbDJJyA4n7D7auZArYLhT8F31PqCSKj1LVZIh46FZ+MYIfwcJmRO+ojB1/CwffQfJSgsA49zPY5xKF/vYunbHIQarbmd0RCa3oFvNnUCOLX84cmfNt7f6OHWduREUaQJNcEdHcwR0VzcN7syQ+I9234WBomOM6yXj4ReSqBEHokMlJn+ll4cxlSJn3ojXs+xNTGC3V7OX1N1jFr5LaiIlXKRAKOdIM0jiJb8K8IzcD+IxZpmwphb+w== 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 ZQ2PR01MB1164.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:11 +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.8158.023; Tue, 19 Nov 2024 02:06:06 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 05/11] riscv: dts: jh7110: Add u-boot device tree for JH7110 based boards Date: Tue, 19 Nov 2024 10:04:19 +0800 Message-ID: <20241119020425.51989-6-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1164:EE_ X-MS-Office365-Filtering-Correlation-Id: 95135f66-fd2e-4130-a677-08dd083eba1e X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|1800799024|41320700013|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: oV/QOjzfNHKawyqZXfJsSWu24GUbFMGCHRdpuP0KLJCv1xWXiMIK3e8IP+Mf0XVbLZq1W8IjSi8KNrsRBXg5g9ZAzoXmInWBWHf5iy1VenO5nNmUEJz9iuuS+dIWT/E9GeHvDiVzsS0oRdSIUTlfNa4o/u2iCwOJvBLsuz7t3lKrdIElOSY508BtpB2fXU3AlEyzP3GVM5wfMHpnZqgN1E6n1w5hWRBF2oegfmMoUOngPrjmjPbbMZcqxnYshM4ZHebcEEOsSKMhENo3WlKfBXyOiMVXEvVZrxis2gFp+40IQq6zh+XfMsWSXWsuTGAYp0erthhCL8qM074+dl+9JA94JaWwIDgBZv+Xw+6zwszTPL0/lY25eHHZ/wr+8bFfV3VhY64jhRbrCei/fxeO3QA41EROlE4qUeSsAZjbxf1HHYQTj6KA091tyB+y6/GZvMQaPtt1bw2List/l8eC8f4UBedcFFBCiuBfZHqlASyO7hLQl/yxoJEXWCZeLfgn1VzDhTLqrrzUwpaTCcLBWXjAaabkXTnQzdCkJ+GAv0X0U/PKYjgGYOY29AZ9JCtKmMriN7NUyjI85eB6JfZYX2JujHovQxdPLiblSJeE0uTuRSbsy4W5Sz3GutpIGCtbt0ba6hexgczKcA3GFqRlHw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(7416014)(52116014)(1800799024)(41320700013)(366016)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6QsbCpDCixcD5KpOeeB5NoFDG8JeFLI5Efi5mGLC9/hLGupQjBEQrRdf2g527xC2xw+AdUprcO8wXGxDDH3D+C9hIuLOP9rDYyW0NN90/E0EHpfWBzSlTlrTbf3dM7QH3JYLN3hRlLXBE+m0t/Q5/elv4+1WHdQNoJafgOHGcpUcxvMP7PChXbnBntTCRwsqqwSltARICgOC5/Dc6fbPmIyzn4qRAkN8vJ/Ae2SalcmHPQsQ3TUxe/kiajpSNJ7/Pg+c2Tckcrf4A0Tf9mS8oBqFjLLXLK6DPHcFABCqUJheKrIR5flNmsWyEDBXQXYGZH+uRsVPDo+OwJb6O2alKx7TWvJ6K+bo0dyte3RKk0AA1MU6R8u6GqWZ5KK22TJM3jR10HlC/zXjqHEdgjixYeoJBXF5pmZE2ryB+eB6xIFHxcM7/SpwfwZSuEwBCfFSz6HyNQdvbkXCMpHYs+fYurimvgnfbYvgAlIlYlJXZot2zPA3l2avcEAvsxurDb+HEkBwYNHrDot1s666nZ0ShUhFb55vmyc7UYfk+VQbMH6OltMgk78W9SYlOIrpDzWmtULvy6BHBb7xUFpYNHH//mhOyEO7LGiPgh8wa5ryomtZCgGsZ5MnseSEkc6oXvxbx53z+X3qwwlH/f9T3pTOCLERmoOzSiLO4MFOWk3vCXj9NuV3elAE5+GTpPIA2gvVm+7oZKcEmjfz/8ye0ToSWa59c3fc4lyH0hS5EiwlH8qO+o/NsC6sH7u+rxMT18VFbGzoeaC5wxYBhhwA0TfGUP03iHPTYHAg9EAPAxNQgH7fHUwXToQEcgfVCGDyxeJ/E7j3lPF5tKAj2ZYHSiIk5vBZs1q6iaHrsM+0Dwan1QhXVS7/sznP+vMWE+eVdXh1Gkyo5MGtPeq0t9xusogROLH+NCZ19zcndGz1sr1GDT6/vMOlTEVPRSjKY2D78UQ0YCsg3Cl24AIXMxyy+KGu/VPSQjW5kxH7biS/ce+fC80f07/xMkpq8ZgQ9DFfSr7srjO1ibCFDd80+oYfhZR+rCosGEmOjHZgw7mqh2uZ3o6k65XrSYir+1rP9G7L3y1xqarae1OuCefsSsb9S9xiiGcbdWDgcDyhFE98Em9T5IjuIErO2I32NqctkOLXTLcbdmhqRDzRBsoBXrr4PCPBN8j49sJvgcTwjMaG+HBR0K7GAyLrMDm04GAEI8twNteEKtkaWFHSWWySMXK4EL+cXIHTlZb30StvV+Yxe1umx716L3LN2nm1MzaQDWYctX8P21fYqmYtfArvqmwZYCp61lpdXEQLfSX9glT1viPzmrSIpE5UPT+JgimHz8k+lL0NZaTeXXs/mtPPC5pntfxpnPRO4b4pGH+W0r3l6OaaFfFKD6H/CPMC0e4/6dJusBpV4qrjOZZ7qvyk5XRdXsRKAT+XsbNA+SsB4CrTaLDro/FU2RbK09StgrQNBiV+0CzG1DmldSiOscDLCO+ShlLB2/I8nckaxnYU9umZu3JVGL1IYzw/WHYTDWWJumZysl+2xrohyFALz4aVkLXGA3umGkCcYraZ2cX2AI+xTFv6tRmUXxZNBJk9ecZ5KfLOfGZySdTlAzN148pFyhYi7EFbuw== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95135f66-fd2e-4130-a677-08dd083eba1e X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:06.1379 (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: O+O+oZL7EaNKRf1aw77PaT7TiLqaSU4ReUKFxuPxFjq6uYhHzyHe9kIHuJtIcaEn7VceXbkEpgUlhm3bKgHjjcULU0J8vdNFp94QVzqoKLQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1164 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. Cc: Heinrich Schuchardt Cc: H Bell Signed-off-by: Hal Feng Reviewed-by: E Shattow --- arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi | 10 ++++++++++ arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi | 6 ++++++ .../dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi | 6 ++++++ 3 files changed, 22 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..cf4f0d4c06 --- /dev/null +++ b/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2024 StarFive Technology Co., Ltd. + */ + +#include "jh7110-common-u-boot.dtsi" + +&phy0 { + /delete-property/ motorcomm,tx-clk-10-inverted; +}; 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 Tue Nov 19 02:04:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012996 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 4XsnyK1X13z1xt3 for ; Tue, 19 Nov 2024 13:10:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3832F894CE; Tue, 19 Nov 2024 03:08:54 +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 A4B708924B; Tue, 19 Nov 2024 03:06:10 +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-bjschn02on20725.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::725]) (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 80D73894B1 for ; Tue, 19 Nov 2024 03:06:07 +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=lhrnqOiHFV1U5w6nD5W+v+OF+P8sBSpczMh3yYO+MD7ILfmY9i4bLM/xedgoRLV+XdJTL+5fQZWT3Ve3Vk/GnkQK2dIWlH795vEaE2nNE58L0vr+mYkLSzKkCIpL8iJ4pLeUSkY8kK21bd1lfgX+8HQ5UIO31f4SiYKQSJ8uOBl+8nEAR4+EOOMACvcesdvVX+WCpiGtLPLOzXUQKupnkGfJFPNvM0JoK1c5jvkJtj82Tz4/aAhR28fZu2ppnSIk7BNhz7tlESArg7isRyK6/nJh+jMEmpu3cfePhLZfX0uIYIWw3p1yqrJVvzv6Hb0s4qrFNQJAbpQEcyJFc1Mf+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=6KJA8s/8W4yuZj9uS9rwhUOoI3arUBUsv9mlM3Te3g8=; b=RyBvTXkrOsT6V4dknJgt7vCpc+Z+tRBQRclOcqjbbuCr6syUaFuit5EAQH2NEqXM0ZG3RrYs5VoEWTHTRU3gM2zZ9ReQsGOlYcbJllgnrJmtqKKvrnBHFEnttYqd8lCKjPUQ+DWRFD4qTSyrXN6VM3dgZ38l9xD3vz90j0uiRdDg2FuhwmzADvMZ5IlG3KHl6MV7VY4UpMjBoQgwJQvstkngVM3zrI7ewJSqsJlsegKV9uO2g96bMYrRWiyYaMlPU6EdfWUL4jGwVcLqLcqvVTj89Cjd0TXHxwU6vEPAnEYa9sPHUR8YBMwXeSMfTUkVsj9AlfFppesXf9uR46ui0w== 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 ZQ2PR01MB1164.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:11 +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.8158.023; Tue, 19 Nov 2024 02:06:11 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 06/11] board: starfive: spl: Drop the unneeded DT modification code Date: Tue, 19 Nov 2024 10:04:20 +0800 Message-ID: <20241119020425.51989-7-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1164:EE_ X-MS-Office365-Filtering-Correlation-Id: 64dd5f60-57a0-4881-5495-08dd083ebab2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|1800799024|41320700013|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: KvcmoPpYMphE7nRtWK3R0wOAko6WtkHXjNnDHnYIZp1nlbbCWhYBIKb75V5CC/tbo6sHhqU/vFRUkrOm9hTpjy3piiAtu9nc+YqJ9qecCs58fVMv18xqn9ObAIIR39yRdOa1zXD9LMwQLYHB8WN3+wGcU62bQCQN+I7dKN/+7bt87umwI3co/7G+wGiprdoVOeu0JqbP21P9GLdC0+WXRsjWMC8xyQZMUKsVo9s20Nk61nQgNDIypALAo06+I9FdP/wAX8VabJhI7qSEp22F7Kd4RqmyZK6su6g4S2Eq11eOkFavHqF07Uatu2BoEuEl/8AePw4AM7RPpbXWD8q7wx5DWi6HeoRKSBOQyhe2iM8JUNo5AePSdC4FEuKMMdg6TPfuqrdow6+jXMcKde8i+UK6CBE6q/ayc3EA8nZn4lbTcmTlsovVbZD7FOVpmc2CGXa6BwzdQxQcqDvkLh4GO5bLqPVPwINg3nECWMs9LHNxBfjGKFmSCFvZo1kcvNC+02PTttr12etrfUI5Q3gYRipxgnvXQnsKqVlKNGvVnmZQojRpJW4euP3NlgPlxN0VxR1us1rdVy5B2P2AS+BFXis5Rs//oElzlf3k5I2OEiz0Mh3KLEs4BCzLGjdGm2IRYGwJ0qkNlrY0xPvd1ZvgYw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(7416014)(52116014)(1800799024)(41320700013)(366016)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3j6co3K5mC+6xUgSxbitQ5qdFQSMLR+kef4UbHUFTv6mCOVwcKNad8xnBarmx/ncptKCi+d9SAbEJ1pVrGIZ+Y3M7f3yDhzTxqe5qt5wJpo8mqceP00hW3Y2q0xzqtnexuR0bV0MFmt11csoE2augpwTOqtmbzVhEyNgyrHeo2XC86G5QLDZhH4fw9lYIhhiaHK/dkQpOo309O54U97WygM6By8aW0gGsbGGYtGHw7hFh4LLRgQPDa4zA9/kUzI18Z3RZY3W5LydI/QIWiU2upJY4+QyCsqctI6sy8o3yyzyHlrRKyxlw7kYGorf8/SfQSgfx7B8a+QKYA3nzoezvsCmN3zHuAUp+puv2II4mykpHbdeowvbYhKSa4OOtj8IDx1aWdxbSx/c1YRvPvRMgJdCXTWkpMUGIRIrGELqXS44FXSdvDPtZvhGfSFk7wwsUmL43i8XJru5CCW12CpgJm0Lgct4RO8OQahX7j6jC+Y3k2ZXxGHGIHUvQnMXRlvKOAGEPgrWgfKnDXmWR0WY/yvizX+95m7UIMP18GIrPokk1T+LM2/Uajo/DwsyjluwYqwHYdm+MzebI6FaI4j+hCsg1xGtILMWlVNWQGIDCyJdd8V0vcFfKi0kIh6ztx6b0W5nuOay4ZNK71bbLLs9OTkZoNZYvsnw5XygwXjkP/fIl6AnIFFb+yqd8ajfVXWZtnOOrsmmvlsUrOtIBpimch4QJq4mx0zQad4NMn5xUjUTICEqho2RWAUsmzB4L1cdNVAuok7/vK0ti2U1+sEacfsSsBOOhWU4YhIq/AUtn4fhCoZTrwMOWTsrNsdWcyUW4f3NXZYaokjvkjDMo04byEHqkTQ5jF8i9Xfqf1gNv8zaooRW96dR3MfN8vvJUBwKHFlm95c3q12/fQRJdkgSMGGBfUsdPHQo+INh25RB9iaIsQ50qYoPSZbzOCTkbLWcJ9DtQJSl01M0859EPPLrnA0QlrcPv6AzAa1aebh5eAm9u7kqcd0KjXfJzc3/UGwlc/ewevl480aIcm1P8FBu1pZFTysTWMk06UOXIafTYOAeUWLMJ8M08LoGBVmopk+kOYXxBLKFX8gHrX5WlPdVny3zHrH7nWNT287C/6GPEbOD5HuBT6g2uPvJcVcKssOXKl+wbcUc8OV8apmDQiSPjTnoNo4rbSOnLFaZEjHJFEc49knY3siqW84Go5aClCQ0LP0rUbLdE73UZT2hlXoeeTeQQmxgiqTik6wOp/CUZP3jADMEeT0vnt96adOKkpKlAILrbXZ82o4Z39/20ee/cS821CKS34QMik3rdDAJaop1czJ9jd6M1VVyn7eVN5wE20WujEw3eN9NM+PDAkUcMVDEUywNNJwx8Mri33NddDYoXxGahEK/Hh4Qs5XFeEsslUFzLwzME0g3gN2cSBPjidfimNm71xuRoSOEkUwCIDnuH53ks4kKNqL0J19O1Jpns7kFVrJhiNdjE9VAykhHVHBmL3ndHJZ6JxP1KyY7KdZEa3KFXjcLULzo/2+3Jn+dc3EV+OdSKFjXX9WTU6TNsnBD7jb+zgMQZ0YAMp8RKsKNP8gloENXnsGEPXFethD4Nc6A8wrM/mUsBw0WPPNo+w== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64dd5f60-57a0-4881-5495-08dd083ebab2 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:07.1134 (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: byXvLZTytjQuQVXJOs2IItJuEadS4QQOFSkhKAgX2XUlmos6bjDoTACzTYF/uCSk4b5YNc2h//roCDn672bNBBsSqkurcjHyq/7wILk1VCg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1164 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. 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 Tue Nov 19 02:04:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012997 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 4XsnyV4ZZLz1xt3 for ; Tue, 19 Nov 2024 13:10:26 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AD0C6894E2; Tue, 19 Nov 2024 03:08:54 +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 0300C8924B; Tue, 19 Nov 2024 03:06:11 +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-bjschn02on20707.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::707]) (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 42C66894A8 for ; Tue, 19 Nov 2024 03:06:06 +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=CweB1qj+LM5iSHgBEdvgbM6gt8Mtich8ZZmuD/3OEUIDSIZNTFeimkf4n/jpMWa3Qs/YqMr7GdcN51xGWG1vE5hroyfu9b/mHkWaTSE1JRAGcHx3Kdv6yJFJP9a224gJZ8sO3v5LplgGwazYVTg/t1A/lm/rvfbnPW5w7eermg1yOtNvJmnZ7KC22D78XhOqQJzx+P2gqWj9ItvwkB+PYP3lXTAWfM/HzegaZJ+xt+74e0EV0QBqtm5K5z/Vs2aYOvg24oBUFarRP9xHNDSsvZh9HDo0zAgfzZC+ZVGBwjdVBIPGjvuQnHTW4MP2NX/SbqoDQEW2BUhRS2IbGHaxMw== 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=+UYvy18KPXU4zQd2ylcP+nnTCd7nnCmXLXdqhl+tbVA=; b=eY1kFD9GKNF/NQaeJ7tooZVNki8hunZNIOX5/Mr6DkL6LUAd6/g6y1dyW/o9F/XkOCAh8rypbGJ/1MW1AnXMcrR/RxeqPGqPsMWXTxbdL+UslrlljCPsvpCawwtO6/DKX5+tXVujqREuvjKzzMQaoO288p/2wIhEAeGPsPcWo5fYX0TWOm10Mg0P3SsYccSI0mMXqpoGaheUcvG7tzJsN8fjYlkwyjegiLHLVaEPujtW21RmdbnFlDfC3v7qLHWgwIAsQQO8piEosh05ahBNh7kAb37ESLkIYLELWv8WUajlwEVQeOXBvtN+lqmOcT9Wg3gC/Qrr5g34fMaoVQD8kA== 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 ZQ2PR01MB1164.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:11 +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.8158.023; Tue, 19 Nov 2024 02:06:11 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 07/11] configs: visionfive2: Enable MULTI_DTB_FIT for JH7110 based board DT Date: Tue, 19 Nov 2024 10:04:21 +0800 Message-ID: <20241119020425.51989-8-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1164:EE_ X-MS-Office365-Filtering-Correlation-Id: ca654d41-19f7-4599-5956-08dd083ebb47 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|1800799024|41320700013|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: pyDKabNb2HDzkfwIVbQI1R5tE+V9xgJR1q3lWm+zEWIijx/0W5JexqIFDgKs5LoNfKsSCXHjDWrk+eGjq91hu8VT2dE6SGLWdQ4aRxEhKJXgrWzYyFlN8Hda1GoAIrmHLPX7hjvfCRY/iVEhPkVAwU7V2XrsM3xic9VGQHj5O0F6ZyOp4ThVAU+uchlzCcHpkJ9tVG74ZaijPr+kfsPZVXrcYifkSE5wxp4jrXKIZ0VQot8ioktZuRm9ooMM/wzYefHcczx4OSO9I5+c8oglL8nnmGQd9B7iITUya6ybUucSTAyW5EYoxyvb+ZRmeor62fSAcz7OiEVMzbuMYjltoapN9heJlxb48d7PFMspqEV/QMx/yXZ55QNAgQQr+l0R4G/jh/fRcRpLdZpdpSFYbqTvKC5JDx9ieHnaqXS5HCTQMipT4iHEOSGG7O45cM5dWPT0akDONrwSQ3IlRxTahXi4e8i9cxyXooGIqyxD2DcmaWSJpaRPjYN5mp5YcXI9a+MucN+we+H/zg3Q0iS/2J5IGA30akH03wb0eYGWMPdAwbpRcdBAWqhpoOobdaEMeflBkBJfKiQzLhAGYm710qmkCCM2QFFcZQxlmGYbN8tR+ggATG6ym66JLgZuv0M6Y6URxXIGW2yim6J0CgCbFQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(7416014)(52116014)(1800799024)(41320700013)(366016)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eM4SmdyBkQeDRQdEZOYv+Ye9Pvc7hYRoj8d5WP0GwUzjSbfAZlrZAnD/Z4fF9Izuacw1zCN6Dkd2fFbpnGD/9RLmh2tddY6RG2/o8L/9UB22q2mmQPyCTFxDq1/BxoDXPOFvaGiW2v2XeM7JP8zMS5GydBf+2YZCLt0zCwkpw4YahkqhHJsZNsHG5AkJv0DU8CSPyroU9qNR46vt0LqpLhJMw0gZLEstBtSAs+Eq+4+BdsrcwIKWkZRY2+yF+uILUfyikVrXNivGCVM10aDn0lXxUaFKxCYFE7FjSy4Hz8ygTV2rAEBjBziixdwXUjh/2U6AEDMcPfF5aYtxLLUHTbrfEpMpn3kgDvuTPlbNRrunu+YRl+vrE/5CVZulZJ7WU1lihkbH7LVXkDGop51GOAlMuB8WIUICg/b5xVGPxvQYkkHjs1vb4C+aOG4TcfStV/nVXBTROpHMzCIBmrdJrOVTTa0agw0F2ixsqQU8CKd68o5cfmD4veM2iVCoT5IFjOg4r3BNPixSTFQd+Gt2yqlOzbMSaDg/QTY0RNJoGCNa/c/9TEK1264py6zIno7FGuLVmV+ZrRVAG8UhuRSkJfT3jjrPBAxhtMjHGofRlzE96bYpNkB95q1hISYbsQ4Ak3rN5TJuEshv1ByZsIYFktE6e2sAbES0C2G6tCLgTFzZi9UyCECy60sAYxHZsWvMqunWlgRmi5sK8EWVBJ4oYJZ+/wVDxwR2xASeTBYOpmlDu985UjV7KtD0jhcoJWdS7NKyTYxgYRzbSsRQZuR5f7mHM/Gvf5ivrWtjsl6m0d08tvkSDh8aI5tQPNpQ7MLk4scXAle9FSv/oY2i4RY+VzbwexzBh8TYtGTE3PJh0txDD7hQ8fA0hCbKuGixYIKXfhAohkp7l2TU/D3NNOBrCZhh+i6hNMvURsI4mPIiFSIFS9hz6fDFqgfCo19absjXfAhntKJL2MrUOalD8ylLju0VahZk9/Ldd+cH9HKcSLDgk3A46y4jm6wd9m4Bs/PUUgT1NdvMSJ9KDazwcaNb8BonMX/3Ae/bXCY6nNruKAALcgVkHMGEvCBAhCMjBJrsqsYhcIMW0wOyCGbMePahC6WL1xowhAWqc/TK1bR0AfVl0lrxgHm76+ky3lE8l23XcqpkQq1OjZosCYWSqksuXEp7YOPPNTlK8Dk7tMggb6qElrbZ0rPXe3GuAC02uojrOY4/gankflIh0sOY5BQBG2UIg2bDabyomHQpLyhhHRp2BSjaJWCTKSeBhzoXCDUNmxcIfqtvB/AquuXCuCIL607rpmeZUvHddY/o0bqMsuFSCcLLQjteVGYakJ5ywz5r2P51VKwBbF09JQbuh03WECKOby8H+xTLjYPcbuRVLRvutvJdsrUpQs7ArrqMMI4JAFhKD64G5e6xDYMaS/q/1cWewagjN5wO+5EOFJOtwdwvTQ9wSHv5XMvWo9WvH+fugg8Isd1R/LXnZN2p4d2EHi3bkc4s85yx42CqJkFYBRn9kS7NE20WeLv7KOAOssQDG1d0oTHgVfP3dkaNO7L2PIt3zPtM4xCd0fogAnaVZnLXxLH7/BhsFOxAuzVjWY0+U5qGsHAaPcuQ4RE5A/UJqg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca654d41-19f7-4599-5956-08dd083ebb47 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:08.1127 (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: 9WeseRTEN3NlF9D40VE3PpYn9nV4OaFlgq5A4J+8n7Zfl/TnsGiSCT97HItJG7TqyunCGQglpgHTlrYmtMCZ3aqitESQUKQuouHpMKs9yY8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1164 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. 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 389adb5e55..18b3c00ca6 100644 --- a/configs/starfive_visionfive2_defconfig +++ b/configs/starfive_visionfive2_defconfig @@ -78,6 +78,8 @@ CONFIG_CMD_WDT=y CONFIG_CMD_TFTPPUT=y CONFIG_CMD_BOOTSTAGE=y CONFIG_OF_BOARD=y +CONFIG_OF_LIST="starfive/jh7110-starfive-visionfive-2-v1.3b starfive/jh7110-starfive-visionfive-2-v1.2a starfive/jh7110-milkv-mars starfive/jh7110-pine64-star64" +CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_SECT_SIZE_AUTO=y From patchwork Tue Nov 19 02:04:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012994 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 4Xsnxx4Qpcz1y0C for ; Tue, 19 Nov 2024 13:09:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7CD41894BD; Tue, 19 Nov 2024 03:08:53 +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 3DEAC8924B; Tue, 19 Nov 2024 03:06:08 +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-bjschn02on20725.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::725]) (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 9D12389277 for ; Tue, 19 Nov 2024 03:06:04 +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=Ein//GJVU/4rStfTTeeTkygOK8oK51pDHyVwE9h/IVmwcagJRZiK28dUlKzr5IjAGxdtIvGJkuWPKJ0TaFR9jdTkG5YDR4ObeVj4nw9xsC+2VZFF3OctrBtlNukhxA+lDNoCqyqk/JUMlHzNlMg/qi31Z5aSOOcocKKh3xVXmuE7d7GcAqFQg7daqpFtvOgiyWtUBwwZ2yHwpfJVvUqfzWrMOgt6MCEbGznIIzQD2aL0GnqhpZ1F4qt8dmFR90kJSH4cBcfAVbXdDK0Sbpaj1pGlqTmSBTnqVVXG7vZmGOl/9jcdJ0lYwCooyqY2IreLkTx28kaXkL41+6hrnJHizw== 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=SEQQk1938L+DFl6JdFbDlfxXPbg4/K8ggYDs1DPkbtc=; b=N4fkzDhs0hGlL3EBQjwI224q/uXSPwwOT1p3UOOtHReoBn56wtJNprOQ/tXAIcZTLDQQHXZqLrmBnbIYIvwIE5JS8cB1esV1e9ZxH0UIGnls4dFFeAEoP6qLJdRga0h6z5sVHJ8Bk5xOlQ6FPAY/gZTuyXCBmFrzcxwgn+ljsgvYO2O6sPSbFxazq4vF0FZ0S37MFolEv76iq59oAnI6UtEc3UKDEQA41b7T0Fo9L1Op5L5Gm0IrPetc7XOjhpk/twnFqM+sHeueHsgbVCtGwqHFYqpK5Lz1hbyuUp7cXaA1RsLNX5t0oh/MRaVObCcXcb/Yr+2QhEPvfkmL8slQkg== 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 ZQ2PR01MB1164.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:12 +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.8158.023; Tue, 19 Nov 2024 02:06:12 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 08/11] riscv: dts: jh7110: Support multiple DTBs in a Fit image Date: Tue, 19 Nov 2024 10:04:22 +0800 Message-ID: <20241119020425.51989-9-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1164:EE_ X-MS-Office365-Filtering-Correlation-Id: f7b66ef6-3710-435f-2ee5-08dd083ebbe7 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|1800799024|41320700013|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: 64qEcHZNHWdA4GI2GX9wEmzf+bdZrEiOtU+oUwNKvQzeCzGV3fPKEHICXzh18Or+UEbCXJGIs6jZfWYpzdBNysegUPNdbdaDnNCE8Jcwzv0zt1hClX8OGRBcLFGkBQDnZbVFa5+sMdBhRMGh1Wal2JsHhilARHFz22kJ901zxo/9YPcH50YfDxH4SmWiaKMNCGLV7rgg0xNq0M+AJJKOWukJuLzfS9qRKd17pNpONStnMvUPKS/LgDwb0cCjm/JhPuBoXUW1x9992ZGCU98LFpfa+qTvy2Xh2a4pMoELvGnj8wzkwzQ8xAUugiBk88BvQDlMbkQKI3XyfZl+jy4E0Q5ZVUV6AlkQgtQtwLZIwSPWr9gUJE1tEa+25pBFb+MADuRHHmd9opMq+rgmTssw8OlY2d5ocbWKb1xZ/bWtaHV6ArOfuGBPN/aTROfOT0wYgrpjiAR+hMFjHvpxxBr/S3bzVE83EEYjtDviVbS+kB8QEB0z7tZnpEcbeiEw91kkyBaYaJOTHljYqT0IxpfZachLEopm3cftqM429TZibUdu1SYYEHLDUwDrZJJJ3NXqWC6b0z1AQ3aqdgyydAQIqI6EkhEQgidVg6RGE/hgtydu32b4TRJbBfHKAFeyhqlm431lrkhZleBxh/+Llk9I+w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(7416014)(52116014)(1800799024)(41320700013)(366016)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WFyKfMQepk2bbkOmuYD2O+fncm29UNgcheq8txc/vagR5cCmME2aQFY/jWCBIf/Y5UMrjC3oXObK6h8QTKfy93kxEji+kdE2VaTOPo7LDlpUTbtQxcKhLIdd/x+caFviPC6ROB8aMovWsCN6tduorVtANNxXmPlq8Sg+VDVnKyGcGpHw5NtIFnS7Zd8NE7q1yxLD8MV5EPl5HZElZ8GtCumG6tjgyi86eZpFsCyBJZIEMBPykn2bkFOw9+5KrPYdL8s5hysjL6tK/eObycL4v7x6YAIio0KPxcq+6hPoocpMnz204rojCsdlZ6l3GZie5t8VksTtcaweKq2nSK/xZhXDM/xWl8sz/gOplrYjTf6FPdk6+jAzSseMXAXZ1c5EX7GU3oQiqww+U8DVrngjmulFwR9qtNhWxSJkS2XVfpV55Z0sLI5f0Jjg6szpj9UlEBi1KCgFVYu9nC4jUhswntF/HaZVRswv2eTXAypJHFsdTzvtX7XchtSYg+/C7nXk8pKAbsUBRyEHCv+L7Nq/Pk8bfQaNIhj5qjZUkN7vRQK1Wn6ipU/IfYH6C1+KfMaqwJsHwaQsmmP7jy7Us0AQlMtbsJaBHMTm/IUUYHBaoP5AxbQQKL+yPYG2QcRec9BeSx2EL/+G2Wod/a+XMv7g2FiJd58pFFG+BYwMmj9QVTPWtLcX3h2cm1ElAatLWHxv2IFH4RUumoD4jnczypY9iRA/vlQwfC3e+aq7Mhp5oMG/jA4ZX2R8E0ivDz0/TP1NzRnfd2R7aBGq57h/LUxcWAS38mRbc8DYWRNjI/GPqiwGo+bcBqUUAxwIEWyqlcKeLygvruhqQRfZULhOSocQteNq4W3AzyAE6bbQ9jA0uzzho4dNHCFBmFypf57vEySD3QoEmnZHFR2cShJws+MqBEmhmtdcm3eq7EF2VYu1IByq+deCpR78YKgrGRXl2AbOhHTT6mhN05N1beJrFU+RvlF955UfFq0hEzTJhi80RrUXNEyTCzDcdnCppPxB77QUXpIYrfF0BbJ5ypqEcawJEbvUMvTvQ6tmyZsZPshbjIF48hIKxp/bAXQcgZ67rofgLaFt5s66xcTQG4hjloYRS/n+EkrYaOsZR0IE32Cj3fQH3GlDT1RT2UwASOJknhzwzkktgUyaoEP8PgL5Fajo3vBOEYDtrClwc1KwVIcFYwbozVU+kpe239ZXV4zrSozZ1rweYM7BNqYKJIx+4tZH2Lg6PT3UMXEsfZcV6T22K2lB/kWg9pWXIuA7HemzOVDHCY++dzg72UL4u+gJ2ZTfyV1lOPIokUhNNIlLE3XVPmjyhbkmrxyz/GYz5LbBlJMl5e2NqukuZa+aORQOfcjrsKd7O2RDk5QyENGlzJAyGvB/SG1VZ95D7MoNeMfne9E5uK6+pHXNa7VfwyEBBFq4uzm4H6XQClg56ycX8AhfydfRqkbMwGnoR7KQYQKNd+AS4tHyMCCjaCCGP82n71GSOd6KIsweB3lh2+G+Xlv6U9f/fM9VTeCizFWd8X91k51uvz8djA4LatvlZ1ie/l8DO5qBoQdQYtuWADA3ZSXAyLokoVRS4dTWUhtoC43ry/iZYOtvhdYyPv4Z9ALfPTgsag== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7b66ef6-3710-435f-2ee5-08dd083ebbe7 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:09.1385 (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: nvtjV+c+MAOW3iWZp7Z8O2ToKfaOcdL1ljxPtSG5pvBFv2bTmPm18my+KeUto0xKOqLmxaS6DSRzvu+DJBIpO24mXk/kuVJ27Gfumf8tkjg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1164 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. Signed-off-by: Hal Feng --- arch/riscv/dts/jh7110-common-u-boot.dtsi | 60 ++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/arch/riscv/dts/jh7110-common-u-boot.dtsi b/arch/riscv/dts/jh7110-common-u-boot.dtsi index c44553455e..3928d551c9 100644 --- a/arch/riscv/dts/jh7110-common-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi @@ -113,20 +113,74 @@ fit { images { fdt-1 { - description = "NAME"; + description = "jh7110-starfive-visionfive-2-v1.3b"; load = <0x40400000>; compression = "none"; - uboot_fdt_blob: blob-ext { - filename = "u-boot.dtb"; + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"; + }; + }; + + fdt-2 { + 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-3 { + description = "jh7110-milkv-mars"; + load = <0x40400000>; + compression = "none"; + + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb"; + }; + }; + + fdt-4 { + description = "jh7110-pine64-star64"; + load = <0x40400000>; + compression = "none"; + + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb"; }; }; }; configurations { conf-1 { + description = "jh7110-starfive-visionfive-2-v1.3b"; + firmware = "opensbi"; + loadables = "uboot"; fdt = "fdt-1"; }; + + conf-2 { + description = "jh7110-starfive-visionfive-2-v1.2a"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-2"; + }; + + conf-3 { + description = "jh7110-milkv-mars"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-3"; + }; + + conf-4 { + description = "jh7110-pine64-star64"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-4"; + }; }; }; }; From patchwork Tue Nov 19 02:04:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012993 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 4Xsnxm0pH9z1y0C for ; Tue, 19 Nov 2024 13:09:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 143A8894B4; Tue, 19 Nov 2024 03:08:53 +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 15D1C8924B; Tue, 19 Nov 2024 03:06:08 +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-bjschn02on20725.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::725]) (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 ECC6889426 for ; Tue, 19 Nov 2024 03:06:03 +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=Qw7cLqIpe6hrLmPYu1rJGhNvebZlN+CTQl43W7XX5P0xId0868jP2U+PMzJvYXUVFE/SXcwSUPYtccC3AruPmcjytHZkdwviBN15EkpqpBcbJZ/iHCIEwKI69mG4TrH2sNh5QQ7E++zLJXgpBNrdKOqsBIVLaZ8Z1lCIuqeKBh0haKx6wH4VhTM1mzRsXeoAHIxFRVKtBySirORZ5ajFTu1jVn7q1syM6D6JnBpsYymoWDac6t50Wdx31KocH05DEvrIyUDgYgHTjEOBxtIIUlGv0C1n3u3xAnw1hL4PcFxqkozyft3tZebeJQZtHjzoD1066GIX3NC4RRF7eNqCtw== 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=DXmbbTEGACnpO38ox+3LzDG7uPq/O+InZFWij05lLTk=; b=S8GHG6EudXhggeHtJBNg8yg3f/qTX6vLDYlFxlysvxo/fJ7PQt2ffbifUTKRAZL+aYVkgLZrFSZszdwhOwKmK/vLi9J7YwNiz+jzB+kQJKwP/yejOKcKp2ym3/otombb5u4guYxx39I/pMCb1Na0Ftc/WfbQJVXPXBqFIs0F0yB5Hy0VSbVBKGmN7y0etEIjFIM3aUqafiakyUtvdp2R48I/6ek9CJB8tHJhgqFQe2Hz61l1A8jRml4aaUHogOpH8Q9ETFBrXh7R6SgdC+4S4ox755oav2yX6N/PJOnTRxLxZbcJBFOAurIUDu3xNKA9S1UHiVIZ47W+3EqlR/yFTQ== 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 ZQ2PR01MB1164.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:12 +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.8158.023; Tue, 19 Nov 2024 02:06:12 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 09/11] board: starfive: spl: Fix the wrong use of CONFIG_IS_ENABLED() Date: Tue, 19 Nov 2024 10:04:23 +0800 Message-ID: <20241119020425.51989-10-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1164:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f349a9b-99d8-4c97-cc4c-08dd083ebc7e X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|1800799024|41320700013|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: TUA+aXVvOOaiBlQMbZtBZyHvIqVRdgTADA17Pe2MEUw8PsmFD76oLMLcQZQfZlt8v6wYP+LR0TMW7I1zK0wggd4ckmlV+2v8xyTA9OK/RpVoXOpV2UPV4StXPRBWOzSDCIQ8s9AZC0zH2jpx9/3zLEDeLQLj2PS1SZfOeT3m45NE7n4PaV8fxuQ1OyZzBXwZbzEpYpd5o69ZDHyB+smebB3ULwiqHVkRNHaAq7VQCymDaTtzhEvUkSN0cjMmcQZ+4Ic5WNXUZwrH/q7pWB7WLrqbiNOPm3VdA9dk/fFgSZ1NyMkSIQzyj9LPx2n5r4xGZ7iE8L7KKyveIdmoJRHoVcmNNZTBAfDsz9td5lg53U5xZDSUAai8JoQXRx28240OvN+L3S+KTW/NfIzoAUHfsvJdYdcwVUREAnPEBiXmwdLB8BExEOP1JDmvQUHponXccqHAhor2heFq4Eour8kEkSW2NvKEtD3aJTdB0RJb7SCc2oGnhm4oQbnWLySTVeQkLhfFhp/oldMwomBJjKmOatFEyDCuJQJmI9HBUxITq+S034hVHyBw+Vs5C93Ie43cYu8C+kAC9mtuMu9q956CbQXYcI2B/jJlaWhEt2RuEdVSXb8aL7Ml6dC9uiAq9eIBaVBFyLuEvYyNFpABi7qKhw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(7416014)(52116014)(1800799024)(41320700013)(366016)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a8Yh+PhKmjqaVUzA9XacD20HdOmC6dFo3xqrHpyIJegyKP9zjdl9LueCfNCBDHNX7mYSMiytRJakubYYXECmRUE/3Ij6iKeNels/8aUeuVjUv8SLp7F0UJAv9Eqx2zcH+SrKeFWmoq8O58Gdotxiq4fYw3DXxwc00Re5lD4S+wNKtSymWt6rhqAdEB10ORu8Tds+Sw/tk20s/jM8DCW6KeWRt7s0Z3etfhaHnnEkop3u1GJ3QlaawRcOM1UWGBHabZquBIvVhY9zksfAeDZc6Ult3+KkLTV2EqumKvYItDUvi+MC9TY+r8OaLp9qRE4nIW1oSe+g2OdzdKfmqtDb83VysOYtuWoWcxormvmArql/c34yskVN30kc7mOpMezaFVPo/NEOL3+wOuo/bfTEPPJmDeAaQVOQMJLxvo5DfOXqxxe+oX45/hqInzKmdIlsu2/N1QIl5WVF7A0L2HYP3g3Ex3LL/Fw5Qu9uxKBj6ppgHOjVU3XqqU4f7D2mgOQibzO/7QXsC04nrq92JofLYu9wUMPvdkMBLvLSUWm0ov7p04COQXUNWrfao+7U4A8IOM9cu3nNuK5x6lI1pNuTeQ1q/z9bvV41paPAFiioWl0Gokj4FLv9N49MGoAeImvinIIbdRIq0DMssg4ou60/OFNnKyIPVrFLrjW50fE/OIBAKcNgpyM6eXZf33lAoxuiii5NBt94quQLxXG/S0gGd0aFpbq/slcBfGSX+vkycX2YZFrzXyn3S6ZGfeqjqzjaK6K7SuT0uyf9xT/FXR+Xz3lCMz9VNRVcCatG/u0c8c//KWqfGUWXmoN2EXoXI8/pznXDoz+hTqZkA0vCzbdHieGjYiwcqymAtdxHj7JuI0ow8BZXXX8n4yTtT6hZG5YmIQSOywmgKHIdk8MZ4wNwKne7zHN4SCHDz1CaA50kgefFW2e1Hv4/uw6fNwZwSSSK6JGrZDh8yQ2333NsDHAYaMkigB714YC7mL7NQt9N1opWMFvmZdLwMpqU/io4VdMO40QmlMiwVd5fqpi2A9HcL+bU36/G6LBROpzkuG6uI8Z3BzXL55QXN9qLxM+WiygRXnlvDQ6lezLk3YfmXFZUr9jNuwqsPdy/fFsRCE3GYA4sWEL4BbVER3ExsZJojLy0NEiQZjqyIU3FE5Ue4IGTckRipn3TIhwfXlE1kuW8h78F1m0YtA/QsHyXwjmGiyAnBIwkJ51LoML0fDhNpATTngA078Uzepty/tnPAEmhzyc8i+hfkDHtzTFPnrfm/U8diP7vNHKx8oTtBcOIk6P0o3hqsfCc9npE7KOYAFpOkUPCyH46e+5k41mY25PoDIF+1N/LFMUlP3klvvK6FYywk6CB+8gTHKYD+7RSc73gj13Z3oFkyufFsi05wAk1FCuMCFgfp+OPRDisIqZkwXQD1mWzjmU3OY4rLIpZ5BZ6y/4fI/ewh5fSAB1/Z7w2t8+KHqLIR67hVLlVAffHrYUhpJFhdPqlKBlOm5X7zJ1hNqQ3JPfNE3ERuvcCja9nwuARN4Y8aAbpddt7VEFnK+RtX0S6LvJR6AGMCX9Dtu4P6f2O+matNgwjhJkMoRFN8VGPGOBnloL/6E9LujsPojPkeQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f349a9b-99d8-4c97-cc4c-08dd083ebc7e X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:10.1439 (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: h+/+U0Xqh9T9GxxXcNRBl0hJi+eOKvCVUuAzmLdIhb3rfr/pn/ji0W+b+6tbdXhBTWNH8Hvuhal3ru6VDH6x62ZPUd2E2jWVMxS1BVNQ5Gk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1164 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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(). 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 Tue Nov 19 02:04:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012995 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 4Xsny70dJsz1xyD for ; Tue, 19 Nov 2024 13:10:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DCBB6894C2; Tue, 19 Nov 2024 03:08:53 +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 71E848924B; Tue, 19 Nov 2024 03:06:10 +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-bjschn02on20725.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::725]) (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 43F0B89417 for ; Tue, 19 Nov 2024 03:06:05 +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=MpYuEWSJCi7q7H51exjTasgxxxqzFg3DuxUOj3bLxM3mscICUxAPdFBoujdF933t+62FPbq7SS0hdjCUS2bvh77evxxHsruPhWGzNogohogbJrTkbAqAR7DeTUxCoxGGN2LMNI3JSoSvT5o1wXCoB7Usrog9dCXT2PvxDg0rwjD8rwUApxHhj+y/qCsPWGI+bbKBjXX6OEWchgDr6k9aL6PjnXvmqvLs28yTfNLUmQ054Ocn4pzi7S7kLeg64PFkxV6fi2xbFUKGTGnAR53hADQV4UDNUcW8LpD+dn9qT7qYFHyphVb4UjuSTAiOYhwetCS+wqUmFO6t5UwLvPKGWA== 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=puqyiKD6HLx3xa/8IWwsr3tAKZFZrFtvQXHRkp7j60E=; b=iTVjTaCGXTyYHGUv3FlEfFYFpDDvXQqgQvaw9csx6tnwv6f0Xhu8NsLLbq+aLHPdQXg8x1VKaN1iC3EyVsvnlxley9Oup4lFe0GUTMjauqPHEpHp7flf1Sod9/GCaG0giCbKNinYY/N5MbpXeFLCFYGMESn5Uz4HcvlnObaFazSl6yra1NRyS2zjHkT3rNFDLanbApZt3TAI3czQk+uWKGrLVaw5YYyLOupDtTY1RiDnmzWOUZMYRCU1zAEn6cTXxne5IHqa4VMhpyKkg5CHWPtDORq7gdsRRI7hDtVKd7Dp4oA9yqEkLszN1vzt0/8Kh7XX28GiTXfsgyekSTSW6Q== 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 ZQ2PR01MB1164.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:12 +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.8158.023; Tue, 19 Nov 2024 02:06:12 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 10/11] board: starfive: spl: Support multiple DTBs for JH7110 based boards Date: Tue, 19 Nov 2024 10:04:24 +0800 Message-ID: <20241119020425.51989-11-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1164:EE_ X-MS-Office365-Filtering-Correlation-Id: c339f7a8-fa34-4eac-1a04-08dd083ebd15 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|1800799024|41320700013|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: S9JoNlE75cESaHCA0gB5383ve2CXcYgjz2c49/8Zda9GYCxmhSoY8S9JxtopEv8T8C11o5bq/LPHTacu+MMeF0QAdZhaZgz74xvfknB1cGvc4T6OSAVynPfVySkX4Hm5MaNDckjMyIJZ6V5eqkud08xbw1YU7tLuLRi6Hc/9QUX0skep107TOsmXfbVFqX/BBZXb/gXoSDgf/oe6vDO0msKtOwy/YG4m8kOhvg+ZJpbrJULlUh/g2YiXQhLaMwFLQOkTq+p0OUk4gSy3nES3U22IMJdgYSX7GQOaOKMApWCAZ+RulUC2M9CwizwCiERpeQ5/ZfMaYPzD9jEwlixn5BQhb4gXmURIEf4UECboSIGsM7/HFLb3fLA4aoGIBiWFWIQFmDTrM7movn3bz5SUswBQoCaarWOUibxW8ug/R2eD95mLeelEDir8JwAoxT4nKv03kIhvPqY2UfF3xKSBWNbMLTn4EcXi+UGPDpJafLTgfoT7IC/FWC8O8pALF/kLMsbp4IX2Sgd/cifEQ7LbpfvqY7BgG1btDqMPUz+P8id9RorBUP6+TcdwevJKhMoSYTBE4Bt533LVo2qO2k2N05CR//DkrM8FChDKA45INrVeVC+SqLqKWUPM/EMxko9w4HgghtANWjMjudQLs31D8w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(7416014)(52116014)(1800799024)(41320700013)(366016)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4zC6SoqnT9NDvZLsZGFLI4dJjvsyVdwrBJ/gGaiHYRhIxxfnw4SxWMIAznfvW4ZjTI2SXfExHFKxXw4DvQITkByg5SrIIlY/JjEy9pDLKd7hIYc/oZo1Bw+2svtjb43g+5Ci2q9Io87Pjws38PSAw9ybrj64lbQeEkdR6Cg0xZHTS4gCX7G2zNAf+k7Xe+JB4LaOe7hhI2YkuM5FkjtNJrY9eaWAihn5kS93LcPLB1MWxr4TF8U2xiLJ9Gb9klIZOA6Lwj5lACNEI4lH3XPAgUpykwhlDw2TUYa5y8/SNv22etW6XeeSeDzt759YytX/WStnSjky7gWmLbbG2gSLtuw//Dbz+iI6mX4QTlE0tsiWRbkIU5qeDpbdp2MN5Dgnt3BiTvqZO4T4XNYx2SxJqyrCsHOD/J7JiFIlBMsYpdSDoasztWl4VMBaZkmydTxRUf4ZuOg1jaruEhhnFPWLOysp7LA3kcyjEcyBkwJ/1XYJAqkCbt0PUD6VwooDbYKR5XRePOD4FMmYwwawTy6o/Gp27T/OaZX2gzsYXLnfcOOXlmNmPm4wBFgrR+nX0VPrpj8cl5o10EUkQ5qLfAPBn13JPsFxqeWNZhUNRa0iTZQenX8MOTC/Muf+VH7YeurZ/1qjcPVglpFWxAen4jJ8l/M3P4wvfp/BwknY6Xg6KaOvtUKIfInPj19WH1U2XzWb0sQrR6NjdsABaU4gXzvDySwM0FUWwaZaO3Qx1V7QN1WZVhwQPVOtLrlLH/gXYeBwFtEZ1a/nHnYBOBymmoO5nJQ4NGkJaj4xwSUnsSNgJNp4POnpj/BkArT8JDhpEdgDc0DItnA6S0Z/WliokzPh4IuTOFyqXGd9PTXW8dn5Q4kRJq9GYsI7ebkZumQi9X6PIk8gyBAcTNTnplS9EDquA65J6iD8tzRefeE13ohOcN2p+tQAfTA4KwAcaysqsdmsYgMjA097675N8iESxan5HxiD9M9OdutlUaGiLuj2waHZ8j6OoKQQk6Sx5R5UKTpKkPXGNQxGoQyMaQkUeMH1wsyqT9pSdnKt1Qr6RwXssDJhWQLKI9wvm6nxvM6K+a13ewuhsHRXRkirNlDtlRmlyglejCY0Pf4B3TSp+DTfmeFUu+zyNYDdCVGX9O2zxPrfM1+AjEK0TUGzHL4B8t5mEq4TamwFmMupqUvUoBXBE+cIlBihYep/7yY99YH47IRuxwgf/5oZYcSqxmSAn6FhTUVbm82p/S6dadxF7zvCbI4wbj7aPvZY/zYzszsPnN72VxjWMpz2dWrjDIBgDlk8SWxiSPUTxdJcj87ElxEpFCzoEKdxhX8ldcIdh/NaKwUNPXnLGqBmRWBCo/XAzodccLjsn+2Glqnezc+5qNu6BB1OXP4+pjCnkn35hABgxOx6BUwudFEpNLWYYLggS8sFmgVbZEKxrdZf2D+qQTtFIwMPM4kLcJSfC00okktt2Oh9Arp/XOvWn0NrxnYQQqidi2fyEGgoPTSR0dUQGzmMzSyZg8PeQTk91uXnncC9pJ+KbVqCpNZIEh0KpHgKg/N/XD8Ji4uj9ZtPTLLKi+m/QMC+RCjUqkPZB0NK0692cuV+zAI2POtpzBzkkawEh/hBGQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: c339f7a8-fa34-4eac-1a04-08dd083ebd15 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:11.1023 (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: vnLQPFkuGr6dEH431KFA3jvQWtKR7BquN2iLI2cFBcrCqU2UZIGpUU+lBvqaZHjTEJPYaKg1R4xR5HtoRcMa/SyO+xviwbetjkzEch4bJ0Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1164 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. 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 Tue Nov 19 02:04:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2012999 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 4Xsnys3T8sz1xt3 for ; Tue, 19 Nov 2024 13:10:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 73B4E894A8; Tue, 19 Nov 2024 03:08:55 +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 60DE58924B; Tue, 19 Nov 2024 03:06:12 +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-bjschn02on20725.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::725]) (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 1DCE189491 for ; Tue, 19 Nov 2024 03:06:08 +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=a9DwidyDxwxxajYXx9NxZMQxdukSRaWcZ7XZQoTUqu2aC5/7Rj7d+z8lM15HuAlvfbkusYBlZMskfHCJDEuiYs3fhJC06QoiWhH0B9bGQJAINuNRBISYqy33kJn0wMJcOev7509E8FSO+jE8n/3qplOJWtfQwIboTbOr6tGoI941MbOm7kBeSalVG9olhRpOQN8ny6nQdPiPwlirRmTCUsFagZn+Lj5zcghW43vgLvR4OabQFuygYii/8bibu/8G+x8LlA13cAuVYqcn8qoYCsYvmtDkuAkj1mMVNPmC96YMdODp8Ap73nLQmd1cOQBS8WStHczHmigTfk7FUS6a9Q== 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=ssGJyXBTj8knckUWPjTdbPNR7/UIHPElgv6DVU32Bz0=; b=YTf4q3WH7n8//DGDj1SVnIcmdNlm6jkKrgRrEmEVTmPGRxMh3kNmIy7fv0GvAhgVoIlAj+MsZDopv4uSLca346GydmLmD599PADoPFnQdn/2ETPGtjSBf0CRT/hYJw71SfLGxOYmnxCbAI4ER0omUJR5kzkOsOiyxtVVh5C+eFluAtVaKNIiNEwXXlcJPtuNQgjRAuQ5kqwZIkJ3l6dqIrFlSWAhEiGokw8wb2jG8zssyATwhT4rqMi68l3s3vtfQpU70v2qJ96IB2W8vQPe+tGpE2Ldo+MEU4zyYKxB/9KeGi5bSwMleNiVApnHe/I4QPwPZIuMBUHgFodno2UoMw== 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 ZQ2PR01MB1164.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:12::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.24; Tue, 19 Nov 2024 02:06:12 +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.8158.023; Tue, 19 Nov 2024 02:06:12 +0000 From: Hal Feng To: Leo , Tom Rini , Sumit Garg , Rick Chen , 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 v5 11/11] riscv: cpu: jh7110: Sort the list of imply statements Date: Tue, 19 Nov 2024 10:04:25 +0800 Message-ID: <20241119020425.51989-12-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241119020425.51989-1-hal.feng@starfivetech.com> References: <20241119020425.51989-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::21) 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_|ZQ2PR01MB1164:EE_ X-MS-Office365-Filtering-Correlation-Id: fa6962f1-ebf9-4ee5-2c5f-08dd083ebda7 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|52116014|1800799024|41320700013|366016|38350700014|921020; X-Microsoft-Antispam-Message-Info: 5GaqSlM5F603HWlyJGvBEt+VnbFo6MOkVdbp6AuiAp08FXA0xjYHb6rPa8WyfzGdYMrgeL+ZpuzxwRxzu+Wwz3OaPwWTN6OwmnOdFqZyuKPBCy+KyhUndZkuDGkFx4FfALFKFwYxPn4nm9uhzVVxk8gPPsUrLmvlxdPW8ia6SDrMEap3D9IxCa6ssN8TZTsd/JNc6s7kEzYkNlI8aWkqrU4kbl1GqtCqWKZ1AVmXrtxUq5TgrWSL5PBCzPqoG3RKkKpnxZvVeODqVhGxLfC1MyMytW8E+ncuBd7r+IqdS6hvNq6fpBy+WzRvpcMjddUl9X9mbEBECobuMMditGgQoYi9t1PORdaRDEN6BRDgs4KYTBm2ZTc9Mg61DqoY8QSCkKLJ9zGSNe+LTTJDZBlq7/EGBiBAhKRIgJkiZyGeeK7mMyXhWWnl48jbF5bMOF/AEU4dKXd8lhkrrClSKiSq/GZ/maCearqxudCpZBjRZ1mFceolwtnmlMM8ADZgxE2XJ/x/Ue475MwcWnt347QCHJaarHcIbQlUPIpWlIkWX4GBwexpD2TH8dmnwn2A51kwlUP716EAui/sC+8ocHA+OnDglgFw4Fe3gRmHwROjbbh+wtuIAIPWjo9HnUH1xsyQJaH9wBky/Fa1PUVL3o4XrA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230040)(7416014)(52116014)(1800799024)(41320700013)(366016)(38350700014)(921020); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gQejZ4RxCNDzJKph1YQ2oZ4aJMcRPxhxv8/xveN8QTe3YrC5RSGlU1AEswURzloQ8ysXMDIWtUEzb53yCD22oeEAWAK9E1zmXgrQM+1ihl8fQC8MPwxosPmN9QKTpy8bKMNjS9/yJnaSq8U33aQzGLMBN1JEPfxph0zFQerIQlRIchj4o/b2qpGSMTQKWyrJ/B5Cqsr8bOr92PvgsfSX4+YNZimDWko/Xua/uQCSdz5kIGWLzbsxfGHtOk1L4P9PlOixvk0BWnWzEyLZT4WKy5tzGi0740xnQCb/C8hhpo6R44cm5vgs8s7mRMjOmSIdq0Sum4JIeV32rJvPh8wM6NkEVhIYwAqfv5jh+napAzk6HS11+zX3Wl1LXa60+U7smGgV4AyHVbhv8O0bLf3GuqrckhWMO9DYx8+FUIEJ5C7AWle7UJeC98qClj6xxPe3gy4ThIgWtYw14xtHYl46nCwhm9MVtR0wk3rvMWzb3q7tukrrRiQBHrFbYxWMTPuzL2F8yuRe1/Cui1umU9lE4x8RZ/yvRj31cRNy3ORmnfNAVqPdrv/GdsN5aJkX61GQhxClbXjaHR3eGNOc1+0nFG3GxE66SfR7zHJAwV/xH7Yw0y3paI3Kq1I7Xulse44b9bfQu3Uw/IX1RY5+HisDr6U7feahjb8NkbmMqR+a3ZaH0I9SuT3tHGL+RizWNQ+TLAMUl4KFSs4sqUZSxMufoD134506qMTXSF/t1NDu9bl1iT9j5qrtqwV77tyi/Nc83ky4rIdrVqw6aGKzC7DKAERcZsMbiFrV2h28C/Bii+NFxhXMieGh1XwFR3JAl3zv4iItAXFa4wXkAMDfcJkEVAcwG0S7LcuHn2CwZx975ZJEPlrt5aQw9ISiXW/TldGXHfRtlzPPFMr2LFNF42/UbZgD3W16Jdnyz5+QKlQ2byFMrhban/X/YxDkpLSC3FT4rYotqxRHWKPtza5/MjAT9a8XSfrQviiGTmqyV3bzmBcUKZ0V4Xcb63MvmzaT4oQ99Q5uQWhSb53q3fI9od87+CCVUug7XZVZXhoj9I2pi5afT5KQ2gcfaLU5ooohk3p6vDTPWIA+lveX96kMmn4gS7Uc6HhRwRgHlLqCwO0GJePIx5Gs2i7e/tlpw12bBVpJk0peogWJWMPk2zezH8wUj5QkUPSdCVfeLI95Fu2J2AP4UeQzohqMrHkfaK2Duxu5euaTIJ8uyfGxrV+ixtWzsi+hVJsV7JV9eqcCUcYCbd9driKx3Qjjz4rkbWdnFaTGLASI8UucpAS5dEICYAxsdH+L75W4+8shWvpJi7sfQBA3lMiB7LtrLR9jgUiUmtJT7iSv/J1RI2Rxvm1pWmE8JoEwBq51/MmQsbmnt1kvo5rcrNPn6lUpyZHJbUepjVc/s8cM2Qgu2JulJTXUFMx0So+M9Pn0lj95xwHPNE529lmjTkDI+AKAXlujJYu5qZD0aP5Gw2r0cczQtBeWdrHoqhe0bHGgmOrl23LSJZC/xkuLkJqU5U4zsf20ADeJxdmQJkGsvb3TLNxJh4RsULo5p+3ozC3U2e0YHBLPWjnP4s3eAq4s96hUCWPSthkeEFHUAmqMOvamdt0EQjm2ya2Y6w== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa6962f1-ebf9-4ee5-2c5f-08dd083ebda7 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 02:06:12.0540 (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: 2RlhSCOFvSUkj/YFkdrjwoFC1BFTE4sLmNEj8bsFmEZlCxPE8inKh/nE+5rFHD8Oat7RSezgNNRV0K/BcU9/Eal9fps8C8FSLMzAzjp4X5o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1164 X-Mailman-Approved-At: Tue, 19 Nov 2024 03:08:50 +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. 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)