From patchwork Mon Jun 3 13:27:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 1942945 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 4VtFfm5cy3z20Pb for ; Mon, 3 Jun 2024 23:57:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5A3E88830C; Mon, 3 Jun 2024 15:57:38 +0200 (CEST) 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 D83EC881C3; Mon, 3 Jun 2024 15:27:38 +0200 (CEST) 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,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2 Received: from CHN02-SH0-obe.outbound.protection.partner.outlook.cn (mail-sh0chn02on20718.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4420:2::718]) (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 9968F882ED for ; Mon, 3 Jun 2024 15:27:35 +0200 (CEST) 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=gpT3VBXO6q7owceUucLZCO1ytyGFMVE42bszwaDWhEMEM4wPBdIhcWWrZzIQHgaTEo7B5l5gVufLeS2N0hDRjv/K1qjCeoNdky+UL98JoFJNtz5CPy2BEKALJCUFzoeQso7ZV00v2feRwik2n79QMrIGxiMxeREeKtFiWu56NxRgRZgvD2hkf0ws3VcBqW3BPS7GEFANyRTAb16WMIICf6PtIojQeLwnImXhjt5CwfPHfKo9pPw+m2wQ82cy7OVHUuKctFruyMbtM3DMvZD8/AC7deJwhl+aw9Fwz8dvBTNHVC0fgk9zyqw4tSzUdczwZcuwnYUlVHoy8I5uKXy/bw== 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=zprFBAsBy5aaw83OS2VyomFPzLWeoJozemm2G9Ukl2Y=; b=kdBQ/4SbNC9KkJLJDaNIZCymFUnh15fNPHS4bWt23IIpRWF2e59Zr/Yob02ymiREyZZ/Q48CiBxZ35WPwXoMJwir4wmm+pJwG8F2xhjQjjttSi5zsT6S1o02o54DEY8hG0O/AgL3G+8dvgV+gD6JmyPuUSzQVv6rJmK4Oj4FtZUPPXKFQ/cV/k2hpS0QsLzvuiFlXRMa9ajv4v/XNs2jYFHWD7Vl9uaH5EPnDJXAymzC0JMu7dOxYfsTFptD6kJZst1a9BfeGLPhnF/TBUvmD6KBrKpO8Z7WSxhv0K0NIW7bv/PWCp5nrs9t7bjxJv4wqi5J2Ui1qJ1SFXx0YcoUPw== 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 ZQ2PR01MB1242.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.43; Mon, 3 Jun 2024 13:27:30 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::61c0:a8fc:1462:bc54]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::61c0:a8fc:1462:bc54%6]) with mapi id 15.20.7587.043; Mon, 3 Jun 2024 13:27:30 +0000 From: Hal Feng To: Leo Yu-Chi Liang , Tom Rini , Lukasz Majewski , Sean Anderson , Rick Chen , Heinrich Schuchardt , Nam Cao , Bo Gan , Yanhong Wang , Emil Renner Berthing , Minda Chen , Hal Feng Cc: u-boot@lists.denx.de Subject: [PATCH v1 1/4] dt-bindings: clock: jh7110: Sync with Linux Date: Mon, 3 Jun 2024 21:27:18 +0800 Message-ID: <20240603132721.6522-2-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240603132721.6522-1-hal.feng@starfivetech.com> References: <20240603132721.6522-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0029.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::10) 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_|ZQ2PR01MB1242:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f2805dc-08f6-4e83-8684-08dc83d0eb23 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230031|41320700004|7416005|52116005|1800799015|366007|38350700005|921011; X-Microsoft-Antispam-Message-Info: VIIyXTRwg9kSNc/Pu6GknuKI1z3P04MKOUxnAeQRI1nhpqr2WB8jrYLto3puz/YMimtDSfPsu0rKZjv8qRt6KLnf3SJIg6QxrSNaRKVudYbrzOF7ES74RleXeSyDt65ZJanj2JTuwnrSs1+gn5O74qFJoSF5Tlc3JWWeQIj0ifEyhbhFaaXo7WqNS7ks7Q51QdOV9OWVyxB2Bz+Gbx2EB/m/QdkEBd+7wNG59usJB8h5nS9ePYzrEkbfqQiZEvPMYxc9JkTcuyIDVwpnJfB+L7oYBpkxmkOfl/LRDsaAXPJr0lCvPrmez6dFdO+2BsavsxiQIHPOY6yBycuXzR/EH04fdIMUYEQpv+MpSmhJiBj4txeJqHyxGsuPwwY22hpvdhHXLgURJ8Te44f/Y5EaBs/xIl24rQeoXpULBxpuXWsFFqjB+uWnQb5VaEimzClDT/2QSo26j1XfmwbvJKFvhHFuAQZv1PA+FfAMaltBJQh4X51Qv8nhnYCUKJFXr6CuDnM9+2z2D77MBTnu3kKJlajUk+rEktksAgyZO7tP7YSEY/vw1EWrmo9qna3OQWAXbFpOjj/oaCdLWKTCGTMQzFJ2rHS0qz+XmQQi06uOJQjs68WIcEgQd3yBUTb3WbL4c83TRBecFpgW2iZoWla9Gg== 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:(13230031)(41320700004)(7416005)(52116005)(1800799015)(366007)(38350700005)(921011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Vjj7jref2ROJ9j/PIqwRybfv0GjzNgfdw8uiiv9Bmx4Hqx7/fPBm2KuFohMuRvpUrLqtds6OH1FsS0wQ+Bo7FE6pgg9evM1+a7fMzuhgGx/pvuW3+zjFWvrTc1iOTUtIwg4gt3Eg9j65wyUKUzEAOtxRCj4p9brVETXR5UW2x+CqsEyhtiKgntiRHBGwIQck1mr/knk+vEWFIXG6mz7eCLOPIfmu2eg+Az1ivdbl6xeVxU9xG1oMTCHt8FT+A8NZk/F/RegAJDjTrImKIIiyzEc2VAk+zDE6MkEgnndgvMCnJGh7YWMTjofiClTWNulU0MU8SD7V1UDc1TiH4GuDQSyM93DK1iFkb+NfOqzZEmWYnTehQxPqwla3/B7RyRXeeW03Abt/WRkhNPcTuH8mFni6H+5A0pEtR24XC8ozT9Oa1rz7BwJsr776MjVFZqlT4KdHj5ujg5jrHXAtJCU7Eifkv/nL4GVKiNJ1fpUYAkkJu25cFyG/f3j139Jn6cngU16RLfy4riX6iWCw72XWFJdf2HBb40GwJI0pT0p4yYXq6cfy2e9chGhgEo7IOqiJWFgnDAvKQrKv2VhSQD046cEU8kYfO7FmI3OOkFORawXCSJfgInGu9TUWa0oNNoHevr4CuOSp224/GSHniXRBpPseQWwR3HxPjUNC9jfWguS0Dve4T0pocfp27K+xsqVey4rqXMzn/FxM4qa7w54GGyeimZqfx/NTJ+/0kENZ8X+JV4THc55zGI+CjmsckgYLIDXXgSAA0UzqpXk1WZZrznOYqSNI/+PdXFI8HJaExFoQi9112mdu6ubXHj/h3XFrZVKTh5k4sfNf/mge6LAIXeQ9OII/s13zeGxrNv7qomFILLOIOwPljOP0z8qQqrzdxMzuBpGOGwEZy3Oi4ASgON4WPoj4z+nCafqimi7qaF0lRYf2Y10iVXPp+DXQ8Xf0j8LYp08fKUV1gTeZD8zqXcURBbcaIjQ023nUlxEIa8kAVBKKpkEsZ/izzPhAmQYHjsuHuApdXrXoE2np8pIrigsZ/KQWuB690B0SqvUfttTxCpo8Zjreh4IqhQrL/8RFsbO1NWIdA0jkc5FWbcujjcaW989Qh3xGkvgfsnjTIa1G6PPgssgiT9C3+C3E0WIkR8RzESD1W6SExi/wpWPOtQUAc0tcv/rpKI6kTWZwWsdWkLpO9NxxhUdQ5WYMsxIggTgo6EGzr4D/ptjbkASWo8LajPmP/kVHA1vDMS6d7ioBm1746Pdq3awSHHvRBnHcuFTAiRWTPZQEdOqXlrz8JpGxWn1U9pWAOFO/drjkPDMR9EmE48Q6I204/+Fk0xWCjb8mJcvUjjCoR92KUzw7oHUAjILqtzeQfHfUgGJkNn2msPFm8qFrr4K+4TloKMpwyPHMvCZvu3D5JHPoJtoYlH2xCw/zOiZWU+sxh5RJ/nnB3J18TlZzVzPHaHWjvFuruW0xqR6HBRp5xFGecMtbaVLP2g+//ozdmDFN3MO6PkfG0K+u7m6QlOtJ/p3TzjLX3p4H2al0ou9kGKiRPNeCTQ9uFB71jg23vyI9d+JwT+kFp7hPJfCCWKW2aOo8gH0ZjUOBBzaFCr1nxq6/bhm4fg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f2805dc-08f6-4e83-8684-08dc83d0eb23 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 13:27:30.2266 (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: n2SxJlSpWrR18lNtBM/DhX/+xX58msjtENLenjp1WNgAu6BXv+OfdGv2AU3MbdE6MirQbd8kQLt+vfyz4yEKDT/ezk/0LpLs6GZypWJ6qp4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1242 X-Mailman-Approved-At: Mon, 03 Jun 2024 15:57:36 +0200 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 Sync JH7110 clock dt-bindings with Linux, which is the same with dts/upstream/include/dt-bindings/clock/starfive,jh7110-crg.h except copyright. Signed-off-by: Hal Feng --- .../dt-bindings/clock/starfive,jh7110-crg.h | 180 +++++++++++------- 1 file changed, 112 insertions(+), 68 deletions(-) diff --git a/include/dt-bindings/clock/starfive,jh7110-crg.h b/include/dt-bindings/clock/starfive,jh7110-crg.h index b51e3829ff..4eabb05473 100644 --- a/include/dt-bindings/clock/starfive,jh7110-crg.h +++ b/include/dt-bindings/clock/starfive,jh7110-crg.h @@ -5,19 +5,21 @@ * Author: Yanhong Wang */ -#ifndef __DT_BINDINGS_CLOCK_STARFIVE_JH7110_H__ -#define __DT_BINDINGS_CLOCK_STARFIVE_JH7110_H__ +#ifndef __DT_BINDINGS_CLOCK_STARFIVE_JH7110_CRG_H__ +#define __DT_BINDINGS_CLOCK_STARFIVE_JH7110_CRG_H__ -#define JH7110_SYSCLK_PLL0_OUT 0 -#define JH7110_SYSCLK_PLL1_OUT 1 -#define JH7110_SYSCLK_PLL2_OUT 2 +/* PLL clocks */ +#define JH7110_PLLCLK_PLL0_OUT 0 +#define JH7110_PLLCLK_PLL1_OUT 1 +#define JH7110_PLLCLK_PLL2_OUT 2 #define JH7110_PLLCLK_END 3 +/* SYSCRG clocks */ #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_PERH_ROOT 4 #define JH7110_SYSCLK_BUS_ROOT 5 #define JH7110_SYSCLK_NOCSTG_BUS 6 #define JH7110_SYSCLK_AXI_CFG0 7 @@ -26,9 +28,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_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 @@ -50,12 +52,12 @@ #define JH7110_SYSCLK_TRACE2 34 #define JH7110_SYSCLK_TRACE3 35 #define JH7110_SYSCLK_TRACE4 36 -#define JH7110_SYSCLK_TRACE_COM 37 +#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_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 @@ -64,21 +66,21 @@ #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_ISP_TOP_CORE 51 +#define JH7110_SYSCLK_ISP_TOP_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_HIFI4_AXI 55 +#define JH7110_SYSCLK_AXI_CFG1_MAIN 56 +#define JH7110_SYSCLK_AXI_CFG1_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_VOUT_TOP_AHB 61 +#define JH7110_SYSCLK_VOUT_TOP_AXI 62 +#define JH7110_SYSCLK_VOUT_TOP_HDMITX0_MCLK 63 +#define JH7110_SYSCLK_VOUT_TOP_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 @@ -87,8 +89,8 @@ #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_VDEC_JPG 74 +#define JH7110_SYSCLK_VDEC_MAIN 75 #define JH7110_SYSCLK_NOC_BUS_VDEC_AXI 76 #define JH7110_SYSCLK_VENC_AXI 77 #define JH7110_SYSCLK_WAVE420L_AXI 78 @@ -96,37 +98,37 @@ #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_AXI_CFG0_MAIN_DIV 83 +#define JH7110_SYSCLK_AXI_CFG0_MAIN 84 +#define JH7110_SYSCLK_AXI_CFG0_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_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_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_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_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_IOMUX_APB 112 +#define JH7110_SYSCLK_MAILBOX_APB 113 #define JH7110_SYSCLK_INT_CTRL_APB 114 #define JH7110_SYSCLK_CAN0_APB 115 #define JH7110_SYSCLK_CAN0_TIMER 116 @@ -137,13 +139,13 @@ #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_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_TEMP_CORE 130 #define JH7110_SYSCLK_SPI0_APB 131 #define JH7110_SYSCLK_SPI1_APB 132 #define JH7110_SYSCLK_SPI2_APB 133 @@ -158,21 +160,21 @@ #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_APB 145 #define JH7110_SYSCLK_UART0_CORE 146 -#define JH7110_SYSCLK_UART1_APB 147 +#define JH7110_SYSCLK_UART1_APB 147 #define JH7110_SYSCLK_UART1_CORE 148 -#define JH7110_SYSCLK_UART2_APB 149 +#define JH7110_SYSCLK_UART2_APB 149 #define JH7110_SYSCLK_UART2_CORE 150 -#define JH7110_SYSCLK_UART3_APB 151 +#define JH7110_SYSCLK_UART3_APB 151 #define JH7110_SYSCLK_UART3_CORE 152 -#define JH7110_SYSCLK_UART4_APB 153 +#define JH7110_SYSCLK_UART4_APB 153 #define JH7110_SYSCLK_UART4_CORE 154 -#define JH7110_SYSCLK_UART5_APB 155 +#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_APB 159 #define JH7110_SYSCLK_SPDIF_CORE 160 #define JH7110_SYSCLK_I2STX0_APB 161 #define JH7110_SYSCLK_I2STX0_BCLK_MST 162 @@ -188,7 +190,7 @@ #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_APB 175 #define JH7110_SYSCLK_I2SRX_BCLK_MST 176 #define JH7110_SYSCLK_I2SRX_BCLK_MST_INV 177 #define JH7110_SYSCLK_I2SRX_LRCK_MST 178 @@ -200,12 +202,13 @@ #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_TDM_TDM 187 +#define JH7110_SYSCLK_TDM_TDM_INV 188 #define JH7110_SYSCLK_JTAG_CERTIFICATION_TRNG 189 #define JH7110_SYSCLK_END 190 +/* AONCRG clocks */ #define JH7110_AONCLK_OSC_DIV4 0 #define JH7110_AONCLK_APB_FUNC 1 #define JH7110_AONCLK_GMAC0_AHB 2 @@ -223,30 +226,31 @@ #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 +/* STGCRG clocks */ +#define JH7110_STGCLK_HIFI4_CLK_CORE 0 +#define JH7110_STGCLK_USB0_APB 1 +#define JH7110_STGCLK_USB0_UTMI_APB 2 +#define JH7110_STGCLK_USB0_AXI 3 +#define JH7110_STGCLK_USB0_LPM 4 +#define JH7110_STGCLK_USB0_STB 5 +#define JH7110_STGCLK_USB0_APP_125 6 +#define JH7110_STGCLK_USB0_REFCLK 7 +#define JH7110_STGCLK_PCIE0_AXI_MST0 8 #define JH7110_STGCLK_PCIE0_APB 9 #define JH7110_STGCLK_PCIE0_TL 10 -#define JH7110_STGCLK_PCIE1_AXI 11 +#define JH7110_STGCLK_PCIE1_AXI_MST0 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_PCIE_SLV_MAIN 14 +#define JH7110_STGCLK_SEC_AHB 15 +#define JH7110_STGCLK_SEC_MISC_AHB 16 +#define JH7110_STGCLK_GRP0_MAIN 17 +#define JH7110_STGCLK_GRP0_BUS 18 +#define JH7110_STGCLK_GRP0_STG 19 +#define JH7110_STGCLK_GRP1_MAIN 20 +#define JH7110_STGCLK_GRP1_BUS 21 +#define JH7110_STGCLK_GRP1_STG 22 +#define JH7110_STGCLK_GRP1_HIFI 23 #define JH7110_STGCLK_E2_RTC 24 #define JH7110_STGCLK_E2_CORE 25 #define JH7110_STGCLK_E2_DBG 26 @@ -255,4 +259,44 @@ #define JH7110_STGCLK_END 29 -#endif /* __DT_BINDINGS_CLOCK_STARFIVE_JH7110_H__ */ +/* ISPCRG clocks */ +#define JH7110_ISPCLK_DOM4_APB_FUNC 0 +#define JH7110_ISPCLK_MIPI_RX0_PXL 1 +#define JH7110_ISPCLK_DVP_INV 2 +#define JH7110_ISPCLK_M31DPHY_CFG_IN 3 +#define JH7110_ISPCLK_M31DPHY_REF_IN 4 +#define JH7110_ISPCLK_M31DPHY_TX_ESC_LAN0 5 +#define JH7110_ISPCLK_VIN_APB 6 +#define JH7110_ISPCLK_VIN_SYS 7 +#define JH7110_ISPCLK_VIN_PIXEL_IF0 8 +#define JH7110_ISPCLK_VIN_PIXEL_IF1 9 +#define JH7110_ISPCLK_VIN_PIXEL_IF2 10 +#define JH7110_ISPCLK_VIN_PIXEL_IF3 11 +#define JH7110_ISPCLK_VIN_P_AXI_WR 12 +#define JH7110_ISPCLK_ISPV2_TOP_WRAPPER_C 13 + +#define JH7110_ISPCLK_END 14 + +/* VOUTCRG clocks */ +#define JH7110_VOUTCLK_APB 0 +#define JH7110_VOUTCLK_DC8200_PIX 1 +#define JH7110_VOUTCLK_DSI_SYS 2 +#define JH7110_VOUTCLK_TX_ESC 3 +#define JH7110_VOUTCLK_DC8200_AXI 4 +#define JH7110_VOUTCLK_DC8200_CORE 5 +#define JH7110_VOUTCLK_DC8200_AHB 6 +#define JH7110_VOUTCLK_DC8200_PIX0 7 +#define JH7110_VOUTCLK_DC8200_PIX1 8 +#define JH7110_VOUTCLK_DOM_VOUT_TOP_LCD 9 +#define JH7110_VOUTCLK_DSITX_APB 10 +#define JH7110_VOUTCLK_DSITX_SYS 11 +#define JH7110_VOUTCLK_DSITX_DPI 12 +#define JH7110_VOUTCLK_DSITX_TXESC 13 +#define JH7110_VOUTCLK_MIPITX_DPHY_TXESC 14 +#define JH7110_VOUTCLK_HDMI_TX_MCLK 15 +#define JH7110_VOUTCLK_HDMI_TX_BCLK 16 +#define JH7110_VOUTCLK_HDMI_TX_SYS 17 + +#define JH7110_VOUTCLK_END 18 + +#endif /* __DT_BINDINGS_CLOCK_STARFIVE_JH7110_CRG_H__ */ From patchwork Mon Jun 3 13:27:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 1942946 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 4VtFfw63j4z20Pb for ; Mon, 3 Jun 2024 23:58:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B6ECC88350; Mon, 3 Jun 2024 15:57:38 +0200 (CEST) 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 4F359882AC; Mon, 3 Jun 2024 15:27:39 +0200 (CEST) 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,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2 Received: from CHN02-SH0-obe.outbound.protection.partner.outlook.cn (mail-sh0chn02on20718.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4420:2::718]) (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 3B1EA8830C for ; Mon, 3 Jun 2024 15:27:36 +0200 (CEST) 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=lPgdCRdXxToi0FUeVqtMl+6Jss8nbyy92ADp2MkTVIPuY2NFJbOsBxxvP6mkmeQdf4x5kUGGlOCLIyf1xE0eL8qBVfYSUIn1wpLEPylP4t1JdSP6nJf47u9deAnO7dr9c6dcvTBwJk4gfhss6dmSuYeiIiNGK+HN1PBmyYlj2whrHVNgPgnLNAB64BG35anlP0X+ERmrxBpn0kCJx1qVYtPwXRlgG3y6sK80Iqd+6rPRLeUS7vRk7/8HvcW8D7NfkTDe6bBOt03WXQnhhItQCTZFqXnR5FYwKmmeN5ZDNq7oZs3iw0EhoZGD1GTB7IQ3fwqhIBKKuL/K7tB86D9k6g== 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=M3b/xIXcmZPF98f/rnmudhC18M9xvexhonbF9B2UDBw=; b=MFhtDDnbg4hRintOcGnlpivasOy9YXjP7pllx0t6yukfJABoT2aSqQsTJO0OKH03SXRZ8Cd7FWAbB6sDpwYOMxnnZOV2xUJw2aafbfjNNKirQXXGCDBpGz5EBZtSCrFTDswrB9tZimLJ3gSTxdrEYLWZx8RdAntgcX6PoDde20uxPGwTQEZ5HuCnUfad/r+QKMY+E++fcDW6RpySyP7e7m4Ar3iqUJ7KcdxlLzJlcXGQMSgrP004J1ZYm6nkDbcylhfCtYEBe0bv/C7zG05zmSf9YXKZaQdRCo3MS/d6D4z/QIb0Y9lK3M3suRt1HWhbtmA8L3cig3xU5VA8DW1nEQ== 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 ZQ2PR01MB1242.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.43; Mon, 3 Jun 2024 13:27:31 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::61c0:a8fc:1462:bc54]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::61c0:a8fc:1462:bc54%6]) with mapi id 15.20.7587.043; Mon, 3 Jun 2024 13:27:31 +0000 From: Hal Feng To: Leo Yu-Chi Liang , Tom Rini , Lukasz Majewski , Sean Anderson , Rick Chen , Heinrich Schuchardt , Nam Cao , Bo Gan , Yanhong Wang , Emil Renner Berthing , Minda Chen , Hal Feng Cc: u-boot@lists.denx.de Subject: [PATCH v1 2/4] dt-bindings: reset: jh7110: Sync with Linux Date: Mon, 3 Jun 2024 21:27:19 +0800 Message-ID: <20240603132721.6522-3-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240603132721.6522-1-hal.feng@starfivetech.com> References: <20240603132721.6522-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0029.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::10) 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_|ZQ2PR01MB1242:EE_ X-MS-Office365-Filtering-Correlation-Id: a40b3a1a-cb4e-409c-479a-08dc83d0ebbd X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230031|41320700004|7416005|52116005|1800799015|366007|38350700005|921011; X-Microsoft-Antispam-Message-Info: vYhii1KHqTrzVedJQQQAQMF4sup2iAWcr5YOj9g8qXxQVvDheYNx+k3CGGqoonuPoaP8+ijmp3qf5kF3eTq9E848kpXA+5i5Pr8MFXYFEurcJOW1R0C+N5cad/Y+HOf5Sz6ghbBvunrjNaNiNRmHDBiDnL6Ag3B/VQvOqThVYigujX64TlhpjHGE/3+/JEcSYbiAbScgPJzb/bVywNV7UVvx22PDP8eSgkhgYBDle/B3IAHlUVJ/OmwD1J5/xoAzX1G3C9Q/8uqprXnzAJLR7pZFwfkApVOLwDPFiP59+udeTkeRjLrdu9tGrULsSTyAR3kM9rlKr8DxExqAGRu1EJAhGQ+V5jOD72kws+G+j26mJHLWBQqlOnFNJtfHNttxL7N2AVv3Dqd5LGlEWl/9SIbyy7avk6lbg22HU8xpsutLlJ/lGCvjuO/1Dl+W3Slk575gCYoWqoBPvL8e7vRnH29Ri2TYa5qjdAEBFoz6m8eTJ+ado7dU2ru57KjGXOjLlUbOedCfi8zS838TUm0xPXKxEnSGY0/2Zu4YaQgpe+NaRuq6K4Ed8BrE7nPqinLeS6B+u+NsbJbOlx6aY/5eftNmHK3SCBP9kusBClW0qZJH9KXFS6mf0n7sFaQR2U9RjP1Z9rs4mVx3hbLHMVOpjA== 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:(13230031)(41320700004)(7416005)(52116005)(1800799015)(366007)(38350700005)(921011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3dPbNblLP3O6jswPzZDhciBMpjfymD5+9d3S35W0lk9pExtAc9utmsI2Huyis5ja/SHcoa7BMhhFtKPoDuTYAsrnsSxZtrUA2qqiTMUtkTZ6vuZhDV+/V+LOX5bkHuY+9iaPORosFiwvFZLVaqUSGa24pjZwbmO82LQOCeLU2YylWoWWgw10UWhTRQvWsILtTHkWnx3yAA4GwwB1ALLcZJmWQIxQ52WM4z+Ac57QVLXFE0s3MTFx611LNBGeA/Wylf6Fj0uv0d9c9QaLipOIjCoRV+4apqMn/aBh0vTD5D5HEp2zJfWwU1vOGxiV2cjdRqj71BxDTybZv6aykaYdeX4Bf1Uziu77vEmxInYRvMkUoxkimx9YEvBL69sHYedA54wDhMi6ZojQbyFuK2+PUvVXsBMa2g5aEUgyVE9Kx2bS77ui8txi1c2MGsq2b/imbZA4m48Cbl1uV7Lrq38kMBfDDgXDJI+7YnXoUKS5EptZ1C2iXNtO2JnwkstVlJ55XtvvMizGFnjSZ3CD7e9GIEwZKuJIgk894xNzTvnU23oxget6NQ0QYT7Igg3EFwcjNIn/JTZk2ScOt4jp+dmLMOGteBtTmVLjSlEULIxOpaH5EYwE6Gds39Q0sRwel4NY5mqboBxusWBcH7Zz+cnsyAAr/7WvT8otWyG0R7vgYqSzFeRR20Txk/63aWXaiQu2pwEKp5Xlkmn6Ze9YH71rH4MA73sCAvibHsJh/EGmxek+Mx6k92622tOl47ArfqOmgiIMR8VflHECKGpUDX//ls2jmTRYcd9Y1HVOQNlOvtqmMz4NZcIeiXC4HBdtsHzQb4loGSlmy7XJjxeTTPN8JOaaE+RgTN44G5vMQqhaxfMbDEVuRXjJ3uqDWoykq7MzrJEZ1bS0XLu2v227Fj0uJfh7xsyf/7vxWoQruYHN8uy3YPaitU+CSNKHwvVis//bYvy0nP0QlnSkC4BQ4FYJzRXu5qjyGlPxH3B5Yy2HdNVWqK/XMnnI/MfGcysjwUv8oLl82A7O7T3y1y3A3Clcyx/bTz+uCdC5GVsy82LO+JFCoyyf3y4UNXNLqCz4iMQZmMd4rINQsZuMATeIso9JIKvQQ/q8xhCMhY9vwBBF51F13o8GWQ6R6bo9SfazLn5tFvJsBXV31wKw8Rb7GfhVs8KI1YOgiVGsjUglcpYgZ5053rqKHYEvXnJUe/LKoaAe9dq+7W+NKy56rpn/GE2YDXfRu3Hz+OMiLL7PeaimKz6z3byqGRSOj4Kc6YyYUqQJcol1KpUNLKJOyORQ48t6FtHr9p8vJtdG1b7aG3Eba8HjqzbbE2V/MuaQHjTT1zVbypl8KaB42YJ8uODM0YvKo2gVrJz9CtAYbiYDbcBfmkSSQpMY82Vtlf0Do+wcGFRoJwG43Kf5hOQt4Mky+E08jk01pERAUl5myXQCZqb9hrEarYzdWGkp8xVNJeQOfNaqNbNU2Kd5FvjOnpDXeDmyPx7qLnJC2rbdAKJCAytwlvSZwM+AbPLZ6LVOCyxlnRFxQ/nJWRl6PMPCr+AH7RPufvlFMy2ZHRYisg18AKjSb48GzKz3pxnzA3QTUtMYe026PbKbXzJ5p2FnQaUKKzOEkw== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: a40b3a1a-cb4e-409c-479a-08dc83d0ebbd X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 13:27:31.2145 (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: qqGP6oEl41sIIQBUmKcpcRNf8XrOyFcDYLGGcAMdngMTWs84TJlj0J399fIgaXG7wy9erS/bQE0kOuVK2RbfZ8cwjBDUDnEsVzrk1RGJq3I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1242 X-Mailman-Approved-At: Mon, 03 Jun 2024 15:57:36 +0200 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 Sync JH7110 reset dt-bindings with Linux, which is the same with dts/upstream/include/dt-bindings/reset/starfive,jh7110-crg.h except copyright. Signed-off-by: Hal Feng --- .../dt-bindings/reset/starfive,jh7110-crg.h | 144 +++++++++++------- 1 file changed, 88 insertions(+), 56 deletions(-) diff --git a/include/dt-bindings/reset/starfive,jh7110-crg.h b/include/dt-bindings/reset/starfive,jh7110-crg.h index 1d596581da..771b1aecd0 100644 --- a/include/dt-bindings/reset/starfive,jh7110-crg.h +++ b/include/dt-bindings/reset/starfive,jh7110-crg.h @@ -5,13 +5,13 @@ * Author: Yanhong Wang */ -#ifndef __DT_BINDINGS_RESET_STARFIVE_JH7110_H__ -#define __DT_BINDINGS_RESET_STARFIVE_JH7110_H__ +#ifndef __DT_BINDINGS_RESET_STARFIVE_JH7110_CRG_H__ +#define __DT_BINDINGS_RESET_STARFIVE_JH7110_CRG_H__ /* SYSCRG resets */ -#define JH7110_SYSRST_JTAG2APB 0 -#define JH7110_SYSRST_SYSCON 1 -#define JH7110_SYSRST_IOMUX_APB 2 +#define JH7110_SYSRST_JTAG_APB 0 +#define JH7110_SYSRST_SYSCON_APB 1 +#define JH7110_SYSRST_IOMUX_APB 2 #define JH7110_SYSRST_BUS 3 #define JH7110_SYSRST_DEBUG 4 #define JH7110_SYSRST_CORE0 5 @@ -29,10 +29,10 @@ #define JH7110_SYSRST_TRACE2 17 #define JH7110_SYSRST_TRACE3 18 #define JH7110_SYSRST_TRACE4 19 -#define JH7110_SYSRST_TRACE_COM 20 +#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_APB 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 @@ -43,17 +43,17 @@ #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_AXI_CFG1_AHB 33 +#define JH7110_SYSRST_AXI_CFG1_MAIN 34 +#define JH7110_SYSRST_AXI_CFG0_MAIN 35 +#define JH7110_SYSRST_AXI_CFG0_MAIN_DIV 36 +#define JH7110_SYSRST_AXI_CFG0_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_ISP_TOP 41 +#define JH7110_SYSRST_ISP_TOP_AXI 42 +#define JH7110_SYSRST_VOUT_TOP_SRC 43 #define JH7110_SYSRST_CODAJ12_AXI 44 #define JH7110_SYSRST_CODAJ12_CORE 45 #define JH7110_SYSRST_CODAJ12_APB 46 @@ -61,8 +61,8 @@ #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_VDEC_JPG 51 +#define JH7110_SYSRST_VDEC_MAIN 52 #define JH7110_SYSRST_AXIMEM0_AXI 53 #define JH7110_SYSRST_WAVE420L_AXI 54 #define JH7110_SYSRST_WAVE420L_BPU 55 @@ -75,11 +75,11 @@ #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_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_APB 68 #define JH7110_SYSRST_SPI0_APB 69 #define JH7110_SYSRST_SPI1_APB 70 #define JH7110_SYSRST_SPI2_APB 71 @@ -94,24 +94,24 @@ #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_APB 83 #define JH7110_SYSRST_UART0_CORE 84 -#define JH7110_SYSRST_UART1_APB 85 +#define JH7110_SYSRST_UART1_APB 85 #define JH7110_SYSRST_UART1_CORE 86 -#define JH7110_SYSRST_UART2_APB 87 +#define JH7110_SYSRST_UART2_APB 87 #define JH7110_SYSRST_UART2_CORE 88 -#define JH7110_SYSRST_UART3_APB 89 +#define JH7110_SYSRST_UART3_APB 89 #define JH7110_SYSRST_UART3_CORE 90 -#define JH7110_SYSRST_UART4_APB 91 +#define JH7110_SYSRST_UART4_APB 91 #define JH7110_SYSRST_UART4_CORE 92 -#define JH7110_SYSRST_UART5_APB 93 +#define JH7110_SYSRST_UART5_APB 93 #define JH7110_SYSRST_UART5_CORE 94 -#define JH7110_SYSRST_SPDIF_APB 95 +#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_APB 99 #define JH7110_SYSRST_I2SRX_BCLK 100 #define JH7110_SYSRST_I2STX0_APB 101 #define JH7110_SYSRST_I2STX0_BCLK 102 @@ -124,26 +124,26 @@ #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_CORE 112 #define JH7110_SYSRST_CAN0_TIMER 113 #define JH7110_SYSRST_CAN1_APB 114 -#define JH7110_SYSRST_CAN1_CORE 115 +#define JH7110_SYSRST_CAN1_CORE 115 #define JH7110_SYSRST_CAN1_TIMER 116 -#define JH7110_SYSRST_TIMER_APB 117 +#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_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_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 @@ -154,30 +154,62 @@ #define JH7110_AONRST_END 8 /* STGCRG resets */ -#define JH7110_STGRST_SYSCON_PRESETN 0 +#define JH7110_STGRST_SYSCON 0 #define JH7110_STGRST_HIFI4_CORE 1 -#define JH7110_STGRST_HIFI4_AXI 2 -#define JH7110_STGRST_SEC_TOP_HRESETN 3 +#define JH7110_STGRST_HIFI4_AXI 2 +#define JH7110_STGRST_SEC_AHB 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_DMA1P_AXI 5 +#define JH7110_STGRST_DMA1P_AHB 6 +#define JH7110_STGRST_USB0_AXI 7 +#define JH7110_STGRST_USB0_APB 8 +#define JH7110_STGRST_USB0_UTMI_APB 9 +#define JH7110_STGRST_USB0_PWRUP 10 +#define JH7110_STGRST_PCIE0_AXI_MST0 11 +#define JH7110_STGRST_PCIE0_AXI_SLV0 12 +#define JH7110_STGRST_PCIE0_AXI_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_PCIE0_APB 16 +#define JH7110_STGRST_PCIE1_AXI_MST0 17 +#define JH7110_STGRST_PCIE1_AXI_SLV0 18 +#define JH7110_STGRST_PCIE1_AXI_SLV 19 +#define JH7110_STGRST_PCIE1_BRG 20 #define JH7110_STGRST_PCIE1_CORE 21 -#define JH7110_STGRST_PCIE1_APB 22 +#define JH7110_STGRST_PCIE1_APB 22 #define JH7110_STGRST_END 23 -#endif /* __DT_BINDINGS_RESET_STARFIVE_JH7110_H__ */ +/* ISPCRG resets */ +#define JH7110_ISPRST_ISPV2_TOP_WRAPPER_P 0 +#define JH7110_ISPRST_ISPV2_TOP_WRAPPER_C 1 +#define JH7110_ISPRST_M31DPHY_HW 2 +#define JH7110_ISPRST_M31DPHY_B09_AON 3 +#define JH7110_ISPRST_VIN_APB 4 +#define JH7110_ISPRST_VIN_PIXEL_IF0 5 +#define JH7110_ISPRST_VIN_PIXEL_IF1 6 +#define JH7110_ISPRST_VIN_PIXEL_IF2 7 +#define JH7110_ISPRST_VIN_PIXEL_IF3 8 +#define JH7110_ISPRST_VIN_SYS 9 +#define JH7110_ISPRST_VIN_P_AXI_RD 10 +#define JH7110_ISPRST_VIN_P_AXI_WR 11 + +#define JH7110_ISPRST_END 12 + +/* VOUTCRG resets */ +#define JH7110_VOUTRST_DC8200_AXI 0 +#define JH7110_VOUTRST_DC8200_AHB 1 +#define JH7110_VOUTRST_DC8200_CORE 2 +#define JH7110_VOUTRST_DSITX_DPI 3 +#define JH7110_VOUTRST_DSITX_APB 4 +#define JH7110_VOUTRST_DSITX_RXESC 5 +#define JH7110_VOUTRST_DSITX_SYS 6 +#define JH7110_VOUTRST_DSITX_TXBYTEHS 7 +#define JH7110_VOUTRST_DSITX_TXESC 8 +#define JH7110_VOUTRST_HDMI_TX_HDMI 9 +#define JH7110_VOUTRST_MIPITX_DPHY_SYS 10 +#define JH7110_VOUTRST_MIPITX_DPHY_TXBYTEHS 11 + +#define JH7110_VOUTRST_END 12 + +#endif /* __DT_BINDINGS_RESET_STARFIVE_JH7110_CRG_H__ */ From patchwork Mon Jun 3 13:27:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 1942947 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 4VtFg64QGGz20Pb for ; Mon, 3 Jun 2024 23:58:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 28C658835E; Mon, 3 Jun 2024 15:57:39 +0200 (CEST) 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 A8CF888300; Mon, 3 Jun 2024 15:27:40 +0200 (CEST) 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,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from CHN02-SH0-obe.outbound.protection.partner.outlook.cn (mail-sh0chn02on20718.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4420:2::718]) (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 D0BFC87D1D for ; Mon, 3 Jun 2024 15:27:36 +0200 (CEST) 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=NzsUTsvStS78WSQGPZXu6hF15M0ZFExiaKSEt/fIMl/TFYCc8NWYhbh7hj3j7AMHUowYog+P8z4VnDxXGKaoFxBpmiyBIi6XR2nwK+kih6hgoPed/qcVfCi3NO2QarSvmVN668J6KEsA7zHuq3Yb/QVsoyk4PUW2hdo1Q/WAoiraHTycF8oDbWYlBsjg8kelNKUAviizTOGZFA1PIjv2Bsb1Xb53F9EePNG/9yDR6TDcfnQgqny2vJq02HLgpdDz1jaC0MwESKUzkaEFPiA/B4Gp29GGuWYZOJuql/WSB8aBf4SOR2uwuAZYxu5IiiIzdS6kzXIJoqf0LeqPkTJHwg== 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=2Jwnjk23e/2FmjrkMQpwMdeRjy7gGKAG05AoPlki6Gw=; b=FfrhinrE9bHcuNKyypQ0fBhQjyUl//saRpSbl7ecbTEB2OsfFAYj7s5AJhi2EtzacYUj7qRfAfrUOCfItqIL8tnt5BUsZ5QwKnIo3qPgHr6AcGAoKlt/mur2ZcDOBZBkCkzjPv9pnaxyYkz/7J9PajbxYbfwOrWa7h2LOsUcrIe4OPIhFm/OVzDKRoNCL1V5DqtyQxe/cokQxT6xxR+MpJl0Z1NuzVUojHjw/k1483Ha9QeQHJg1yo7+WvTdlgTs8M9OMR8/3gXeqhU9147BcsqgHfQaM/SYCUPXZVaiHQ0Y5P2YvFX4IPz+SxI5qCdX7rfyq7ofFSHYn9chBKE3rA== 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 ZQ2PR01MB1242.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.43; Mon, 3 Jun 2024 13:27:32 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::61c0:a8fc:1462:bc54]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::61c0:a8fc:1462:bc54%6]) with mapi id 15.20.7587.043; Mon, 3 Jun 2024 13:27:32 +0000 From: Hal Feng To: Leo Yu-Chi Liang , Tom Rini , Lukasz Majewski , Sean Anderson , Rick Chen , Heinrich Schuchardt , Nam Cao , Bo Gan , Yanhong Wang , Emil Renner Berthing , Minda Chen , Hal Feng Cc: u-boot@lists.denx.de Subject: [PATCH v1 3/4] clk: starfive: jh7110: Sync clock definitions with Linux Date: Mon, 3 Jun 2024 21:27:20 +0800 Message-ID: <20240603132721.6522-4-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240603132721.6522-1-hal.feng@starfivetech.com> References: <20240603132721.6522-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0029.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::10) 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_|ZQ2PR01MB1242:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c5ff1d0-b536-43bd-9d7c-08dc83d0ec52 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230031|41320700004|7416005|52116005|1800799015|366007|38350700005|921011; X-Microsoft-Antispam-Message-Info: EHPejRDLADIOPNuqGkPvuzREyTJXBYySmQpORrGHwm3OS7RblP5THfcpVZdAE9jCUFAFhk3C092Ud/+DnS3zXDohaEop0wFoxDN2iUUhFcDdfrpK7HxMR6rxrKsYd524rrvrZ9OcR7f/DUBO+XdyuY31vcrt60TtPai+RzLl0DX5LMxYr0jdD+bBS77cbkLm9PbCMD4Nav/04K4lM+2DPdfmud+8+CH8dQNLpzO1Lyy/xkaZq/xTfhnlcdwZg/WK/pBAO2nnY6SnonZkyErBN5uxqDqS0asfJPoCK/3Sq3dW6frP1VKdO6VhuTPuHU4P1fvHslJH6XvC1EJnIMqhhz8tmYjvAe3LmdkueEhDAVcuJb3Boep3Hq2cVMAU04b9PSKGqn+kviprd0duvHHM/SEulTwTifzIEyopxgZl/J8WTIYxH955xl+MeXeDsuv9tA6XQUD4VpQfZfJFLAKt91y2gOIwZ1iKs4Rvf+B3f+AnCtIC/J1l7UVrFefgr5vl2mrnLHp3Hbt4Kx7XF6lFGMFF0ui9lCDUs804jkyIJvqIVEA7FM6zwM8TTvOWOeCOa2TszrAvRvCCCRddyV3oHzMmLGu+m3baohgXN8ngIGVSqjX0UAWNSCSo6l0e6C7nvoXLGsMZBVWpN1XnR/mfeQ== 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:(13230031)(41320700004)(7416005)(52116005)(1800799015)(366007)(38350700005)(921011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JqIenyvk8JhOB4tCXU5Q9p+/x7is0DmAUgU2d6+C7HX4bpqTWbLMZv+P7xPleQDT3WByuVyh0MOTQCKqIcIKhPAUrkpw9/jDkK/d4JuKn8YGpiFK3HtVkqfqYegK1kXMxNS7TRw5iuFds4tuJJt7Ph6NnU06hxnAs/FU9gIayZos+zeVNOeUIhcTBSuqXRtnsf5xJo1w8DauKaPsnELc5CoKRG/v/cJQnY0RP4gnhKKBKyrwmF9hCNbjJdPsomuFaTcZG9dtJYiNdWLzyK9zcjk7Rexxoz9aGoqu+Qs19DHtJ+UotLqCOX4SQwUzaofPRIwarzcOrK3qTM8o7eifeYXkcJ13w7OIOO+HqNaTIzV0qM/+uRsvrS6puUIP75Qh22QPbmY8y19a7r8fC3zfUZAOoAfWzJFFR6MZM0aD4osqTRN2ts1d9QAyNIG5jIuWwkjaBazJ4yuhTDZs1/XLRiMc00HrQ6aW2r11xmWLF2YCBH7TyinmBSu4b2TEK7mpnNoaVm6Bd2NPbSmDbb9ENorgbjGN3oBTe5dLl/laqdXpcCegXXzSgjMU9XTmVqN3ESmbG6qrDE0WkgbHqiqFVz/iXdAd5/+weswTPIvDpRJ6MNCUq5DC3elxSlciJBSg9HngVHSu+5OEVyybvJOsVDAoaMGMquo7zm9XnKGfiW5fetitU7L40gn1F+CY6R+nXYZnmb2Pyicj3x8t0GgwZNGtH3QNyjHt38MGNJL5KW4uQhllEoSB12OCkB1ZHqcBn1rQLKyN6eAfdyvypkIlImS08x7rXetNYmTbUItcpXubBW+uvAkTafKRR4ehk6tCTmR1ZnCLk7DVu+vtXFNN0RgnVMKMDahXX5pUdOex3T+WXuBFGdDD0ugWNTWjw7gxojWLMMBqwRDUxoLXAi6YfcWguAvjcdOyLg/kY+9ei7yG+u/bGgAKbKDazI+KK0Cs6UlBGPxe3D6gRSf7Ezb0VrJJF9r2pfPjBlj5svyT49dKjJO5Pur1UkIXE8Gbx2s/UCz0Fx+RPpmZkrGUTpKmx9nWz0f5dxiHxW7ZP1JdLaSVgSy9P51Y1ZfSSZ0UbAlAQ5R0JJ/gV2yOIe2NDk6VQs9CNpofy/J1DhQ5njDia927MNxlkk0fHmhxtiq+wy0+WuLVm+57SMtWNbf2zlIQL5bubBHNf2TZ0zUTzeM0WTJom9viNOTABtrRjbncDYHY9nAJQgiOijBIKTYNta2xkPz46DKnXc0goNI5T+Cg7nNc8N3WA/Vfzlvm+raaEkXQtLEyQHGK0nyTZlf2WEZjz9Qz5fNZTxa8AuMfZgNSyji4eUHzZwiibkkbCUw0o32Wxy/tdxfB3U4Km6EFfpsGcTlvABXC/A6emZU4CvuqsSmzP0fqy3xBnATUKFpg34etP7EDT9wHGqGi1nOyBhZj9LNF2MCgnuz5WtD6l/1184AobHiz4KrhoDVowJoj5dOO687veeBOHtcuZb/F3qnUuNmG3DP0+EH1N80GFGNl1qJGXnVx9dgWcUh8nQWg5vX66XyVMiOtRzSERX1NS2wE25KueiKpS64jybvJcoQ5rXiDRJFYvmZeABHhuZe4l9BfHjC1nSp0o9d7ZFv4gDp/qQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c5ff1d0-b536-43bd-9d7c-08dc83d0ec52 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 13:27:32.2047 (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: HmXfbzi6X4UHhu40MZSa/EEANF1p4brFYkw+//BqZKMJWt+VCo2ZTpbHMo86JR/0YrDQiF5TKI5LdjdB9t129KlyN74v8RQnm0oHeGGBtU0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1242 X-Mailman-Approved-At: Mon, 03 Jun 2024 15:57:36 +0200 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 JH7110 clock dt-bindings is synchronized with Linux, 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 1568a1f4cd..96beacb4fa 100644 --- a/drivers/clk/starfive/clk-jh7110-pll.c +++ b/drivers/clk/starfive/clk-jh7110-pll.c @@ -375,13 +375,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 a38694809a..523342128e 100644 --- a/drivers/clk/starfive/clk-jh7110.c +++ b/drivers/clk/starfive/clk-jh7110.c @@ -496,37 +496,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", @@ -535,10 +535,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", @@ -549,14 +549,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 Jun 3 13:27:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Feng X-Patchwork-Id: 1942948 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VtFgJ5DgBz20Pb for ; Mon, 3 Jun 2024 23:58:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 87C2F88369; Mon, 3 Jun 2024 15:57:39 +0200 (CEST) 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 383F787D07; Mon, 3 Jun 2024 15:27:41 +0200 (CEST) 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,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from CHN02-SH0-obe.outbound.protection.partner.outlook.cn (mail-sh0chn02on20718.outbound.protection.partner.outlook.cn [IPv6:2406:e500:4420:2::718]) (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 B4D0E8833D for ; Mon, 3 Jun 2024 15:27:37 +0200 (CEST) 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=HOUwvW+RqBcDlwqSxoHMI7RNdp8sJ1w0jbgIjBCaoRpEKHXyIouX0y8tJDo+I+WcIuNb+Zrdgj+kWhXC860tj05sMU6HS8u8hNx/JlAO4u7BzY9BaEopAlQv73HD707bv+usxVIEU5EiBo3ecwCZtzPQIk6Z9fVRfl0vwkUIFUaAD4qR5mWpFunrQkGCfNPz2B++hL0PfTXzXLZKVGgD6UKH59F4kxpgGBoWJe8jYqBlBG/2jtHdroN1Ug++TQOEIBkgZI7sMEepp2ovz29VOyZyeUI6nJ5dQMZ9t6pZDLGiGYwlPm0rq7kiXzyApXZGTisWbgzDYSO43hw+9SJHjA== 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=cho+lANaeE9chqwQsrWkLg3ndTHO+1+Q1HZWAMI6Qtg=; b=TsZP7keIH8nLneT2X4uzHgTpIAbYvzz5iRT/lUQsZLogzKdU8Vz+xL0i5hD+I9qvgv7Knlp1g653eW1pdXAC2wS05ih+u9+LLrw3pbi3YAFoatkwvr1qL7FRbvsFWjiN4C5WsOBdZVXOYaVvv8FFeFwsRdPCytibUFc3XFobPZZDhkj9uCrWBKJ6aZKCz0QV+9/dVq+P4rccJF37pGaTb2lXYcJQIt8yb9EAem9O1BbZzwGjdjX6n8T8hp0FispHgczltLDf3Dq3YUnPntt+mlXNArK8iYyBx+X143AhapS8xJgTYJkHzKhz/FJ8ug1LiRthEcjjnpvFsXQYMAqE8A== 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 ZQ2PR01MB1242.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:11::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.43; Mon, 3 Jun 2024 13:27:33 +0000 Received: from ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::61c0:a8fc:1462:bc54]) by ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn ([fe80::61c0:a8fc:1462:bc54%6]) with mapi id 15.20.7587.043; Mon, 3 Jun 2024 13:27:33 +0000 From: Hal Feng To: Leo Yu-Chi Liang , Tom Rini , Lukasz Majewski , Sean Anderson , Rick Chen , Heinrich Schuchardt , Nam Cao , Bo Gan , Yanhong Wang , Emil Renner Berthing , Minda Chen , Hal Feng Cc: u-boot@lists.denx.de Subject: [PATCH v1 4/4] riscv: dts: jh7110: Sync clock and reset definitions with Linux Date: Mon, 3 Jun 2024 21:27:21 +0800 Message-ID: <20240603132721.6522-5-hal.feng@starfivetech.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240603132721.6522-1-hal.feng@starfivetech.com> References: <20240603132721.6522-1-hal.feng@starfivetech.com> X-ClientProxiedBy: ZQ0PR01CA0029.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:2::10) 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_|ZQ2PR01MB1242:EE_ X-MS-Office365-Filtering-Correlation-Id: 325f8530-c797-4645-b5eb-08dc83d0ed00 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; ARA:13230031|41320700004|7416005|52116005|1800799015|366007|38350700005|921011; X-Microsoft-Antispam-Message-Info: LlC5sF4DxtoyX0z58x2dFkzD324Vsm1TlTqb/6zkKBIZz60QV4XSnf00bff1Y5n85rYejQETYizf3coCxXm6u2/P+6NhM5mvPFAfhpB84mdBDSRiXKMf0QCZzVx4OWcjsvz5CcXo28WLEeA+9u7fzCIlhfKK6NQzCJrS1uUBwh7hbNHjHHKz7xO5/pYrgRqn4hwC/UKrFPYv3LEkucIN/VdZHj+MAYjxVGz6SpzmgrvuB813oZCPH9IoUw6859nn+sn7A20I4B8eYthpMaRkeJrhu3yjRczHJXTjEt87GiSEdve4hPE8hTaaXr0REx4jwl7DnVBb8EnIUUnMBmPGdWYYlll0/vDBf3YyqgL+qlXSTBZZOfePUMdrGLkmv6DbH5VeC/CB6l/slcX2B4I0n0TbWcQnw8krWQYwFD1ONanjZ2xKJBPUXe7gjcA97xYnlWgO7gPXKzjSF7ip4D2fYluunQsXq/x0g1X8hwG+qq+6z3SibMOUbmh/pGc8dbXKazyd7UY2IDDgClDg3FoRoBmzlS7nB7IWoyDZwNSG9HCmif4jakU95WMgQxmMy3ylXtJCFaLzbgQbnHE4qhDR5UWpBkZIMuE5cFM06+1+1Z+A/ey6kW2JJUuseLZWsoslrTrbHNU2j8Xc9hSReWgzBw== 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:(13230031)(41320700004)(7416005)(52116005)(1800799015)(366007)(38350700005)(921011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fdy/MbZBhCpe2FVekEgohHJYW7ZRsq6EfdWz5peDVa6XJWXl2jnGciM1ViebPG+7mXKPsaVqumhZue3/4y7SRQWqQ2cRcWNZF6eTP3VxexSHeoaRDc7W4ra5ZoBR/1TD022B6R5oBTJ3bdlCkEaRkpOWg9dxrxZk1RaJjWpLfMeydn2HTLmceWmsnHpHuJ991rQ298yrX7oRkRGanQMo4S19aAXHKIeFW7tJGhES41BucQBNIk/1fEpahWexDz6jfiFePN4WgdP/xRlD3Fyq9Okz6U9Q2Ib5HsiT1+FoOCTABNSj6qIjE8OLHNyzff0CGSdkSelAIbVK7HVT2EVFEbKEtU3Wyrel2kjes1H5D0G9+iMIBz4aeNqxe+geoY4U5sGnWYAyRpJxTr0+XfEf3d2RV94Xjxqn3lUemwVp/ZJTVM5/fwpunAmTupTCyAim+MOigcEodoF23zx2jv0U5LI6sm83hfL4rIIpnvti/+C90TAU3ZGx1h1/UVh+pQLAi74+v/z85aZd85NDIf3rT4XXdZaFSzluPrFiOV6JlKQX+1iSqGwi+UOE+IibtNzIv+mC52dsiSajF6Yayc+YikTeMxRCb4dH//bsI6JIAoc/nnwhtihEwx+5TB/D9njEkCGswNJ0/pJEer3GHezSsin+NJ8yPSgY2qJJGiUX9AOn1G7bGAXr+o4hskoUvNEVX0gl1UzBlpg1pSEUYcH2C7/ecRsANSRWJW7boM14tHuSAqSGVykhnZ3VGCBufSizomC+Wq+BRUhwIvS+jLHRgb25lhXmEVBzU0mZYPN59Ot64XQbmPp7Mbm/U3j6nWrKcAbJ1gBb27viJgFj9/HudHBuwWAnHJf45PFyFKxllYW9GlYDGwj0yMQGsn/gNSJmRTIaDeMhx9cHtl9NdJAENlRp2owHrAxeXp1oz76Y4zc1esBko/K3ekGPmLYLHbcO0Fidxxbl1jrxf92RRJU04R2qaXZynW+H3IIfggvTnQV0ktQXRcfYoKVwjyHODaym+UTvTFkRUBAn2/8DFf5oxvLUw78x8vZ82Q1i4RqjbKquM8epeKZRGMfEMJVHX9D0dkwx+lnGqMktIb+cnVKaqdu5irPH2x5osFozrvWq+KU1lkBt2GSvGImjtgpNu6ck7dtBrxruRYokS50LIZ0J4hEWOGlvutFzRPWhbOzoHaFwLWLMnvzNh8seKKQVkJ3JzWcquo1My1UOW1BTrkpMPuuJ9qHH264WS0zxbjJpEs9ChsAlPqCrPmJ3gXp8hvMgLg1QxVchTfNJGdP7h42aBsy1QVA8lKRyutzWs1mjzPq14VgTu9xCWxHFReR/NNns1k/5JTb2F5nV43A4Caq535e86karQ1yyTPmucw8NTWDdqJRkQFNfV1NuFCMT2x0croZTMyCIF4c4MbgnslUku27p0dqttyWBOvLCw7JKUibm/V7MHbhCygZhgU5EG1BUKZCFZFwdtoS4O1wmrdFHXOAkmPu0qawVsXbsmofonWQnE7QyUXPvrJOoaYGWlI2uXACFiFvJYsQ586m5yR/S54BGMt16fa4XUr7EzMSr1ZhcrH49O1uT3Nh6MN9nLLlxQrGlm0YPdvWbWM0w+F7w3w== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 325f8530-c797-4645-b5eb-08dc83d0ed00 X-MS-Exchange-CrossTenant-AuthSource: ZQ2PR01MB1307.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 13:27:33.3409 (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: QDVRNWjcBzFhHr9wCOIkvlRX1REUJ4G+VPzFX/Ow3MX9VU/Iz+YrSneM/YD3E1V/oqHf6QPL2t2ssI4mz3YIxN8oHXy8vyQl7HZa7Yvf+/U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ2PR01MB1242 X-Mailman-Approved-At: Mon, 03 Jun 2024 15:57:36 +0200 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 JH7110 clock and reset dt-bindings are synchronized with Linux, so update the clock and reset definitions in device tree accordingly. Signed-off-by: Hal Feng --- .../dts/jh7110-starfive-visionfive-2.dtsi | 6 ++-- arch/riscv/dts/jh7110-u-boot.dtsi | 2 +- arch/riscv/dts/jh7110.dtsi | 28 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi index e11babc1cd..2666fd4696 100644 --- a/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi @@ -334,9 +334,9 @@ <&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>, + 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>; }; diff --git a/arch/riscv/dts/jh7110-u-boot.dtsi b/arch/riscv/dts/jh7110-u-boot.dtsi index c09d5c9170..56530cf4c2 100644 --- a/arch/riscv/dts/jh7110-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-u-boot.dtsi @@ -62,7 +62,7 @@ <&syscrg JH7110_SYSRST_DDR_OSC>, <&syscrg JH7110_SYSRST_DDR_APB>; reset-names = "axi", "osc", "apb"; - clocks = <&syscrg JH7110_SYSCLK_PLL1_OUT>; + clocks = <&syscrg JH7110_PLLCLK_PLL1_OUT>; clock-names = "pll1_out"; clock-frequency = <2133>; }; diff --git a/arch/riscv/dts/jh7110.dtsi b/arch/riscv/dts/jh7110.dtsi index 2cdc683d49..dbce57c421 100644 --- a/arch/riscv/dts/jh7110.dtsi +++ b/arch/riscv/dts/jh7110.dtsi @@ -503,9 +503,9 @@ <&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>; + <&pllclk JH7110_PLLCLK_PLL0_OUT>, + <&pllclk JH7110_PLLCLK_PLL1_OUT>, + <&pllclk JH7110_PLLCLK_PLL2_OUT>; clock-names = "osc", "gmac1_rmii_refin", "gmac1_rgmii_rxin", "i2stx_bclk_ext", "i2stx_lrck_ext", @@ -646,10 +646,10 @@ rng: rng@1600c000 { compatible = "starfive,jh7110-trng"; reg = <0x0 0x1600C000 0x0 0x4000>; - clocks = <&stgcrg JH7110_STGCLK_SEC_HCLK>, - <&stgcrg JH7110_STGCLK_SEC_MISCAHB>; + clocks = <&stgcrg JH7110_STGCLK_SEC_AHB>, + <&stgcrg JH7110_STGCLK_SEC_MISC_AHB>; clock-names = "hclk", "ahb"; - resets = <&stgcrg JH7110_STGRST_SEC_TOP_HRESETN>; + resets = <&stgcrg JH7110_STGRST_SEC_AHB>; interrupts = <30>; }; @@ -707,12 +707,12 @@ 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_AXI_MST0>, <&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>, + resets = <&stgcrg JH7110_STGRST_PCIE0_AXI_MST0>, + <&stgcrg JH7110_STGRST_PCIE0_AXI_SLV0>, + <&stgcrg JH7110_STGRST_PCIE0_AXI_SLV>, <&stgcrg JH7110_STGRST_PCIE0_BRG>, <&stgcrg JH7110_STGRST_PCIE0_CORE>, <&stgcrg JH7110_STGRST_PCIE0_APB>; @@ -744,12 +744,12 @@ 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_AXI_MST0>, <&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>, + resets = <&stgcrg JH7110_STGRST_PCIE1_AXI_MST0>, + <&stgcrg JH7110_STGRST_PCIE1_AXI_SLV0>, + <&stgcrg JH7110_STGRST_PCIE1_AXI_SLV>, <&stgcrg JH7110_STGRST_PCIE1_BRG>, <&stgcrg JH7110_STGRST_PCIE1_CORE>, <&stgcrg JH7110_STGRST_PCIE1_APB>;