From patchwork Mon Nov 11 02:07:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009355 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 4XmtdJ2J16z1xyB for ; Mon, 11 Nov 2024 13:23:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 15D75891AC; Mon, 11 Nov 2024 03:23:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 253D1892E5; Mon, 11 Nov 2024 03:09:41 +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-bjschn02on20719.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::719]) (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 E676889198 for ; Mon, 11 Nov 2024 03:09:38 +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=nyMuGMYm3M7/qu7fIp1ozL8cBfMeAo1SMrDjqEF/FJmLvBQsAr0QupAAZlnDlx7D/rNHNhNUqXC5QYdt9e22eOprkgb0+lCL3x/2PR9h2CT12xh2xRDGvH/IwfyVWhE46DvKAZHToFcalMvNX7oWYFtmOMVDFsYs+adkKSWw6h4DfYNx+ZZoXow3NB1C+4Jo/+kMHAvISzn1qchcKxj6K8Gk6VlrN3wjwwEVtNOhZCI51sxUyCi7mIT72e/1lm65OPC6gZARwWxFP+Cs4tdNJt6zsI8vRbdnvDN5+cOdMecD1Pbg42ECbjkLv86jOgGg6NxPr9qEGirNZAnCJ6zJlQ== 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=8UdUuc3bjF9uaY0gMBk5dVFM4THlJT4z17Fx5MHzCEc=; b=OJflGE/Dq2CbD92QKY7vBJFITG8ywn1+6lwO/Z9wE888XxV/lOjy+XLeRWpmLzrH/LPsjBqRrKEHCFSCrOftaz8WiegfFthN64XLYMs1/98lBdcIryUMjTxW0KHsAExjbdhQ438Yg/B0iwe/vuX5WWZ00RpFm27t9ZuboQfYrwWcLnpcFVL3p7GVZejAIkwAEOMng9SWTEs+VSt5t+ci2Zh3OcxfwyM9zSNdY0CVHt2gOtDosfz9x2v6CwGbv2iSDVqE7Axp6tT4SGnW+gm5QKFMoGFA6Xf9/N7ylQZx9VWTsk89hqsu6tEqWplDLCQVrtxTd31C13i3he6TFazDPg== 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 ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:41 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7%7]) with mapi id 15.20.8114.035; Mon, 11 Nov 2024 02:09:41 +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 v4 01/13] dts: starfive: Switch to using upstream DT Date: Mon, 11 Nov 2024 10:07:56 +0800 Message-ID: <20241111020808.38974-2-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_ X-MS-Office365-Filtering-Correlation-Id: ecebdf43-e004-4fd4-446d-08dd01f5e74b X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: ArQS1voR4qPMJJRgaYpi+6ygegSGSaMFP3QIyuLF6W8VA1n0Ho0MFOzSSjWjBrOUZJbDwBoqB5rX7m8Xrlz4Qbif8CVYey21Sho1awwvy0nUYemS/4hZSh1bO8h44BxJTr1Ib+nk3Me+/jlgMZjFKPqS/A9h5uYq61fj4/pG/VxhyvW0grb0BblgBB9QWxGi5B6PrwdD1sKlJXg19661PC5eB795NY6CyWepiuvUy6cjcukkHnB0+f1gQYjCrCJCZ4oaODCau4HOHeVK2mIwXyDfZF90YADYOUFLP7hbh+VbKMsWwq3I0d1ESIpHhBUJ4ikl+D3BgDR83msxGwVXVMfk+jNUkvBzlMPXxcVWZkDyyrqVJYUzgdQoogy1f1wx9wd5l8v/ODCZkUP3s1kNazOS2gpzCGzKwODtbVBH38Azlv3Uj26J69WOYp3LjGfFo//JknTpiyPO/QQ6cb9hNGyU6dmHhxpAnUun6XFXjXTv8/9ceQ/T7AEUcMRjQXDJlXHUJK9lowl3LLEJcq3XJklA4yRCC9MrKrCZHb5YTiTCa9nxlYqfikPKg6cyUQ1CDj0ZhIqbKkDhuhrHRi5zjs/3NNcZzRYLYWuQAszDgYlYEmVyWD5SaqAZqgFTlO+oAj0x2S9wYT28BlfbMESykg== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 76uh6OIPBuvEBsqn3Hzl2t32ymIGny6HmFCTlh39c7snd824VepFMgwhO7eiE4yZxMabffztwGVQ/4oWWXU6DiuEayIqDKTqlnbgcq9FgctX7BOSxt1d9wwQhqeGAS1PbSSKMAgvfoYc3yZ7Uw4SLGidwykC95RjBXOohisTsjGyuCbieSUqZQjEETWOcujKfbm0elTaO+kdWL7vPd13j4uYDUPnF4hyST5XplUuMSH3aVSohvEU8K1t5Hqcxn6Bp7LH8eV3srSoe4fJELx/206UBKXit0eW8nTGQeICUk4KSjkXRhap8ACcRHO1qYa129Nvvr1ZtDmuBp/G5ZjMcp4rtDJ7QfsMS688ZJbiafNQmOECjxHEA9QpkNaBju81Fn1v8S1Q0hBv9zCjYduMmtatyWuBaHIMWyD+rs7J+S9tUs9Bc+jINxvIHKA2Ug9AdUVAOM9fyFJ47IOvTeiKENTi7gNK1tKU2ziJ5UcHwBJWFf3SksxZFV37s37JbWq0UmvwuNriom0pvPVjTAYy0LLdbzriwsnIi5QcSkghr7kQ3JXvo0X9FpgyQWCaXzsue9ScR871v9AGiYRcOiw5c5aYoNi6qMiciri+RN8Oofe7mEJVWFmwWxEYHCxsFdz9527wIsyzHAN7dnT7fz4+muMQr3FGpArJgJVb4w7+tcbYWQbxtKZ8/Kayp51cN2K/e9aH76NF1XyLDV/U2sSFt9G+HQjzVHYZvUSMQHzsDhgtvUWAQ94Ax+0azpdBUZQq1WQbNEhEtI/ZZYq71ZlH4ZrN2F+ZKw9Wiax/QWf7jRleVeoxOk9giLjr1kUa8sL0aaQ2/lF6+qieUuNtBMrk6S3A9MDLNmUcZwgSK76HVg6cyoGxl9ob2gW3uCZ5Tykc63a+V0IDWYuALftx9aTf4MsOg8TD1XeYIjy68pLwzkXpsrujCMn3C+2dIf9yDl3aTcHy5FtcNKNfGhrrImfRrtG+LHI1Ae0EtNNRKzm9eW6RKTvx3ScbupCd85BAkfz6UiHFtMX2pe5VPMtMvGbt2iKesfjDmgJ3VkvcWo7rPESfjnMJyvi7w22EuCTRPl63/H6h7c9OmNmGRvQkrJ8ldQCfUiMlgviYy3NCUQHR0dxNFjLZtH8iNapYOI5jOCRLEMqOfLSpTQGYhCL0j750BKrt9NF8YAPjKu/95Fw+2Wlqrb+wiM72sDoWm636huqugFdkoKYsLoHxdpbnd04LKt7FgjdUHp1N31VO82+oie/pTe5bOJxbn4z6Vm8aI0RqFa2RJ8mIElliBpocxLxGBjXLPWlwwrEBRcqAKxtHAaAZrS9DlAmUlxdSztAbFzQbuW730YLBk4gz0LZgd1lsqua/BXfvLyS69+jnVX9Bioj7c+boYtTUiMUb16QjYZwJoQmtMKurI2QGRyJ1njY7P337Qo2wA8qWCrfI3A2jUSdCo94GtgKoclFnvc8lM1RvzxNx+oqe4WWpav1OCX+4lm/+TsqsIgmnMF2FaOXsAPAt4f9eLWy+s0yuBgTBha7EjSRqkHAlJpHx/PH7SacQp7vhpRCpTA12ouHrv5khXSc3ErppY/lVyjgwHOWkCuxD0wDM2tIlWVpagH+eeqYjzA== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecebdf43-e004-4fd4-446d-08dd01f5e74b X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:41.6466 (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: ncci156P+g7qxH1bAxVYb5E/m/4QmbrCNecCt1m03vsIYBu1Qfoil0uOL3WatdccPzvueuiRcrsHSrTN1oY4i0V7BQF8ZDpjYbT2/H1sgPI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1307 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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. Signed-off-by: Hal Feng Reviewed-by: Heinrich Schuchardt --- arch/riscv/cpu/jh7110/Kconfig | 1 + ...boot.dtsi => jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi} | 0 configs/starfive_visionfive2_defconfig | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename arch/riscv/dts/{jh7110-starfive-visionfive-2-u-boot.dtsi => jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi} (100%) 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/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/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig index 11e1332f87..40f553816e 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_SPL_TEXT_BASE=0x8000000 CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y From patchwork Mon Nov 11 02:07:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009358 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 4Xmtdg3XdVz1xyB for ; Mon, 11 Nov 2024 13:23:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3CE4289319; Mon, 11 Nov 2024 03:23:22 +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 C49D189308; Mon, 11 Nov 2024 03:09:43 +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-bjschn02on20719.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::719]) (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 8329E89275 for ; Mon, 11 Nov 2024 03:09:39 +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=IjP1/Vorn5dVnnmXnZd+NyrkcrMS3L47f1vyN//JYtSN00dvE2Kz1x1tfQ7d/m2vh1fE9QWadZj/Kz9GcmnhUVCcQ9kwZoiOOIFoStallbcAgR7lcYaHX/s69Jg7Wvw8IDqKEXAuIn+kjYKDv9RK5Ouk4oMxaAx8cGST9DUNvkGEUr/6fNpWFN4b1mHcQ8rb0pvtXBI+wH5xy59jYwm692NH/IcLIwOyt+WBRJE/gX2rUDIjMrad13vBdeORjrmNBATmlcZjqQXWk6nlZ0GCAYp/rFyyDlTXGoNEWrqFV3vH5PnrzDuqRppOMZlf8EE/jk/1vEAgURIt6V1MWF50gQ== 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=9Z9e/1FHw+uP/lkCaVhGfy5B1iuWrvD68dTUwtwubcU=; b=gK/7Q3t7ERCfP2qkjH19nsizuWRlkLiRbHAymqBzWX61+0VbLSEodNcUe3bttAdL21Iw3GnL4kviBZSTASSqw5Zh0MiXwA/+xl5ZX0iHwSyyQ+0jZ4EEA32z5eZzPhftgcCAGgRDExD84eH4CJ2zDVXS+STFkJJkypJ1hvND4+gSzNBGhPzIkWcwnAjzw/fmwGPOlOOTOX5ce1n3W5J9hpGx6xGILhPfBfBPNX4mRK5rjQaqdAw/GpvY9JiIlTKARlacEbWkp0MNNv1wtdlhBkvwD4JHYH8ILtpwQVrnZ9NkNmxFTO8LhUGHuFndvn8u685cDWBS1x3ovYU2OSjYXQ== 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 ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:42 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7%7]) with mapi id 15.20.8114.035; Mon, 11 Nov 2024 02:09:42 +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 v4 02/13] riscv: dts: jh7110: Drop redundant devicetree files Date: Mon, 11 Nov 2024 10:07:57 +0800 Message-ID: <20241111020808.38974-3-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_ X-MS-Office365-Filtering-Correlation-Id: deb269f8-2564-4a19-efc8-08dd01f5e7ef X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: eecmBqBDDUfFtBu9EL57JjQ5MtDebRHV7Rq3GsAyIQ4bKc0eVFymcRp+etNd5nDrk7ytUp7bvkILJ5q035KG74CYlZJUC+FM637UvNl/7Oqwh3RwupHaUTSRhp93GhQbzamCsBBXBFAAe0oZbPy2xCmUTw5EjsNhGJ0RdiGZ6KBiAh8UpW4cZiEuT6V2O7n4FOk88Y9/VFNa+HqXmLIQT5oBYTOBYy8sGMDHCXtrvkoix+wIQdoR6f9K5Gk+xGBoaddoZvE14ahMGF195DU6BOQjgL+LPnu30ACjTsOkDZF/Cewwvyt2mGLzWRjTsciLWJGbH1I/RZ7XCG+CFjFtBNtqU1xZouVjuvFI6T/Ntf/h4MYAMzUTqYNm/KiBzvSvZyR1+vmWUbwPi/ihkYerFKeuqb7Egr4KEtcFgG20uXgI5WrLuQqlcFNG6aIyZtVuL42ZKtNDecx+w/GxdHRmLrKdJc48f9jfbZAbF+VASK9LoN/KaY4u0CiDKZ1olLuUYPp5mWgsVaURsG7UwwdxL2I+KuHJcrT8uxKc0pconKMo5+Nz+trOahunRiA4yEA1JP3xYdOaRybD03nfMGVWp4sL5QrMihaMZwwfhHTVLNIrJowSXaFSJ/Sn8s0N2Xu1lgOsAIVVA9629FPEMestQQ== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tXgdRgStvfOoAExqA8xDrhS+rd/9OH2b7E/LJ18RUj8JBAlJXAMlwX0Z7gqkT+3SfOD20ObpjuKJlaAhKZdNLQ4zZuIyzz0F0ExGGZCYUVdDWQ9819siBJhaZOdMsf6fJqTVnQFvc0753HwgcPl7vrcUBOl5zDoRTuIUK88wyo8LaYVGiK0Log/rnl8x6Fl307vyjSW5b/zX+CkM46zpz4HKVSKrvpD+n/WR9C3mccdHejkxsyS91avEWGUH+id2A/9IoYAzFhGBo0eiknxG8rnPG4Df7juGET7rUJAzg/baW9A3qLgo5uZ5kzAUHOJs8URg3Sb8uRFOFG0icVraHqRu7zVljl4yK4APm/tGaiTXOwUqTxQK8PB66oe49HBXrsSPNVVJzPUTOD2fh1maJJaxLbGbykjqBFurmaCwTX16kej16fUdxhqea3zroHu7X7Zuyd3+0I7SWVz40jn8y1/gF7goHE1GDXz851tUqFRctiE71FolDSskC00LNCcTrjqe5fERfhBunhpCk5jaG1CixEQTPck4T8fvyGSSTC0pCecqlehuldQGurE4j0P56WPh5wwhRYBgN7aTF/b6jsWUvkbdH2sASUYXwG6CEGTt9wlu6Vrd3smGhDJcwys6D4x9dRgrygcB2YYsxcgw3ST5lRuzTdrOLCXg4rXrdX6QbfBMlwtLRl9bysyipmmKr+GaJfxc3R6+pJqalnCsi4JH9c0P5QfW+zOOOLTzm1HaZgW2kN32353HX60XrH8zgdY6nkfpNB6NCYNGkvDtUPhvLZ63v4+TVfel3ag0NyQodBSgWdjqgQDf+3c+hmuF8bLYFpYgyUa7vmmEtMqXT534+i/xoOlPEKSzc8HlrPXSKyC6n2uGfnEncVl6xmPWAHHhtSk6KW783yJWFx0WvcSbHcU0RgufdiqEQjuTr8h1nCT5OCE65l1T6fljWrji4TmtHR4MpNCgAqG07rvMmMKTZeoo+6Vj0wLDliXrkFHQ7UmXoqnGbNHv3hpXzT7QCuoa0u/IqyfKTEc8CyG/G9KmAZkxDRSbbpiK2fIIpO8D3JMJ6jFGRSxjm30sWTa36VDSV2rJ0mGQipuz8jZk8g6ibPZHG55z/eO5visMzNYRcoroIXK9Pyb8DuvJOpngv6fOPzBSKAypBzm7sOAa2tZzSSjat1ZHbrruKTygsujC3d2YGa+tHc0b/V1xIEQsNwY03+yNLtx4L+EtLs+enOVgMOZHfa9eFsPKDzeND5sqRuC/hwXpoO8P2GK7/XqpAHHb3ZBGOdb/PzlwdvGYKUTHA6AiTOuIgis+sPFDdhRmVDNf7c3T7WcnIv9eeGjVzIbA0YVbWHRa3K519WJwJRhsVFOLnpdGJjZFx+UiqZ1cJzhk7CPTybmiwZKEkYDOlLT4b34Enrz3REtMpjNvdI/qoRIs8SfzNk0EtqgTyPMmSyiQfxn/4QKpyK562snpTztP/Yr5xSdK3a0x+Wsk2l4Qp9UKoSV4cG7i2NcJQuJfqNBwHi4BYrcoF22u8stjLleVd7ts9wVa/ACRFY5xhfTgIYbC59pS573rtITIYsS+iHwcEjRcuiDA+cr5zhAVSWalb4QSVsIrUoPwEGMXfw== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: deb269f8-2564-4a19-efc8-08dd01f5e7ef X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:42.8085 (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: 4X1+VcYY5SIkGGyFe83LPR5E+GfoS20RORoZirbGndKK9kNnkbyQvAwEpTjd5+jnBEjAk9MyWZtBgh8CL8MAk263g37WGaJilPuTYzFwQJg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1307 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 JH7110 boards switch to using upstream DT, so drop redundant DT files from arch/riscv/dts/. Signed-off-by: Hal Feng --- arch/riscv/dts/Makefile | 1 - .../dts/jh7110-starfive-visionfive-2.dts | 11 - .../dts/jh7110-starfive-visionfive-2.dtsi | 380 --------- arch/riscv/dts/jh7110.dtsi | 761 ------------------ 4 files changed, 1153 deletions(-) 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 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.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.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"; - }; - }; -}; From patchwork Mon Nov 11 02:07:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009359 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 4Xmtds1Gbsz1xyB for ; Mon, 11 Nov 2024 13:24:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 99F798931E; Mon, 11 Nov 2024 03:23:22 +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 2DF538911A; Mon, 11 Nov 2024 03:09:44 +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,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2 Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 36FDE89198 for ; Mon, 11 Nov 2024 03:09:41 +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=cKQ4qN9e97oMvG1UbVErftRelWr4lumBS6fcMIg63BkIlPj13sN/PT5ur3fXxg2PgwXMbtN9VudypKZo02p3rxZ9DXnqG6ifhvLN9GODX81Ks23gfCcUEXRPRmklt30WmVakN/J0gXfR7/+nw83LQObIjun7UBNeXtkyohZK4vmzD0Mkt6/6lBM/cbcnpCZSgl+AOlJeiS7t5cNPALM3v8wSS4O8s1eeUozi/skVMU1XdusuiQyGK5N7pd/1eUEAwUl40bUec9C0DGURVRgCBwuGs5OryQpzhAbfd3Bcp3a2f6IiBqlw1jdvjEuPjxtMdTYL+3Ew5oYrUpPT/x/RtQ== 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=bunPIF4vKEROSyKMxeNIlGRVq5yIuLnfz3zO8O9/6S0=; b=YK0j0FDgK7LF+EI+JuZVp9wZmHKCzq7SzmDP9mikpSD8KuEzi9YDjKveqAwmrIlulQ3btM+eJracmDInAg8KUOQZl1yVvNSJH5SI1x51IQbmqYzU+f7YvYJm/m+u7kVu+q78PIT+qTeAPzsR1LAZ2kd4rO/vaXLj0sXiHak+0A02PGi9ubKnXZtSUkjum7l51EuGfivzd8E9WvllEq5G4goUpBL1nxqdtsF9Y7+vSKmOBe5zznh5flotU7DmSkockkj0/k3Yb6045fod1U1/OuJ8tJC1dLcYZsIZbpSdh61z2Hcge3rTFDnNTNonBGZkNbb24KotqTFivkvNuB7e4A== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:44 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7%7]) with mapi id 15.20.8114.035; Mon, 11 Nov 2024 02:09:43 +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 v4 03/13] dt-bindings: Remove StarFive JH7110 clock and reset definitions Date: Mon, 11 Nov 2024 10:07:58 +0800 Message-ID: <20241111020808.38974-4-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: 2fe6cdef-b3c2-44c8-c966-08dd01f5e8a0 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: IVirdaYp2oEFJYt/BiTR5RKd6rjmKdAsnp97vpumXnCrapbbgaUMu9LlKpahPszwy4UJaCQlS3d55+48RB+pHvPMPk5oluoQqfOZHBh+B//AqT+DsrVQyfUshlTi6EUhZH9+cmV9Nb42u6s+iCWl44479ULaiTJQk85c2k0byy0SwPqn9fa9Rt4juBm/3NwMpBeMj+wSj7DRI9r49/vh7jKNzNADPlTCYEDbrTkqxT3g7kp0cdUOK7j6rgH2Ulj2FKH0nzCc12hvkXk92R4nzePhBKKnP2kYnqDYZSSMpoK4SNvIK/z/KG/I3osQtHpjay2t6LDaC1bkymCmMsMCZMYtoNU6mM7yhCkKZ+EVLJraEtIJRieAZCeCoS1DX0YzKn4mltVSXU5NPgxayTp5wllukW1AEvAC6WWkYu6CBaQ9t9x8+IT9sqreOimXfIZJVAqAKlatQ7Mc2LMcDGHIF+ztW/sCpL3riuSLqDfwcXcv9UhxIo2VVeoGrep341YrVhGRqcmf5ndozRc3mJAnvuLxd0/SKAjGUAV4cjQDStEdko0b6nc69oPI/a3+sb85PyUCuM/zllNWlZxudIRHRNYRc+3tf2QHu7Y0XzuK7lEexhGxmd1z+anM0ThhtrZlkGfMWkhoTn7U9VrPqSklaA== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NDB8b+J4B44L2crk485qvBaACHF0Ez4qkGxtSvHQWr9oABnjLOpiRa6/11sOSX500pfmAVIsPblv5xKmWh5c3j7nPbMTF1dOhwgoJROOHSwfFruOlXusXs3rPvRYQhQ1lpH91zTjPYAP8pIrByf42laYs7ptDmmPc5yBZaprIw3xbcEsOZLTAQfCj8qlrWfApZJM8o0nZNyImqtwPu/vc5brNboI6nbEAgt96A/lR0pt7LFitPd3xx81IcVVUgaqviU7UPqNKpgLqXmf9BairKYd5Tc7S8W4CTYGqjdHgPvcp+MZVGdCicH31Jt722VZh0roL/z1KabQ0gFYyBQBqQxVuDpX2ruUUwj9HlZI5KBDgXw5Te5mBk4xGLMf8kB0X7efv6jYMmZTlfAhObsOXZ3f8leaxJZWxsf54BGGTdYHt4Mj7Yq0sliMpzJfH+N/8c6WxmxS2bb5+YWaiiKyGJfPqDJFdkXQdJFCHZyrihtRbIG+QnI2AZ3QGgo/m5JvnzAxlt9md8trqO73QD0nTEuYyYFIG63iqIor73Et+6kMbOFJYtcRilbpi42JsHqyxxnHdMpOKPdpU7SKfEoJRfKWfNvsX+wj/4Y/sPIHuZ7+OJXV8k0MAQWE+O7/bX4wag5pq5HCD1eVGFxrZiAJbVhw1S1/Penznp+ZNeQE2DS4PZykj1t3e5/YQtE72F1wQXL7nWQZMZYgG3Y/O44PAiLizEu44IdMPjmnWiu+fUnst6GqVgxKNEqA6WR1E+mhn7iLqV4t02ez+MY7ljhH2DSX3plHQZThVBbKkYOyzibgFAQwVUw71vk4xRQIJaTGaB2FYIcXu8IteW1IscDpRaxsK5c8jsD9JFVbo5raqff4NUBsO56OATP/qNIkmZmrNqFGAGehMyfsXNN/z2uH9SEfU78FssNXVdAZ5clgJa3gjkK5K+LRbGQpNOA7dq5QfLUb3YAcFuIW5UjNu+yePcNOjmbgAH8U7p+JYY+8fwT5nwEy9nSbx2J3OqRaxilQR+wjcRYOQQIj9xqVP47mJiZDBcAr97hqonKTi8I6TC7X02gvbVwstWHL/3Ky9+Dk8A6zS8ZTf5PHxWgTVUiHKXnnr8Wy9RUzvkPGLAskzceY9AdNRxoSigGXuIPakJGAzmliGs0C+2rP2RM34s+b33ZQKyM4v3yQigVU+cJyhBSleo82NTunPW3e7Sv3PvicTZT4MSDIUi+dqYQ2Uspx3vYSRnSL7S3+1ZHm5OaAQtywQtpTgGF3e1pxI3pDZAaT7LtSS1PFqIJB0WPK63pFxiqE+3qpHpSSxTnLPqqMRcO4GkFo3VGOsZn4iTkrXnZEhZXG2t+3BSKWtUDJJPQgJTI3oENLbqRk5IEIAQ8fVNoPcwSb1JPEx2yiUKLDDhIIzkfGTswS6K04NnM0vdTpVXqcBHpJ7YcRhMCMEjTYTRK2vG7GD6C/ZUi/6F0ikQFTVpIoOpXHJ+QEupVzoxoOpDyr1g/lEpKrF24ZglrauOvt8Lg8pTTEfr8sZ21RELl5KKWLondR3LWKL7Pd5I2AYc9EcZgKidXnA/fdMVxXNnBf7Hh0ST4LNyfy8whSZw7xL8diNtVpAecDPx5zyrLE5Q== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fe6cdef-b3c2-44c8-c966-08dd01f5e8a0 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:43.9354 (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: 3paTTXJp6PeO4dXJQ0d3oCcFG+ZAavPYQTD5Ejr+iAk5WWNGbtQYGQHkvH3DEuYkNHI9fCYLCJY1iUiRzGOL2/xit3lnty4A6F07futIROs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 JH7110 switch to use OF_UPSTREAM dt-bindings, remove the redundant clock and reset definitions. Signed-off-by: Hal Feng --- .../dt-bindings/clock/starfive,jh7110-crg.h | 258 ------------------ .../dt-bindings/reset/starfive,jh7110-crg.h | 183 ------------- 2 files changed, 441 deletions(-) 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/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 Mon Nov 11 02:07:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009357 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 4XmtdW66WXz1xyB for ; Mon, 11 Nov 2024 13:23:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D4D558930D; Mon, 11 Nov 2024 03:23:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 255E589308; Mon, 11 Nov 2024 03:09:43 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 9B5D5891AC for ; Mon, 11 Nov 2024 03:09:40 +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=Tgw3zUBP/5zuKMmaHQ/92QoMo+w/CxoB2jKX7kS2wU3YnpuMq48pmiIOUs7YLMjsfW5+67q4gaoj9bzMQvYQmt/tCO5mB4clr1ONijJy9u94bXTsRjaQbKhVI8ko/MhpIE4ePAfn6bNJ6e5E7f8TN/lE3Gxxa341ItbzYPvtK+uet2XpuIFkH2Tzn5pMHNgx5UlSx//jAJR0ANP6/fKdSBMYJD1F8wz5aeES/RbUo5g7HKoUv2T6rwfUMZLgwug0deIS236OdYqHTBEWzP0qXUgkzGU69eM8qtssjYv9JVOBnv7JHbm5tl6EPikjeiLx7vfCvCObMl1YBXTqdem8cQ== 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=RAa90Jy6dGBdyGOmO4CaRNff3xA7cwFHF/llf2gGUYk=; b=QYEmajStoO0bZh15R1oI+WqToJ8BUj1Q9o7a4kNP7gB99fqx870eOagaupFoCyTjdBThjb3LAm7/2IaA3eboF2rodS887tpiiChlwI16YOXwh1dxKDvgN9wWRDtXsw6KoKOoOVF6LzWLS0zSKOdGd2/iVt2jxh09Zq5WgiQgtvE3JNxE2cmX2f4TDJOQxHfM+qHz8Aijlc/nCgAZwhrRH1tq+22P3zZiKI2+2anZ04/CL5Tl9J7WzjlvvCYaiUAvAnajqiOSV6mQY4Z8ANMFB1+sNzMrLAaS87cRVkkhhvHe5hEp96iXfCNU2f6LFVXRTB7+gyxjuK3PXRVjCi5+lg== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:45 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7%7]) with mapi id 15.20.8114.035; Mon, 11 Nov 2024 02:09:45 +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 v4 04/13] riscv: dts: jh7110: Make u-boot device trees adapting to upstream DT Date: Mon, 11 Nov 2024 10:07:59 +0800 Message-ID: <20241111020808.38974-5-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: a2660d39-25f1-418f-3fc1-08dd01f5e94c X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: SJ3vigC3KLYdEZEhFfPdqPge8TQxKp+ugQBBYcfsI9b6H5lvz80FuY9TFSsUbCNOibrtPaRLjKj4XSt161UhFSIfTN1Cfwii4EbUw+2lb08dneW+9rCacyFJNCsfdJCvNLHxUf1ZwocBbo/8geaTb+I/EOWCa+RImgg/6TWs+0THGCsIr9usKfpOYfNuX2UHwFvBUwrC+Va5AGbscnVAjYJ5PjbUB3X6sn1L/C7NBk8VcyNIWzKOjnjTluHs6iMuHbwD78yrmhvXxcpPZn5rhdg+SAKP0TZKUdpeWrUEhSTQ/+cJkxyw1yK8DoiwQ6yAYo07bjci7nBJVnOwZ7lUcp9m3hwPiAC/yWklCjTKaghfS7GDzvZcagdiJIc8Lan+YcuYeIrmAork/9eAu1UWRBVQ3vb8byPDu9m2CmPQ0JpQbuU2Yv4/8OAwUdlW3zeqMjPS1+qBmQ0gGBkVRR7qVuVz79x3BDRnTPN3CEsh1GS99EsDReIZ564j77r2/is7EbP35JHLPzMLeFQGTP56eWjwEszQ6SvjfLMx1UKkSr52jETIPWQjODZK16gKTdSZ+ZKndSZnMFH49CrtDX+UJExNRbYAYt75Enaq6xMocGfOiPNGgT2DIm9SDl+VKZBIlHAtifk1cNIHw06y5ky5SA== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aGGoOsyLa/lCayn+orOup7XHUm50lqRXjTsv8coRO4bE+9cWKSdR7KQ+0QJA4witv9UwLPLyNExHid4VEECpefTmb5HYb16i6SkYoIdghasYmmPRrNINnCc1gOtEQyV0Z5AyjRq2NqmOXW4EGxgaBR9mbOQUF4VT63BnlVb1nNZxBrM9Wdwh/x6ekNXUiLmsJ6cnsy/LPfP+u5wg6ogJ2gJvTfkhRc0yvp5dmD/kion/VcQKYTyDCa5XaTkSpGuAmI+wLvPk4EzhDe8EI/AvGV4ZetmftpmtMw8ZwneRpoK7v7EJo/3O/wyo0mSA8fJKZFL8XdGd+aHW2EIdZt4OHwj/wogl/Ai5n/plF0NmGXgCJsA+a6e/JIjBx75SsnZBoO5prYgK14AUgq7m+TSTOBAaf+7BgTZcaZQbsXCt+bWxiXHTxrbrad8WBGWRJDSxst/n7fNJUuqS9xQWFQ2gX7cy1Ye12hhxEmJSaDUeG37D8fVUyyK/ysQerhLZmAL80mZtasTmanwAlGskzNN3zFeb5mkQNy09/OHrF1K2RQntBQkCQLe7UAyNyBdsb+9LI7d/MAbqAfTgBhzpGCXv7sQ2HmgI9L48/Y+dEhoMjoea35K7I648SfldFRIC494jCyaV279bqUflu1z+dzDkhkFZxSk+D0gpzd03U4yE9jo2IwYyQ5sfLgNCPQ2PRQ8LWtVC8UwGo0oK50XXywqFyrOSOGVRjuBp1FhFjHcD/fHy6IlALAfoS6gdEjDhqq0zyaloYHeMk7+eBjDRt218NSSNloiBCPetdcU2ma56D/gxkp/XtYBfO65XFb3yOQJvAilcMqV4+hXIGrY5I71huOi/Nv3oXCj1r71eyOWtvBNR833nALnS83f14M9cis0KwuZ0EzWeLnyUi85hj4HxVjGP/L99rKdMzKH1Vy+taBIlmkgZSAtOu1gJeL+ytptKWJA9i/dWTr/qXG6NsZw0PPgkCfYz6+3DWKqDoJPUpY46Tsfqs7yECgGaQUZv5OF4huMG48EB1i5g15h3F63ZwqXi0vbRR6xk0gL9zJnlP8uGSTy1ENDN4ardv4O8jw38VOWzk6HwzAPbl/F7rr+OA0YF3LhUJK/A5Di2F74Jzlx8teF7bSLTpsrfm6lYBBwn9jbofEtjIu8GGatmSz4I4iGZJQ9+f2RDBKQYL7ahJsxHkWq67Rq+nQ2y6iyaisGyh8rfkWEZAeabtMVvNFSr1Fl6MpK0vRpLPQXSFHjdeg/jEqQ/kIBbpnaTjiUfsiusdthbfA3I1UZeSqMuG/oh5bUnMegLGJ1lotDsWnJ3dKrGeJk6j+KGkV8+XKrqXPUbRdzQxjPanhHOdoFo+BACz0Z1FVWzZXpOlajktGKVMCwiVN11IAxyNPwT2c4JnAK6YC/LWSFjonuFxBVrVoqV8bKEvDbOyngPetXEbg1ghI0mP8HF43joGcjYXe8RgOM6Auom9kKhO5dokqf7ebZWPUFbcYpWIDVoacp5egcqI+6wn35svZRIyU5xxyK3q4rATLdQBrna2YstTN5xSQC3gjQ92N12atENOCAgu8s8zdLif47/3W9PVwE4VzyvHLxLVQ9dq3YBaTA5+YEj97/T3w== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2660d39-25f1-418f-3fc1-08dd01f5e94c X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:45.0101 (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: ooH+0absVj5tTiGGfeVGpSPTi3Gq5X0YJsQSaA9QUbZZQA6PHBGU+shHscg5YBntgosyQ08RDnz38rfAO2aa3SlwvUzlnfKg+1I9+7sbAJ8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 --- ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 49 +++++++++++++++++-- arch/riscv/dts/jh7110-u-boot.dtsi | 36 +++++++++++++- 2 files changed, 80 insertions(+), 5 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..2b063414e5 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,76 @@ &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>; +}; + +&aoncrg { + assigned-clocks = <&aoncrg JH7110_AONCLK_APB_FUNC>; + assigned-clock-parents = <&osc>; + assigned-clock-rates = <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 +116,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 2f560e7296..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; @@ -62,7 +71,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>; }; @@ -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 Mon Nov 11 02:08:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009360 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 4Xmtf218ZTz1xyB for ; Mon, 11 Nov 2024 13:24:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EEF5E8932D; Mon, 11 Nov 2024 03:23:22 +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 2D74A892E1; Mon, 11 Nov 2024 03:09:45 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 161C2892E8 for ; Mon, 11 Nov 2024 03:09:42 +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=cjLNsSGhZ9EVx0FvqwDbbNeyrlpSSlRTBhwMrJvTxCaS6cBGBNLJZAJVOlMnqA+4f/7uSsMqlJbhOYpUJsLx5/hK4VSKFbNJh+KJIwNy7A6OsLxFgiTfBLSCxNes7HLhDhfoXzbB1KSgN1kLVA6F4AWZg39RfA2KXHf6k1zvfjPyOGwFiO/ItaIh7mKmZYTX3z72aY3/9Cb6g39EHJXjkdngEPy7j5y70btsHu2pN29gmsLT26Z4XLbmuSToSh3vXT1OAqvUmiZV4vkqjozQkSzS8rDvUEhMY2r9bVkWY3y+fSarYeUSpe7VFp+lfU8iSUzZXc1qmecL80nW3nn2DQ== 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=1LgxYdyRp1NghF/SYV9jOcARi+qLrWOJ7sl20ZbCDfA=; b=YEgTU6OzabQmJeORwcF4OaOlZKz2rJpTKGUa8/j8ZtOPHHm5zOwXos+cxfcybdrNPpkcg+NSvQKomh4+uK24Ap/ftvu3zTWsuGI9i8A8S4l9/fN9X1FIgXsJv8E/0UaFpFzVGBXii93FDdyf1e/TArkDhK28jaTuM2GNp40Ulnq59JAtR1koLtT5bAnsJYQ7tFTn3vQ8UxVK1dkBQK7hPRZICdJxm5xqotHD7QCLv9CFmWun/HiIxf8LhuQ5RuRKe3sY1V2dFUHaFBJMoMQctDvyk2Iey3g1TA5pT8ABxZIa7cbS24nBXGoCGWrqB8rPwN0CQIURbINGsnF+dytDbA== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:46 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7%7]) with mapi id 15.20.8114.035; Mon, 11 Nov 2024 02:09:46 +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 v4 05/13] clk: starfive: jh7110: Sync clock definitions with upstream dt-bindings Date: Mon, 11 Nov 2024 10:08:00 +0800 Message-ID: <20241111020808.38974-6-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: 39da7b17-db0a-4f8b-2aad-08dd01f5ea05 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: BgLAhCmnIqDZ+l02vFyD9TLy4NqFdRoOImQH+sKHuVEH2HGmoAp7BEMfeT3ozDJnwx6wV/E9Deu+ire2k1vNmi2Wde7ZkyrNhpGAD8fgIFR5qfFgeX3wgZxSVu3XB7Sgmw/6Yb7KsTJFUrGGrqwH8kbaNuy8qs2vuC+aA5qBHx75E9YiQgOi48XqtLgk4RDcMlZcv3K/Uws+y3N3rLw7rg6TSLZcpT+2wdI6jjiXjuGi1ZYmfzJkg8joa9ed5uBeyUgFg0MG4qrUh0aA3z032wxlXWrDuDBaNhmeZEiu77pqFpfYHYZrSMySEEkRauh5jKew0x3Zi0yA7bKwcY/uuYgGF+d4H2tlcy1bPjIlDN3UG+j4AvwoLjpqScytOPXocymwR1nIBOL+E6b2vKroJLLs/eGsQueHxAvaAwQrQEDUYevbSKet9peTDzLVn3BDGcYGyDoeP9ruw90Jne8yKaqFfggDqyS2LWNQOMtk0HfiBfV1MY2shfFKqYWHZ5KDl5FI9dXOp+3NsBpf2YIwe92amlkP4R3LkmqSBOT1xzvx6alx+lHeczVjSj4TlZQHbnY5Ys1VJf+Kx1WgIbHKqJYrWxqt00KU492SVp9BWxMgd5EAcZ/cjYBebR5uU0GL2OflIMusbD5UlTaL7xExXw== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m6H/XiQ9LgppOnpAjCHuaEEu/48T58jqBslmcLYd/jfOJy4vMg3qPWkjW+Li3iNBZyzi7s/Ulfc7oz6iWt9zpB8r/ojR3xlg1/GdPBLysX6/K+e74E21XqxWhFOph0TAlPPqttodhF0JrjvfopD0/LK4B8TCy7ejJcuZttWARFZ5HVoHFjL2ObVOwro7HPxmFAAeh3+JLqPmo+k6zY7XH1IitwoQ6BFjNeIZmY8iosb4n34OwoaKrmJ/PLDywmUDMIT59/reyqvB/LuA0ZEAYGN5QmT6cFX0ALi2c8+0m3Tbw5JH3V3j1ueA7eTdkkVjv52eHYP8PfmaKYc7izKISwAj4KngmVeW37GIMOSuri7OAmMuUTc6GVxrogdJrJa0Pfd0wKOsQcPtBkvBZ2kgNbqjRp3PrqKNZrE7xSOKyutgMUVWI+KMC85FIlGk0WxH2WVCxRACTLGDDptjr32PXeSxWHY22XU0muOlNZ+qboLPENUAy+jrqXHhrZzblSZC+ck4rQQjJTuAogGIQ2VHr8wT1lpoUgchqOuoQ0w/sNNPCaXYXi9kdbdGCANcM3v8drevT9WLDzR59vuuVljvjfueRHyqwEyl67QMk/Go2EuP9dzLx4CCbLUA9xTQ/Xr8CaGSR5pxIP8mZ8ig5P8vfUWgSl66MutqNSTjlkZBPrNJdXCjVB7NsFW9mJN8AmY2NEl3yWfpBjAUlOjk1GsMprJGRF5/zm8URnrfNDEK7QXCbViytsSlf/Inj9XatSvrKp4h/zy5WS2Fx3QIfMjYOw47dXVrwdxIGDVAahujZeLyjViw6mNTqzWPhzQnaqQlSOxng+cUICtGCFElor/E6ViSiIfguuu+L8NXLariUpSiKUOZn+cBZyucoHMsi+wNeHhGMiw/exFBcTygIKI3t58GS5enMbjK66XpfbbB8jaD2ts7ovUHFbg2gWIvlnsD8hVLPqttPZChpbXSWsRLm2l+GyD+xVLZTEJ5eUO6GkrQoGFB0cCQc5+uiOqIYLivFXSo8U6pfruhoX9HU/7hmvzOtI1SUwwxpSMrXjRQbgzIUGhdUCeNpBT5GbcEDT3UPl/2//7TkC4Aty4xQsD/Tvia/F7gqiyw5F8YCBOnNWVtRh+ZDw3Yf8+4SWBhIe6suJ9lD64KdaOjGRNYUJ5JpZ6Af2nGw109t4PyOuhlo6pJFC83/WCmDqdzlqK5My2eLw7nqABn3ZPpNyKOSXS0gXl0NJYBZz3Gs7fqxzFMRzoZrsk904gNZOF7birDt0x23jX3kQbCHfPQ6ZS7+C335NS9bxxT17WgU0fkNSapA/dcMcfvq/Vc2eUQjKny+/6OqrA7U64Gzm/8tyyxZ1gVorc+wENP3nYxtIbfij0WaKrofrVMr0bxOnIk/HPGxK/Ca8ah1YjbAjNreMSQwPlRndr4151hbJTuESTiAYb/0aPLy1+RXF8oOzkVYw99fFr8M6cYSJkEA9QkrMiau0PZDvFcjDIH3qRSiNY1wSPjAmUeg0t9jzIhHcNOW7qh1IfS3huJoJxZeFSrJRaFZ0oneZdvazENtDklMqvJTAOjvDZKO+AVOBcRoKsmc6VHcTo9ca83ZdMKICzG9xxyys+iFw== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39da7b17-db0a-4f8b-2aad-08dd01f5ea05 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:46.2185 (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: RDZg2SCgtejGJdnhDM17K6bp9TciaZmVFSkrXSMvMWxJKVaL1yhWtBScmH1kabmBwROoMYTBdGfD6Dy5nCWOzuxWanVMcCd4zUor4hZ0UjI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 JH7110 switch to use upstream dt-bindings, so update the clock definitions in drivers accordingly. Signed-off-by: Hal Feng --- drivers/clk/starfive/clk-jh7110-pll.c | 6 ++-- drivers/clk/starfive/clk-jh7110.c | 44 +++++++++++++-------------- 2 files changed, 25 insertions(+), 25 deletions(-) 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; } From patchwork Mon Nov 11 02:08:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009361 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 4XmtfC2YfCz1xyB for ; Mon, 11 Nov 2024 13:24:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4FBC689339; Mon, 11 Nov 2024 03:23:23 +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 87499892E1; Mon, 11 Nov 2024 03:09:45 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 E884E89300 for ; Mon, 11 Nov 2024 03:09:42 +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=PyGFI/eRBRSCeP8W1lygKBeqo/vBuiy7ulICISBLV/d84lIUROLpDdKdDXYk2MvPRt0Q4NqgnoLawanUxRoSgYv0dDgGEdbbEnukcdYFueQij5NFkexBthf0oikVLLVOk28ca87WJeYpiZEn+ljQ/9HT+KC+2/AD03CzFDgbo9S0c6Xlh2BGI30vd2U71qc7+dMMXGF/wa6I8C8UutUluoHUjhgd+ARCaMoaIl/I0HnvJ3HyUiFw1HclwBkRKmhGs7mAopkRsycH83KS8qBdYnDss2yfcYRM0a6P6ljjU/lLIjYdRZMkiSHBl2DGpzckpwoWlI06Ux8zpXvxdM39Rg== 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=Y3Gp6mJLIi5x+FUgzyXkgHIyKn1be0ktxEARRWm7SiW/39zGrZQLab/BwQtHcXe790mEdYG97hoCwOsyjic30k2zWTHNrpklZgclA4bSU//stBgmOljuukvxHwD/nqAsU/tkUZLCoDzdOQc08cf8UQnnqJsd0oAwpHiqF2sSCK564jUxp1TXc7nQlTUQgQ6cxAXGPvm1iWEOtRxxk8q62JIF1eVE+D2kkUVAJWUaNVBtzCDQbnIeML5k7DS0tZESWQmNJsP2b5c553n+mPyQCvfj5FNAczhNtRwtrXNQ5dfgRy0a6t26pL/4aG0fojthoEhrqlISPn78Pq758qUCRg== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:47 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::2595:ef4d:fae:37d7%7]) with mapi id 15.20.8114.035; Mon, 11 Nov 2024 02:09:47 +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 v4 06/13] pcie: starfive: Make the driver compatible with upstream DT Date: Mon, 11 Nov 2024 10:08:01 +0800 Message-ID: <20241111020808.38974-7-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: d0ec3bdf-b272-47aa-77f4-08dd01f5eaaa X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: 3CSqkK2/bQ7urICwqYcFEzjMDhkJ/V95HEULvTB3RaMu2wC0TqR63NBVGmKAhtln/x3rk+6miLKM/0nn9c5kNlFl5PsRi6dM9EgYqI0Yy5+2w1cvajrjreCgCIomUKmzDsYnkR3t1AfvUHabJ8EjisblS7dBhBv+s5qkCK8IfUIhtKj9baouOb+AUlzJXX11uHkEj1ASgC4wNUq011M0Ypv+2hPVGvtK9Sq1Ccf+K/CQQtS82ZJ9Gz6c6jV21kPGbVWxsPj9rYM+XJufA1Rr45Ric8NLJsVQsHglcgGBZhr/BWPcSHHAl3raxtJVJfbhaSMJNxoM4+SCiTVOYk9ub8/ogSX5xLpkhbin/d/u3vlPQeFNTdOQ2ITra+6b9dkx5ZE5AXCklU3Umsufq+X8T76T4pIhIpHdiPta6uj2TFjNE3dcNZuN6oEuDn6zT3XfBZfpwHKMQNnntfZncS3TMnbvDBq+IqM7bcQ7H2bb9OXIrxR7N7t4Z09/lGQBQN2cFhxNNy1TOIZzYGnCHr3lOevHoi79p72ytvKFYADQCajMxvcZnVrNR1oAwljNii6xa+efU4k/cvHoCVJcHqtMSIJ3ontM1N8c7uJ+3xGnEW8a+L+PHJ66z0Zs1N9IKXGvHPvxAKCt3eFff6RK06bpUg== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YLR6N1Ok14fM3EiDJRBZou/0zpwHYg6cAUe+prpC9WPdAGGhScbca5FpTSuJS79No9klYQID9lnXDiDg2HQQwNXuvbAP/4Xn9Gfx3Y0fFwWHTaPZPUU3Y4MpEch/xrKQ6MZSDOK74vmtfMBN8yM/o7BcR4PwElspUNOU4SU2tcOhhUk9nPgHcBaOsT6naTpfr5m9hsvQEEg0iI3K/xqv6mPqmNbqUvw9tSYNo5t2xjm0ygOP1gw8uBZkGqBP8KE8TefLT+UPcZBOUAv37KmsyiFMEzuLqtPv0BT2PZdbVqxHukWvrDC2HOFFCxCyNRAXiG2zBKIQka6x3D8TxViOHcsgYmClQh8ILQoxGZAwCXPIhCEmGesmOsS0HOZMZeRmZ0SL4XZ8BMTATfWYup02rqioas1saKajO2M7jOVA9jnp8OAr7PgJmUm1UY/vumeYW2BthY1Q0ekQoDut96AlVmyItCM1Da8Hu1glnJXPPONHb+8fDJB2uVvdDL6hpvG6SeSrVOrQerbdm84pAhQpuMLc2WG87XKl4hjn14SVH/fSFgYtlP1TGzhjJbQnShZHU0FvLswDakQTBK/T1TPeG4HstRBQKoDq78uUPbqknYgUA86bAz9LOT7PpXahYAUynLmtKjgODVJtsbiaQ7PMiH9d9YBVl0kDq5A61K/iq6byXuv8wIk66TgkJd3WH5oBXNSITCRA0wyFfAeLbH3An9aFPa51+qEtqPiE/g6B+L3AFGOTOJEYZl0/cZC4WjPkiDar2NkOQDmtji7R9jxeXkCZUkeJuCKaUvACbsEZSUA9w7pg7Z9uip2JjOM9pNRkon9Fxjeuq5IcvVV6C755AebL9UQk1aZZLqXz5cSQJEbVe3mis1Dq/eJUygOv/aHK7BMAbmpnCMz7reIP1dUigd//xodBAOZcOF/0MvKs8voRrkoRNRN9UDCnWX68sSj+b6W36nCgqRcGMB/CIAF3vkW42wh/06UmN9pWMvKvriPprHjtIDNZZ8+5OlSXkKBcU7l1V6nKd7WmeF3lED3DhJtkx5RRc/yeanEwKxUJgVHSauZrHfQoNkCQeTGJsK/XMYXV86zGf7tAAVgyVccWDWeDdN7ATy7jN60e8Mp+SBrsDYFFYesexs20IW5QEuTH2PsQ+23OSUfczUAoamqVvRsOEvY0kwMsQymPywquuq8nf8DE1Rbys+gsuyJdLHV7s+1qq12wOcw9wS3fyo2e5oN+V/pir4ycdsIDJ/uhKcvvAF5J7RTppnCVozE6V/H6Q+FMyTgxhvYv+aNgo2KeU3msfMKqv2mXd7KKBvhbJAkNA9jiMj5pt2o16fC1pRk/v+m9YWFhMEPnXWTyWPjEQq4LeqtOKwVLbvAO+0iIgkT1Gm61QF9Ns8v9S3P6GJRpIzb0QxRMt2ycvKMRUoI7IANP3B2cjo60mMaeX0LO97gX8fCxYqcKE1Pa+kfbyKoRL1Eg+7QVTbDB/+qkre5lw3mUB7pOiPsKuOk89GZ5kLNw1u5CJ5Mo/hj8GhSwazauywA6iojwd4a75yI7G5x3xjI8IQkbdM/amHdYAxMJc53xcnLlswqXmpXSlYDmeUiRuFp4rQF8bGov46/la7FVpQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0ec3bdf-b272-47aa-77f4-08dd01f5eaaa X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:47.2962 (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: KkBmZWCvnnwuKZEW46OK7VyqyxHLQ/UVyCz/SkunnPyfzBhShajyjNGXQg2ztlRqrpdAgqhsvmBpabYMnOHcmlm7+BDyVIY7F7yfM27fjSQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 Mon Nov 11 02:08:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009362 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 4XmtfQ10vBz1xyB for ; Mon, 11 Nov 2024 13:24:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A48DC89345; Mon, 11 Nov 2024 03:23:23 +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 5B6E389308; Mon, 11 Nov 2024 03:09:46 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 C6DA889275 for ; Mon, 11 Nov 2024 03:09:43 +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=n18t3GptXKhjVZgjvtZRy3/L9uf7TTOnlzl8fDdh+e1bAQXudyn5eGQ2EWW+xBNeFGI3Kc3w4GAlRwuQsu3i/ES3WFOXGg9bPVfLl7b+dx8RHaZk/+Exn83hUtLKfit/wdT3ATnTL078VBbWoyjLl+T8cmDWA27KIE9KAlT9erv/qoghvasH0VfDjUOLF4/o1Zq3369G7l0r67G8iMfuQathjgvnMbyS7OFtmZyjYF4jP6TD3LQEXBKM7mHvDjzN13ydZHhHon/TRMXe3xOba3s9lRvZKl5/rvXZO2Ud5bKMrfSRwc9LYTGt3WJk+MiZymN3FvuA5yi9WI+ATKegyw== 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=xhNSw0Hr0EE7L6fRJW7oyWQzgeU86yx9r6IQmtJoLxI=; b=iFT0Lm3O3wgfxxxqZIALWxUNfM2AhD+TorHBIp493h4oFNEaMNu7fLUu4qaKGP3Voo1b4kao0KukcIe3ivy4vIEQHnXt3V+5Mrdma8MHnoeOpLVh1Lme3DGIKbIUrCDptFHjZLFEnA+QleOy78dJGLhVKX1k3+9zf2iVzvVd77Kb3CYppwJr9MdzZvHFvuJyV5u9hGC3s2QCQhhIg3L+OxtRruBcgZYSWedWPiSbqOTXAU3Mmy+cNkS8Pc9Aw3T+Vsbi51RCZapcrD0f/d3pQR1jhpPzCrwzMoLNmpDq4P+dg3K35lqWxFEDo1GiHl3uIi/J5MmGER6r+u4ktHu4MA== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:48 +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.8114.035; Mon, 11 Nov 2024 02:09:48 +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 v4 07/13] riscv: dts: jh7110: Move common code to the new jh7110-common-u-boot.dtsi Date: Mon, 11 Nov 2024 10:08:02 +0800 Message-ID: <20241111020808.38974-8-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: c979d345-00c9-4eb9-cead-08dd01f5eb50 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: vx1e7TTigFOe5pN6WDS5/vtgDLbD3FuI8ouutVe+fJazAR0oQ7iFa007jDC188bIiNYPw1pJAX+02PTwrjEf+JaiUsh/mwHk7+orjcJcuwGVWcYPDyYDW9xvDBjCoaZLAd2+WFXa2NGYs4AmZFH76oqbAXap4XEcIuT7cjUQv7clpwcDetcw18pDQ62yc1pCkytY6PokcIls0bUf3q5rCsEXst06n6/inQsT5s4ddN4boxgWT+hrQZxAnS77psawUC14tcsIg4qPslj1UEpYnhHkEXwivuvYJyMyauGCVgCoIi3oa1ZCylzL9abk/rWmvQ6A7cPoYUEkbI7Eiy7ych6t+92DsCuPN+Fc+DcUZP6B1cePwswsPzTppMTuaHcSiJiJbOwIRTDqb6RUt6m/AcCZfmd0dHWFBq7NTZAfLVnCyapYZPXxxpGxkiBXMjVOieKgd0JOacTE+sd+VyHPT8NAJqiCq8jnJyKlfcqodwAkjO6wRJ7adNIJtW/RFQOGrnY3horRdUOkqZuNrtyebQnE92DsFAsfl7Up0HnZa6iJJn8RCRj/D6ALuTA6qDv5E+PQkjfp4xjoJAxzm+CTAUodvq2SSjLHLVaNBWCxbVGF0ALTje9u6umTDxWeuKPApnpDZqK/4D5vdK58DRlIgg== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QkkcGQor8w3G3x5sGB2a5gx+Hx6dR/OFbfnoAa7M4IA1pvNTrGiQRUVfmtcZg1KKXBwEneIjK3sZNZQoOH/VxRqamRgqWVZ8NeUxnbKFfHqpgYFbVuriSObgp81bekmVZ/RI0Wdu125Q2cOFzDG3zW2bPoAgPo0Yp29vGh+aU3QBDjxO7xrrMe0X0e16kfy+yhLVD91oUeKobKlC8F71+9WNxN/9Vi1yikisQ5rl6W9UUpj/fk3eLqRprfd8M0CK3AO13aKYFEM7AgKUpS1wVnfcsN7hju6B+FXZh1ka/nvJbWP79CgUChp6BTQ9yrkwCi59CwxZkL4JH/XYvHaNR63ntnzakoAO6e4RWnnJSbuNB6kh61iLoDFPGA/Hqs0GskMsYfWJ+ZSQ5QBGzrn7GbIZiwRHA3OH7OBHVAHNCWCAj8FgNnVKapjOuaMkd+wQCkmGSEh9lGuYA5BvqUGmaGaADbxFVyZLB522gTApB1TFj7v12LehezNhfiXFxV5EFTOgf7q1B3dQOB776laGex44Q1Y3xnVa9TfJf8FK7Mr/s/JVhKCrzOnWNiOx8DNJjHEtDFpsCU4idbB/4DQiXtS+dhLHEXyExzyUZFdIM4dQcDBy75y+SrgF5s7tXc3ldBG7Ej+r7ymBecvzIQm1cc1MJeSTm/HMIePYXxnxzVDJt2dvy3v1QdWzLDbW0JvQsTyULvnFYNI6nllRYmwWH1ZEA8yeyR5uBHgv9ax1JgscWavLESnR6Zgg2gZqfDfhpd3JE8FC8QJDBZSJa1oyaThFEGONWpl61skqaN75NSYeKCzOOOlKugLtc2Sa7zZb4sb4FWjejWnFQ4sJBjusuFom2q7+Uo04uVIimZ//iGYXN+L37rORybECH9NqymoeO1sn11it8R3+MlgcmH/vPrxbrVJOqkOL1kD6M8GJ3imkl+u6jjOYxDEvr9qIsTwS9EkEoPjbLDwHSh/D5KbOPWUJZoSrGJo+HW3M+MRp33b2ZMx02CIHDO6lI94/rI6qgvc2O2vlCC7j3DmUxq4N4SM/fPFChbqWLB+UK3TqkYK2EP6ZVHtUrDChWXLWbDpnD06BzDT3iRpOToDbKJU9zG3sSLAEhMnGpPqLz2Pa8BAAywuK0JSuwoLtfnFoC0kns8J13hPyjdrZZ3WDZSDNKlqInqr2Dn/jI+OVbcBL5sNM9S14l3E4pJeOSNZKhIoSZ8k11/yT2LtaOvX0htL1Mv1VGjnCvWQDnOJ1IOw99fmS9BZscdZVlp7Cmo4ZIu+biDECuj71BHq/cwErQP88wWkXUF/PurUgAsuB+7Wb7yH8xWEntI9SVZVgeAaNgLBZq3//S2nHMJxe4F7krJ4qrtfv1qATRJ7z/Ggt0R4ahYwpK1tJuhU+UkFZS86ihjl521mktcJ3eqvN1P+2658CcmiLcGwTt8fFZNO7fMNMOxePsgClCPzS5sT9X/g8ZLScnweaLP0xvWy8M9uEbiSoixbg/GbU1rLiPy5sc6bneuDQfYuv4CsdM7lrScJV0YyGDITmfuq3GLhR9kj1e5+sbLDzEnnQfJg4xQBLcT3COR5AJhY/GICC6pCELGfO99fC+YjBU6xKl9TqQYb2t/iiYQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: c979d345-00c9-4eb9-cead-08dd01f5eb50 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:48.3976 (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: 25VYLPIxwy4U57hCShKN6XAst5DVPEG2VbJBT1IYLZpA1XsGY3dl5VXIcMZld4iaQ2/Nd10onew80tAK7US3b+beOhDuf4CG9bSglmCskVo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 | 150 ++++++++++++++++++ ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 146 +---------------- 2 files changed, 151 insertions(+), 145 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..cfd3c04aec --- /dev/null +++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi @@ -0,0 +1,150 @@ +// 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>; +}; + +&aoncrg { + assigned-clocks = <&aoncrg JH7110_AONCLK_APB_FUNC>; + assigned-clock-parents = <&osc>; + assigned-clock-rates = <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 2b063414e5..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,106 +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>; -}; - -&aoncrg { - assigned-clocks = <&aoncrg JH7110_AONCLK_APB_FUNC>; - assigned-clock-parents = <&osc>; - assigned-clock-rates = <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 Mon Nov 11 02:08:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009363 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 4XmtfZ0wWtz1xyB for ; Mon, 11 Nov 2024 13:24:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0A15289363; Mon, 11 Nov 2024 03:23:24 +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 D9681892E8; Mon, 11 Nov 2024 03:09:46 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 A7A978911D for ; Mon, 11 Nov 2024 03:09:44 +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=VoVQ2oWM2g2/Yixo0uFpyEZb9VmhGDGOlCQtBuPSZl2HJPrwh/4xWX7yLRUZXvCt2400OjyBdBYYDduuqLNZJlhIs5J4YcNKw+TP3LMQCyxS8GmxfA1rXEJqkh/SI45OB5r8h8tMo3108hQI55J9cCLy26+qr0Mu2Zjc4WeSdujR660V+0+AD7cEBQWpp61am/bGp/puSfDWzsMqgstA+wvOkPRlY1J65/Fl3Qv87JycEP44Dl5mHnduerrZR5YW+T8DjFCZKmYldDTzBP5cACXlyuILf2dgzra0lMOwtd7f8CoOj7ou1kR3M0EBmz2O34zaAJTJ48OJV3vXXtmLTw== 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=eOP/i8Gwa0cm4X7eay1WHV0ADDB0ZulNnftc9gakCsxQ7XIOc2b/gqTzE+EA2Hn9Ojst+xBDkyOQZpYcA8So/kZPvFdfBJfvhcVhrhYEXcrZED4pFHT73HZQM344SihXvgojUgCuuRG7mvfoH6QG7eAN7nCYZiARirtseS3RWoGieBX76AjAhHZkPdJjBpmyd8bLBdw3w6UZT7fFK6jfoAedqz1DyNBGVbkRMW/VlYUI3YTKLmBojNgR25CLoeSzySE8hK3bY4iETVKdtg5/GIg4hpuoZ00ZIOZ87DvYKP7TEr7tiw/zsQTir2jLekcLgLxRj4pH0h22IzzXVri8UQ== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:49 +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.8114.035; Mon, 11 Nov 2024 02:09:49 +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 v4 08/13] riscv: dts: jh7110: Add u-boot device tree for JH7110 based boards Date: Mon, 11 Nov 2024 10:08:03 +0800 Message-ID: <20241111020808.38974-9-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: a8f1f708-1123-4f48-f5e5-08dd01f5ebf6 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: fmQLyPef0iQMb4qdkevP8KyqVabBnGhZ7Qi7rWoECsXZR9c+SU/4TV9S8HbiE1NqRM1POT/HabSx7eY+Qesgg4ToI9/7MsKqrUWQxsnGhLnxEmkrhtypJgGMoC5IuDU9hLo8KcyzORFMxxMYu/MDeGY6F+qJQ38aGdXO+fqp6Rh9DGDlPpOuwVGDTEs9/V9mbDPFR89q0aqVm/MZ/Mpsm5Vr5QqOoNXXaBog9IbxiQGaBivqG+FhQLxfpWai67K3msIcc2udybdb8w10rZUirJzUrNWjjkkMQ9Y9D+0o11Y1hsdVSS+u8Pdyw+g+tieQNpDL9IgmOOSZA4/GMDlrt3GT4TqAoIePceZiZS2tPN+dBx1ftBqg5nfWZl6LHTVCk4IT7N/zNS08EPmP8DgsJajNp4QzcX27nOuJcrN1EnBfSX3weU9N36OCZnRbmhJgC5k2zv2hi/GNlrK/Igtlp6jKIU6p5JU1mJgy/Gz7gBFHesOhn1/70yY0QhA2tMyGtlMBV2ZHgdYtXgN8HuCBSb/67gWOxEjf/ZwBlGHRGNcsInbJdD8EBO7htvmTe9VmjCvzqkoxT+isWZ0pNm0bXw+86RbcMBIu+0CHGxVSLmB2HkRKiJqhNJjfvcsXXWJ5ifuOqfiwz7Kmc1norE6ZhA== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9RK1oHW81BzuLkW1J6fspplZ9VHOQj8vyB5vY83sLnNKET4yZnacfkWPk+kDBEo/fVri8bJL5vsItod4rdcUWogMWSN7fUJD3I4WCC8uqef8R3A10m+ptPJObsXekGg2EKJ1o7nobJDco4N6X8u92YObIWkND5cP30dQeDwWNYu7W3iJ2RWhPAPB72egNwmjco5gwa/7Tq17DcNIFoiHDr6TOE5i0ZaK0g0cDYAewfKqLSebdZ7UBZ+JLMO3/sGVGWoqOrdDL1Bm9TmNlOYS8fGIDQbICmeAhIVsfYF3Tdjn/HYkVXMiR2T9fZw12Pb/FCSwo2kcj6eT3y/OLOXnodsi9xFFh9gvZBKLGYqwiGSOPId4jAt2oeiwY9sG49RbR4S5SFz3jYKvGVUxPfeqPapgj2DKPVjEE9VGDJxeWh1iNmkj+q1ylj9Ti1dIQIKptRoZ1DtJar4OvNcHl6FMCG5XEEZJ9xf2czPyYDuTIyuCabQvTFF+9DRetKGfT7eHVfEgWX+ht/sA6QSmKJ53VFxK3QYHS9cb0NNpfVLwMV/Rcl+WHI+uxeW0ANEQtTExOJjbnY9kZM9fJRlOpH0+oV83fKowubBx33cL/LCZ6WDIqI8UnmiC11UqUmMx5qUrZrIdRb56baO+RXqufAOEPAtYfdJuIbu20/JtARJwwcWzWeWGQhtuwNNYM2LNKoBjWCuczFhmg9rH2idgOnum044JlBWMSA5xR+kU9svIUMTGi9JOANkjZ4mkH5r45wpq9sIC9ExPhYk8rmdrPSuyDK9n4AtqYpte9wd4d4i1XjtHHeFlHdtiIDbtDDqWqawTG/0ce+7n2dBp2Fl2RvKLCj4qt42JyyleghQcrRaq2fqtBjuwB06xl99H0AafNotYFVn3G+rZ3D83n3wrMzRcLxkGbceMZ5jCMvZ6Z/XrdEL9LBu8DcDw+F3BaXUrw2rgIXeQ1nooznk4IQ5M0uvdn29HRd8ZFVg7e6hKIJZ4MM8mOludVmXTMEg5ewd+KUyfKRGbuZ41doS9s8fo2AdzmQeAmykesYbeeK5dDvGMPk/Pi+tHdiPdwodmPCPf1pF/Ug1cuW1qdP/a63GTzz051qY3icqPmUsxE+N/EGzAoQpeecUmkbTyAOtAtdIX/LckS711nQw1FU9Fzlw+C4eImo5Z2l0RBLLDatYCXakF3DHRxurL50iEpdY/2aYeFK0BVe01afI69aNRcgnBABHjhrm71ScRUi3FO9VZfqaiW9cnSNQDJf6e/bshfUixgH3ZuPdLwEv0OvVGVRd/WS/dj4wW3lF7jkOUhxEEjLplw/QkFMP+yL0E480fmkN8IJ/bQgUHvZ8CZZ2zEdHtaSu/L3rWIdGY63wvlIIxkk4lpaq1xcEK3M3E7q5xtDygjb43+FnZJWbi2wz+EmaGAiLZprgmIOh6Rgz70mPceOxFRs5xFPEx7VQX1D5LzKw9EJAgGnDzbigoKPOnnSaPoSrKCQ6/VJj+iU9s3VCXAKmjKMw5e9o78RgjZfsIsqToIjA+1iL9QzRkS8g8yfeIEeYbL00V8b2z8CzN/rUxhqEVi0431evAgbdb6wYpEOlV2YATIOKP3OxWhYBD2MaBCiDQnQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8f1f708-1123-4f48-f5e5-08dd01f5ebf6 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:49.4709 (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: q+ryhexoZWBQWJG7w89j9MFPRAPfIFMU5VrkdPmIYusSvXpqaj7efJ2+MTZIiKWUnM9LC8ZjPy2GPvi40v4SZ9Whe9SnSW7vdMGiz8rrJc4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 --- 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 Mon Nov 11 02:08:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009364 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 4Xmtfk6GWtz1xyB for ; Mon, 11 Nov 2024 13:24:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6047C892E8; Mon, 11 Nov 2024 03:23:24 +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 B07D589318; Mon, 11 Nov 2024 03:09:47 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 4312B892E5 for ; Mon, 11 Nov 2024 03:09:45 +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=F7ZUuNam7jmStY1c34H04G4RS3Aejq5gb2GZabgs7zgX0IdwlFVCFO1onj0I005yosSnELLlalq+OWUU4kmSR+o2otj4ibiwklnuIbEWjndOmaqgfFxgbCo3CXx5iVh/il+lDBt+lWRlprmFuugzgOuUGfLjTzpWhdVsSsLQiwXLiuq/SiWTS7Wy+bO9/gD0MNGoszDZOIj2XIW1cPiClfwz9YbJaTePXBb5TTUxAu729/FyEXDuwl171mOUPZ/QbEFzYHXUksjFeotNd+QVhFG5Gbl/T6Whm/ITeMbiCZsRt83TfLRE1EF26Qq0zJtj0OrH0/sGq9ctQLTwUta/hg== 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=hyQ1f8DsvRsJkvNYT4dOTpJLdlJ0lbv8MTIMkvCJ+EzUssc71v8NbNrtiyyYYeCYOd8AWtpH8x6vPO8fvhFXNvU3GyN/MPyDxbosSjx5RADTNYgN52FMlJSeuk+sVpJHdm+Jt9AQPtczpS7qshK1hDhDdod+6wiH9+4PzCK8WtS3PlOcwNFjAmGkHa51lDAXwEKCooAxdo+LH8EUPt9NpgtQMOs/e7szdKK1SFpVPqzt3j6o1eVl1dSM2bR/2/4/FbwcHjQ4O5nqwdGnVMpAMtjCoKkp4MJlF8QpX/GJfZ1m6UXnaQal0d/Is2AM4EBcTgMWyy3xu0DAmzOM66YHLg== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:50 +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.8114.035; Mon, 11 Nov 2024 02:09:50 +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 v4 09/13] board: starfive: spl: Drop the unneeded DT modification code Date: Mon, 11 Nov 2024 10:08:04 +0800 Message-ID: <20241111020808.38974-10-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: 35164fc0-19a7-489d-7c4d-08dd01f5ec9b X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: jyfb1ylRUFaMMBUvsVt73p3Bgh7zBuYwk9fkYMFX4yNPxEb+r4s1v8QFMg4LQfil83T+2lTlrxpvWuO3dPl1umRduMHdbIr9gOWpDg5ljenvIq8HDxW8fI4tIo2Xo2ZMw75BYJcrNtyyRNK/DJ/2TC303zhnTsG1JNVDPmPhi246pRFaNQyCs+mVVxw7vkEhJsANDyyJxOJ1NORBzqURKoA5gfasFhYDiSBjRdnXb2/n7aqJypQ+OMoxZHCzvWvVGBgGSLCJplgxQr4y7yU5NNOove6cguLMVVMGoQhRxRkDPrm0zUYLxSHaSHrM89bQ8zc5PLGuQY3gQCs2xtOp1Pam73xR8UJpjKQOnzwam2uCd/w/RQfpC+xuhWxr/rKRV6sNlpFCwBGlJcTEe7WUuWsnfM7RpST8uv0s7sUP0MMgOW4iq+S6gzUanNVSemUHF39Gym45JL6mPNRBG7YdnYLJUhIYEz8JhOvi29a7Ce9dPAsOsFyWil+YF+HMhW+MuaMixU1xMkAVAYL67LnJvdmC4Q38iLjyPoggijHDTGB8YnROxujU5cTKlTI+hP+tGbDLsUoL1lJvv9g5JayiWQBMAS8cBBucpMFdDDuyYX5ay3hrlYw39XAegzKrqOtkiiOwQ+ZpxiRi7ebEVU5umQ== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TcRzlyOIeEiS+qS7ySDTf0/6KWevJMZcCarW3c22U5iW6lcBSpB36K1gv4HIySUeRLTDkzI4KqYb7ARP5H2wYTb3+zMFgDOmABSmWpfIG3/pibNPTE34Su0Mj6/qzlSctsk99B8OiPah4JQY0W2XQPv6jx5RYPLznHfPY+R/T46OzGGf+LD7bmpMYUKo6qiiDFMJ+TBRh4mWidCSjswi98HWhpyCizi3BCOxNzRYUIqO5ovPgiBxfrlFnst2nbWK3EoZ0cEA31EZzGuUIIe0NTpEtsvecfo2uzbBLu36mAuo3H71MX/paKg49GnPW0IvIk/CaT+ZcRYTb/qSc7TqXXnwkj3DhD6lDh9ZcojJ+tAQ2HIElMCE2uJILAP3ZSnB2FVAwDNGnZZO0OED/6WCjZWgYgviQth3AMlHoiXsmVvD7RMWVpFpk8yyYv+cy/GVLwc4GPnDKMm48Kamhl690pBQwr+Ppc8K1kAkceU3kI0pwvpDi3gXIJZKYodnPdrCxPRA5J+pnSChT59ldSfpGNf8/DiiYJxB4XI04yVjr0N1CF1Oo7uAtNqkO77lR7jKqczXHCWlKk09TFh2jL5SQPqVb2xuKO/tKUI+xunLPva4uprxMLsaVMUWE9hzxlYf2TWrlKjDXYsygkWUD6GM1YXJv2QM/47b4w0WseNloLEbjVSX4zL2G/ueA/mbhziTj28lFeM6NRYPKStwTDiYFY3S+u06IestTq5IffiAjZD+pAFEP1Qybdal+K4VAMCsLsmEseJMgAPjkWdCEbqsW8E5BIAJp2F4ZC9h3smo1vPAB5cwEI8oZ6gI705fc1AeGam6b9CVOeKAUGQlBXaoQ5sO3GZHHkai6mAyMM0Jusq469YT87APozOM3FCV9ZTwXcw6EEKUTfil1IdpC800tYUoOF0uID3pNqujKP/POPyE5YSUqbKfwWXDDOPUDQG6RSDH9COtm9b/4ZoBzJ5XrID1k8nXUjqp4prZSlXR8rFs0z4QT81BeMn0gj+VDLjqLseQvz2Ms8yTpww8qh92JRVXUqDAs6M4T9fXa7NSti+38/i8sKUmmvQz5MKTgk6I5by9mHX/Vsay7eBp75PJD1f914pcjGttGvPWQnCA0uXSdqQbk4WQzA/NXR1RE5AFTKX9uJ8HpUHeYfasbOpChRq4qxcrlO+g0/9xgWEls9aydumbWOrIJI4FKFtw16vtnuyaKUC1KrxcPaaMeqa6IsHvl3orejAX44olasdkB3Tvsrj6WQNVlOVzzIzVPX5zvWS1QOK0qCU0cyupxDUKJWMccdlqBn+K6WDExF/GTXCxmIDh8xj6Ebzi4/kK8k6wzp61BtaAk9CcaEtVVM8GyU0/w8NkB9Bp4is3agngQ7IPGLaOJ6wVqhcPcZf19flpflvAE7fm1FRpwkf/idMt0YECWUNvSEf4QzpxW7DYJ3RXQjelvmpN0HfUxCQKT/XJpOkO9Z/jRaf7AgJ0OzSokuNLLyBjGxxdp2gr+6rJ9QjMMagxnX6h7+gPrvrrfc4dTmKpyDid4h9uKc9vaLzUM2GxZ3+qyjpPx9micb2e6mn8SXywyBSOlAvnCNh20ElP02gEjCuefAhUGLqYolRHDQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35164fc0-19a7-489d-7c4d-08dd01f5ec9b X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:50.5660 (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: iANsMx4FIDOGGjPROpcZ5vUHiPMe/CXnCTEcW1uDzxxDVYcoe2WQ++Wuh25LFogK8R6OpYB44JDhcZQEOLMhmgQDopIpzugjcRknWR7oPmQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 Mon Nov 11 02:08:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009365 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 4Xmtfv6ppGz1xyB for ; Mon, 11 Nov 2024 13:24:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B55168936E; Mon, 11 Nov 2024 03:23:24 +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 0541F891AC; Mon, 11 Nov 2024 03:09:48 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 D3C33892E1 for ; Mon, 11 Nov 2024 03:09:45 +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=jnh6j5Tdhyck5cX4Hz65I2zz2at5uttEw0hbFYHOONk/rVynLy4lqakrR7jvgph1wO3w78mhFcaJnPMwRBfye3i+0C8FCvjJ5U+3IIYD4XoCf6TlwuC1JJb3UufCNGf1emC0WakxekWiRYjm9PmgL5JUKsBgRh/1qnPWO1i8P5VbOocqJpN3RjBFk796E+ZN4YhdlCyVsqOD50pHaDu++JmcwjUGxn9mm1CGQYmB0ZY1c/sAAFn8JiXdojXYGae5C75HWfhfnANDvsv8nlwS/JorpoFCDYw+U62yNwINawTbutAE4r/PQJd95PwqSLrTPE4qelfBV/pAUPP66gLr2w== 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=AkaRGwwdj6U2/M05ZME83smIPgtF4+WsZdCk5RaQf0s=; b=B1sMsVXQf6TL8+V4XUjvXqSfYHOD111ix2XtYz2Yl3K2iD0jlTOKPZbkBZjueaofoR5zHwklsVgVUpDRKKq7tGQtpWnEnFejFjqehPlKuMJmlBQAPOkN2j5284bD5xmeq77LiJq1tfXSiavAQa7oQ2ODIMYQwESvIf3xnXcrJW7ATa7bBqAt/o+AeroV6JvUnPtJREibY3a34VgxO8nWdbLNBT/hLKCe1/Bsxu2ut082qiw8ox5qdgISmqOmdDs9wiO0TUBbIFSAd35EKm1mwaBObrjqqT6NSwchAPESZe/MBS/zX3QFfBnUzwtd3t1yo4c3Yno6QW69TfhofYe5pg== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:51 +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.8114.035; Mon, 11 Nov 2024 02:09:51 +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 v4 10/13] configs: visionfive2: Enable MULTI_DTB_FIT for JH7110 based board DT Date: Mon, 11 Nov 2024 10:08:05 +0800 Message-ID: <20241111020808.38974-11-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: c8593d01-7ec0-4e94-239f-08dd01f5ed41 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: FOQmKEsQ1b2otBfOaB5l6ifWjLVfoC+BjRVE4N58VZ8k0mPtgyV/UGZYzI7lpkX7WpuVH/jbt1Ku0KJ+9rPndUPta5+euzg6kkojLOc4af6vW1uEXH113tBMSAehxrIwzF5k2LhiepEWgPkj5P5jtfxcssLAcpiEGq2hMGMLq87efXw17/Wobek3zmI1h/p0ZEpz3fxnJEoL6sfBJow6K9vZFMZqBwMGZU+EpFXOK7X1ofyqssL/p8e7IGsoaIr6Fw+X6SV8U5v5B+iXps7zMfaG/uedWV92VDxtJ7QskzHkSVL3EX8GoDppk3xxBq8Qje0CRlRsKDeX2Uzt4LezyiM6wxe+70l96gZTYay2jOi+D80rupxM8TKRTMngb/0fU6iYo6JUx5L+M5wVZ1OgqbXujGx0prVvhizVIg8cBpvUlPqaqoVR6UX/cGYZC9M4GGZaWyf5WATi/t4+gNJy0MB29Q5+YXRdpgYS5dHaj0sbAXidU7kfR9OSA/rzZZJfJBrQOxWTupGXAucr2mUBLmi85gEmuqTPXFYqWQuqlWIt2IiJbqqZOnhPdTfY0P08z2tlGBXqjgo95PawAS9pxum7qmlUJ9ba6DT+vTJj1jVAnD7DSAPFrXrFxrQwH5z7VcGau+AftF53iPJNtVHgyA== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: erpzZQKU3JNdEbreUbUIdYvTZhkB5rlu7jKNSIv8PHLpugBF0iV2PKWAdYME92zLOPlQiVWluAURX4J0BoJVOx/ztG/TEYtvWYKMBWWEQNnjvyZGyx7APsCeA03RIAzqLX+k3B87cLJQPHq+qPwDpFJ6NMnPCfeb9ZKBh9K1syki1fJFx67u9mf4Z1m749tKQv5NedQveybv/4d4EXYEo807IVZuiPWpjrInVAbWkYwa000hlW5Yl2HdErz/CUduMz56fyiw9gIzN6wfsu6xcdS+jKE2XeW7GGhbvcCYvc01aXKqaMyomZ3lUMDrUtbDAAq75kGdzTemEsukQ2l/gWUcKozu3u4TMMBhnDnMA/rXz/TWYZhUYMrT9UUUg0C2v10ejznC7iE6la0vTIfG3BDdD3FPnUS+8syY9pcHe2OajTYk3PpHUMoQL3VIjqK00zofHVVtHFUlchwRSIbFsm7OLUpO1LaLUbrP2UzVPkZzh34aPHOKsZjA9nyekDZBZI6r+x3GCNydRYOAOrv3LxM08EBx/cl60mXY+YpOzeB8EPwWoBDZoL2kwdhjh0mTqP8W820EPc1NeT1p8Mfs375+0bF4tpp89l77LeigwNGUQilJoVbkNnAYyYEe++zMJMD1RJaYJ7+3zlCr4/bzqxgtZRRPzOD+2BrMneWyX8dU9Gm2w/pocaFYUWn+L4ZwKigXlAQMcjLHAFrWBwmmKOwwX0kUWx649xBSqvg55bmTwVVNZ14tIB0ZY0Q5IBBPxUvhHKXT+o2En64Jf2rj/JG0+fqqB/PuLuefkkGCH2KR9eUH8WXWjEVUD4vfTC/sI0/yObpOgEVW1vdmOxEAH3rTE9knC7cmE/5AaA4o71ZKFV+yZjxnxrAqPV5d+C1/7IrXZQ9v9/OUDKjvTlZ5HAQ0gnwPIh4KRc1EcDZSWiwwzOEn0jKN4AxQQEsy04LDnGq09aJxMxrKJAmAA1uLlTXj7osF6wAevvFWTtZKTVF8bWCay3fuAKu3CFJbUFMKwZ1kfVrhlP6FP/8JbLAMxbZOPmceay7LS98OHPIB0lpvWW2DPcSzf21gqbsAjqYahUj2a2wnVbdnS5bw5hle1F2k94VJdIqaPDNcerRL0x1fDC43q358ZDqYH0xQIyikKb73KCJYgtaW2d5/qB+RCcyz0KjsCkWVNq78PXQHiEr2rvttZzDV6jvBM8cN6LLBjDhVWdchL+LmyYOGEUBji8OAHcxIppqMCYikQx3EUToR2PGf0q9dVcEEp+7CHo0yKRSP2XjR3ydKrd/fy/BRsvljCEbzAKeQgkQximvzBuvFTF2U3UrEUTtGGirHiRFPZ8FFhaOE60uvmTKQq0c4cOsZsFbJRk4KlXTl8efv0HsSpF/WsxOlhELuS6qrV9bP45OKoSzqLca5hCb92hmDJBihQvdkEoFcD7Dik0ugshk0Nc5Eoa4jCSiifzNMqu8VSi/AliK+3mGK2WuCf8DJxLQM72tYXloH2y0keCojy7V7cCcpyKx+RIDRwfXSCBfhHPoibLiHV592hgZeYtkPFwgGiun3mNPGGSAR4r/yju4JSZLjTVYleqrwTYqtIayLfAdRA/v6dN27h/M38jIKoA== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8593d01-7ec0-4e94-239f-08dd01f5ed41 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:51.6759 (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: m0w1hxArAJTp229trJgWTp/i+7WMoLS3k4QlwPySXQW/et+l1qKlAqnfWeKP4tQV5yKaLYUx6hbga0OviYwD5YupENwk47WAWaGDFqVky+E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 40f553816e..5c631e09b1 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 Mon Nov 11 02:08:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009366 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 4Xmtg53PRbz1xyB for ; Mon, 11 Nov 2024 13:25:05 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 15E6489372; Mon, 11 Nov 2024 03:23:25 +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 90425892E5; Mon, 11 Nov 2024 03:09:48 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 6E9438911A for ; Mon, 11 Nov 2024 03:09:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jQBLh29bnWg8uhdRzfD3qB6BQb4cFBGnB66TfALRg7YJ689s5CfpScmvl+w7gz95nxqLJ12GGdvbEaiXv7s5qsGUFUCaGeqPnbtu1yorq6Pi7Epla6WQyfFHeK96JIEFPh26U/G32aPNQ5oTed4FKkFkzuiBIxSH8SHWqxpskLfxodGDSRMqGmRMZgciKU8g9vFTpcjIk8dOz48Ohci9D6PrlhaaPCjJBO+swPwPVvUD1x2s82qoM3g9I8388euQt1Z+QuppoSc9Ieh3D/wADN6Kn9xI45aYJ92Gzzhu4iJuDwBfkWZeNdfdYUaUIyIgZkf0/qeccoaUuBC7Ncl9eA== 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=NwyfpC8mTdXKuZQPMIHmFlqu0h07/IaaLTmLu/2Yms4=; b=aYUovFJbZavdsONAUkET9nRrXNGjrn14Vsfb83HFdI6+VgnoRV4aSW5uHUqKDKp4sBSJ9WF78HDYa0kCcS70mDUXESRDJcEeC1JlCB5fWNRPE6S8WPFjHTqPdtEJI34PWfw/VKomBO4JBXHCrd82xKqbX2MKXgjMOiEOFo9sl1nITkFx+gdrj9i5+JrPaBPmHzIZJurCbsUPVVYdAh4jeoaZKSj9twdLBCoJRvRlL65TX6wU7FMQlxq3azWlIBYDpJ5j0tt7YUuc66rrRkei0jhw8HGUoro7eDKC/Rt9HTTT8KoPLEOU8Gsp35hvrjvuV857zY42opim2GS7nbAu0g== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:52 +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.8114.035; Mon, 11 Nov 2024 02:09:52 +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 v4 11/13] riscv: dts: jh7110: Support multiple DTBs in a Fit image Date: Mon, 11 Nov 2024 10:08:06 +0800 Message-ID: <20241111020808.38974-12-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c3ce2be-3aeb-43f7-684e-08dd01f5edee X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: Nq5GHdTKKu/Qk1WCD38eA4iFvZ+BCcfDByRUXLlgKodKfK0NWJ51ZgSNa1h8nNioMcsVZQIvO1hVsJ+NghranikgH7zuzvJhZhd5NlfH1LM+zDEIRFBErVww6FD3GK0E5LtcKZ2anY25hGoScb8l6DFKl9DhxCaJTyuRW07H097GUQMKO/bG0dVY8ZIkcVBIvP5RzaEMgTL+dJGjddz0B2iNcFhIOEmzWjjHdSaOWIxFMm4F4afdRnB9PR3kYff/snJuHd27aoWQqYcJOT19u7GmYTbh62m/XOqWI0vVyeb6Xh80sFpJg0agXcMd5snct2Vvpm5TDTM7K76UKDejyrxfwXusZ5JdaBGqMNLILWqPefhxXRYichiB1IjJODPLpSW8lHBD1TytGEUQYNP0M0mRrXBIy1Kp7ldTQVwFVriUuViCb8cR6GAXs7ASvvw2RurL+qhiDlhmlkXd7ZH1fP3tcPV9MTWnY5RwTn6JgXruSGyzGU5TXddJqSR52rZcOrcQRasnCLfzo1P2j14U1e4ou4oXyekeJJIM1TgyglGofvE7hd768Cq/lGiZMTasXo3ErOBtUpLU1l54L9zwQbmpQOxQu+ByXOBoXv9IaVE7GLUAabKvGMRhGQy8DWYnO5U48k9xS7Q9hvw0iGdUKg== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iTu0OmC0bE4fSeWacVSzr/u9Z37EU4ZLpYVoV/Kd+BUtsocywUKaEOOWFXl99pi9VHj6f667rAAKrMuTCcS0gNjx+YE4JZBLUMZLiccCHjUxLHbTti2oVV+NjIRkB6f/XBvNezFGlCNMmv9bdpnZ4XCSE7M3jo2WXynGTVLF3K7ugrpTXHWiuzagElH5y7xfekB2uC96SunpTFehSnEc+9uwRraSLbpO3DlfYuQhNUqjCTqsme1GejqD+EJoVz4KY3NqrWWutrv9hqpTGG2RgqZwDxWRBipq9iwhplBrXSbzCL78rvpH6tQQ4o9iAbsCjAwtTOEArakHxIqHGVLiAMjpunmCIvwyabSvYuEN8S0+OT47XozuDd7kCrlGNaPoh/VZNNr4iiMd006wnd4hW4A5SuYgPHb8icW5bCQPsXnughlDcfqSQx/pcwGgQjTl3Um+AFxG0TuAIApZZOMJG+ZsO5VCEvep7b8Dl6cma028KqVFX7kUjsfYm/lILy3CNoIQHV3bHAbywjRrE76vqfyCTYBpgAbI8AySu0fRZ7llj25t3oXfyNGQsk5RYBrvD7qT1xO9iDuxJsBza7ZylQcm9owWYPnp/Ei4Lvtu2fVOuXcde5PRkvCsYE2pYw6YK+y38b2JQMryJD9PTGXCrdasJ/TZCBc+QvAv1AYDWPK3PXKGlqLKCIeIYjqWyAvGK8U8OQ9vFKiXBfjlIJ8DsL5TbnxQ5wuP6AOrrNKCcYKBeKt9fqMwy/Fm9pH6eUStfoMmoO4/W21xWZCvwiEudUChrw80qwSgjqIsbFy9kZF4Vdz1Gn+B+G4HNE6zOvDYIYHGChyyBDFcmX2PVxkGMcoowjWHq4BFdcqL7EKvSgjcteYyRJw0xCpY9Qikxgb2F9As/rCoE7nWxDkAwF/uYPRyDS1HS4syf67Ycez8MWoCVnvw7hmn+ujbLu0on266mtAQvnQAoPaCmIWL2jphr+2diS8osJfujAi1aIg+HN5PPb36lxYWis/SxG6sVLHB6IvtUwyNpL+t1qiDUjobaFa0AFd0mrb5+pe19yxSQI6kvL54udZvAHGnN7xS7Q9nxdHtqSYBiHrHzXZjMIx9UwT8KfaAegaRCqMU066etCS2Xb6DoigVsPKC9+2ynFPd4EwNgFK+uTARXrYMgDCwqzW9/hLEsshFlx0Fe+TelKE5tBTmwwDRVlUHrIIv/+/grmJ1+jij3VuQXHOy3WODvIELGhVDqDkWi0Vrj8C7fYHNJ54q6BCOaNxBvmRBWcSJVczogOAEKLWFt/XcQhaypT6B8vrq1fdUSjaMzNRyOJqMfljXCHuINVrZbSyqJadVfwVUP6CUCqG0Ec0O1Y+OBv6fn4C1+8fUUJLT6xXwd7mfM2Y2EPJiX0KmARe+c73K4imL86mxC0Y46W1Pq0Rw1wXN3X7LWy6kUycgX6+gHgo65QIJtZhwpyzLvvWcsGQ4zrkNE4UwxDmiqZgs+jimSogx3K/2+yhB9J+ih3JkYvpmHmwmbF8+vkAnRXNluu911MuZ4oro2Er9QfbwCe5hBPv4nUeqh35cUIPxDNM4wV2WrZ5+hnGKNasuUwPk7rsHNV1Dh64pengtCoGjNdc8XA== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c3ce2be-3aeb-43f7-684e-08dd01f5edee X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:52.7804 (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: Zb9H+g5Q1Uq/WiY8na2tav+HBnxzRcxjRWKIgjPAQhv2tBy/9lc6WPUk1Cms1ZJX8Q530kM8YntKGmENs/foN1K4Q42LSRUefF1jvUJl2Wk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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 cfd3c04aec..995a4f667b 100644 --- a/arch/riscv/dts/jh7110-common-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi @@ -119,20 +119,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 Mon Nov 11 02:08:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009367 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 4XmtgG6hjHz1xyB for ; Mon, 11 Nov 2024 13:25:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7891C89377; Mon, 11 Nov 2024 03:23:25 +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 2C9D3892E5; Mon, 11 Nov 2024 03:09:49 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 09BE78911D for ; Mon, 11 Nov 2024 03:09:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WiIln8CoGHi7tGk9kpGNljPvmFzQkVMxwj1FsALU08+o0hQIVW60ageUQbzJUyr5tY1xBtE4jWRuYQipcISqOYQlgE0iasxf/6sWIR9eRFi3DA3uovVUrn4MZGUuCrsgIA0fMKzrylXhJRyuFOExOYwvMc3vBd05+bW/t5W1EYwFjqtKrzM13qfS/gvw69Q6WMaihoWntAE5r6Bz0Se80BvpFU7sy1j7lYOj0iizkwkd3T60xhyR6MFSkErL0G3BYqhIFqjENZ3u+oS+H7hmBi1H5JwKRL7kWbT4JInBIgN7Kulj5WgDwRvFCBB2tf+78bZoo6Bus/1UI2Tej4Ryew== 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=FBHJJp30lHUkjPj0ri4VWOhD+dIkoMv688WXiK0fbKw=; b=m0Gh2pP4MdD0VvPlV5S/i2vfOjfoUY3gHvnXQ+Z+9hq1yeUyykg1UzFSvyX3g9B+KIbT2DAvGbxPVVWAOAiKyQFFLhNsqjx5QxVgGxJDsQsTn0Mx+sqFNQ2Cs0bS7XPxfv/MpRVCJo/OM6kSLflEmqkA8GImBqyRXtv7Xldmt5hsDA9qtKHLW4W6UqgQiGEbI0xWEz5zWwbtvboBfqSnrhFO7WxyW1p3yOefANhZSK3uBULXWRtL+Alx0HG7Nf4B8FsDOfkI4tZ9W1RUgUedcj5hALJ+hYbbZWz7IEVWeeJcfVrI5eqj8v8FDzbP/sx5JxF8ct8orPyynawDVGOCaA== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:54 +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.8114.035; Mon, 11 Nov 2024 02:09:53 +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 v4 12/13] board: starfive: spl: Fix the wrong use of CONFIG_IS_ENABLED() Date: Mon, 11 Nov 2024 10:08:07 +0800 Message-ID: <20241111020808.38974-13-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b941235-6dd3-4924-f56c-08dd01f5ee93 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: JvDTLWtAzESuuiG+i40wJ6dgDm2X9w7I3jjCieHnKqbEhTtTe6L6ueRVmMMJIo6M1dsNOVI7MGONklD98K1bGXLlTzA1XAigr7RlZ8DYlUw+o+Ev3dhgYR9dZYuHJ3zDjnBSBiZE5aZLX54vHjeXH/XjJrzBR+naz27lLi/9mGcpfixxVPqDwKRspJ12RkTRWA4FxEI/Ew6dyhY4x+pY646BAhLMeOHXRR+51VIbOu7PuxENZqD5pyrWgWf1vzAud6SoN9eyRjZDYdTMBQxkprM5C4Vur68H2wrAC5Ub0+mD3yGNAvIRWpvKyUaHun3vdlLmUMcpqFMtLX48FnOxZd2IpDOYdspqUAuQD9Ust4fPyWnzOqgClKDlaaAb3YNOmiMvVAOatjxyXPRAO3Brq9q9msmEbJAVrnMBj5DYbw741i1/9qWcSV5j/Y0fRv6o2ZLSjN6G7ZmHpzO4G1Jbf6BFZvu0lcfHgcCWsecqvK8JhPvOqIncFyeuOajdJvJqHOvA+Wl4g9dlGpkxX9xfAIGrEl2L5/TfYx0Pg4V3VH8/HcXgjC6meapedJSPecUtXUjVHc2JCYFRMuNt9uZ0/Ufs5Yl/P7SUmTNl/jlsM+FrE66I4GcvhlfrdsPuHSBaq3qmIRuYLJHDwk+bm6ns1w== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: I2qLDcyD5V8HZSVitxWbu8qqOGRV/uGomtFnwGpqGqKATfQS3lK2Fddle4/I4EXEX2A3zgZF6T3Lz497xzAnG7hSKSdsz2lXwEePV3lIy+ogczFbMUNPecXuNlhUWVk6EgAkNUlSfNkuPWJTIQ7VxJd16gT6XXwuPHUWG7oEyix1xgYnkewWdLndvUlhF6hTujjVPMj3trkAcylCsKHYliK1VWNJQvaBmSonVxEADfALxNKzFXydqQqCk1zgVW6wHHbMkr/FQxnX0Rv6xkOZ/HtoCR82b+O6ZfHY7Rsgi8wnVAIIjFPL1aKebxP5MROBJFtXmclYdQEm6bxtyoQDaQIeRKqVPcD8Bh8Qw2M1dWovqheehbxp/3xHJVxPl+/Pwjb4y7kAXAXPtu0iqYJHi2HOZiTJxq97Z9+nR2wYQthoTyXCFzR4tGG7Ce0pK+vLeiLhSq4a2Vm52iLkj31h2I+VJdgM3G/bepeJmFPCsR0bSw5oOR0/eFDxwibVumZah+csXltoIPt4uwLS0K6QNaWq3MphLGB6VRmf2nhM3ncNKvW35W6f0mjgDLlkL5ykPRLXWgz1J/CaJr1em7XXUNQdmat+/9urVx4iiQuORxnJRwpteCYxPo9fQP8u9Pbc6s81ug720zR+13hIxO9+895YX8uLAPHS0jbgzTYL+HU6rdDXG1Pd3JtTao1roboVseKBeaUi9+jP0rVxP59Qf7TOH3zXGNHHW0NzM7ECEJawL2daaBo0uDE+TUmWoYECn6HGbI2a5GVIQEg0J9UL7NXwXyJTmAhTAzLuA9ASRORIc3OVU2sN96nAdzzpc3C8URCHxpB+QkpeCpLiEHuJi9RBn5FJXhHBdXr/IS6c2Yn08lrkGCfX+XdfQl9oM8p8K0mpcJE4xWIwc9aUsl/6R3nMFSHalHnIL5EmLNSZMOU/tAM7EdTZ9ZHSTEa9ZX8LSzYOeDODusAONIlVY9pSN95bSkz5sLy143bNKpiPD51HgMqx33fgys5P0ABJoieVsZqBYDrsVahg9FDiusdRqKVIAP4pRLOTreWPYbGLHqJQwABrlc4K6Mq+1n7V1c44koCeXfhon8oKvh5K8N9BXyBW69grJ7fmF1d3Z8plwMOEcYmD1wHJK7ATAbjfQx3x9t3YBqY6iWSS4rlz4SP3RpEpX8vO5s9QmZXIUXATYpEiV8KNCq/Nxk1whcKbNG/F4Ridf2zUuA7rSoiCOCY2HN/iRTBtah1NsIwbEXuf0JH+YFEceX8OGn34jCkbb9okjBBOwK44KngfWiVeto3EqpwEjoWbVv0dkr8cslZRxU2Og2AlpoOfoT3rX/gXZWwSO2c2bVoaPwtEUki7XajtEeTciZ8UPXw+u7e3+/5T2+35wBF2Kt2ze4bXrynh+KqRvXhf0h5+/NH3tpkjLmDKioxZfM4qpyB2JHOQerV5151SDMueN28H1uNr2oU/uUFpvu9mCpgN/UEbxOHD5+jV4Qc/QnT1QHhfFAiHiplaZnUJfhqRi8Sge8ymAzgarZTfLZDIPVswIoJVLyTVWFKJEe5jJx920AYDLGdbNNL73D/MnZIEa7A6JICXMPih/wJi96Mi+/t3xwhpIchzb0XZFg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b941235-6dd3-4924-f56c-08dd01f5ee93 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:53.9025 (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: UO/Eo6KoXFyrtaZpCT6S6qJjzSaVzY+9NaAWxPu/iRt2/AXIh0KvklZBTUiK4MkxpDs9o+Q2KLtj27YkMhDWR1daoL//A7s9JZVi5FiZxT0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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(). Fixes: 5ecf9b0b8a75 ("board: starfive: add StarFive VisionFive v2 board support") Signed-off-by: Hal Feng Reviewed-by: Heinrich Schuchardt --- 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 Mon Nov 11 02:08:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 2009368 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 4XmtgR5Lfmz1xyB for ; Mon, 11 Nov 2024 13:25:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DC83D8937A; Mon, 11 Nov 2024 03:23:25 +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 CE61C8911A; Mon, 11 Nov 2024 03:09:49 +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-bjschn02on20730.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4440:2::730]) (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 9901489312 for ; Mon, 11 Nov 2024 03:09:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=hal.feng@starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HQEQZ+q/KoLfFDUq/ZzJfr6XI5lBQrNmDB7ahmq8yShu35OMj0PpckAtFtB5Ly9Z3VPmtSIdxvKSzu5nHJRnkEyUIGMBpKJYjPHlhKWZ+Q3oU2gzMyAgrm+8slVTv+MwBoBNnZhaYEuhvZiLzFwMdSTcoq0zLjrPm+S32iQEwtk+ONmrhPCNSxFGOwPDunTBX4XiIv6idG30ynKT3JrE90cCyK5q3UzgqFSZpXwkCLoTdX5Oeok5Z1SyL+qDUNCMTb4f67gj7hROI4YMpBqdnd/HmS95lKU1S/A4+KJajZLHMEcNx6/Z9ugwZiwl/qcoMSQOisMwT2iXcs7pnyIxxQ== 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=en1M+5+Naqji9kcX2ScIEyYOV4g0uVqV7zhn5ID9ygfNOg+G5W88JWwKghqi8M69r4u6BOUEKWsxAPLPEfeUD/gI/CC3+/3D4fGCxj5opYelCQ+3myKC2Zp8nDn468ewl+UNYYhiazTIjLNAlKQw7mBtK6d/+DUUHqfoRz7vHCh2jaWNcsbUgsj3wWGKDo0a9gNXD4TiOAzrxFubTTpz3MLT+ZDPjB256UGO8ryVFQSUKjgtihbtweWOxR6Rq27CsDRvO2OTHwESaqEmR+QcHCyX8VcEmBzmCrz6bhaXiDdZ1Ys6SfuvZD4N95P05gRatTN1iN1be3K2Lg+OQjlsPA== 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 ZQ2PR01MB1178.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.36; Mon, 11 Nov 2024 02:09:55 +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.8114.035; Mon, 11 Nov 2024 02:09:55 +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 v4 13/13] board: starfive: spl: Support multiple DTBs for JH7110 based boards Date: Mon, 11 Nov 2024 10:08:08 +0800 Message-ID: <20241111020808.38974-14-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20241111020808.38974-1-hal.feng@starfivetech.com> References: <20241111020808.38974-1-hal.feng@starfivetech.com> X-ClientProxiedBy: SH0PR01CA0004.CHNPR01.prod.partner.outlook.cn (2406:e500:c311:5::16) 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_|ZQ2PR01MB1178:EE_ X-MS-Office365-Filtering-Correlation-Id: 67bbb824-80c0-4e83-4eff-08dd01f5ef3e X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|41320700013|1800799024|52116014|7416014|921020|38350700014; X-Microsoft-Antispam-Message-Info: oiSTJhvnCzbOXipBUvhatMF6VoE6zdmZstLMx1dZGsT6gOYJ9SAJXrh6apTEQrUeCY3ajVLjB9u9rGwgCePx/OvYeBObFavwHGeOvNQzmPSCCmdNt7UPbDyS57rlz/Q9y4Obhl5BhaDNpSRe021v5YDqJtN/quMSm42EQ0dwTbYCFRV/ZzI9A3hQPfFKNZp5LcnRiHkxd5tPdKlbK1JCsq4Jl9c1Gg6toweGVqJokLkrX/5KavEMj0GKuBmAaQZekuSXA0q/aNrV63LMw9sRGacDeRlfNOSIc03QwHqIENZvyC52kXWU5h5Lk9TQdKjAU1uYL6q+OT8Ei+tLDJdwc1xd8zmOlDugD30h6p9oVufAA/zBiv3IhF9d7AaRf3Mq1UQi6duEEa5gRDddIZdrpnTTV2DSpN92LbT2ZsVO4ejbjn+cfZFIDWpkUg7+JXGH4SX5NQaRaYyzQRa2lRfCfLQAnflpk6zdOnuulYafLxnbDfFWCaxSTp+gHXyC7FmX0okYXhM9Myn50k9ADlsZz3oerVm4NUCcAonPvG7Q8K365WwHDLXSZXA87UIxPqOGWS8zka++c4WIysgkc5wv9/qO3bApHPFxLJl+a4cTZO3He/lYS28fvVnYg/VVqzW3ElPMXWvSOfGuW5GfAeI8+Q== 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)(366016)(41320700013)(1800799024)(52116014)(7416014)(921020)(38350700014); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a8xAmx6v67inrVr3Oar7FY0nF96bhaSmqyw6Z8/bi+P94C/rKDhn7Bm1nfHzijNWrrIqMGcoJ3irKAciM5aBYJsVaj+nTcpu8Np/0qtiR9DA0oRtC2Bfa8x90FB0C3G+4OK0kuMyOeZjhrYpjm/bKS2FXvup6e5am+2xetjDJZehZdTdbLhT3Wh7XgNXaVdHWoYZeDvF2UDp23uYPIl9Vp6dpnhaxO8hIbG8BSFvEPU0y0p1qPkKD+p/ua9toL0HaQ0ysRV3c05tI03o/HKJOVvi4fJOtygBkt3JPW8rmCAPw4vWsX3grMI7VycQNAQyy6zFZd/QZ/ozA3U5wAY8Hs5TefE8/2Dx9cuLT++c3awTLhRFTk6lPuw4DE6zwk6ElNvwr6P/dEoDiw8L8pWWQgtBn58L+DxLvKAJ2WJc5BAPVm5PY8Pa+t1pASlEIF4fmtUbbfw4NbIygI2yjjT+cnM/ZDxyvkMeuf1frzOuUeOpn/C6JpHQn+Gykgv4W4xUmmV0wS8tVteUQ4WQh8eUgISKuBKkJ/6KAG4x1zCXpNA2j719qc6g3VcDVFpQ0AoMvqid0AUJJAYZLqMCD0HCxI+NZk5HWrgMWEFiS/92rD9moNZItdhsTG0UVTj85OYatb5rWqSk7kFW+S+F8UzbmMNqvTalUNy1LibYeMhuOx1viSJOTSNef8vF737+AXtvegp4pjhKotw0HDxjeqy+rmr9eSGbr7A3jN6a+G1Nuq5SoF0NQTF5jR72r/ENEiqruT1Ytmws6a5u+/fVhRpMqVeM1obREdG2MwPcvl9huAN4zSwDXjp0Br0TwjitRDfeZ6YcGLsuNSlttJRHFTwafn0BhMTGh2zHyJSCC1L/NTIaUM9sJ5l4H1QyLTmis63vpIxLFzjcejVoqbN0W/4LBwdbkgCYuBDiyVmjvZXHN4CZXofPL+53O0EZAWmDbE4dEfJw2I3M3vZEm5jAf8zCCH4HkCcTcvKbU7ibBehXv3YVGrEILxVrFQ7rBXscYB2+7G3RBmYbBnlnvlY2toS0xi5ADMrhD4gS9xTYPkslNbxeikR/j3wV3lxBX3mNVZqpZ2xF/tRZEek+LbFJ6yQRtBmdUoGaij6f4VXIp/PwgyH8TiHP25mldFZunLTN1bRnlxi5U3B+2+Sl45UP7usuxUAdLHU+ILIToR6TxGg6RHx5/htsR+akwyvFNTvYoq7b9n0ab5530Q6iIacnxnWQdyOZIH4mo7vX1McqHlnqz6wLjXKYCZ5jH6dgNvqlpcXoYv2JJwcyJGU4c64j2QhdzW9ork5Om48jdPyy9WanE44Kyrroe76/iubClqXWqE3ES1Mu25SxAmBNVU2XX3uY8VBn2kzpTJ5WpCLu5ARGT6xIrxeT9PUrHmRJsyoSROzktbZDH4nfFEJL8DTyt/wx0sxGt9JR9KZsWXwWzBxhOfkwEqPxSXM86D7MKfVoYfL96oK0vq9O3bT+e8OGFNmndVzNIvFFIylK+uaF6DP/aFvloRWlgJx6IZdQCDLGUSUbLMmizvKaDbGod4MYGt/13hvoKGMM5hzoeCINC9uN/V3/IBljQDmyUN1psRJkpdeMh97Z+eN+3O353R2hiD4KFg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67bbb824-80c0-4e83-4eff-08dd01f5ef3e X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 02:09:54.9703 (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: Mnyet2txXbp9OR+Z8LQ0GXAnJoPyE5lVrYWLxU/PTnL8fMbhPix/4hX6J2cQ6MmSeURANVNpbUHa7+9HbryPrvBDhFh5UAqLooD+jxa/2p4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1178 X-Mailman-Approved-At: Mon, 11 Nov 2024 03:23:18 +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