From patchwork Fri Nov 17 05:07:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inochi Amaoto X-Patchwork-Id: 13458362 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B848C072A2 for ; Fri, 17 Nov 2023 05:07:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VEZsZpgm88F9Iln7e314Oz3QCe5pNosbB30ulWhvxrc=; b=Hy1AV2zODvL93U fYHScmYN61XNn1tRJhuGfQc5K4HoIRvWcgCbkuoEn5ab7fjtUK+JLOzwrpv3XczN9f3YXSdFxGv75 010ZjeczfsDsFb3U3v4UteigEq6INWrgZCj36WMFWyRhH2w6a/KMrK08XhBiuU4zTF8VLBTlGJE23 T/Jf6AOOvtk+dF7FiihJLMN95dkvSbpqJUzWTUrm5ZT01B1sRMuz4r/apZRDEbOSA/hAu7X47ob0s 0KXGBcCVn/ul3x0ViGZrYjFG3X1HIQ4FScpkRFWezmGVXrf4DxFwCPCGW8kpJOCtWpBFtNvXJdvW8 OvX98BRnrlqQDWj2mD9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r3r4g-005eF5-1W; Fri, 17 Nov 2023 05:07:26 +0000 Received: from mail-co1nam11olkn20824.outbound.protection.outlook.com ([2a01:111:f400:7eab::824] helo=NAM11-CO1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r3r4c-005eE3-2o for linux-riscv@lists.infradead.org; Fri, 17 Nov 2023 05:07:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K9GKGDl+zY8GjgsYUNfhmQUfXhjgIIrUMdHVb1OBhddtU5KiAYm6hpHqf8CCSC49oU7aQp7Y68KUsohIOFclI4if5Xg4KNdXD5MfWaKcKVzz3AMQ4f2E7gjac6IYqB1RE3M3X52PZucaftWBjHxJoqOM87s5V5j1+N4lFHW9k1ncpmBK7eloAOlAVzHZgQAvuC0k2C4xwRZ/D0b6mU4Wb7mKDfHdEiqiZlVilI9UQNj7Qz5ROcxhTr0eNaU/m2p34iNU7N8n1ywhyRk0SEEulRa5VKt8h8Ofce+kO88eXG9USV3Z9lC7fnKAaYvgs1fq+fMVVTg2xkl+bsgRHRGa3A== 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=kBBd0hiRl1kC/4CnV0dwx/zTn7/DG0Ghrwu95ZdJb3M=; b=JuWQFmbkv0OHYFGJfzqWv1FcA/ukcFyPu4BGchMiORHsfVGchrGQ3ocWCZGcVz+ddUHwBwxZjv1eCW7eXY30U4DJUMn8kM7uNzXlytbcnGGnfOVjfPswsxkWH7eiwUEj5f/tXUHdyM4dj/HUxOX7uPZubdBLBmfa1jd7r9HXAqM3Hjc374pwuroxWSTjctujKmzVZb/ZQ0wQRk/EJznCshIPy1uJpQF67paP7Xz1+2B8kIW1Kti+behHNLuhjgVzcj/5/tNl5ZzVr2dP5xhMLOiUFSFopTqPV6pIX0N5KSJqxs6wDKeCfvrZAv2SnqMcBCzrc5KKQnw7rSgzTKNk9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kBBd0hiRl1kC/4CnV0dwx/zTn7/DG0Ghrwu95ZdJb3M=; b=PKCnmi2eK1Q7QVvCrGcvVlmkNs4CcDmfjkWdtmxG0NxdzL2CjHDHTFi40I1Fp+o7HsKdLk/kqHy2fIaH/5Vpe1E6+DueDu2jO1TkCuhtb4ZOcvODpU2yu5dCP/FRlK2aKxR4Ms2wSFlih3jLlg1y+sk91+5Sv+DXPdD6dG27AnlV3o0j5+MOx766LFLhaFLO7Fr3mmFfQhbfp/MAvsqf65XyNyh3HVeGHzTy6DtqQ4fjyODspMQUHMUrm8VL6c/Exsc8j1NyXycfRHfyyDcx6ZeLj6/OBsSomXsFCB9Cz9LSqK4Cu5dh++mPWHeKdxnav4An+KwDm4iJLd2rhjl/IA== Received: from IA1PR20MB4953.namprd20.prod.outlook.com (2603:10b6:208:3af::19) by PH8PR20MB6394.namprd20.prod.outlook.com (2603:10b6:510:25e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.23; Fri, 17 Nov 2023 05:07:15 +0000 Received: from IA1PR20MB4953.namprd20.prod.outlook.com ([fe80::55b:c350:980:ad8]) by IA1PR20MB4953.namprd20.prod.outlook.com ([fe80::55b:c350:980:ad8%6]) with mapi id 15.20.6977.029; Fri, 17 Nov 2023 05:07:15 +0000 From: Inochi Amaoto To: Chao Wei , Chen Wang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou , Guo Ren , Xiaoguang Xing , Inochi Amaoto Cc: Jisheng Zhang , devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/2] riscv: dts: sophgo: separate sg2042 mtime and mtimecmp to fit aclint format Date: Fri, 17 Nov 2023 13:07:52 +0800 Message-ID: X-Mailer: git-send-email 2.42.1 In-Reply-To: References: X-TMN: [mkQOPn6RrDr/EOxQVts4RJAiUvtU04Jxjg5wcZU7Oxk=] X-ClientProxiedBy: SJ0PR13CA0049.namprd13.prod.outlook.com (2603:10b6:a03:2c2::24) To IA1PR20MB4953.namprd20.prod.outlook.com (2603:10b6:208:3af::19) X-Microsoft-Original-Message-ID: <20231117050753.870596-2-inochiama@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA1PR20MB4953:EE_|PH8PR20MB6394:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e2b5128-b0d9-46af-c819-08dbe72b10df X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F1WDU9CPleeGB7ELLtyKs2wNjKertzMkrvqRwMpDfI+KG9RjjTQQyLk6+hw3M6ci2wMnD4AmnZeRKnXbRPxiRY9Ej4qwEu35qWX6E2GU3wyzYGVj/SvhmpR941NYqVnFZb3RULP7Glm+6dmkf7ibiNpm0gxm0dSUm3JJ5zrsGuSaEOHgu7FnP2nglx7n9cASyXuRIdkP3yYceBrbHR9HZcgb5LczMEgN9AjomuATkU6dHLm6z4ikFBWaA1C0Y3tzKQ2p22XQ9lriwAfKo6PS8F4Y3hHJaWD5Z7dZO7/fXBETr/TCa5usbgUXzy0tF8tV3DKyDjiAdA4wtvtXePXJ57jNhulQXui41/YBqCLfYpnpJSz9mTr8EdzW1GZViYjCfM2tA0BC64nHN20tb+qKiJ5okgCVUgy8IrVlGtFx+p33NNyOZ1ji1S6VE8B8icQz+eBOku8QGWF4KLnz6m1n8wJA3INcp/11XXTsRZHylRadBdosHZOAyzQGPtuqqCFjc3S5dG3BpaoO3UYcZpmchtOKcsN/0JrnkeZbnfL2yzzK+JGoSUFkXVJ2lRvZb9pf0i3GMgJ1zYuMsF2gvDfLkVSCBD1UPSK8qi+Wb9YaVgah3Bmcsrr939Zvi8/ii52O X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g5K3mnjhMnxAPQ5EznO6zGhbqW+PQjNCM/5VDZsnanwqdD+57TmwyKw1VGeOr1rfKT05j4jDEM8jXsxIv4fcmWjXwc+W8JfluGL3UuaqzV1JsqQRRi6r3LCwR3EzZ/O+HpuVioZAdA5veAIBJqUg58atVw0SYAxxs0ydy48Cm7CaCfFlzUzwMO5+KGHnywDmR2eqY8IMovb6FmJc8wCTgLqAtYFQR3ahoW4MbdSZmvxcBjVLRE5BUmFNiSmMym89QSM/EFl/FiaI9AgQmkzdEbhvXFgvt2m5FspyioBf0xXrWOejSsVubyCoW9EeveTRmyf47BIp90YN/p4RTQlp2YaEQFhhMEUHtapzaZQruQ9ulKmt3g37VtpZajQXq/JAPAnglLcHauPbccLzuo9hZbYOOaYqA+OZYCDrFMtDT5w8DGVw6/n8WIxN02lejHZovScdNI60G1cfNADVIDV0khLgQl/Mq0uPQZu1f+XItbniXP8YB03pkNBPq+9EIpKUbEEEKS/K7bzxBLcK81XiNYyCXNjdD/sYcZJE+N50yWlB9WGJxxSjRNYFafAe9EohnQLdAMjNeoomqIcA/79xGcSH++K3oI4mKrGMra2M0uXwYTNmkoOjk2K3WwnmayVh1WjM/bGShEKhJcNDr1IbLsSTqzr/IIjSDAmzXmk8CmHsCuG7/Geaon4NBXYrcL5JpF2K2tuQB10aD0VzWUOfN/oQvA1914LIRnPV3dYJNTNXIjSmBxTKg9pb7DstDJ9GLPaQlIdco73x2GBe2IWUI77TRDpo3Ccceg+EfBS338g7MmVYK5IigBQIYWFxt86cYYiI424OFmiae6YlrSBgho5j2MFUuyvQSHDITPM+RyMd0uCVSD7JCUWz1Bj+qCANvmdAAe97Yq72/17+fP+vZJTgbsSZCFfIt7UpTXvJntiehMI72oKEI6fNZzajwK3hkTV9eTKB/xlJMVi4IGk7XPop6QK/9ScPwdOvIFmkvxDOH8rrdXMS+2dTA1MBKj907VOqhK44tgv6l/J2E5zNHHQfHjxdR1PR/xM/tfhoD8+eKTzAfWwLw7NDRPL9oLjPwJhhMKNsyfEXuoHhWbqHd6BGvkuHJ2E1mwsjI2R9B/78IA85SsaqbyQ40f8KZ7ISZF8J9B7M3u4p1WAnUA9LXTl7fOytd4HfVEczTcswJMcLr4n1Ge69AdOBFknFl0Pm7sUe5Jm6M7Oeg+YbGCjvptb/hZr6RelDnBj7GQTJgFw= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e2b5128-b0d9-46af-c819-08dbe72b10df X-MS-Exchange-CrossTenant-AuthSource: IA1PR20MB4953.namprd20.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2023 05:07:15.8311 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR20MB6394 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231116_210722_913209_EB7BDB04 X-CRM114-Status: UNSURE ( 7.02 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Change the timer layout in the dtb to fit the format that needed by the SBI. Signed-off-by: Inochi Amaoto Fixes: 967a94a92aaa ("riscv: dts: add initial Sophgo SG2042 SoC device tree") --- arch/riscv/boot/dts/sophgo/sg2042.dtsi | 80 +++++++++++++++----------- 1 file changed, 48 insertions(+), 32 deletions(-) -- 2.42.1 diff --git a/arch/riscv/boot/dts/sophgo/sg2042.dtsi b/arch/riscv/boot/dts/sophgo/sg2042.dtsi index 93256540d078..ead1cc35d88b 100644 --- a/arch/riscv/boot/dts/sophgo/sg2042.dtsi +++ b/arch/riscv/boot/dts/sophgo/sg2042.dtsi @@ -93,144 +93,160 @@ clint_mswi: interrupt-controller@7094000000 { <&cpu63_intc 3>; }; - clint_mtimer0: timer@70ac000000 { + clint_mtimer0: timer@70ac004000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac000000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac004000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu0_intc 7>, <&cpu1_intc 7>, <&cpu2_intc 7>, <&cpu3_intc 7>; }; - clint_mtimer1: timer@70ac010000 { + clint_mtimer1: timer@70ac014000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac010000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac014000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu4_intc 7>, <&cpu5_intc 7>, <&cpu6_intc 7>, <&cpu7_intc 7>; }; - clint_mtimer2: timer@70ac020000 { + clint_mtimer2: timer@70ac024000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac020000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac024000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu8_intc 7>, <&cpu9_intc 7>, <&cpu10_intc 7>, <&cpu11_intc 7>; }; - clint_mtimer3: timer@70ac030000 { + clint_mtimer3: timer@70ac034000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac030000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac034000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu12_intc 7>, <&cpu13_intc 7>, <&cpu14_intc 7>, <&cpu15_intc 7>; }; - clint_mtimer4: timer@70ac040000 { + clint_mtimer4: timer@70ac044000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac040000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac044000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu16_intc 7>, <&cpu17_intc 7>, <&cpu18_intc 7>, <&cpu19_intc 7>; }; - clint_mtimer5: timer@70ac050000 { + clint_mtimer5: timer@70ac054000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac050000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac054000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu20_intc 7>, <&cpu21_intc 7>, <&cpu22_intc 7>, <&cpu23_intc 7>; }; - clint_mtimer6: timer@70ac060000 { + clint_mtimer6: timer@70ac064000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac060000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac064000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu24_intc 7>, <&cpu25_intc 7>, <&cpu26_intc 7>, <&cpu27_intc 7>; }; - clint_mtimer7: timer@70ac070000 { + clint_mtimer7: timer@70ac074000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac070000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac074000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu28_intc 7>, <&cpu29_intc 7>, <&cpu30_intc 7>, <&cpu31_intc 7>; }; - clint_mtimer8: timer@70ac080000 { + clint_mtimer8: timer@70ac084000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac080000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac084000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu32_intc 7>, <&cpu33_intc 7>, <&cpu34_intc 7>, <&cpu35_intc 7>; }; - clint_mtimer9: timer@70ac090000 { + clint_mtimer9: timer@70ac094000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac090000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac094000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu36_intc 7>, <&cpu37_intc 7>, <&cpu38_intc 7>, <&cpu39_intc 7>; }; - clint_mtimer10: timer@70ac0a0000 { + clint_mtimer10: timer@70ac0a4000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac0a0000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac0a4000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu40_intc 7>, <&cpu41_intc 7>, <&cpu42_intc 7>, <&cpu43_intc 7>; }; - clint_mtimer11: timer@70ac0b0000 { + clint_mtimer11: timer@70ac0b4000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac0b0000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac0b4000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu44_intc 7>, <&cpu45_intc 7>, <&cpu46_intc 7>, <&cpu47_intc 7>; }; - clint_mtimer12: timer@70ac0c0000 { + clint_mtimer12: timer@70ac0c4000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac0c0000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac0c4000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu48_intc 7>, <&cpu49_intc 7>, <&cpu50_intc 7>, <&cpu51_intc 7>; }; - clint_mtimer13: timer@70ac0d0000 { + clint_mtimer13: timer@70ac0d4000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac0d0000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac0d4000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu52_intc 7>, <&cpu53_intc 7>, <&cpu54_intc 7>, <&cpu55_intc 7>; }; - clint_mtimer14: timer@70ac0e0000 { + clint_mtimer14: timer@70ac0e4000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac0e0000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac0e4000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu56_intc 7>, <&cpu57_intc 7>, <&cpu58_intc 7>, <&cpu59_intc 7>; }; - clint_mtimer15: timer@70ac0f0000 { + clint_mtimer15: timer@70ac0f4000 { compatible = "sophgo,sg2042-aclint-mtimer", "thead,c900-aclint-mtimer"; - reg = <0x00000070 0xac0f0000 0x00000000 0x00007ff8>; + reg = <0x00000070 0xac0f4000 0x00000000 0x0000c000>; + reg-names = "mtimecmp"; interrupts-extended = <&cpu60_intc 7>, <&cpu61_intc 7>, <&cpu62_intc 7>,