From nobody Tue Dec 16 07:31:49 2025 Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D46D218AC1 for ; Tue, 6 May 2025 21:06:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565608; cv=none; b=ijalBICYhSpStobsFb2k4chz2iQyZ4qi3LRjbzYqB+tQ6loQpE0aa6vFRIUCUy27NfzRxg48O4rBNKBss0mRCOocz4PCyGopv2ZxbtbLh3UUY+j2a75U99ArHzqeaD3pFrw1514YEkjzJJWP/A++gUowa+c+3dgq1Ypb95faof8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565608; c=relaxed/simple; bh=JbvxIKNnm2l02MeokP48X8vc1GIBXzEECfh/a24p9gk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S2XbHBtvduL3A45weydNbl9oNEOFL9g/1YGK1Y8aDq4Rcju1fiSl/OyF/3YA4jBZEh9QcmxaOMR7O7/rLOh8n+7johZFegkBIH116ZXI3nwf7h79c+OaohV0LHDuMsq/1QY+xOftohHbde1c1f88vj7ZqtymNOTtECFvY90tqO4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=xNcKJY7V; arc=none smtp.client-ip=209.85.166.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="xNcKJY7V" Received: by mail-io1-f54.google.com with SMTP id ca18e2360f4ac-85d9a87660fso629981739f.1 for ; Tue, 06 May 2025 14:06:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746565605; x=1747170405; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=81a1v+nMC7nJeIGTMZQ54emwTNg/YN8dMbbTK1LgyT8=; b=xNcKJY7VbdqidshMoGgQ9Ie0w6kppDyFrSV88s61WpYxlbr2GVWsdLWlEJZR/YOaw8 BF0mcWl9vte66icMT1sYZ9CZZV9EJBqIAXqD4WBcK++ouzLwVMH/t1GDfxtaOzK+C8UO nbN4Ui13tQ5skXex+/Ro4u88Qqf+Zn6wpl6hxNvpofZFqfzY/BV/fOgFBxPCcsTBeUoB KqLN4CD+dWWFYmhW/tD8F4ICBaNFnpyvqPzpHTWA+9+IxkTOuHKHyKg3MmIuflMwdkT9 1UPT7AB1aKmpfCCxGwZgxOsvvdD9X95LGO2ecyjB8XThVvBIouz6bzE0oAOacCtANIj/ L0Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746565605; x=1747170405; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=81a1v+nMC7nJeIGTMZQ54emwTNg/YN8dMbbTK1LgyT8=; b=Yt1G+i1w4mZucyQ6uuLnQNmgwR7z+GYcp0WZNm2qupVD5tvaUQl/eGDp59sssOJWcf 5BLceb/7kwe/U1bY8nCvcJztglqKsEWOTJjdEa8wHvArmq22YLVlGpVgFzdJyUH4R/84 tiSa8KRi6og2E74pUM2XNNEAnhw5UHcS1tfyCt2a0mwP3rCems/jKwTW7od7b30r1b2K W0ccmNiYAnCKNv+H0A88r5TW9h7/N064BleKQuPTyGcKoN6keZyOTDbGt+aDQtaItZnp UrwRuAwxiv/QtVtie8L7SG/5PXyE03122BpIsdgAI0s3EnkFIfB7sfVCBcEv5TpPu+js syEg== X-Forwarded-Encrypted: i=1; AJvYcCVaxxbK1MsVYIe6611SzU3O4pXP9Tq0ihYrZsUO4N8eFsmlJU87IQ6io6irD0HrB8Kp2Uhy9lrGVzB5bDM=@vger.kernel.org X-Gm-Message-State: AOJu0YzJ2jI/uI6u951QXqlksZE61/fJ1uQySEiRzMICJzlIzGTtJtml jJUGw5f5fzEm0YKFt8UWZmfG9DaHInfUuLtsqcnj9rzfG8Nj2/NmUANIN07eC9Y= X-Gm-Gg: ASbGnctGQJJfTjSEcML5g+hRv5UnUh6Owmv4ojmAIUzhZPNgfR+Weobvh4MGdgmPt1z EMkHM1uH9SWFWccCrnrJfydftszvRDuETOrDHOGU+IknRjjsu6d6uuahdpi36/GmUkH/ZifcHU3 gdYWXGqbI1Sc+V6C6ctuNzVlX0lxMuxp584YHlI9hJV1rIN5b9HjexLxdlji42WrEzFSH7M8k7Y ZIAJK8yy0ml3c905Uu4WG86obFfowEWTCpwaPxqpiA+9Iu5LhVdQ2fqkQAzer9GLzERiips0yXv O3c22N462z8Ts8P2gQQrq3Tvq1+vjls9SMMXSnprL94tC2G4qr5iENH1VR7Q9+kFujkCQ8ricsM ldMq4ZKKuUZpe4w== X-Google-Smtp-Source: AGHT+IFaSiFdFSaPGEmumNkQtpvmWp6yb4qDesXTZ/rAEEaLYKpdVkxK2+7Uf/5NT01NxeM6RYqIWA== X-Received: by 2002:a05:6602:490:b0:864:a1e9:f07 with SMTP id ca18e2360f4ac-8674727eddemr160776839f.8.1746565605143; Tue, 06 May 2025 14:06:45 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa588basm2419559173.79.2025.05.06.14.06.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 14:06:44 -0700 (PDT) From: Alex Elder To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, p.zabel@pengutronix.de, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, dlan@gentoo.org Cc: heylenay@4d2.org, inochiama@outlook.com, guodong@riscstar.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, spacemit@lists.linux.dev, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Subject: [PATCH v6 1/6] dt-bindings: soc: spacemit: define spacemit,k1-ccu resets Date: Tue, 6 May 2025 16:06:32 -0500 Message-ID: <20250506210638.2800228-2-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250506210638.2800228-1-elder@riscstar.com> References: <20250506210638.2800228-1-elder@riscstar.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There are additional SpacemiT syscon CCUs whose registers control both clocks and resets: RCPU, RCPU2, and APBC2. Unlike those defined previously, these will (initially) support only resets. They do not incorporate power domain functionality. Previously the clock properties were required for all compatible nodes. Make that requirement only apply to the three existing CCUs (APBC, APMU, and MPMU), so that the new reset-only CCUs can go without specifying them. Define the index values for resets associated with all SpacemiT K1 syscon nodes, including those with clocks already defined, as well as the new ones (without clocks). Signed-off-by: Alex Elder Reviewed-by: Krzysztof Kozlowski --- .../soc/spacemit/spacemit,k1-syscon.yaml | 29 +++- .../dt-bindings/clock/spacemit,k1-syscon.h | 128 ++++++++++++++++++ 2 files changed, 150 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-sys= con.yaml b/Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-sysco= n.yaml index 30aaf49da03d3..133a391ee68cd 100644 --- a/Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-syscon.yaml +++ b/Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-syscon.yaml @@ -19,6 +19,9 @@ properties: - spacemit,k1-syscon-apbc - spacemit,k1-syscon-apmu - spacemit,k1-syscon-mpmu + - spacemit,k1-syscon-rcpu + - spacemit,k1-syscon-rcpu2 + - spacemit,k1-syscon-apbc2 =20 reg: maxItems: 1 @@ -47,9 +50,6 @@ properties: required: - compatible - reg - - clocks - - clock-names - - "#clock-cells" - "#reset-cells" =20 allOf: @@ -57,13 +57,28 @@ allOf: properties: compatible: contains: - const: spacemit,k1-syscon-apbc + enum: + - spacemit,k1-syscon-apmu + - spacemit,k1-syscon-mpmu then: - properties: - "#power-domain-cells": false - else: required: - "#power-domain-cells" + else: + properties: + "#power-domain-cells": false + - if: + properties: + compatible: + contains: + enum: + - spacemit,k1-syscon-apbc + - spacemit,k1-syscon-apmu + - spacemit,k1-syscon-mpmu + then: + required: + - clocks + - clock-names + - "#clock-cells" =20 additionalProperties: false =20 diff --git a/include/dt-bindings/clock/spacemit,k1-syscon.h b/include/dt-bi= ndings/clock/spacemit,k1-syscon.h index 35968ae982466..f5965dda3b905 100644 --- a/include/dt-bindings/clock/spacemit,k1-syscon.h +++ b/include/dt-bindings/clock/spacemit,k1-syscon.h @@ -78,6 +78,9 @@ #define CLK_APB 31 #define CLK_WDT_BUS 32 =20 +/* MPMU resets */ +#define RESET_WDT 0 + /* APBC clocks */ #define CLK_UART0 0 #define CLK_UART2 1 @@ -180,6 +183,59 @@ #define CLK_TSEN_BUS 98 #define CLK_IPC_AP2AUD_BUS 99 =20 +/* APBC resets */ +#define RESET_UART0 0 +#define RESET_UART2 1 +#define RESET_UART3 2 +#define RESET_UART4 3 +#define RESET_UART5 4 +#define RESET_UART6 5 +#define RESET_UART7 6 +#define RESET_UART8 7 +#define RESET_UART9 8 +#define RESET_GPIO 9 +#define RESET_PWM0 10 +#define RESET_PWM1 11 +#define RESET_PWM2 12 +#define RESET_PWM3 13 +#define RESET_PWM4 14 +#define RESET_PWM5 15 +#define RESET_PWM6 16 +#define RESET_PWM7 17 +#define RESET_PWM8 18 +#define RESET_PWM9 19 +#define RESET_PWM10 20 +#define RESET_PWM11 21 +#define RESET_PWM12 22 +#define RESET_PWM13 23 +#define RESET_PWM14 24 +#define RESET_PWM15 25 +#define RESET_PWM16 26 +#define RESET_PWM17 27 +#define RESET_PWM18 28 +#define RESET_PWM19 29 +#define RESET_SSP3 30 +#define RESET_RTC 31 +#define RESET_TWSI0 32 +#define RESET_TWSI1 33 +#define RESET_TWSI2 34 +#define RESET_TWSI4 35 +#define RESET_TWSI5 36 +#define RESET_TWSI6 37 +#define RESET_TWSI7 38 +#define RESET_TWSI8 39 +#define RESET_TIMERS1 40 +#define RESET_TIMERS2 41 +#define RESET_AIB 42 +#define RESET_ONEWIRE 43 +#define RESET_SSPA0 44 +#define RESET_SSPA1 45 +#define RESET_DRO 46 +#define RESET_IR 47 +#define RESET_TSEN 48 +#define RESET_IPC_AP2AUD 49 +#define RESET_CAN0 50 + /* APMU clocks */ #define CLK_CCI550 0 #define CLK_CPU_C0_HI 1 @@ -244,4 +300,76 @@ #define CLK_V2D 60 #define CLK_EMMC_BUS 61 =20 +/* APMU resets */ +#define RESET_CCIC_4X 0 +#define RESET_CCIC1_PHY 1 +#define RESET_SDH_AXI 2 +#define RESET_SDH0 3 +#define RESET_SDH1 4 +#define RESET_SDH2 5 +#define RESET_USBP1_AXI 6 +#define RESET_USB_AXI 7 +#define RESET_USB3_0 8 +#define RESET_QSPI 9 +#define RESET_QSPI_BUS 10 +#define RESET_DMA 11 +#define RESET_AES 12 +#define RESET_VPU 13 +#define RESET_GPU 14 +#define RESET_EMMC 15 +#define RESET_EMMC_X 16 +#define RESET_AUDIO 17 +#define RESET_HDMI 18 +#define RESET_PCIE0 19 +#define RESET_PCIE1 20 +#define RESET_PCIE2 21 +#define RESET_EMAC0 22 +#define RESET_EMAC1 23 +#define RESET_JPG 24 +#define RESET_CCIC2PHY 25 +#define RESET_CCIC3PHY 26 +#define RESET_CSI 27 +#define RESET_ISP_CPP 28 +#define RESET_ISP_BUS 29 +#define RESET_ISP 30 +#define RESET_ISP_CI 31 +#define RESET_DPU_MCLK 32 +#define RESET_DPU_ESC 33 +#define RESET_DPU_HCLK 34 +#define RESET_DPU_SPIBUS 35 +#define RESET_DPU_SPI_HBUS 36 +#define RESET_V2D 37 +#define RESET_MIPI 38 +#define RESET_MC 39 + +/* RCPU resets */ +#define RESET_RCPU_SSP0 0 +#define RESET_RCPU_I2C0 1 +#define RESET_RCPU_UART1 2 +#define RESET_RCPU_IR 3 +#define RESET_RCPU_CAN 4 +#define RESET_RCPU_UART0 5 +#define RESET_RCPU_HDMI_AUDIO 6 + +/* RCPU2 resets */ +#define RESET_RCPU2_PWM0 0 +#define RESET_RCPU2_PWM1 1 +#define RESET_RCPU2_PWM2 2 +#define RESET_RCPU2_PWM3 3 +#define RESET_RCPU2_PWM4 4 +#define RESET_RCPU2_PWM5 5 +#define RESET_RCPU2_PWM6 6 +#define RESET_RCPU2_PWM7 7 +#define RESET_RCPU2_PWM8 8 +#define RESET_RCPU2_PWM9 9 + +/* APBC2 resets */ +#define RESET_APBC2_UART1 0 +#define RESET_APBC2_SSP2 1 +#define RESET_APBC2_TWSI3 2 +#define RESET_APBC2_RTC 3 +#define RESET_APBC2_TIMERS0 4 +#define RESET_APBC2_KPC 5 +#define RESET_APBC2_GPIO 6 + #endif /* _DT_BINDINGS_SPACEMIT_CCU_H_ */ --=20 2.45.2 From nobody Tue Dec 16 07:31:49 2025 Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 73181218AA0 for ; Tue, 6 May 2025 21:06:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565609; cv=none; b=M1+OWHY0c40VvNbJoxuHOAkatEuSgP20VMfpajmHAsQFdhYbyQtqj4BNMFLqFoqS4cOi3mtfn6T/nGC43KA5VFGAPkQowrH2ZU0WRmST47brgn2ueeVmpOTJ1erVfVWI5rA/hn8qy662+oNU8zkbesZqibfRKmR3hIJV+bAQa2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565609; c=relaxed/simple; bh=6jK5CYvBRNJyOjCNuRekR+rMKSw1oKTG/qB0GadUojg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hm1dnHyiO5jWhYOP8urEoWG06kT0G3QvOIcHe7iW6vnXXvOY7mAjKw9cnV91YQXV4/NFsSey27/ApOm30oOtiUbEieT2E0c814MoKvOLsKPlUnKU/tjaQpZPO5CUo4wLFUR1bdg9atKDaMNTnMjL0nnleKbgygsQKQN2mG5vYPo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=OlSkHsBM; arc=none smtp.client-ip=209.85.166.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="OlSkHsBM" Received: by mail-io1-f41.google.com with SMTP id ca18e2360f4ac-8616987c261so211992139f.3 for ; Tue, 06 May 2025 14:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746565606; x=1747170406; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mBKD3W/WkOy8dZ3KYyDI95rmwatFEwvNTEacEsXwP2g=; b=OlSkHsBMJWkhmM4HMzoiljq+VXtzVtGGTEKCoxEBHm4JcllGk2PPdkNjxGRGM8Dwrx UgNf7XOsaVsjVFcP3x9mHrjxbrmhdPgbcqyXN3/r45mbcUuKrgNWxuiFQTnWtOCuyVyU kox+PtG2n4UHykNUZao1Fjf0TtEVLAw0A/4cGWL3JIMrU6zJshDFgcHlmt9LkNEUISHI /37c7FbwGrFE3euQe98PsW3iMNcXlCHZ87qhKKgW7q6seIGdGAzYaW6ufN+C6W2B06ri S+QaH15wEm4FCM45refXJAtOB53J7IMAII/Pbx9qEYljfVTV3N45DmjyO9GXaBTLNbTQ wwaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746565606; x=1747170406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mBKD3W/WkOy8dZ3KYyDI95rmwatFEwvNTEacEsXwP2g=; b=wWbnHFgcIdbq9tmGWVcj7uUbahLfsLksdXIvVBofDaYrElz5vhr/u1IC/vPp56t8lI yQT4ZBnHusrKZZK4gYmiVfhvyd7jyupbdOYltqiBVBt59LKHkOmkO5BnJaq3Y+L93Z+2 kuN285+QufBJhk22cSFkTwc6M0ugCwB8UimCD/t09cSvfsqS5NC+UObLoSN4HzXIfqCz RxATVRuTyLMHOzmpbGPbRm98NwXX8Pqwgsv4PZ7LT7Q7Gd80gg89smPIpDqFYk6pH9/3 /+sANnmdGYb23TXtV9os2s3ufdUSx8vlCCf8Hh8waEPftBLCTPU1cDE729JQB7Xv3YYP lbYA== X-Forwarded-Encrypted: i=1; AJvYcCX4qT9fxaomQfyFjhrnkVUtVgwaySpDJTsPLv2s4FajpoAfcu45v7qiEzbnmkHDobTLtOJ7s/yAQ5p3muQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2MOhJ++FyGwpWhB9dV+u27spk5SRmIiiCVTZ0F3Rm61SAX0wL t/mzU3bGXH9NyZOlX9P/zIo5M8x+w8ypkIiYXe9BeDW23D1TscUXroyHzbTK9No= X-Gm-Gg: ASbGncuoGLCyB2ruRaoDHZXbB2SrO1gLa1NefVIvc7rk3IMGFiLveut7rTGL+UKh6Ox Jn4nUQ2b3smo0qJ4X1/tYVY0OSZzk6BWzTcsdCIv9Y5zL0V7C8AyYsofjKquqsmZukgdmZhv7s1 itZP/u40IzGL0khVKoM99Gq/xdQ4FCpUlVElFhH02+Ofjqpfy+wS3mCp2OJUS0vnAgHBWim95s7 pUHCyPnR0ie3ZyhO/6KS2760h8UamKegmrtmsi5qlAaBTN4ukn+fgc5VkbHL6swfSUMweVdUIeP aZP4yBHKkrZDrjEgfcSuVwLludYUmmXWi02oe6PBMnpW9r3YwMyRXh8fca0Uv1++03zG7IgodgX HV0C6gewthqWQqQ== X-Google-Smtp-Source: AGHT+IFXruIV51Tr2St8D5u/YGaIpHTB1nFxmpkn7M1ig3oTDGN2NFtDKK6rHKo+qe3Pe0CZ7fPRmg== X-Received: by 2002:a05:6e02:1d92:b0:3d3:f27a:9103 with SMTP id e9e14a558f8ab-3da738ed799mr7976595ab.1.1746565606519; Tue, 06 May 2025 14:06:46 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa588basm2419559173.79.2025.05.06.14.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 14:06:46 -0700 (PDT) From: Alex Elder To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, p.zabel@pengutronix.de, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, dlan@gentoo.org Cc: heylenay@4d2.org, inochiama@outlook.com, guodong@riscstar.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, spacemit@lists.linux.dev, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 2/6] soc: spacemit: create a header for clock/reset registers Date: Tue, 6 May 2025 16:06:33 -0500 Message-ID: <20250506210638.2800228-3-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250506210638.2800228-1-elder@riscstar.com> References: <20250506210638.2800228-1-elder@riscstar.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move the definitions of register offsets and fields used by the SpacemiT K1 SoC CCUs into a separate header file, so that they can be shared by the reset driver that will be found under drivers/reset. Signed-off-by: Alex Elder --- drivers/clk/spacemit/ccu-k1.c | 111 +-------------------------------- include/soc/spacemit/ccu_k1.h | 113 ++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 110 deletions(-) create mode 100644 include/soc/spacemit/ccu_k1.h diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index cdde37a052353..9545cfe60b92b 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 #include "ccu_common.h" #include "ccu_pll.h" @@ -19,116 +20,6 @@ =20 #include =20 -/* APBS register offset */ -#define APBS_PLL1_SWCR1 0x100 -#define APBS_PLL1_SWCR2 0x104 -#define APBS_PLL1_SWCR3 0x108 -#define APBS_PLL2_SWCR1 0x118 -#define APBS_PLL2_SWCR2 0x11c -#define APBS_PLL2_SWCR3 0x120 -#define APBS_PLL3_SWCR1 0x124 -#define APBS_PLL3_SWCR2 0x128 -#define APBS_PLL3_SWCR3 0x12c - -/* MPMU register offset */ -#define MPMU_POSR 0x0010 -#define POSR_PLL1_LOCK BIT(27) -#define POSR_PLL2_LOCK BIT(28) -#define POSR_PLL3_LOCK BIT(29) -#define MPMU_SUCCR 0x0014 -#define MPMU_ISCCR 0x0044 -#define MPMU_WDTPCR 0x0200 -#define MPMU_RIPCCR 0x0210 -#define MPMU_ACGR 0x1024 -#define MPMU_APBCSCR 0x1050 -#define MPMU_SUCCR_1 0x10b0 - -/* APBC register offset */ -#define APBC_UART1_CLK_RST 0x00 -#define APBC_UART2_CLK_RST 0x04 -#define APBC_GPIO_CLK_RST 0x08 -#define APBC_PWM0_CLK_RST 0x0c -#define APBC_PWM1_CLK_RST 0x10 -#define APBC_PWM2_CLK_RST 0x14 -#define APBC_PWM3_CLK_RST 0x18 -#define APBC_TWSI8_CLK_RST 0x20 -#define APBC_UART3_CLK_RST 0x24 -#define APBC_RTC_CLK_RST 0x28 -#define APBC_TWSI0_CLK_RST 0x2c -#define APBC_TWSI1_CLK_RST 0x30 -#define APBC_TIMERS1_CLK_RST 0x34 -#define APBC_TWSI2_CLK_RST 0x38 -#define APBC_AIB_CLK_RST 0x3c -#define APBC_TWSI4_CLK_RST 0x40 -#define APBC_TIMERS2_CLK_RST 0x44 -#define APBC_ONEWIRE_CLK_RST 0x48 -#define APBC_TWSI5_CLK_RST 0x4c -#define APBC_DRO_CLK_RST 0x58 -#define APBC_IR_CLK_RST 0x5c -#define APBC_TWSI6_CLK_RST 0x60 -#define APBC_COUNTER_CLK_SEL 0x64 -#define APBC_TWSI7_CLK_RST 0x68 -#define APBC_TSEN_CLK_RST 0x6c -#define APBC_UART4_CLK_RST 0x70 -#define APBC_UART5_CLK_RST 0x74 -#define APBC_UART6_CLK_RST 0x78 -#define APBC_SSP3_CLK_RST 0x7c -#define APBC_SSPA0_CLK_RST 0x80 -#define APBC_SSPA1_CLK_RST 0x84 -#define APBC_IPC_AP2AUD_CLK_RST 0x90 -#define APBC_UART7_CLK_RST 0x94 -#define APBC_UART8_CLK_RST 0x98 -#define APBC_UART9_CLK_RST 0x9c -#define APBC_CAN0_CLK_RST 0xa0 -#define APBC_PWM4_CLK_RST 0xa8 -#define APBC_PWM5_CLK_RST 0xac -#define APBC_PWM6_CLK_RST 0xb0 -#define APBC_PWM7_CLK_RST 0xb4 -#define APBC_PWM8_CLK_RST 0xb8 -#define APBC_PWM9_CLK_RST 0xbc -#define APBC_PWM10_CLK_RST 0xc0 -#define APBC_PWM11_CLK_RST 0xc4 -#define APBC_PWM12_CLK_RST 0xc8 -#define APBC_PWM13_CLK_RST 0xcc -#define APBC_PWM14_CLK_RST 0xd0 -#define APBC_PWM15_CLK_RST 0xd4 -#define APBC_PWM16_CLK_RST 0xd8 -#define APBC_PWM17_CLK_RST 0xdc -#define APBC_PWM18_CLK_RST 0xe0 -#define APBC_PWM19_CLK_RST 0xe4 - -/* APMU register offset */ -#define APMU_JPG_CLK_RES_CTRL 0x020 -#define APMU_CSI_CCIC2_CLK_RES_CTRL 0x024 -#define APMU_ISP_CLK_RES_CTRL 0x038 -#define APMU_LCD_CLK_RES_CTRL1 0x044 -#define APMU_LCD_SPI_CLK_RES_CTRL 0x048 -#define APMU_LCD_CLK_RES_CTRL2 0x04c -#define APMU_CCIC_CLK_RES_CTRL 0x050 -#define APMU_SDH0_CLK_RES_CTRL 0x054 -#define APMU_SDH1_CLK_RES_CTRL 0x058 -#define APMU_USB_CLK_RES_CTRL 0x05c -#define APMU_QSPI_CLK_RES_CTRL 0x060 -#define APMU_DMA_CLK_RES_CTRL 0x064 -#define APMU_AES_CLK_RES_CTRL 0x068 -#define APMU_VPU_CLK_RES_CTRL 0x0a4 -#define APMU_GPU_CLK_RES_CTRL 0x0cc -#define APMU_SDH2_CLK_RES_CTRL 0x0e0 -#define APMU_PMUA_MC_CTRL 0x0e8 -#define APMU_PMU_CC2_AP 0x100 -#define APMU_PMUA_EM_CLK_RES_CTRL 0x104 -#define APMU_AUDIO_CLK_RES_CTRL 0x14c -#define APMU_HDMI_CLK_RES_CTRL 0x1b8 -#define APMU_CCI550_CLK_CTRL 0x300 -#define APMU_ACLK_CLK_CTRL 0x388 -#define APMU_CPU_C0_CLK_CTRL 0x38C -#define APMU_CPU_C1_CLK_CTRL 0x390 -#define APMU_PCIE_CLK_RES_CTRL_0 0x3cc -#define APMU_PCIE_CLK_RES_CTRL_1 0x3d4 -#define APMU_PCIE_CLK_RES_CTRL_2 0x3dc -#define APMU_EMAC0_CLK_RES_CTRL 0x3e4 -#define APMU_EMAC1_CLK_RES_CTRL 0x3ec - struct spacemit_ccu_data { struct clk_hw **hws; size_t num; diff --git a/include/soc/spacemit/ccu_k1.h b/include/soc/spacemit/ccu_k1.h new file mode 100644 index 0000000000000..7df75043e78af --- /dev/null +++ b/include/soc/spacemit/ccu_k1.h @@ -0,0 +1,113 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* SpacemiT clock and reset driver definitions for the K1 SoC */ + +/* APBS register offset */ +#define APBS_PLL1_SWCR1 0x100 +#define APBS_PLL1_SWCR2 0x104 +#define APBS_PLL1_SWCR3 0x108 +#define APBS_PLL2_SWCR1 0x118 +#define APBS_PLL2_SWCR2 0x11c +#define APBS_PLL2_SWCR3 0x120 +#define APBS_PLL3_SWCR1 0x124 +#define APBS_PLL3_SWCR2 0x128 +#define APBS_PLL3_SWCR3 0x12c + +/* MPMU register offset */ +#define MPMU_POSR 0x0010 +#define POSR_PLL1_LOCK BIT(27) +#define POSR_PLL2_LOCK BIT(28) +#define POSR_PLL3_LOCK BIT(29) +#define MPMU_SUCCR 0x0014 +#define MPMU_ISCCR 0x0044 +#define MPMU_WDTPCR 0x0200 +#define MPMU_RIPCCR 0x0210 +#define MPMU_ACGR 0x1024 +#define MPMU_APBCSCR 0x1050 +#define MPMU_SUCCR_1 0x10b0 + +/* APBC register offset */ +#define APBC_UART1_CLK_RST 0x00 +#define APBC_UART2_CLK_RST 0x04 +#define APBC_GPIO_CLK_RST 0x08 +#define APBC_PWM0_CLK_RST 0x0c +#define APBC_PWM1_CLK_RST 0x10 +#define APBC_PWM2_CLK_RST 0x14 +#define APBC_PWM3_CLK_RST 0x18 +#define APBC_TWSI8_CLK_RST 0x20 +#define APBC_UART3_CLK_RST 0x24 +#define APBC_RTC_CLK_RST 0x28 +#define APBC_TWSI0_CLK_RST 0x2c +#define APBC_TWSI1_CLK_RST 0x30 +#define APBC_TIMERS1_CLK_RST 0x34 +#define APBC_TWSI2_CLK_RST 0x38 +#define APBC_AIB_CLK_RST 0x3c +#define APBC_TWSI4_CLK_RST 0x40 +#define APBC_TIMERS2_CLK_RST 0x44 +#define APBC_ONEWIRE_CLK_RST 0x48 +#define APBC_TWSI5_CLK_RST 0x4c +#define APBC_DRO_CLK_RST 0x58 +#define APBC_IR_CLK_RST 0x5c +#define APBC_TWSI6_CLK_RST 0x60 +#define APBC_COUNTER_CLK_SEL 0x64 +#define APBC_TWSI7_CLK_RST 0x68 +#define APBC_TSEN_CLK_RST 0x6c +#define APBC_UART4_CLK_RST 0x70 +#define APBC_UART5_CLK_RST 0x74 +#define APBC_UART6_CLK_RST 0x78 +#define APBC_SSP3_CLK_RST 0x7c +#define APBC_SSPA0_CLK_RST 0x80 +#define APBC_SSPA1_CLK_RST 0x84 +#define APBC_IPC_AP2AUD_CLK_RST 0x90 +#define APBC_UART7_CLK_RST 0x94 +#define APBC_UART8_CLK_RST 0x98 +#define APBC_UART9_CLK_RST 0x9c +#define APBC_CAN0_CLK_RST 0xa0 +#define APBC_PWM4_CLK_RST 0xa8 +#define APBC_PWM5_CLK_RST 0xac +#define APBC_PWM6_CLK_RST 0xb0 +#define APBC_PWM7_CLK_RST 0xb4 +#define APBC_PWM8_CLK_RST 0xb8 +#define APBC_PWM9_CLK_RST 0xbc +#define APBC_PWM10_CLK_RST 0xc0 +#define APBC_PWM11_CLK_RST 0xc4 +#define APBC_PWM12_CLK_RST 0xc8 +#define APBC_PWM13_CLK_RST 0xcc +#define APBC_PWM14_CLK_RST 0xd0 +#define APBC_PWM15_CLK_RST 0xd4 +#define APBC_PWM16_CLK_RST 0xd8 +#define APBC_PWM17_CLK_RST 0xdc +#define APBC_PWM18_CLK_RST 0xe0 +#define APBC_PWM19_CLK_RST 0xe4 + +/* APMU register offset */ +#define APMU_JPG_CLK_RES_CTRL 0x020 +#define APMU_CSI_CCIC2_CLK_RES_CTRL 0x024 +#define APMU_ISP_CLK_RES_CTRL 0x038 +#define APMU_LCD_CLK_RES_CTRL1 0x044 +#define APMU_LCD_SPI_CLK_RES_CTRL 0x048 +#define APMU_LCD_CLK_RES_CTRL2 0x04c +#define APMU_CCIC_CLK_RES_CTRL 0x050 +#define APMU_SDH0_CLK_RES_CTRL 0x054 +#define APMU_SDH1_CLK_RES_CTRL 0x058 +#define APMU_USB_CLK_RES_CTRL 0x05c +#define APMU_QSPI_CLK_RES_CTRL 0x060 +#define APMU_DMA_CLK_RES_CTRL 0x064 +#define APMU_AES_CLK_RES_CTRL 0x068 +#define APMU_VPU_CLK_RES_CTRL 0x0a4 +#define APMU_GPU_CLK_RES_CTRL 0x0cc +#define APMU_SDH2_CLK_RES_CTRL 0x0e0 +#define APMU_PMUA_MC_CTRL 0x0e8 +#define APMU_PMU_CC2_AP 0x100 +#define APMU_PMUA_EM_CLK_RES_CTRL 0x104 +#define APMU_AUDIO_CLK_RES_CTRL 0x14c +#define APMU_HDMI_CLK_RES_CTRL 0x1b8 +#define APMU_CCI550_CLK_CTRL 0x300 +#define APMU_ACLK_CLK_CTRL 0x388 +#define APMU_CPU_C0_CLK_CTRL 0x38C +#define APMU_CPU_C1_CLK_CTRL 0x390 +#define APMU_PCIE_CLK_RES_CTRL_0 0x3cc +#define APMU_PCIE_CLK_RES_CTRL_1 0x3d4 +#define APMU_PCIE_CLK_RES_CTRL_2 0x3dc +#define APMU_EMAC0_CLK_RES_CTRL 0x3e4 +#define APMU_EMAC1_CLK_RES_CTRL 0x3ec --=20 2.45.2 From nobody Tue Dec 16 07:31:49 2025 Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5D41219A95 for ; Tue, 6 May 2025 21:06:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565612; cv=none; b=creHSBehPxDqrac3JizeiOWg10xgofO5BVbrIF80yQtdGu0DTtVRbminAhYmSHWsnqNj0BUXvcJrQvV4b/SCPuqkFXQyY7peR5mIsGjGTfCQuPhn1pw81Kiw1+oJh82Gm62ebsTQWucb6pY8zDXst2kgUaHhu8Qq3mX4D8ISiy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565612; c=relaxed/simple; bh=Q9A7ivkauVlgucb1lRiZVv7VAIqJk0Dt1cBSdIS+1MA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RnOBhlths10CN6gVzu4JDJNduq8JDW9O+qvkbDwjwGG0TF6mdBsAtAhkMhI5EYz8s5PzrbkvTuyfzhhkPdX7eXVIdthoYlMtVQVC57CQayJGuitJ69DsgUpfYkgWTooBMrka6T8Q/GpURYKPKOWREQx9Fe25b+9fPr508EZD5es= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=2CwLW1Py; arc=none smtp.client-ip=209.85.166.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="2CwLW1Py" Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-3d8020ba858so32216105ab.0 for ; Tue, 06 May 2025 14:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746565609; x=1747170409; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jme2oFU9Z+jcmGst64hAoFvbFfUFjd99f802R0svshY=; b=2CwLW1PyXFbTo+KJIED4xVw/kWSPXrjgkCGBU4tTYV3h9BPrCNmOXjUSt1PqTM/T2W AL0q2gM2BA1YmA9vFr+B6m578zIT11mVpbCXdAWf9lT1dvYnfIDnyzpUrg7B7i/x5M/b OgwKJOXA0nNPBqD54MvA+4ibqHEmt4kPsap18O677Kw9KDka1R4YLHUE2WQ0VJosvBsH yDIepJyN9YKUyqnbbZbDhYrOLp6RWI7lXC86DgZmTC/PPaW5pr6kHCvll9MVVPAEKMxv BO8QZFSm2XfgNOJw6K9gzVEE+M0Ktxa8xmoMvodffKryZgJfHtHONxE4JPVO8962D9oe dJWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746565609; x=1747170409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jme2oFU9Z+jcmGst64hAoFvbFfUFjd99f802R0svshY=; b=pJLCx19FlXDo+q9E/TYtemR0rVdpvxjXNZwcU8sewHkVO7ibxVH3IY4OOBLt5Po78E sjKr/rKbIIuICYnMBISfSyUK82GN7ycdF5e6jxZIT9IPJ06hpyyqvPn+glXy7yDfO/YM XcoFU4u4fQvmJdJZ0UbAw9jbSUYFw2yEVjHVPWcux8261NuTuXRSgr2PQV9ybC/duV4A +Uz//HF26kyljy1lk7flXv8vCyF6otP4TSKE3wCGXwb6ykYHQtlkZAoY9MEmDiCfEAaf cLlVnDF+TWAN6mQh6mpTxadU5RIay+QHnYFZ1NeE9P14+4rKBhC0iFZgjpBES0KzB7P1 p5BQ== X-Forwarded-Encrypted: i=1; AJvYcCWApO0TdZaA45+ACYAbNuHUpWXSt5+CWD+lZ9qU/b+XiPd6GPeifHKNzof3kRcBFyil8Xcphn1ugeyr9g8=@vger.kernel.org X-Gm-Message-State: AOJu0YzpnbetYnUNpgxFDVFtb+y6Ph65M3Z0nkqn1WPhhFhMPMSjwlAr kyOyc2HncxxQVNbn6Ng8ZxUiQAKSSieoqDbzBJLJEsg0USLU/flna2aP1OTW2CU= X-Gm-Gg: ASbGncujsAlOS2rWf/SoshQqxYEoTUNef4c+WME/UDMAPDSQB2T6Ejtkpw80KtXPWsf 4te2cTrhe0Czs2WJNSn+jgyyvyCj4X5oB6+zt/cf6h/cgMJJEAvh11WQWg6gGO2tybD7aDZ9ZAQ e9ONCnMFWv7bFYGJ4gfZ4+ysYe1Zv0dqqCAe/ekBdfk3MHbJJpQTrw75+N+kqw62rfCB1t+y22i /mFt5cffl0Tl7j5do3cM3kIkL8ItHxSClRBZf0udnZr1RqWbeItxaVBLB+Ofk1ytujnaMC+WEYf jLr34FKrF88FIi//m20AoyEg43Q7BKMpl3ngwqxEb0UgXicmVN4RXQgakPrNaEQgW19aFOsvqjW 7kC43LW+HuIwO5Q== X-Google-Smtp-Source: AGHT+IGYwKA4uXQW3ijIOTs5HDkFa1SjzFI8ZE8DNwl6JYQYd64vEUmEQBbyVONgtUbEbjRZVgQbwg== X-Received: by 2002:a05:6e02:1c2c:b0:3d8:1d7c:e192 with SMTP id e9e14a558f8ab-3da738f849emr8607825ab.7.1746565607731; Tue, 06 May 2025 14:06:47 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa588basm2419559173.79.2025.05.06.14.06.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 14:06:47 -0700 (PDT) From: Alex Elder To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, p.zabel@pengutronix.de, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, dlan@gentoo.org Cc: heylenay@4d2.org, inochiama@outlook.com, guodong@riscstar.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, spacemit@lists.linux.dev, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 3/6] clk: spacemit: set up reset auxiliary devices Date: Tue, 6 May 2025 16:06:34 -0500 Message-ID: <20250506210638.2800228-4-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250506210638.2800228-1-elder@riscstar.com> References: <20250506210638.2800228-1-elder@riscstar.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a new reset_name field to the spacemit_ccu_data structure. If it is non-null, the CCU implements a reset controller, and the name will be used as the name for the auxiliary device that implements it. Define a new type to hold an auxiliary device as well as the regmap pointer that will be needed by CCU reset controllers. Set up code to initialize and add an auxiliary device for any CCU that implements reset functionality. Make it optional for a CCU to implement a clock controller. This doesn't apply to any of the existing CCUs but will for some new ones that will be added soon. Signed-off-by: Alex Elder --- drivers/clk/spacemit/ccu-k1.c | 85 +++++++++++++++++++++++++++++++---- include/soc/spacemit/ccu_k1.h | 12 +++++ 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 9545cfe60b92b..6b1845e899e5f 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -5,6 +5,7 @@ */ =20 #include +#include #include #include #include @@ -21,6 +22,7 @@ #include =20 struct spacemit_ccu_data { + const char *reset_name; struct clk_hw **hws; size_t num; }; @@ -710,6 +712,7 @@ static struct clk_hw *k1_ccu_pll_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_pll_data =3D { + /* The PLL CCU implements no resets */ .hws =3D k1_ccu_pll_hws, .num =3D ARRAY_SIZE(k1_ccu_pll_hws), }; @@ -751,8 +754,9 @@ static struct clk_hw *k1_ccu_mpmu_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_mpmu_data =3D { - .hws =3D k1_ccu_mpmu_hws, - .num =3D ARRAY_SIZE(k1_ccu_mpmu_hws), + .reset_name =3D "mpmu-reset", + .hws =3D k1_ccu_mpmu_hws, + .num =3D ARRAY_SIZE(k1_ccu_mpmu_hws), }; =20 static struct clk_hw *k1_ccu_apbc_hws[] =3D { @@ -859,8 +863,9 @@ static struct clk_hw *k1_ccu_apbc_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_apbc_data =3D { - .hws =3D k1_ccu_apbc_hws, - .num =3D ARRAY_SIZE(k1_ccu_apbc_hws), + .reset_name =3D "apbc-reset", + .hws =3D k1_ccu_apbc_hws, + .num =3D ARRAY_SIZE(k1_ccu_apbc_hws), }; =20 static struct clk_hw *k1_ccu_apmu_hws[] =3D { @@ -929,8 +934,9 @@ static struct clk_hw *k1_ccu_apmu_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_apmu_data =3D { - .hws =3D k1_ccu_apmu_hws, - .num =3D ARRAY_SIZE(k1_ccu_apmu_hws), + .reset_name =3D "apmu-reset", + .hws =3D k1_ccu_apmu_hws, + .num =3D ARRAY_SIZE(k1_ccu_apmu_hws), }; =20 static int spacemit_ccu_register(struct device *dev, @@ -941,6 +947,10 @@ static int spacemit_ccu_register(struct device *dev, struct clk_hw_onecell_data *clk_data; int i, ret; =20 + /* Nothing to do if the CCU does not implement any clocks */ + if (!data->hws) + return 0; + clk_data =3D devm_kzalloc(dev, struct_size(clk_data, hws, data->num), GFP_KERNEL); if (!clk_data) @@ -981,9 +991,63 @@ static int spacemit_ccu_register(struct device *dev, return ret; } =20 +static void spacemit_cadev_release(struct device *dev) +{ + struct auxiliary_device *adev =3D to_auxiliary_dev(dev); + + kfree(to_spacemit_ccu_adev(adev)); +} + +static void spacemit_adev_unregister(void *data) +{ + struct auxiliary_device *adev =3D data; + + auxiliary_device_delete(adev); + auxiliary_device_uninit(adev); +} + +static int spacemit_ccu_reset_register(struct device *dev, + struct regmap *regmap, + const char *reset_name) +{ + struct spacemit_ccu_adev *cadev; + struct auxiliary_device *adev; + static u32 next_id; + int ret; + + /* Nothing to do if the CCU does not implement a reset controller */ + if (!reset_name) + return 0; + + cadev =3D devm_kzalloc(dev, sizeof(*cadev), GFP_KERNEL); + if (!cadev) + return -ENOMEM; + cadev->regmap =3D regmap; + + adev =3D &cadev->adev; + adev->name =3D reset_name; + adev->dev.parent =3D dev; + adev->dev.release =3D spacemit_cadev_release; + adev->dev.of_node =3D dev->of_node; + adev->id =3D next_id++; + + ret =3D auxiliary_device_init(adev); + if (ret) + return ret; + + ret =3D auxiliary_device_add(adev); + if (ret) { + auxiliary_device_uninit(adev); + return ret; + } + + return devm_add_action_or_reset(dev, spacemit_adev_unregister, adev); +} + static int k1_ccu_probe(struct platform_device *pdev) { struct regmap *base_regmap, *lock_regmap =3D NULL; + const struct spacemit_ccu_data *data; struct device *dev =3D &pdev->dev; int ret; =20 @@ -1012,11 +1076,16 @@ static int k1_ccu_probe(struct platform_device *pde= v) "failed to get lock regmap\n"); } =20 - ret =3D spacemit_ccu_register(dev, base_regmap, lock_regmap, - of_device_get_match_data(dev)); + data =3D of_device_get_match_data(dev); + + ret =3D spacemit_ccu_register(dev, base_regmap, lock_regmap, data); if (ret) return dev_err_probe(dev, ret, "failed to register clocks\n"); =20 + ret =3D spacemit_ccu_reset_register(dev, base_regmap, data->reset_name); + if (ret) + return dev_err_probe(dev, ret, "failed to register resets\n"); + return 0; } =20 diff --git a/include/soc/spacemit/ccu_k1.h b/include/soc/spacemit/ccu_k1.h index 7df75043e78af..8b2581fb3055d 100644 --- a/include/soc/spacemit/ccu_k1.h +++ b/include/soc/spacemit/ccu_k1.h @@ -2,6 +2,18 @@ =20 /* SpacemiT clock and reset driver definitions for the K1 SoC */ =20 +/* Auxiliary device used to represent a CCU reset controller */ +struct spacemit_ccu_adev { + struct auxiliary_device adev; + struct regmap *regmap; +}; + +static inline struct spacemit_ccu_adev * +to_spacemit_ccu_adev(struct auxiliary_device *adev) +{ + return container_of(adev, struct spacemit_ccu_adev, adev); +} + /* APBS register offset */ #define APBS_PLL1_SWCR1 0x100 #define APBS_PLL1_SWCR2 0x104 --=20 2.45.2 From nobody Tue Dec 16 07:31:49 2025 Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29397219319 for ; Tue, 6 May 2025 21:06:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565613; cv=none; b=ZTiImrYc+dDClw7Cu1zKh5wIbOLQE8hxZvyzWe3ynZum64eEUgBJ2T8K0gNF7dcZH2YZD2+kVM8b/mMlwbQ3GbgBw9xdln859wPX22qXzRl6YfbO5rLSoGl48JvGZy3s92BE+VbLRwWAaeC2XIZqUEzlpmY2r2bsgXPLuBWg6Z4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565613; c=relaxed/simple; bh=nqsH3yR3Ezq0Bm/Bx2cPVqA6NKWuwnXVjVbuASJM7yw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IFvh5jxf+AxIPYgndrfkWuKBCITj4O8oadJkXJidfZGyypVApGmtdc82PdAirxN1CbuGWc4If9qpGuApGKMAYosBkH+HUKqVpC4LstEXMwvqAp82cwxCR9tI986DA2XhfK8baL18OMSzSDyoSuIv38RW3hPEb4Fx4Eb2HemHwUU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=Dtmoq59L; arc=none smtp.client-ip=209.85.166.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="Dtmoq59L" Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-864a071b44bso157203739f.3 for ; Tue, 06 May 2025 14:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746565609; x=1747170409; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=woLn9Vv7U1eAB3kmEge6xMExWIQJbuvrft+klRkSVKw=; b=Dtmoq59Lc+89DVAYAtVdSAazv0+5ZPBoimIn5MO3V7JIGCpstYMlG2apAdmKO/5Pgq 6OicCHwLEyNWvalccR0BzxUDbPNeUWpCYsRPu8FEsYxdoqo1abaSZQr8LGocnp5pr8Zj Dem0/C061p2gqaHUdkRpA0T7u/ZxZ3sjfLjKIEjRwgT6pOmdwRpmkQEiupi8BtKj8q+l A1cnx0D4CfAJOtQQGfN8uR2HSv9e9VFeuv4Q0IcyRo2+HtmxVwwu5T7uclYpsNMEMJWS cqdyea+tvaAch1PBj4gLaV2G5/lgQ12Ny2s8wH1IABNHKjdVVE6O454w6cCNMlT6loda egFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746565609; x=1747170409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=woLn9Vv7U1eAB3kmEge6xMExWIQJbuvrft+klRkSVKw=; b=j9p2IvnblkQCnvmdsyg0m/2qL9rc4bxN7gTYupu1wAd4QQ1B/AoI7cdO5FR2JvU8HU 07QtBfbctbKJXdLRxpwNdAh8BplQ9+72Rxqf1tFcH8NDChO9zYRXRkZoL+84yadnwI5b fn8YKCeYgRKim2AdR4E5LfnDTObuKrsLBCu9pkQ4C7yHaA9C9vGX6yxV08Cn/QWFzhPT Uk4q/GCHxZ4Lq9Bz50XXXOmjhzxqK+PpVNF7KA+iMCY3k5w8KxOQ0YPMtaN2hlM6QHPQ AMlJun0alO5QetOrACHJgtQwW+qRkltGoJOfvyunnukB0atZJ0WkagRxB/Y2YNroyfXY 5PNA== X-Forwarded-Encrypted: i=1; AJvYcCXtSiasXDkMD4rpBdIksx1+hBsytmGnvSkFir2gtAjV/HBHNGAkHsjOgRgguul9g2PvplxXrGvSzFBQmxE=@vger.kernel.org X-Gm-Message-State: AOJu0YytUI+SjNp+0/3Th4mOBXhNY3+TyTQ9Xhlodo/Fy26D0fKy2UV2 oYx8x7naeCWc6ZyeFTo0gaonTywVv8thbYe8hgU9VE9zuDWBCZW6GO/LSsKlHYM= X-Gm-Gg: ASbGncu3UpxKHU6XMNy1+G8WVa2S7Kn8LOkSGi+nArhQEii0HAxlflDPvzUd0kfkWyC 7BR9RK05DAXV90ABx4Ea6EK5g6emuMmpa0JcYGYYGapA9YynoR09NUflpUvS5FETPvcSvujIVyn B9CmjREMhZoyuZxG3QrVb6LrNRvZrek+vQjVFn0EYwlx6RqcLCZvzpqytPT8fdLNHQhQPbgl76b U6UE0M4hafcpKtZUZWcc21LatAl1h98PNgf79zWHYJ5OzAx2MQo7rhc3/AjC6aWWdGPzuykgqSw 2t7tzXQPxN1VtCAFryc64QTsdPeP2ZvDgxAngOo+iFhgOh6AfLAhtDnhZxUSm7appb6S3y8Ykab Uq6z+IuzHQZU/C5tpNpuJK75q X-Google-Smtp-Source: AGHT+IG44A/k6YY4+4TVqNrhG/OugRCgRTsVXuJEoJBMUIWbFJj0TsYrtdiwe53mCPOKw5twIJyW6w== X-Received: by 2002:a05:6e02:1a24:b0:3d6:d145:3006 with SMTP id e9e14a558f8ab-3da73935b2fmr8546905ab.20.1746565609062; Tue, 06 May 2025 14:06:49 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa588basm2419559173.79.2025.05.06.14.06.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 14:06:48 -0700 (PDT) From: Alex Elder To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, p.zabel@pengutronix.de, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, dlan@gentoo.org Cc: heylenay@4d2.org, inochiama@outlook.com, guodong@riscstar.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, spacemit@lists.linux.dev, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 4/6] reset: spacemit: add support for SpacemiT CCU resets Date: Tue, 6 May 2025 16:06:35 -0500 Message-ID: <20250506210638.2800228-5-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250506210638.2800228-1-elder@riscstar.com> References: <20250506210638.2800228-1-elder@riscstar.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Implement reset support for SpacemiT CCUs. The code is structured to handle SpacemiT resets generically, while defining the set of specific reset controllers and their resets in an SoC-specific source file. A SpacemiT reset controller device is an auxiliary device associated with a clock controller (CCU). This initial patch defines the reset controllers for the MPMU, APBC, and MPMU CCUs, which already defined clock controllers. Signed-off-by: Alex Elder --- drivers/reset/Kconfig | 1 + drivers/reset/Makefile | 1 + drivers/reset/spacemit/Kconfig | 12 +++ drivers/reset/spacemit/Makefile | 7 ++ drivers/reset/spacemit/core.c | 61 +++++++++++ drivers/reset/spacemit/core.h | 39 +++++++ drivers/reset/spacemit/k1.c | 177 ++++++++++++++++++++++++++++++++ 7 files changed, 298 insertions(+) create mode 100644 drivers/reset/spacemit/Kconfig create mode 100644 drivers/reset/spacemit/Makefile create mode 100644 drivers/reset/spacemit/core.c create mode 100644 drivers/reset/spacemit/core.h create mode 100644 drivers/reset/spacemit/k1.c diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 99f6f9784e686..b1f1af50ca10b 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -354,6 +354,7 @@ source "drivers/reset/amlogic/Kconfig" source "drivers/reset/starfive/Kconfig" source "drivers/reset/sti/Kconfig" source "drivers/reset/hisilicon/Kconfig" +source "drivers/reset/spacemit/Kconfig" source "drivers/reset/tegra/Kconfig" =20 endif diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index 31f9904d13f9c..6c19fd875ff13 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -2,6 +2,7 @@ obj-y +=3D core.o obj-y +=3D amlogic/ obj-y +=3D hisilicon/ +obj-y +=3D spacemit/ obj-y +=3D starfive/ obj-y +=3D sti/ obj-y +=3D tegra/ diff --git a/drivers/reset/spacemit/Kconfig b/drivers/reset/spacemit/Kconfig new file mode 100644 index 0000000000000..4ff3487a99eff --- /dev/null +++ b/drivers/reset/spacemit/Kconfig @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config RESET_SPACEMIT + bool + +config RESET_SPACEMIT_K1 + tristate "SpacemiT K1 reset driver" + depends on ARCH_SPACEMIT || COMPILE_TEST + select RESET_SPACEMIT + default ARCH_SPACEMIT + help + This enables the reset controller driver for the SpacemiT K1 SoC. diff --git a/drivers/reset/spacemit/Makefile b/drivers/reset/spacemit/Makef= ile new file mode 100644 index 0000000000000..3a064e9d5d6b4 --- /dev/null +++ b/drivers/reset/spacemit/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_RESET_SPACEMIT) +=3D reset_spacemit.o + +reset_spacemit-y :=3D core.o + +reset_spacemit-$(CONFIG_RESET_SPACEMIT_K1) +=3D k1.o diff --git a/drivers/reset/spacemit/core.c b/drivers/reset/spacemit/core.c new file mode 100644 index 0000000000000..5cd981eb3f097 --- /dev/null +++ b/drivers/reset/spacemit/core.c @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* SpacemiT reset driver core */ + +#include +#include +#include +#include + +#include "core.h" + +static int spacemit_reset_update(struct reset_controller_dev *rcdev, + unsigned long id, bool assert) +{ + struct ccu_reset_controller *controller; + const struct ccu_reset_data *data; + u32 mask; + u32 val; + + controller =3D container_of(rcdev, struct ccu_reset_controller, rcdev); + data =3D &controller->data->reset_data[id]; + mask =3D data->assert_mask | data->deassert_mask; + val =3D assert ? data->assert_mask : data->deassert_mask; + + return regmap_update_bits(controller->regmap, data->offset, mask, val); +} + +static int spacemit_reset_assert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + return spacemit_reset_update(rcdev, id, true); +} + +static int spacemit_reset_deassert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + return spacemit_reset_update(rcdev, id, false); +} + +static const struct reset_control_ops spacemit_reset_control_ops =3D { + .assert =3D spacemit_reset_assert, + .deassert =3D spacemit_reset_deassert, +}; + +/** + * spacemit_reset_controller_register() - register a reset controller + * @dev: Device that's registering the controller + * @controller: SpacemiT CCU reset controller structure + */ +int spacemit_reset_controller_register(struct device *dev, + struct ccu_reset_controller *controller) +{ + struct reset_controller_dev *rcdev =3D &controller->rcdev; + + rcdev->ops =3D &spacemit_reset_control_ops; + rcdev->owner =3D THIS_MODULE; + rcdev->of_node =3D dev->of_node; + rcdev->nr_resets =3D controller->data->count; + + return devm_reset_controller_register(dev, &controller->rcdev); +} diff --git a/drivers/reset/spacemit/core.h b/drivers/reset/spacemit/core.h new file mode 100644 index 0000000000000..a71f835ccb779 --- /dev/null +++ b/drivers/reset/spacemit/core.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* SpacemiT reset driver core */ + +#ifndef __RESET_SPACEMIT_CORE_H__ +#define __RESET_SPACEMIT_CORE_H__ + +#include +#include +#include + +struct ccu_reset_data { + u32 offset; + u32 assert_mask; + u32 deassert_mask; +}; + +#define RESET_DATA(_offset, _assert_mask, _deassert_mask) \ + { \ + .offset =3D (_offset), \ + .assert_mask =3D (_assert_mask), \ + .deassert_mask =3D (_deassert_mask), \ + } + +struct ccu_reset_controller_data { + const struct ccu_reset_data *reset_data; /* array */ + size_t count; +}; + +struct ccu_reset_controller { + struct reset_controller_dev rcdev; + const struct ccu_reset_controller_data *data; + struct regmap *regmap; +}; + +extern int spacemit_reset_controller_register(struct device *dev, + struct ccu_reset_controller *controller); + +#endif /* __RESET_SPACEMIT_CORE_H__ */ diff --git a/drivers/reset/spacemit/k1.c b/drivers/reset/spacemit/k1.c new file mode 100644 index 0000000000000..19a34f151b214 --- /dev/null +++ b/drivers/reset/spacemit/k1.c @@ -0,0 +1,177 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* SpacemiT reset driver data for the K1 SoC */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "core.h" + +static const struct ccu_reset_data mpmu_resets[] =3D { + [RESET_WDT] =3D RESET_DATA(MPMU_WDTPCR, BIT(2), 0), +}; + +static const struct ccu_reset_controller_data k1_mpmu_reset_data =3D { + .reset_data =3D mpmu_resets, + .count =3D ARRAY_SIZE(mpmu_resets), +}; + +static const struct ccu_reset_data apbc_resets[] =3D { + [RESET_UART0] =3D RESET_DATA(APBC_UART1_CLK_RST, BIT(2), 0), + [RESET_UART2] =3D RESET_DATA(APBC_UART2_CLK_RST, BIT(2), 0), + [RESET_GPIO] =3D RESET_DATA(APBC_GPIO_CLK_RST, BIT(2), 0), + [RESET_PWM0] =3D RESET_DATA(APBC_PWM0_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM1] =3D RESET_DATA(APBC_PWM1_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM2] =3D RESET_DATA(APBC_PWM2_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM3] =3D RESET_DATA(APBC_PWM3_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM4] =3D RESET_DATA(APBC_PWM4_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM5] =3D RESET_DATA(APBC_PWM5_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM6] =3D RESET_DATA(APBC_PWM6_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM7] =3D RESET_DATA(APBC_PWM7_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM8] =3D RESET_DATA(APBC_PWM8_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM9] =3D RESET_DATA(APBC_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM10] =3D RESET_DATA(APBC_PWM10_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM11] =3D RESET_DATA(APBC_PWM11_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM12] =3D RESET_DATA(APBC_PWM12_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM13] =3D RESET_DATA(APBC_PWM13_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM14] =3D RESET_DATA(APBC_PWM14_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM15] =3D RESET_DATA(APBC_PWM15_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM16] =3D RESET_DATA(APBC_PWM16_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM17] =3D RESET_DATA(APBC_PWM17_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM18] =3D RESET_DATA(APBC_PWM18_CLK_RST, BIT(2), BIT(0)), + [RESET_PWM19] =3D RESET_DATA(APBC_PWM19_CLK_RST, BIT(2), BIT(0)), + [RESET_SSP3] =3D RESET_DATA(APBC_SSP3_CLK_RST, BIT(2), 0), + [RESET_UART3] =3D RESET_DATA(APBC_UART3_CLK_RST, BIT(2), 0), + [RESET_RTC] =3D RESET_DATA(APBC_RTC_CLK_RST, BIT(2), 0), + [RESET_TWSI0] =3D RESET_DATA(APBC_TWSI0_CLK_RST, BIT(2), 0), + [RESET_TIMERS1] =3D RESET_DATA(APBC_TIMERS1_CLK_RST, BIT(2), 0), + [RESET_AIB] =3D RESET_DATA(APBC_AIB_CLK_RST, BIT(2), 0), + [RESET_TIMERS2] =3D RESET_DATA(APBC_TIMERS2_CLK_RST, BIT(2), 0), + [RESET_ONEWIRE] =3D RESET_DATA(APBC_ONEWIRE_CLK_RST, BIT(2), 0), + [RESET_SSPA0] =3D RESET_DATA(APBC_SSPA0_CLK_RST, BIT(2), 0), + [RESET_SSPA1] =3D RESET_DATA(APBC_SSPA1_CLK_RST, BIT(2), 0), + [RESET_DRO] =3D RESET_DATA(APBC_DRO_CLK_RST, BIT(2), 0), + [RESET_IR] =3D RESET_DATA(APBC_IR_CLK_RST, BIT(2), 0), + [RESET_TWSI1] =3D RESET_DATA(APBC_TWSI1_CLK_RST, BIT(2), 0), + [RESET_TSEN] =3D RESET_DATA(APBC_TSEN_CLK_RST, BIT(2), 0), + [RESET_TWSI2] =3D RESET_DATA(APBC_TWSI2_CLK_RST, BIT(2), 0), + [RESET_TWSI4] =3D RESET_DATA(APBC_TWSI4_CLK_RST, BIT(2), 0), + [RESET_TWSI5] =3D RESET_DATA(APBC_TWSI5_CLK_RST, BIT(2), 0), + [RESET_TWSI6] =3D RESET_DATA(APBC_TWSI6_CLK_RST, BIT(2), 0), + [RESET_TWSI7] =3D RESET_DATA(APBC_TWSI7_CLK_RST, BIT(2), 0), + [RESET_TWSI8] =3D RESET_DATA(APBC_TWSI8_CLK_RST, BIT(2), 0), + [RESET_IPC_AP2AUD] =3D RESET_DATA(APBC_IPC_AP2AUD_CLK_RST, BIT(2), 0), + [RESET_UART4] =3D RESET_DATA(APBC_UART4_CLK_RST, BIT(2), 0), + [RESET_UART5] =3D RESET_DATA(APBC_UART5_CLK_RST, BIT(2), 0), + [RESET_UART6] =3D RESET_DATA(APBC_UART6_CLK_RST, BIT(2), 0), + [RESET_UART7] =3D RESET_DATA(APBC_UART7_CLK_RST, BIT(2), 0), + [RESET_UART8] =3D RESET_DATA(APBC_UART8_CLK_RST, BIT(2), 0), + [RESET_UART9] =3D RESET_DATA(APBC_UART9_CLK_RST, BIT(2), 0), + [RESET_CAN0] =3D RESET_DATA(APBC_CAN0_CLK_RST, BIT(2), 0), +}; + +static const struct ccu_reset_controller_data k1_apbc_reset_data =3D { + .reset_data =3D apbc_resets, + .count =3D ARRAY_SIZE(apbc_resets), +}; + +static const struct ccu_reset_data apmu_resets[] =3D { + [RESET_CCIC_4X] =3D RESET_DATA(APMU_CCIC_CLK_RES_CTRL, 0, BIT(1)), + [RESET_CCIC1_PHY] =3D RESET_DATA(APMU_CCIC_CLK_RES_CTRL, 0, BIT(2)), + [RESET_SDH_AXI] =3D RESET_DATA(APMU_SDH0_CLK_RES_CTRL, 0, BIT(0)), + [RESET_SDH0] =3D RESET_DATA(APMU_SDH0_CLK_RES_CTRL, 0, BIT(1)), + [RESET_SDH1] =3D RESET_DATA(APMU_SDH1_CLK_RES_CTRL, 0, BIT(1)), + [RESET_SDH2] =3D RESET_DATA(APMU_SDH2_CLK_RES_CTRL, 0, BIT(1)), + [RESET_USBP1_AXI] =3D RESET_DATA(APMU_USB_CLK_RES_CTRL, 0, BIT(4)), + [RESET_USB_AXI] =3D RESET_DATA(APMU_USB_CLK_RES_CTRL, 0, BIT(0)), + [RESET_USB3_0] =3D RESET_DATA(APMU_USB_CLK_RES_CTRL, 0, + BIT(11) | BIT(10) | BIT(9)), + [RESET_QSPI] =3D RESET_DATA(APMU_QSPI_CLK_RES_CTRL, 0, BIT(1)), + [RESET_QSPI_BUS] =3D RESET_DATA(APMU_QSPI_CLK_RES_CTRL, 0, BIT(0)), + [RESET_DMA] =3D RESET_DATA(APMU_DMA_CLK_RES_CTRL, 0, BIT(0)), + [RESET_AES] =3D RESET_DATA(APMU_AES_CLK_RES_CTRL, 0, BIT(4)), + [RESET_VPU] =3D RESET_DATA(APMU_VPU_CLK_RES_CTRL, 0, BIT(0)), + [RESET_GPU] =3D RESET_DATA(APMU_GPU_CLK_RES_CTRL, 0, BIT(1)), + [RESET_EMMC] =3D RESET_DATA(APMU_PMUA_EM_CLK_RES_CTRL, 0, BIT(1)), + [RESET_EMMC_X] =3D RESET_DATA(APMU_PMUA_EM_CLK_RES_CTRL, 0, BIT(0)), + [RESET_AUDIO] =3D RESET_DATA(APMU_AUDIO_CLK_RES_CTRL, 0, + BIT(3) | BIT(2) | BIT(0)), + [RESET_HDMI] =3D RESET_DATA(APMU_HDMI_CLK_RES_CTRL, 0, BIT(9)), + [RESET_PCIE0] =3D RESET_DATA(APMU_PCIE_CLK_RES_CTRL_0, BIT(8), + BIT(5) | BIT(4) | BIT(3)), + [RESET_PCIE1] =3D RESET_DATA(APMU_PCIE_CLK_RES_CTRL_1, BIT(8), + BIT(5) | BIT(4) | BIT(3)), + [RESET_PCIE2] =3D RESET_DATA(APMU_PCIE_CLK_RES_CTRL_2, BIT(8), + BIT(5) | BIT(4) | BIT(3)), + [RESET_EMAC0] =3D RESET_DATA(APMU_EMAC0_CLK_RES_CTRL, 0, BIT(1)), + [RESET_EMAC1] =3D RESET_DATA(APMU_EMAC1_CLK_RES_CTRL, 0, BIT(1)), + [RESET_JPG] =3D RESET_DATA(APMU_JPG_CLK_RES_CTRL, 0, BIT(0)), + [RESET_CCIC2PHY] =3D RESET_DATA(APMU_CSI_CCIC2_CLK_RES_CTRL, 0, BIT(2)), + [RESET_CCIC3PHY] =3D RESET_DATA(APMU_CSI_CCIC2_CLK_RES_CTRL, 0, BIT(29)), + [RESET_CSI] =3D RESET_DATA(APMU_CSI_CCIC2_CLK_RES_CTRL, 0, BIT(1)), + [RESET_ISP] =3D RESET_DATA(APMU_ISP_CLK_RES_CTRL, 0, BIT(0)), + [RESET_ISP_CPP] =3D RESET_DATA(APMU_ISP_CLK_RES_CTRL, 0, BIT(27)), + [RESET_ISP_BUS] =3D RESET_DATA(APMU_ISP_CLK_RES_CTRL, 0, BIT(3)), + [RESET_ISP_CI] =3D RESET_DATA(APMU_ISP_CLK_RES_CTRL, 0, BIT(16)), + [RESET_DPU_MCLK] =3D RESET_DATA(APMU_LCD_CLK_RES_CTRL2, 0, BIT(9)), + [RESET_DPU_ESC] =3D RESET_DATA(APMU_LCD_CLK_RES_CTRL1, 0, BIT(3)), + [RESET_DPU_HCLK] =3D RESET_DATA(APMU_LCD_CLK_RES_CTRL1, 0, BIT(4)), + [RESET_DPU_SPIBUS] =3D RESET_DATA(APMU_LCD_SPI_CLK_RES_CTRL, 0, BIT(4)), + [RESET_DPU_SPI_HBUS] =3D RESET_DATA(APMU_LCD_SPI_CLK_RES_CTRL, 0, BIT(2)), + [RESET_V2D] =3D RESET_DATA(APMU_LCD_CLK_RES_CTRL1, 0, BIT(27)), + [RESET_MIPI] =3D RESET_DATA(APMU_LCD_CLK_RES_CTRL1, 0, BIT(15)), + [RESET_MC] =3D RESET_DATA(APMU_PMUA_MC_CTRL, 0, BIT(0)), +}; + +static const struct ccu_reset_controller_data k1_apmu_reset_data =3D { + .reset_data =3D apmu_resets, + .count =3D ARRAY_SIZE(apmu_resets), +}; + +static int spacemit_k1_reset_probe(struct auxiliary_device *adev, + const struct auxiliary_device_id *id) +{ + struct spacemit_ccu_adev *rdev =3D to_spacemit_ccu_adev(adev); + const void *data =3D (void *)id->driver_data; + struct ccu_reset_controller *controller; + struct device *dev =3D &adev->dev; + + controller =3D devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); + if (!controller) + return -ENODEV; + controller->data =3D data; + controller->regmap =3D rdev->regmap; + + return spacemit_reset_controller_register(dev, controller); +} + +#define K1_AUX_DEV_ID(_unit) \ + { \ + .name =3D "spacemit_ccu_k1." #_unit "-reset", \ + .driver_data =3D (kernel_ulong_t)&k1_ ## _unit ## _reset_data, \ + } + +static const struct auxiliary_device_id spacemit_k1_reset_ids[] =3D { + K1_AUX_DEV_ID(mpmu), + K1_AUX_DEV_ID(apbc), + K1_AUX_DEV_ID(apmu), + { }, +}; +MODULE_DEVICE_TABLE(auxiliary, spacemit_k1_reset_ids); + +#undef K1_AUX_DEV_ID + +static struct auxiliary_driver spacemit_k1_reset_driver =3D { + .probe =3D spacemit_k1_reset_probe, + .id_table =3D spacemit_k1_reset_ids, +}; +module_auxiliary_driver(spacemit_k1_reset_driver); --=20 2.45.2 From nobody Tue Dec 16 07:31:49 2025 Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DED621A44D for ; Tue, 6 May 2025 21:06:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565614; cv=none; b=BYQpQJVDOP0VetfGEdlVZ/GFCzCL519EJSUESUZCyfR7YLM4byDkS9WOYwS98jD1HWzMJtb5JbYcXJCU9uu/NN9EToikr5gjNDuYHiUFS6zdfWHkpPFaDqGhPY6yxxmm64Ku0amvLa4wPjAzTLFGDT24hHxk5CuqKEn/hzTjjlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565614; c=relaxed/simple; bh=DjfsqH6niK9AVdZVSLESiMTovzwVko5bY5GY/GZAV8Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tt9W8kAhxOdXwY6QyWF3modGRc7CdFjIJGTrTYXqcYykmpNNS9ybdolGYvK7GCZ02wB9nIxrgMbQ6zKx1PF+u9OQNoOr4yIm5ISt/Bi3PphJ1HryOSnmqkq2Cov7vgFqawiyzmRRkpWAx4RbdVLJ9+ZSshseIbrnGuXvFosg0lU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=d4YQbsxT; arc=none smtp.client-ip=209.85.166.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="d4YQbsxT" Received: by mail-io1-f43.google.com with SMTP id ca18e2360f4ac-86192b64d0bso562898839f.3 for ; Tue, 06 May 2025 14:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746565610; x=1747170410; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4z0K4kzFPsp/sHcESObbMXkE8E8lHogVd3HcemJwitc=; b=d4YQbsxTKzYlNDEwPUgxxjAUJyy2ffcWXyVjlu31mLfgikMXn1Iyme4u2xOTYpaWYt cYYY23qKxmobCcyjBxJI+wKnG/6SZz6ClstSiWRH+Jv/fTVHXCN5WwN72f1nJBA5HM8Z AaacJ9kaYF3b8oTBccmERZq7/tiZVArcwyvGdiwV9tPHLBzP4E9krXvE1tT2nnrvH6qa uoAIOZPRGpUbpJxGeky0WIZufY6bKwBPAT5nez3qIm9ZlsmYnjbMZ3CyURMSYFJZywp1 HHorBeHFmtCg5Ddwe9KsrY0SWcUVIolpBB1lnxQ/Hiom8ef2IPuN/hSS2P/SokeF1qRY qJ4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746565610; x=1747170410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4z0K4kzFPsp/sHcESObbMXkE8E8lHogVd3HcemJwitc=; b=T8at7GTh+o+u11QvDHE8WfnTcuw7nT2oEcXvMZ4UpTvDYo6MJNAFFCeexZaah07ZOK prm7QTf/EzJFlx3FInYHNxNeBPhPANf+2KAVyuWHu87Lra/VcTyMaBFv2SnBM1uj/5oK RNcqH4hgGDL0rIUkeBL2aJ8L49Pptb6SjBhhsovcTov5l1VuI7ZhH4DU5jvnIF1DLXDa krs/S6ZtAC3Lec8DGQ1FJvBditbdKIM+rmZujI4m5Z5NK15afCbk4iaLuXnLJgMxyrmh lP81ZnFtkBVUByXVHFWK/20SdSudA0fhbb3E2RGPk6VSiTHk7LEL22gtkzxILUCaY4zQ joQA== X-Forwarded-Encrypted: i=1; AJvYcCUm7Lgk4vSOBxbyEeBLCWiN2W9mXD1AG7Ry+xphc1+49NC0R2qdtp1kZxaGKMbt0WslluJRGl/RgB9MhaA=@vger.kernel.org X-Gm-Message-State: AOJu0YxNXxP9CvxUBTLdkUK2pvb76JYl3Gi5JbaormWlivO3Co5j+zXT jyjoqbbNSWMd1YMCqBTruzHfGGDXEG8InvJ9e4UQ5SPeGhTnMsI6Bd41WnRJsr4= X-Gm-Gg: ASbGncuNEpocSWsvlKDvEG0V/ckshcBHWJbD4mGv1UzxuDMRKCnelnvN1Mippis+9aO whPEwxBjlJboDTZNKuxzbHUJm8offTaTdM6vF4P3RQuFfJg8o56dHKs1v4kAFbEL2eLJdk077Oy As5Umxagl1RPw+j2sv2niXjvGh8Phb7IEG7jqdZWpWEdhKS2tYeqaVZLx/dgPxpcoCCz3o9Um/G MEtLqglgAzDz36ihBulmBVGudv05MLoatSpajM/un14F+pPws3T6X1QpN1WxvTCKZBvHcTglG8H SqF0WJ5T2VXcL8YK3dVVyHcTl5RTzh90Nz9+ZrZxhHiSBySfgO9R6PmuXgRHNC6zJ12QNQYCDHE rpkXXE4yd9JwJ+eoZR8YJ8weY X-Google-Smtp-Source: AGHT+IFGjQEF7fCThICgu4hR6t0NNc2NV3Tvj+Q6GZuc4V+JgASwbCj93Air8LG5cMU+hgkWkJJxKQ== X-Received: by 2002:a05:6602:6c18:b0:85c:c7f9:9a1c with SMTP id ca18e2360f4ac-8674744e2f4mr118536739f.13.1746565610279; Tue, 06 May 2025 14:06:50 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa588basm2419559173.79.2025.05.06.14.06.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 14:06:49 -0700 (PDT) From: Alex Elder To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, p.zabel@pengutronix.de, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, dlan@gentoo.org Cc: heylenay@4d2.org, inochiama@outlook.com, guodong@riscstar.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, spacemit@lists.linux.dev, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 5/6] reset: spacemit: define three more CCUs Date: Tue, 6 May 2025 16:06:36 -0500 Message-ID: <20250506210638.2800228-6-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250506210638.2800228-1-elder@riscstar.com> References: <20250506210638.2800228-1-elder@riscstar.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Three more CCUs on the SpacemiT K1 SoC implement only resets, not clocks. Define these resets so they can be used. Signed-off-by: Alex Elder --- drivers/clk/spacemit/ccu-k1.c | 24 ++++++++++++++++ drivers/reset/spacemit/k1.c | 54 +++++++++++++++++++++++++++++++++++ include/soc/spacemit/ccu_k1.h | 30 +++++++++++++++++++ 3 files changed, 108 insertions(+) diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 6b1845e899e5f..bddc83aff23cd 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -939,6 +939,18 @@ static const struct spacemit_ccu_data k1_ccu_apmu_data= =3D { .num =3D ARRAY_SIZE(k1_ccu_apmu_hws), }; =20 +static const struct spacemit_ccu_data k1_ccu_rcpu_data =3D { + .reset_name =3D "rcpu-reset", +}; + +static const struct spacemit_ccu_data k1_ccu_rcpu2_data =3D { + .reset_name =3D "rcpu2-reset", +}; + +static const struct spacemit_ccu_data k1_ccu_apbc2_data =3D { + .reset_name =3D "apbc2-reset", +}; + static int spacemit_ccu_register(struct device *dev, struct regmap *regmap, struct regmap *lock_regmap, @@ -1106,6 +1118,18 @@ static const struct of_device_id of_k1_ccu_match[] = =3D { .compatible =3D "spacemit,k1-syscon-apmu", .data =3D &k1_ccu_apmu_data, }, + { + .compatible =3D "spacemit,k1-syscon-rcpu", + .data =3D &k1_ccu_rcpu_data, + }, + { + .compatible =3D "spacemit,k1-syscon-rcpu2", + .data =3D &k1_ccu_rcpu2_data, + }, + { + .compatible =3D "spacemit,k1-syscon-apbc2", + .data =3D &k1_ccu_apbc2_data, + }, { } }; MODULE_DEVICE_TABLE(of, of_k1_ccu_match); diff --git a/drivers/reset/spacemit/k1.c b/drivers/reset/spacemit/k1.c index 19a34f151b214..27434a1928261 100644 --- a/drivers/reset/spacemit/k1.c +++ b/drivers/reset/spacemit/k1.c @@ -137,6 +137,57 @@ static const struct ccu_reset_controller_data k1_apmu_= reset_data =3D { .count =3D ARRAY_SIZE(apmu_resets), }; =20 +static const struct ccu_reset_data rcpu_resets[] =3D { + [RESET_RCPU_SSP0] =3D RESET_DATA(RCPU_SSP0_CLK_RST, 0, BIT(0)), + [RESET_RCPU_I2C0] =3D RESET_DATA(RCPU_I2C0_CLK_RST, 0, BIT(0)), + [RESET_RCPU_UART1] =3D RESET_DATA(RCPU_UART1_CLK_RST, 0, BIT(0)), + [RESET_RCPU_IR] =3D RESET_DATA(RCPU_CAN_CLK_RST, 0, BIT(0)), + [RESET_RCPU_CAN] =3D RESET_DATA(RCPU_IR_CLK_RST, 0, BIT(0)), + [RESET_RCPU_UART0] =3D RESET_DATA(RCPU_UART0_CLK_RST, 0, BIT(0)), + [RESET_RCPU_HDMI_AUDIO] =3D RESET_DATA(AUDIO_HDMI_CLK_CTRL, 0, BIT(0)), +}; + +static const struct ccu_reset_controller_data k1_rcpu_reset_data =3D { + /* No clocks in the RCPU CCU */ + .reset_data =3D rcpu_resets, + .count =3D ARRAY_SIZE(rcpu_resets), +}; + +static const struct ccu_reset_data rcpu2_resets[] =3D { + [RESET_RCPU2_PWM0] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM1] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM2] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM3] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM4] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM5] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM6] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM7] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM8] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM9] =3D RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), +}; + +static const struct ccu_reset_controller_data k1_rcpu2_reset_data =3D { + /* No clocks in the RCPU2 CCU */ + .reset_data =3D rcpu2_resets, + .count =3D ARRAY_SIZE(rcpu2_resets), +}; + +static const struct ccu_reset_data apbc2_resets[] =3D { + [RESET_APBC2_UART1] =3D RESET_DATA(APBC2_UART1_CLK_RST, BIT(2), 0), + [RESET_APBC2_SSP2] =3D RESET_DATA(APBC2_SSP2_CLK_RST, BIT(2), 0), + [RESET_APBC2_TWSI3] =3D RESET_DATA(APBC2_TWSI3_CLK_RST, BIT(2), 0), + [RESET_APBC2_RTC] =3D RESET_DATA(APBC2_RTC_CLK_RST, BIT(2), 0), + [RESET_APBC2_TIMERS0] =3D RESET_DATA(APBC2_TIMERS0_CLK_RST, BIT(2), 0), + [RESET_APBC2_KPC] =3D RESET_DATA(APBC2_KPC_CLK_RST, BIT(2), 0), + [RESET_APBC2_GPIO] =3D RESET_DATA(APBC2_GPIO_CLK_RST, BIT(2), 0), +}; + +static const struct ccu_reset_controller_data k1_apbc2_reset_data =3D { + /* No clocks in the APBC2 CCU */ + .reset_data =3D apbc2_resets, + .count =3D ARRAY_SIZE(apbc2_resets), +}; + static int spacemit_k1_reset_probe(struct auxiliary_device *adev, const struct auxiliary_device_id *id) { @@ -164,6 +215,9 @@ static const struct auxiliary_device_id spacemit_k1_res= et_ids[] =3D { K1_AUX_DEV_ID(mpmu), K1_AUX_DEV_ID(apbc), K1_AUX_DEV_ID(apmu), + K1_AUX_DEV_ID(rcpu), + K1_AUX_DEV_ID(rcpu2), + K1_AUX_DEV_ID(apbc2), { }, }; MODULE_DEVICE_TABLE(auxiliary, spacemit_k1_reset_ids); diff --git a/include/soc/spacemit/ccu_k1.h b/include/soc/spacemit/ccu_k1.h index 8b2581fb3055d..66035012317c9 100644 --- a/include/soc/spacemit/ccu_k1.h +++ b/include/soc/spacemit/ccu_k1.h @@ -123,3 +123,33 @@ to_spacemit_ccu_adev(struct auxiliary_device *adev) #define APMU_PCIE_CLK_RES_CTRL_2 0x3dc #define APMU_EMAC0_CLK_RES_CTRL 0x3e4 #define APMU_EMAC1_CLK_RES_CTRL 0x3ec + +/* RCPU register offsets */ +#define RCPU_SSP0_CLK_RST 0x0028 +#define RCPU_I2C0_CLK_RST 0x0030 +#define RCPU_UART1_CLK_RST 0x003c +#define RCPU_CAN_CLK_RST 0x0048 +#define RCPU_IR_CLK_RST 0x004c +#define RCPU_UART0_CLK_RST 0x00d8 +#define AUDIO_HDMI_CLK_CTRL 0x2044 + +/* RCPU2 register offsets */ +#define RCPU2_PWM0_CLK_RST 0x0000 +#define RCPU2_PWM1_CLK_RST 0x0004 +#define RCPU2_PWM2_CLK_RST 0x0008 +#define RCPU2_PWM3_CLK_RST 0x000c +#define RCPU2_PWM4_CLK_RST 0x0010 +#define RCPU2_PWM5_CLK_RST 0x0014 +#define RCPU2_PWM6_CLK_RST 0x0018 +#define RCPU2_PWM7_CLK_RST 0x001c +#define RCPU2_PWM8_CLK_RST 0x0020 +#define RCPU2_PWM9_CLK_RST 0x0024 + +/* APBC2 register offsets */ +#define APBC2_UART1_CLK_RST 0x0000 +#define APBC2_SSP2_CLK_RST 0x0004 +#define APBC2_TWSI3_CLK_RST 0x0008 +#define APBC2_RTC_CLK_RST 0x000c +#define APBC2_TIMERS0_CLK_RST 0x0010 +#define APBC2_KPC_CLK_RST 0x0014 +#define APBC2_GPIO_CLK_RST 0x001c --=20 2.45.2 From nobody Tue Dec 16 07:31:49 2025 Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8490221A45D for ; Tue, 6 May 2025 21:06:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565616; cv=none; b=sr//+OWyJeZooeoW+bpJTuIhDTYxqkIOIwjxN8guUwnJoRmu/1NRvgMKZTTib3Ceh/DWPh0QXxoPRk5TrsGZG28ySBmcCP5KQrAXGRFcKUKZ+QfINl6BOyXhMcHaupCpi4phhd0gEf3UGtnP2hiHfwQ+RhkVl5Rbr5AbCju17uM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746565616; c=relaxed/simple; bh=o+DTlUShzMqTWdpVptHXPZF7T6Hpe95l3FZm/2enEAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=opFJ0hYzpBx+G1iAzDQqHKgD39nqQjzGX9dj1RhKawahnVE5DKDsuCSg9+AvPl2TbuSy+x75RqiRePvJtZ0gHTjhNLNRlQt2tKQQGhuOG6YvZzX0+fxRIHIbl6ikHhIALQ7LXa8k6dS5OplKeAXJ6Z9M5FFzmAmAOelbJamVHno= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=s70s/p9Y; arc=none smtp.client-ip=209.85.166.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="s70s/p9Y" Received: by mail-io1-f54.google.com with SMTP id ca18e2360f4ac-85e15dc801aso560380039f.2 for ; Tue, 06 May 2025 14:06:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746565611; x=1747170411; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f4O20IXLpg8jEm9xUHHnlctypzKfsB1ZRP9Xc0/of3c=; b=s70s/p9YwSg76W2CTUcTOU/9EKFOSwuKQqErfuIuUBIRKWXo0xgx6dnHv5A21YPgsE UjE/KpAvjPMp6/D7tUn76o8B0eG5qcZI3Wwliw/pxspJajr6NsNzj5iCe60ZXHn/H0Wa LSnJUApysR8jiBaVWhCKrLcQDy6LFtKcOQ678+06MZInDDv9TXe/YA10ZXgzQobp2lqP IGepf4+M8ss5Iovx3620LCehFDUwimyqheTYxrN59v7OxMYxjwwCb6KFBgPKZEkeGV9B Z2//pNl0OCSOGJbhMBU4kld/4sWRWf/mBv/8gfKh+V4Ws8PnKG7oqs5zhdBLIxBcRsVZ 6QjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746565611; x=1747170411; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f4O20IXLpg8jEm9xUHHnlctypzKfsB1ZRP9Xc0/of3c=; b=LQl0iNmwe/PC0yDE4h3KXf41/era9KX7KN/7bq3NgAv8/d7vf/gPw4CgavBVN/b97N 0z3OcOkQnBuHKO6YBXoTZfCdiZfBfF5Rh2X2daBRinxgYTILhqxcieV4uSJr4jUB5mpz FiS4pZzQG7sFw4C9YPsq/6tgjU7D9cD/7QifT92NVpW3GNx2tFUWbo1kX7KHVcPwo5oc nAnt6GlStx5WsAG/ZqLDqjHR3H2WWo9HqI7ITXpipVLaomMQ7FVCCXVMPgox1cnCjSSz 3Xg7d6nBzyOQgR88B0jOA9Eop44JTjY+KsCz8zBYOIlb7z5W4uMVIqUml6ehl2P1Y5xt wQUA== X-Forwarded-Encrypted: i=1; AJvYcCVXpm9BAkF7WGoD2mBp4X9ZpwjHPKvn8lIfc5zpu+oSQ2vg3Hg8kPv2CNBq0wCj5kgYcraD0BQ30NXdL8c=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8kxWXEK6TBYr6l6bllXHiqsSSaKFgEV6MT0zlqqkwCUjd2iUw V83NmvOpIckuDLXpjKp6wQUvyXknpFFRgYc5/lfeWPvZF5P+cmi95xV4ihyrknI= X-Gm-Gg: ASbGncvd+acDRZ9gGyCX5wjsE2q3zLVwvNv+Ej6WOiTQYq+GlvGe24YdbGQRpQGXbsA IwYijIkLEdQqMM14g9b5V/XW49UD0dyg0d9T9sbhs90h1pJRITvjiU5WLrQlchx431ckUk9Uq4a 8R1W6Ol83BKMjhE/oHD+sRViaOYTw642Jr5CXaq0znIBHnH+KyiYlzPO3BceAES7G9PeBMOMs6l 6d7+yWafNL2eaKmJDZ0W4xOByvnbNGa4IemV53X98WFpeATo8Zo9lQlhDqRutzsXFZGtHYI6mnq 5k/bzRp3uYnrn0s1mbSZGuXsslPsZZ5Slc8Au1jgEv8xBJvJGA5++q/mnaUv86OYACOGwV+jMPJ 6TeNVdR7FfO8sMg== X-Google-Smtp-Source: AGHT+IEul28rdtLnf24eQSg9o53hrAPhvZHN/Ndz1HzML1us6xJoFlvoRMcUFOXYOR8J/ANloTh/Jg== X-Received: by 2002:a05:6602:1350:b0:85d:f316:fabc with SMTP id ca18e2360f4ac-8674731bb70mr129539539f.8.1746565611497; Tue, 06 May 2025 14:06:51 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa588basm2419559173.79.2025.05.06.14.06.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 14:06:51 -0700 (PDT) From: Alex Elder To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, p.zabel@pengutronix.de, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, dlan@gentoo.org Cc: heylenay@4d2.org, inochiama@outlook.com, guodong@riscstar.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, spacemit@lists.linux.dev, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 6/6] riscv: dts: spacemit: add reset support for the K1 SoC Date: Tue, 6 May 2025 16:06:37 -0500 Message-ID: <20250506210638.2800228-7-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250506210638.2800228-1-elder@riscstar.com> References: <20250506210638.2800228-1-elder@riscstar.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Define syscon nodes for the RCPU, RCPU2, and APBC2 SpacemiT CCUS, which currently support resets but not clocks in the SpacemiT K1. Signed-off-by: Alex Elder --- arch/riscv/boot/dts/spacemit/k1.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/riscv/boot/dts/spacemit/k1.dtsi b/arch/riscv/boot/dts/spa= cemit/k1.dtsi index 6eec6328c26fe..f4afb35dc6bc9 100644 --- a/arch/riscv/boot/dts/spacemit/k1.dtsi +++ b/arch/riscv/boot/dts/spacemit/k1.dtsi @@ -346,6 +346,18 @@ soc { dma-noncoherent; ranges; =20 + syscon_rcpu: system-controller@c0880000 { + compatible =3D "spacemit,k1-syscon-rcpu"; + reg =3D <0x0 0xc0880000 0x0 0x2048>; + #reset-cells =3D <1>; + }; + + syscon_rcpu2: system-controller@c0888000 { + compatible =3D "spacemit,k1-syscon-rcpu2"; + reg =3D <0x0 0xc0888000 0x0 0x28>; + #reset-cells =3D <1>; + }; + syscon_apbc: system-control@d4015000 { compatible =3D "spacemit,k1-syscon-apbc"; reg =3D <0x0 0xd4015000 0x0 0x1000>; @@ -553,6 +565,12 @@ clint: timer@e4000000 { <&cpu7_intc 3>, <&cpu7_intc 7>; }; =20 + syscon_apbc2: system-controller@f0610000 { + compatible =3D "spacemit,k1-syscon-apbc2"; + reg =3D <0x0 0xf0610000 0x0 0x20>; + #reset-cells =3D <1>; + }; + sec_uart1: serial@f0612000 { compatible =3D "spacemit,k1-uart", "intel,xscale-uart"; reg =3D <0x0 0xf0612000 0x0 0x100>; --=20 2.45.2