From nobody Mon Dec 1 22:07:23 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45CA3271443; Thu, 27 Nov 2025 07:30:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228644; cv=none; b=pufePtNFeHEFX89BP97dQN2IWaKSH5YfwzNus5RdG/JwsLSc/M37R8fcYsGicwiYjuG2y4GML5hRPq6E1Cre4mIIZaUA/H2oB/3YF6j+eJ+al/t/WQFBEHK592x14DEWW8pCPDOGJUS+m1UZNd4Cta3I1iYbbRCF/gO1NAtQ5oM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228644; c=relaxed/simple; bh=Vz5O60fug17WeVa5R0d9fG0WfBfnUIbjwQ8BzF1UNpg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ngwZBx/7YjQzyfML3dUUAz7BgPa9UbRYSfAZdlIi5HD6CuR1GzAXEg3Wy8ARHgpOI9/KNW6/MgLE0m/lPS1C23XVuLgbEtegXJbEUr32qIDix8fLNNi5ZTzn/JnN/eOQ4ak9b8aO9ohapbTw8vdaSdd/xuxP7dEXTxIKsFgsAdQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VHNHu8KO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VHNHu8KO" Received: by smtp.kernel.org (Postfix) with ESMTPS id DEC30C116B1; Thu, 27 Nov 2025 07:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764228644; bh=Vz5O60fug17WeVa5R0d9fG0WfBfnUIbjwQ8BzF1UNpg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=VHNHu8KOH0lIy85UVPOmTYKPX54am6IReBoOKdCvkXXG8q/RAyDOb9O0oNjdK3S+o PUBYjdI3i9I0M8PUrrWg/CR/AfYijZcuPArQmWGUSF4iF/3Oxk3mMGDxubY5KOXi4F uEEaCGDnBpCskPtra6wz7pRm54DdpKKa4uB+nWGIYKwCzgNx4ruCI7SFlc2dJDTOND YWIp4tPV8TLLTd5nLY3u1RnbjmJ69cLRfQ8cFNrlge9edn6Um4AN7onkuLexb+XTw0 A0CgdsehL3OIthSiPJv331w1BduWWQdqawB7fKNbhUIlkkKD1GYS7YuYlPQtaegabt P2rd8UOpnlYJA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA544CFD2F6; Thu, 27 Nov 2025 07:30:43 +0000 (UTC) From: Xianwei Zhao via B4 Relay Date: Thu, 27 Nov 2025 15:30:31 +0800 Subject: [PATCH 1/4] dt-bindings: reset: Add compatible for Amlogic S6/S7/S7D Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251127-reset-s6-s7-s7d-v1-1-879099ad90d3@amlogic.com> References: <20251127-reset-s6-s7-s7d-v1-0-879099ad90d3@amlogic.com> In-Reply-To: <20251127-reset-s6-s7-s7d-v1-0-879099ad90d3@amlogic.com> To: Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Xianwei Zhao X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764228641; l=907; i=xianwei.zhao@amlogic.com; s=20231208; h=from:subject:message-id; bh=2OdK+NCY/4qzOMjaRXwivbbB/E5n4gnbT5hQIb0Cm7w=; b=Nni4wp2m2zGAhsKqwfP0M8WsDPvUTnG4Clu5t7Ln4JMqDxq9m52wyAoK7g+VEMXQNkb7oIpi0 YSfvz6dJag5DYsqZrNwv4j5qMKQ9UuadQghQJcJqBVPDfKHjp5KJTwu X-Developer-Key: i=xianwei.zhao@amlogic.com; a=ed25519; pk=o4fDH8ZXL6xQg5h17eNzRljf6pwZHWWjqcOSsj3dW24= X-Endpoint-Received: by B4 Relay for xianwei.zhao@amlogic.com/20231208 with auth_id=107 X-Original-From: Xianwei Zhao Reply-To: xianwei.zhao@amlogic.com From: Xianwei Zhao Add compatibles for Amlogic S6/S7/S7D reset controllers, which fall back to 'amlogic,meson-s4-reset'. Signed-off-by: Xianwei Zhao Acked-by: Conor Dooley --- Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.ya= ml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml index 150e95c0d9be..ab0239cf16e5 100644 --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml @@ -25,6 +25,9 @@ properties: - enum: - amlogic,a4-reset - amlogic,a5-reset + - amlogic,s6-reset + - amlogic,s7-reset + - amlogic,s7d-reset - const: amlogic,meson-s4-reset =20 reg: --=20 2.37.1 From nobody Mon Dec 1 22:07:23 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45D1B27F4CE; Thu, 27 Nov 2025 07:30:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228644; cv=none; b=ADDdRgZPyxaBRWgqZqK2IF/8vsOONE+VCPNNDgsKC3I+heQEOVLn/bQEn9hljY0+kr7uWUxMgggp50vN+GLAsF7+VF4Xp9AD1OPkHusc5Yg+LtSzzs8SAev/TSYHqbAZ5EPC5F2YCiVcBTe1VoV7H9Vr2ymkjdsDngDuDMIyxK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228644; c=relaxed/simple; bh=VlPK9YoqpoRr+lpStVZMNzj30vUjm3u6aa2LU2vTg9M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rvyyzFjse41WW3cBEfkT7k4Rc3Vp7y0TQy2OcNsSbxtWN5wMEyVvHe7hSfSGYXpHkaBRwW+aS9Z8pptdnXw6D2pMhQjUyxqH2JcZOjeoCazoqXVMBd3P+TONvziZroV+verUGsBM70yqN21ojlhMVGKe7EI7g5DHPWhmZPjjKrA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oECKsbmd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oECKsbmd" Received: by smtp.kernel.org (Postfix) with ESMTPS id EBA62C113D0; Thu, 27 Nov 2025 07:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764228644; bh=VlPK9YoqpoRr+lpStVZMNzj30vUjm3u6aa2LU2vTg9M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=oECKsbmd0ZHUVh3FiZ40fH4ZQ9KutJzS7JNHB6rEiEz2f6z3S1g255KNl6rwQFKn8 eDG/KDB0RBz6iW25nvgNySl4EqK2ugglFGSfKkSY+MSW4t3JoEaPkFIhvetosGwjKJ DQ8I8dzP+9Ib00MVIKfJU23kuI3kTWNOxDnaV81/KgVGflWGOqGnEYS99fm10Ejjue SoVxk2z5tHqMuFRVsrEXDTtt6ENKHJZOE7M627Kdiuj55VZA7mVB9NvqAXplWryCwF afPkOJ/yH06d360naUFwcIi42Eho7s2iXzZtx6lLR68sBeErXL1bO7l58fAqdkndEP L6/1pMjWsR27g== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E345DD116F3; Thu, 27 Nov 2025 07:30:43 +0000 (UTC) From: Xianwei Zhao via B4 Relay Date: Thu, 27 Nov 2025 15:30:32 +0800 Subject: [PATCH 2/4] arm64: dts: amlogic: Add S6 Reset Controller Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251127-reset-s6-s7-s7d-v1-2-879099ad90d3@amlogic.com> References: <20251127-reset-s6-s7-s7d-v1-0-879099ad90d3@amlogic.com> In-Reply-To: <20251127-reset-s6-s7-s7d-v1-0-879099ad90d3@amlogic.com> To: Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Xianwei Zhao X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764228641; l=6210; i=xianwei.zhao@amlogic.com; s=20231208; h=from:subject:message-id; bh=DBjDoIozgGAUkaE0mfMdnA0X88fxJQ65BViRQ8l6yOs=; b=h/lZAE+XcJ+mE3c/pYE79oIlKEtDQbfh3Bu/HJxiilUPXOPA5LnQsCOXVfyRZ5GfNNASu++es 1WVqaFz6zkMBP9P6IgOs0RSiBaEA+UmZ4TPfFWt+l5gQ604jRWZ39oU X-Developer-Key: i=xianwei.zhao@amlogic.com; a=ed25519; pk=o4fDH8ZXL6xQg5h17eNzRljf6pwZHWWjqcOSsj3dW24= X-Endpoint-Received: by B4 Relay for xianwei.zhao@amlogic.com/20231208 with auth_id=107 X-Original-From: Xianwei Zhao Reply-To: xianwei.zhao@amlogic.com From: Xianwei Zhao Add the device node and related header file for Amlogic S6 reset controller. Signed-off-by: Xianwei Zhao --- arch/arm64/boot/dts/amlogic/amlogic-s6-reset.h | 171 +++++++++++++++++++++= ++++ arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi | 8 ++ 2 files changed, 179 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s6-reset.h b/arch/arm64/bo= ot/dts/amlogic/amlogic-s6-reset.h new file mode 100644 index 000000000000..eb665b0b8fce --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/amlogic-s6-reset.h @@ -0,0 +1,171 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* + * Copyright (c) 2025 Amlogic, Inc. All rights reserved. + */ + +#ifndef _DT_BINDINGS_AMLOGIC_S6_RESET_H +#define _DT_BINDINGS_AMLOGIC_S6_RESET_H + +/* RESET0 */ +/* 0-1 */ +#define RESET_U3DRD_USB3PHY_APB 2 +#define RESET_U3DRD_USB3PHY 3 +#define RESET_U3DRD_USB2PHY 4 +#define RESET_U3DRD 5 +#define RESET_U3DRD_COMB 6 +#define RESET_U2DRD 7 +#define RESET_U2DRD_COMB 8 +#define RESET_U2DRD_USB2PHY 9 +#define RESET_USB_CC 10 +#define RESET_BC 11 +#define RESET_VC9000E_APB 12 +#define RESET_VC9000E 13 +#define RESET_VC9000E_CORE 14 +#define RESET_HDMI20_AES 15 +#define RESET_HDMITX_CAPB3 16 +#define RESET_BRQ_VCBUS_DEC 17 +#define RESET_VCBUS 18 +#define RESET_VID_PLL_DIV 19 +#define RESET_VDI6 20 +/* 21 */ +#define RESET_HDMITXPHY 22 +#define RESET_VID_LOCK 23 +#define RESET_VENCL 24 +#define RESET_VDAC 25 +#define RESET_VENCP 26 +#define RESET_VENCI 27 +#define RESET_RDMA 28 +#define RESET_HDMITX 29 +#define RESET_VIU 30 +#define RESET_VENC 31 + +/* RESET1 */ +#define RESET_AUDIO 32 +#define RESET_MAIL_CAPB3 33 +#define RESET_MAIL 34 +#define RESET_DDR_APB 35 +#define RESET_DDR 36 +#define RESET_DOS_CAPB3 37 +#define RESET_DOS 38 +#define RESET_MALI_SYS 39 +#define RESET_I_DSPA 40 +#define RESET_I_DEBUGA 41 +#define RESET_U3P2_PHY_APB 42 +#define RESET_PCIE_PIPE 43 +#define RESET_PCIE_A 44 +#define RESET_PCIE_PHY 45 +#define RESET_PCIE_APB 46 +#define RESET_AMFC_APB 47 +#define RESET_ETHERNET 48 +/* 49-50 */ +#define RESET_BRG_ETH_APB_SYNC 51 +#define RESET_VICP 52 +#define RESET_DEWARP 53 +#define RESET_GE2D 54 +#define RESET_VGE 55 +#define RESET_PCIE0 56 +#define RESET_PCIE1 57 +#define RESET_PCIE2 58 +#define RESET_PCIE3 59 +#define RESET_PCIE4 60 +#define RESET_PCIE5 61 +#define RESET_PCIE6 62 +#define RESET_PCIE7 63 + +/* RESET2 */ +#define RESET_AM2AXI 64 +#define RESET_IR_CTRL 65 +#define RESET_MIPI_DSI_PHY 66 +#define RESET_TS_PLL 67 +#define RESET_MIPI_CSI2_PHY0 68 +#define RESET_ETH_AXI 69 +/* 70-71 */ +#define RESET_SMART_CARD 72 +#define RESET_SPICC_0 73 +#define RESET_BRG_VGE_PIPEL1 74 +#define RESET_BRG_VC9000E_PIPEL1 75 +#define RESET_BRG_AMFC_PIPEL1 76 +/* 77 */ +#define RESET_NNA_APB 78 +#define RESET_NNA 79 +#define RESET_MSR_CLK 80 +/* 81 */ +#define RESET_SAR_DIG 82 +#define RESET_SAR_ANA 83 +/* 84-85 */ +#define RESET_AMFC 86 +/* 87-88 */ +#define RESET_CEC 89 +/* 90 */ +#define RESET_WATCHDOG 91 +/* 92 */ +#define RESET_MIP_DSI_HOST 93 +/* 94-95 */ + +/* RESET3 */ +/* 96 ~ 127 */ + +/* RESET4 */ +#define RESET_PWM_A 128 +#define RESET_PWM_B 129 +#define RESET_PWM_C 130 +#define RESET_PWM_D 131 +#define RESET_PWM_E 132 +#define RESET_PWM_F 133 +#define RESET_PWM_G 134 +#define RESET_PWM_H 135 +#define RESET_PWM_I 136 +#define RESET_PWM_J 137 +#define RESET_UART_A 138 +#define RESET_UART_B 139 +#define RESET_UART_C 140 +#define RESET_UART_D 141 +#define RESET_UART_E 142 +/* 143 */ +#define RESET_I2C_S_A 144 +#define RESET_I2C_M_A 145 +#define RESET_I2C_M_B 146 +#define RESET_I2C_M_C 147 +#define RESET_I2C_M_D 148 +#define RESET_I2C_M_E 149 +/* 150-151 */ +#define RESET_SDEMMC_A 152 +#define RESET_SDEMMC_B 153 +#define RESET_SDEMMC_C 154 +/* 155-159 */ + +/* RESET5 */ +#define RESET_BRG_VDEC_PIPEL 160 +#define RESET_BRG_SDIOA_PIPEL 161 +#define RESET_BRG_SDIOB_PIPEL 162 +#define RESET_BRG_EMMC_PIPEL 163 +#define RESET_BRG_GE2D_DMC_PIPEL 164 +#define RESET_BRG_DMC_VPU_PIPEL1 165 +#define RESET_BRG_A53_DMC_PIPEL1 166 +#define RESET_BRG_MAIL_DMC_PIPEL 167 +/* 168 */ +#define RESET_BRG_MAIL_DMC_PIPEL1 169 +#define RESET_BRG_U2DRD_PIPEL 170 +#define RESET_BRG_U2H_PIPEL 171 +#define RESET_BRG_HEVCF_PIPEL1 172 +#define RESET_BRG_AMBUS_ETH_PIPEL1 173 +#define RESET_BRG_SRAM_NIC_NNA 174 +#define RESET_BRG_SRAM_NIC_MAIN 175 +#define RESET_BRG_SRAM_NIC_DEV 176 +#define RESET_BRG_SRAM_NIC_CPU 177 +#define RESET_BRG_SRAM_NIC_ALL 178 +#define RESET_BRG_CPU_NIC_RAMA 179 +#define RESET_BRG_CPU_NIC_VAPB 180 +#define RESET_BRG_CPU_NIC_DSU 181 +#define RESET_BRG_CPU_NIC_CLK81 182 +#define RESET_BRG_CPU_NIC_ALL 183 +#define RESET_BRG_NIC_CAPU 184 +#define RESET_BRG_AO_NIC_EMMC 185 +#define RESET_BRG_AO_NIC_DSPA 186 +#define RESET_BRG_AO_NIC_SDIOB 187 +#define RESET_BRG_AO_NIC_SDIOA 188 +#define RESET_BRG_AO_NIC_CLK81 189 +#define RESET_BRG_AO_NIC_MAIN 190 +#define RESET_BRG_AO_NIC_ALL 191 + +#endif diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi b/arch/arm64/boot/= dts/amlogic/amlogic-s6.dtsi index 8ef631939033..386244b3a1f5 100644 --- a/arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi @@ -8,6 +8,7 @@ #include #include #include +#include "amlogic-s6-reset.h" / { cpus { #address-cells =3D <2>; @@ -104,6 +105,13 @@ uart_b: serial@7a000 { status =3D "disabled"; }; =20 + reset: reset-controller@2000 { + compatible =3D "amlogic,s6-reset", + "amlogic,meson-s4-reset"; + reg =3D <0x0 0x2000 0x0 0x98>; + #reset-cells =3D <1>; + }; + periphs_pinctrl: pinctrl@4000 { compatible =3D "amlogic,pinctrl-s6"; #address-cells =3D <2>; --=20 2.37.1 From nobody Mon Dec 1 22:07:23 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6407B29ACD7; Thu, 27 Nov 2025 07:30:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228644; cv=none; b=AGA+s4NJuXeHzEDA4Miv2KcXSEa4HK4XhXAZhjTtzXbFHyLVKErAP47XpMllFmFfIivATMAtEbR2v6yrAa9SAoe7/Kq/cZn3xaBf6y38kU+I05z8Hni/X+i16d3UNXYkJtyfbruret2vGsbo1CsvhZm85mCNKfUtfC8S7qLmfSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228644; c=relaxed/simple; bh=rnTZ3qIjWcMsJ3cYnRysq+ukPVb+rEOjEzbD5jYVBCc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=so6NMv9hFJI2KAgCHE92Hc/vtNz0gqnJlj+Hr3XVYwtJOlcMwnDYpwdd/dteyP8dHRI2yf4bS+DwEFtC+rGje7e2Yprn2cX5K+BLKjGQPVhyMu57w686tHt5lGqe5tfnluO3XSF4vTMyrdqdZFXuzEZVZ7CjPxtIign9vYJmAOM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=s2oreS8S; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s2oreS8S" Received: by smtp.kernel.org (Postfix) with ESMTPS id 117DAC4AF0D; Thu, 27 Nov 2025 07:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764228644; bh=rnTZ3qIjWcMsJ3cYnRysq+ukPVb+rEOjEzbD5jYVBCc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=s2oreS8SXOcrT3/AIqdkADfy/HyiLQ4xsn4WA3M88N7cyrnU2ozKs951Zp+cky/dC 9s6+y9SndV8EDvHzXiWf8ehnQzMsy68YENuey9GyHWmHEzLucEY+UBUDBsHnGls0YW aAawSX5HONEkTi932DXc97dPxhz8xD8QpvpoEtB4eJ3agZxQw1dMURS3rE30L4sbBQ mBmNvy3TWmX5zmt/WwbNj1vgwYSJk2u60wneerAKXE5Z8aHwn1UQHSUhVbuDsZSASh 0pVEmUCDKuZdQNxFk38uWEqXKkGXtTbd7DYM+wxPPL0W1dYA81fO2qce4VM06/OHJq iFHQfu2fyMJzA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 019C8D116F5; Thu, 27 Nov 2025 07:30:44 +0000 (UTC) From: Xianwei Zhao via B4 Relay Date: Thu, 27 Nov 2025 15:30:33 +0800 Subject: [PATCH 3/4] arm64: dts: amlogic: Add S7 Reset Controller Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251127-reset-s6-s7-s7d-v1-3-879099ad90d3@amlogic.com> References: <20251127-reset-s6-s7-s7d-v1-0-879099ad90d3@amlogic.com> In-Reply-To: <20251127-reset-s6-s7-s7d-v1-0-879099ad90d3@amlogic.com> To: Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Xianwei Zhao X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764228641; l=4612; i=xianwei.zhao@amlogic.com; s=20231208; h=from:subject:message-id; bh=TRAbnAsG5qp7o1oyDaLD3O0/zrNkGqT68+e2GGMTN/I=; b=oM8lBnMRBFLykaU8vgPCBg9LAlANyvWqIdqwI340EgFW/6f5UaA1ewHsxgF9JrO+tPgI9LHhb UnEa60O3vD6BSZ17YapfTAGXe1eOJFfltDZOj3aLV3BPlwPL6gulcf5 X-Developer-Key: i=xianwei.zhao@amlogic.com; a=ed25519; pk=o4fDH8ZXL6xQg5h17eNzRljf6pwZHWWjqcOSsj3dW24= X-Endpoint-Received: by B4 Relay for xianwei.zhao@amlogic.com/20231208 with auth_id=107 X-Original-From: Xianwei Zhao Reply-To: xianwei.zhao@amlogic.com From: Xianwei Zhao Add the device node and related header file for Amlogic S7 reset controller. Signed-off-by: Xianwei Zhao --- arch/arm64/boot/dts/amlogic/amlogic-s7-reset.h | 124 +++++++++++++++++++++= ++++ arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi | 8 ++ 2 files changed, 132 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s7-reset.h b/arch/arm64/bo= ot/dts/amlogic/amlogic-s7-reset.h new file mode 100644 index 000000000000..485c28221359 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/amlogic-s7-reset.h @@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* + * Copyright (c) 2025 Amlogic, Inc. All rights reserved. + */ + +#ifndef _DT_BINDINGS_AMLOGIC_S7_RESET_H +#define _DT_BINDINGS_AMLOGIC_S7_RESET_H + +/* RESET0 */ +#define RESET_USB_DDR0 0 +#define RESET_USB_DDR1 1 +#define RESET_USB_DDR2 2 +#define RESET_USB_DDR3 3 +#define RESET_USB1 4 +#define RESET_USB0 5 +#define RESET_USB1_COMB 6 +#define RESET_USB0_COMB 7 +#define RESET_USBPHY20 8 +#define RESET_USBPHY21 9 +/* 10-14 */ +#define RESET_HDMI20_AES 15 +#define RESET_HDMITX_CAPB3 16 +#define RESET_BRG_VCBUS_DEC 17 +#define RESET_VCBUS 18 +#define RESET_VID_PLL_DIV 19 +#define RESET_VIDEO6 20 +#define RESET_GE2D 21 +#define RESET_HDMITXPHY 22 +#define RESET_VID_LOCK 23 +#define RESET_VENCL 24 +#define RESET_VDAC 25 +#define RESET_VENCP 26 +#define RESET_VENCI 27 +#define RESET_RDMA 28 +#define RESET_HDMI_TX 29 +#define RESET_VIU 30 +#define RESET_VENC 31 + +/* RESET1 */ +#define RESET_AUDIO 32 +#define RESET_MALI_CAPB3 33 +#define RESET_MALI 34 +#define RESET_DDR_APB 35 +#define RESET_DDR 36 +#define RESET_DOS_CAPB3 37 +#define RESET_DOS 38 +/* 39-47 */ +#define RESET_ETH 48 +/* 49-63 */ + +/* RESET2 */ +#define RESET_AM2AXI 64 +#define RESET_IR_CTRL 65 +/* 66 */ +#define RESET_TEMPSENSOR_PLL 67 +/* 68-71 */ +#define RESET_SMART_CARD 72 +#define RESET_SPICC0 73 +/* 74-79 */ +#define RESET_MSR_CLK 80 +/* 81 */ +#define RESET_SARADC 82 +/* 83-87 */ +#define RESET_ACODEC 88 +#define RESET_CEC 89 +/* 90 */ +#define RESET_WATCHDOG 91 +/* 92-95 */ + +/* RESET3 */ +/* 96 ~ 127 */ + +/* RESET4 */ +/* 128-131 */ +#define RESET_PWM_A 128 +#define RESET_PWM_B 129 +#define RESET_PWM_C 130 +#define RESET_PWM_D 131 +#define RESET_PWM_E 132 +#define RESET_PWM_F 133 +#define RESET_PWM_G 134 +#define RESET_PWM_H 135 +#define RESET_PWM_I 136 +#define RESET_PWM_J 137 +#define RESET_UART_A 138 +#define RESET_UART_B 139 +/* 140-143 */ +#define RESET_I2C_S_A 144 +#define RESET_I2C_M_A 145 +#define RESET_I2C_M_B 146 +#define RESET_I2C_M_C 147 +#define RESET_I2C_M_D 148 +#define RESET_I2C_M_E 149 +/* 150-151 */ +#define RESET_SD_EMMC_A 152 +#define RESET_SD_EMMC_B 153 +#define RESET_SD_EMMC_C 154 +/* 155-159 */ + +/* RESET5 */ +#define RESET_BRG_VDEC_PIPL0 160 +#define RESET_BRG_HEVCF_PIPL0 161 +/* 162-163 */ +#define RESET_BRG_GE2D_PIPL0 164 +#define RESET_BRG_DMC_PIPL0 165 +#define RESET_BRG_A53_PIPL0 166 +#define RESET_BRG_MALI_PIPL0 167 +/* 168 */ +#define RESET_BRG_MALI_PIPL1 169 +/* 170-171 */ +#define RESET_BRG_HEVCF_PIPL1 172 +#define RESET_BRG_HEVCB_PIPL1 173 +/* 174-182 */ +#define RESET_BRG_NIC_EMMC 183 +#define RESET_BRG_NIC_RAMA 184 +#define RESET_BRG_NIC_SDIOB 185 +#define RESET_BRG_NIC_SDIOA 186 +#define RESET_BRG_NIC_VAPB 187 +#define RESET_BRG_NIC_DSU 188 +#define RESET_BRG_NIC_CLK81 189 +#define RESET_BRG_NIC_MAIN 190 +#define RESET_BRG_NIC_ALL 191 + +#endif diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi b/arch/arm64/boot/= dts/amlogic/amlogic-s7.dtsi index a3faf4d188e1..0b2ac24e8dbc 100644 --- a/arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi @@ -8,6 +8,7 @@ #include #include #include +#include "amlogic-s7-reset.h" =20 / { cpus { @@ -142,6 +143,13 @@ uart_b: serial@7a000 { status =3D "disabled"; }; =20 + reset: reset-controller@2000 { + compatible =3D "amlogic,s7-reset", + "amlogic,meson-s4-reset"; + reg =3D <0x0 0x2000 0x0 0x98>; + #reset-cells =3D <1>; + }; + periphs_pinctrl: pinctrl@4000 { compatible =3D "amlogic,pinctrl-s7"; #address-cells =3D <2>; --=20 2.37.1 From nobody Mon Dec 1 22:07:23 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64009285CAD; Thu, 27 Nov 2025 07:30:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228644; cv=none; b=KxETNPtv3o9o3vnkYIP26HG2aP72wUqVMozAiexV1HohErSWBFmblZoRlq7LVKXqPHP0ysKMiw/M5GGai7+VDQz5iiRDKEx3qDsvnGKJzwqPbEgF1CVSE5py+S+Jt4Zshz1a7OTEhqX64EDypXBoJXa7nz+7re1eLEqg7diBZYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764228644; c=relaxed/simple; bh=fbTsUCQj1RD8qwzKO52ZApznPD7wF9elZFv8cipPVHo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ak0t8o+av9DDSI/JWDx57Y7lvoGwAyD5ZxLfWBSudhwwLwKIt6SVvM2z5uJrtNODe1i15cCE8rdd7eMjqqFUb0k9R9v1m5LW0HVk4/2jODB61rmYBqHyq27VTMJEVnL0omKu/DAKbaFWOzZdFj2TUJ5aWrsfhY2Gdjp5X72S6nw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rz1p0kHD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rz1p0kHD" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1D54BC19424; Thu, 27 Nov 2025 07:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764228644; bh=fbTsUCQj1RD8qwzKO52ZApznPD7wF9elZFv8cipPVHo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=rz1p0kHDMnlMYm1Uc14gzEwUjGXTQmzL+IHP0en/wlg2mKyAi6cDaVG6GRFETHdz7 v5Dmvl8svW60JwFVU1STsj15zZ8tEf1NT2n+TFIcoL1qQheeFClrYiWZl6b72HozIY LZ/YenSOBFc/UY66ULkLWJx+Pj+6Gj1SLgPOy5DHvevk+NnXMBpWWLnxDg0TB8gaeX vbdtgAsg3h/bsvSlEEndAX78ybEh8WtN5mMep5fCChDDmygyrqZahn3dfyPc0762vM /e2mPfq8A11PE2dLDxHQ9C7Ont5+QZ6aH6XQRtoHuu763nfQsMRFZi/79i1WhXO/wi TzmsLIisaBiiA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13CFCCFD2F6; Thu, 27 Nov 2025 07:30:44 +0000 (UTC) From: Xianwei Zhao via B4 Relay Date: Thu, 27 Nov 2025 15:30:34 +0800 Subject: [PATCH 4/4] arm64: dts: amlogic: Add S7D Reset Controller Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251127-reset-s6-s7-s7d-v1-4-879099ad90d3@amlogic.com> References: <20251127-reset-s6-s7-s7d-v1-0-879099ad90d3@amlogic.com> In-Reply-To: <20251127-reset-s6-s7-s7d-v1-0-879099ad90d3@amlogic.com> To: Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Xianwei Zhao X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764228641; l=4875; i=xianwei.zhao@amlogic.com; s=20231208; h=from:subject:message-id; bh=5wwrW6KjOWT339f03AVM4w+kKKlwXFASNHk49oi+itI=; b=TcG6ixepJGEJNUVljr+70oZ4T6oh5hBDOVvFVYX7fEpMOOxApf1p3OZNTj+myfpTUPCBjaJW7 fOGUj3ZVJ/HAHs+nAoGc2IGUsZb954kEjMCHXzk1bC0LAZHArzXYT7d X-Developer-Key: i=xianwei.zhao@amlogic.com; a=ed25519; pk=o4fDH8ZXL6xQg5h17eNzRljf6pwZHWWjqcOSsj3dW24= X-Endpoint-Received: by B4 Relay for xianwei.zhao@amlogic.com/20231208 with auth_id=107 X-Original-From: Xianwei Zhao Reply-To: xianwei.zhao@amlogic.com From: Xianwei Zhao Add the device node and related header file for Amlogic S7D reset controller. Signed-off-by: Xianwei Zhao --- arch/arm64/boot/dts/amlogic/amlogic-s7d-reset.h | 134 ++++++++++++++++++++= ++++ arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi | 8 ++ 2 files changed, 142 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s7d-reset.h b/arch/arm64/b= oot/dts/amlogic/amlogic-s7d-reset.h new file mode 100644 index 000000000000..02deea1c1fe5 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/amlogic-s7d-reset.h @@ -0,0 +1,134 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* + * Copyright (c) 2025 Amlogic, Inc. All rights reserved. + */ + +#ifndef _DT_BINDINGS_AMLOGIC_S7D_RESET_H +#define _DT_BINDINGS_AMLOGIC_S7D_RESET_H + +/* RESET0 */ +#define RESET_USB_DDR0 0 +#define RESET_USB_DDR1 1 +#define RESET_USB_DDR2 2 +#define RESET_USB_DDR3 3 +#define RESET_USB1 4 +#define RESET_USB0 5 +#define RESET_USB1_COMB 6 +#define RESET_USB0_COMB 7 +#define RESET_USBPHY20 8 +#define RESET_USBPHY21 9 +#define RESET_USBCC 10 +#define RESET_BC 11 +#define RESET_AMFC_APB 12 +/* 13-14 */ +#define RESET_HDMI20_AES 15 +#define RESET_HDMITX_CAPB3 16 +#define RESET_BRG_VCBUS_DEC 17 +#define RESET_VCBUS 18 +#define RESET_VID_PLL_DIV 19 +#define RESET_VIDEO6 20 +#define RESET_GE2D 21 +#define RESET_HDMITXPHY 22 +#define RESET_VID_LOCK 23 +#define RESET_VENCL 24 +#define RESET_VDAC 25 +#define RESET_VENCP 26 +#define RESET_VENCI 27 +#define RESET_RDMA 28 +#define RESET_HDMI_TX 29 +#define RESET_VIU 30 +#define RESET_VENC 31 + +/* RESET1 */ +#define RESET_AUDIO 32 +#define RESET_MALI_CAPB3 33 +#define RESET_MALI 34 +#define RESET_DDR_APB 35 +#define RESET_DDR 36 +#define RESET_DOS_CAPB3 37 +#define RESET_DOS 38 +#define RESET_GPU_TS 39 +#define RESET_PLCK_DBG 40 +/* 41-47 */ +#define RESET_ETH 48 +/* 49-63 */ + +/* RESET2 */ +#define RESET_AM2AXI 64 +#define RESET_IR_CTRL 65 +/* 66 */ +#define RESET_TEMPSENSOR_PLL 67 +/* 68-71 */ +#define RESET_SMART_CARD 72 +#define RESET_SPICC0 73 +/* 74-79 */ +#define RESET_MSR_CLK 80 +/* 81 */ +#define RESET_SAR_DIG 82 +#define RESET_SAR_ANA 83 +/* 84-85 */ +#define RESET_AMFC 86 +/* 87 */ +#define RESET_ACODEC 88 +#define RESET_CEC 89 +/* 90 */ +#define RESET_WATCHDOG 91 +/* 92-95 */ + +/* RESET3 */ +/* 96 ~ 127 */ + +/* RESET4 */ +/* 128-131 */ +#define RESET_PWM_A 128 +#define RESET_PWM_B 129 +#define RESET_PWM_C 130 +#define RESET_PWM_D 131 +#define RESET_PWM_E 132 +#define RESET_PWM_F 133 +#define RESET_PWM_G 134 +#define RESET_PWM_H 135 +#define RESET_PWM_I 136 +#define RESET_PWM_J 137 +#define RESET_UART_A 138 +#define RESET_UART_B 139 +#define RESET_UART_C 140 +#define RESET_UART_D 141 +#define RESET_UART_E 142 +/* 140-143 */ +#define RESET_I2C_S_A 144 +#define RESET_I2C_M_A 145 +#define RESET_I2C_M_B 146 +#define RESET_I2C_M_C 147 +#define RESET_I2C_M_D 148 +#define RESET_I2C_M_E 149 +/* 150-151 */ +#define RESET_SD_EMMC_A 152 +#define RESET_SD_EMMC_B 153 +#define RESET_SD_EMMC_C 154 +/* 155-159 */ + +/* RESET5 */ +#define RESET_BRG_VDEC_PIPL0 160 +/* 161-163 */ +#define RESET_BRG_GE2D_PIPL0 164 +#define RESET_BRG_DMC_PIPL0 165 +#define RESET_BRG_A55_PIPL0 166 +#define RESET_BRG_MALI_PIPL0 167 +/* 168 */ +#define RESET_BRG_MALI_PIPL1 169 +/* 170-171 */ +#define RESET_BRG_HEVCF_PIPL1 172 +#define RESET_BRG_HEVCB_PIPL1 173 +/* 174-182 */ +#define RESET_BRG_NIC_EMMC 183 +/* 164 */ +#define RESET_BRG_NIC_SDIOB 185 +#define RESET_BRG_NIC_SDIOA 186 +#define RESET_BRG_NIC_VAPB 187 +#define RESET_BRG_NIC_DSU 188 +#define RESET_BRG_NIC_CLK81 189 +#define RESET_BRG_NIC_MAIN 190 +#define RESET_BRG_NIC_ALL 191 + +#endif diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi b/arch/arm64/boot= /dts/amlogic/amlogic-s7d.dtsi index 0c4417bcd682..bae89ca6c448 100644 --- a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi @@ -8,6 +8,7 @@ #include #include #include +#include "amlogic-s7d-reset.h" =20 / { cpus { @@ -106,6 +107,13 @@ uart_b: serial@7a000 { status =3D "disabled"; }; =20 + reset: reset-controller@2000 { + compatible =3D "amlogic,s7d-reset", + "amlogic,meson-s4-reset"; + reg =3D <0x0 0x2000 0x0 0x98>; + #reset-cells =3D <1>; + }; + periphs_pinctrl: pinctrl@4000 { compatible =3D "amlogic,pinctrl-s7d", "amlogic,pinctrl-s7"; --=20 2.37.1