From nobody Tue Dec 16 07:29:48 2025 Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) (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 D120D28AAEE for ; Thu, 8 May 2025 19:54:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734059; cv=none; b=hEuz05VXqQ2OXZkNOCJ3mikx3QYqEDkX9lTQpgvMTbjygdXRo0od1I9sZxNXqwDPl0V8yf+MqTEnOIdJItHArKs0cks0W87Iw48moK3g0OZYFuuJpBYsbDUVR5F6wRKRfvaqDTl3w2VvFkg5Q8nvV5T+TAhq5jer2bwUn15bR4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734059; c=relaxed/simple; bh=JbvxIKNnm2l02MeokP48X8vc1GIBXzEECfh/a24p9gk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aFVl7t+G3dosrdrQDM7Rcwhljb3sWPFhQNLsg4ldsQty3Si6eUMaAKTKkj+mVl1HQb8YzRqB6s9fzcUqQZnNYLInL8UzkZ1yLXjPmMIxWvnCVLW9LUWimZgdT0mCMIt7JZ28w8+ye8JbOJiFCobwKVuQOOYlndeQObjusP0cY0s= 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=T8Q9WnR0; arc=none smtp.client-ip=209.85.166.171 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="T8Q9WnR0" Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-3d8e9f26b96so11087235ab.1 for ; Thu, 08 May 2025 12:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746734055; x=1747338855; 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=T8Q9WnR0fc4PzBCO2E5Ay0PzeVwid+dfBVlishPbtiY9q37jgZypEaA1x3BTgp6Cu1 vGSkUEQqi1SDQdrdqBHUW5UQRe2+dYAqXEuCB+Yx7kH3Uw+rHHkyyZZSl9vwbjDRXRvT D9vLPz+tuzsrgw2CCHRZEsXINm25bzmAWqZ8pvDN9+HbXBwgoHWQcq0x89A1v7wP0Bvg qDKcMTlPK8NoXOPR1KqU7n06Th9XGjLP7qAr5Z4KVhjHCyHUd2B/WyR73+AcowGCHrqe gZ7WmQ6+HRxWShK2nM7n4nfNdzOk4CBMopPcd4v5ymfEHD5/bhUlRMAPogqKqYyY+0Q6 7NrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746734055; x=1747338855; 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=usiCD+3v+d5efXEf2tSOL0vUYmQ1gjUp+FXLVD8I5sFlpTps7nqcBeYLE98EPkXbah pU1shCFEsLa/p8yQZuNQJZ0N8ZXNJJW78nMFzJQr3UDnjIaNTNHf3VgdzIHhrGRFddnT 4d/XD/avBYaLFFAIJHaeSPyi7yGdD96FaW1290Mx0AvaUjj+nY9XNNCiVVa6hs4Pa8BW lC/q7MNqiGsvzc7+wxFE2/XbmDO2AXW45uo8RrJCnMr3jjTykLmRtXdSCbSF/XmHvzDN pcLDXzu8FWf0s+4/bPX1feWOL7V5xC8aUd9UMe3YQdaSnNZa2MMXX1I3Oxoiy05k44y/ 8SVQ== X-Forwarded-Encrypted: i=1; AJvYcCUOB94vk1cz8eYSXkPMOeyXnlp9fpbzc3rtNXoEQGRdEwyml/UBA1OKvCJD8Ps45qLRea1MF8YO3ilkCRk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5ElAPw7qIF2RTGCzNJShGUuU/XQ/G8FSi7ZGVVEh18dOvY018 59lOQyCYYqA4mzDccFiWGy7L6QNmzf/x7crgwNq7/JBrWwCDaqIFWdp8ijtinLs= X-Gm-Gg: ASbGncviZDXfJaAZSR2IcDEIpbMV44UwN2kAdWU1OIj1ujRhCmq8rUggAcAXe/S5+dv drmUateSDq5GLztmsTqrultQu+qntwtUL9wkD85U/EqGcdS33J8BEFYMcbBnH2jR88Lfc6NUI0i UJdAbmvxd4q2yOMPhk52gRYwKccrv413Jfei25MbjdVEI9CcSCVtvZmYbJXtqbQ8Zth2i3UZgQ9 6SlAfQZoVVEBXJ73WGFkTd8PgJbjxn5ta2Bx70rBlcMlEfsdCBmITT6oEiULtXqu5RxBrSbcKyD PspuoQ3R4GG13S0hIfzusC72PU06WymEjsGOiXS77Z2VEQj5TwEoh/FRfwvgEL0dE3uF0IQjAKT bA7vwJvcPTZTx3A== X-Google-Smtp-Source: AGHT+IF8CcPkmjAlw6MTkmmdxTcsoXmdwilW9UDT/6qyTJy0KFGIHccSczN1HQMBgLC3/Mu1mNpyNA== X-Received: by 2002:a05:6e02:1809:b0:3d8:19e8:e738 with SMTP id e9e14a558f8ab-3da7e20cfd3mr10930035ab.17.1746734055380; Thu, 08 May 2025 12:54:15 -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-4fa226850e1sm93983173.134.2025.05.08.12.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 12:54:14 -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 v7 1/6] dt-bindings: soc: spacemit: define spacemit,k1-ccu resets Date: Thu, 8 May 2025 14:54:03 -0500 Message-ID: <20250508195409.2962633-2-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250508195409.2962633-1-elder@riscstar.com> References: <20250508195409.2962633-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:29:48 2025 Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) (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 CE9E328AAE0 for ; Thu, 8 May 2025 19:54:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734059; cv=none; b=pYnJNQ6Vj9kj4qo+sx9GNpVcjcFCSoQ/WX7WfBmeyCgxUzYaj003Fn8z9WhewqtpmJYK6GVofqZVzCFyC6yFn+TDM5dMX/uJ1o+hjNhjZaeWyY34rzqS+zpm7VpIQS9vQ0epACuFzNmetD+fifZHkaxV8doR0gz6d+M3u2oopuM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734059; c=relaxed/simple; bh=6K/6bH7Je7ptV/jP5pV/PPgY2VnVf6wqlFpaUbKkDsQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MmhWNF9nGc03aWBbGQQMaQ6cTDcyPPUtYVk5Em25FzkmpsS4pPbPqaJnHytyA+x3a5NdJ6Ww1sbo0Nw9Pi0h48mfu4flkWpuXy7bv10vN4trwGhu9sWLcmaZvXqQS7sDBsrU3JuXgLJ+HeFnJfpndevkYxtp142eBzjkt7JBiwM= 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=dLjbSy2G; arc=none smtp.client-ip=209.85.166.171 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="dLjbSy2G" Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-3d6d6d82633so5212655ab.0 for ; Thu, 08 May 2025 12:54:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746734057; x=1747338857; 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=sn87kBi0jw0IZuZ9WgeUp08zO4PrENwLcRr2dbLjpNM=; b=dLjbSy2GFSNXjT57MJ90qZRs+PR3hnGgGwJfKOowGLAsw0n6O8ldHkVFTpQPi5aDVK lFejLMmRpmCPbUDryd+GN5931cyVTdKhMSoreOOWt8UcKFfcjHuW4ZofGiRVMKcdvReS t0qXbEisC9uNOaIlsczPW9XWVNsbb80n7zcE92QEq8Emcj56jNAKbzu7YhP84K7MzC0q Cf0HYueEBIf8jOo8iS2i42sIbTanm6gbJU16iwqTi0Ayo6yW1bVmDrsrlXnx7rP2NUs5 mz1C0BVD1X6IiEvQ/+yHIFa3QA1FFxd6WqdGMxrnt7HXdGl5fLFlujSiH2cOpy47zWPp CFCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746734057; x=1747338857; 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=sn87kBi0jw0IZuZ9WgeUp08zO4PrENwLcRr2dbLjpNM=; b=q9zVpY0KKonVC58wng6VRdTus8KCXBy3dDsXPVGRoTs0z5wtyu/C54PO7uzKQx8m72 +BOlSaMI8ETLGgPYVncPtSSoh4KnJ+ebeuILmKkfHvRR+XPAE0PawrOyfVNiuKAlVTVw T58IvHD+DQcj8KWFjN8/dAeyRCQ8sD9vqgQNv8DzdVW6/Mqy+zHXgdhIOAa3sXoSf1oz V6sgXeiOExamJHIG3WQmizzG1JIXWyZu+PyXL62EFVWUD6NVB8PHWIR8S9HdhLDZmvax CQ/4dEwv0LmFewiNpJL8uurJFtaEX84i5NQwXeWgC1twOrACeG5d52QmlFF54+pHiPUL LOBw== X-Forwarded-Encrypted: i=1; AJvYcCWHQ7Dres+YuyXfolfRCqcjY3s0EBgthn5U4N4aj5dhjy8gdnifzLV2RGgGlIk5QzZ2qUxzkJ2flIExZTM=@vger.kernel.org X-Gm-Message-State: AOJu0YwrVrnPEBS0s0Y73tXuOw1hLC3poZmszV/Dv/6bfEB6wMmRpcJj TYT0YvJC23+qJAgxwB1T4YaaCxWF1893lvh9u3Tr9RBdi70EO8Kr2JkSlgM6OWk= X-Gm-Gg: ASbGncvNNC5DhIemIQV1grqqwGVmvj9aDidaJvrSz2+4DYvtDNFcJl5I0LwOXseOCb3 fV4J73quj6A9DWyCj2rPd+ckrHqD7QBI80nlm4W1orNBEexU9RtS2NTOUJtantN/xNHj4ONbT4W 27+1sfi0lIcpcIUTVbkEqiWnQipyN+R0Bq3ndDd7j/PcMww51Rzx/AY2udH0+XJE6SjgxqxPJ5p NzMwofvQ7Uh4FD6fkIm35i01WY8wjc6UpftCC8tS5d9g3GEdS679K5mqeM/ho3vDMBXEYdfv6kv /xZHl7gy0BijhOzo6ZbpMimifKnYjfaZxEykTSZmSsXaPrvjwuq9yDf3WZDuc6gQg70uSzvQcdG P2a0usWgZJYbjeQ== X-Google-Smtp-Source: AGHT+IESC22LRQyaCwk/pqd82SBUQvRV2Q4atRVD8nrvfsIbhm9rHggSZf49CnthvSFTtyUNpBMDzQ== X-Received: by 2002:a05:6e02:216d:b0:3d4:36da:19a9 with SMTP id e9e14a558f8ab-3da7e210280mr10474765ab.15.1746734056887; Thu, 08 May 2025 12:54:16 -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-4fa226850e1sm93983173.134.2025.05.08.12.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 12:54:16 -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 v7 2/6] soc: spacemit: create a header for clock/reset registers Date: Thu, 8 May 2025 14:54:04 -0500 Message-ID: <20250508195409.2962633-3-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250508195409.2962633-1-elder@riscstar.com> References: <20250508195409.2962633-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 --- v7: - The shared header is now named "k1-syscon.h" drivers/clk/spacemit/ccu-k1.c | 111 +---------------------------- include/soc/spacemit/k1-syscon.h | 118 +++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 110 deletions(-) create mode 100644 include/soc/spacemit/k1-syscon.h diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index cdde37a052353..801150f4ff0f5 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/k1-syscon.h b/include/soc/spacemit/k1-sys= con.h new file mode 100644 index 0000000000000..039a448c51a07 --- /dev/null +++ b/include/soc/spacemit/k1-syscon.h @@ -0,0 +1,118 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* SpacemiT clock and reset driver definitions for the K1 SoC */ + +#ifndef __SOC_K1_SYSCON_H__ +#define __SOC_K1_SYSCON_H__ + +/* 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 + +#endif /* __SOC_K1_SYSCON_H__ */ --=20 2.45.2 From nobody Tue Dec 16 07:29:48 2025 Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) (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 430CB28B514 for ; Thu, 8 May 2025 19:54:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734061; cv=none; b=EdKUa9uaHT1SUTnhE0a/3XMRbgF6hkQ4n+ZeraDQUGhG2unZ92Rid0lefz/xBEn1NNVpE2/zYkC0bdYvzQNDzdEX9ITNrEOqYJripXf4c73n3uANWPTi7+YGGgz4wv45qREETndjZR5Ihv4TykR3lORZcVgajHwkwFfRhBLN31s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734061; c=relaxed/simple; bh=7v0p8GTanUulmd/yJJq3W29d4ljiHnCna/oQKmCPYgw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=irO0U55+G+hMOM1eihRsEW61/+7q9xdtB+3KnYPEI60nlMjNPalP9BmFG+aICbAEdzQIBpJ28zDoGu+azXOc0BX6bsk9F1JrXSPDOqiIqnJdg3rZ/loo7ckZQNEOQywtfbc6Ns/7y28z3O+/+FFL2frD/cKFyGH9c7lfQTcreqo= 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=vrfxWYMf; arc=none smtp.client-ip=209.85.166.45 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="vrfxWYMf" Received: by mail-io1-f45.google.com with SMTP id ca18e2360f4ac-8647a81e683so40520039f.1 for ; Thu, 08 May 2025 12:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746734058; x=1747338858; 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=r06uiGf7LKwLLkidgxdzaXRW8dtg/cHi/0enoG+J9mg=; b=vrfxWYMfaLKkBYmj8d8Pb/kzEIKM/tpdpE6KE9/1aCtC/gghVPaHf3mVE3lYMz1eGM wxYFsiRx8cTAfUKvcedj2N+HnCSTuhbYPcNL7xyAiysacFEle1ls5aPvGj3uJ9FDnIQk +DLWgMT8bkg3gzd9Pu0lQFiNz7ny+mV/04m1QsGm/TFfWH8IJl8v7WwXNfa6CciHWV3F kpworc3wpkMC6EidK9OXiCgSGuBQ/yvy7zaD1swPTt5dg/6j/lCAjArCi4cV/gjDZk32 VQeito+Ab6f81ZumieVz3lP9t+6peF5dNJ4/+u/Dj9t8zQYQdUaZ/lA7O6QkYKsqyIjV 49ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746734058; x=1747338858; 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=r06uiGf7LKwLLkidgxdzaXRW8dtg/cHi/0enoG+J9mg=; b=S+zXd6KaDOQH5yYp2vdb9zrwUPRie1RW6eNoEmyDjCcG0py6HRkZw8nWKywjP4t35E +hJcg3hj12HJtUb6IfaysrKU5O4SnZkNhzoF6NnpmL/eShTwjRQmB7b1LIEiy1mJD4XR Yqa50WpP+3y1ng6p7Cbyk9Q4aBcQg0G8oQfGVkIJOlAd3E9BBk+8AaCaVsOjSF7bDPa0 mlSv3b3tu0xM+QQ9OaUIErkdM4/6zqUFavvf20BvBX83X5sojY1/eR44Ljl3zVmE86WN WyZYh/DMY0UvpxAAqHcUfFDDouEOmaygiahTudwabD+WMYNO/MUNI+nByXjnebKoG2TI SGgg== X-Forwarded-Encrypted: i=1; AJvYcCXNQkic9iX024sAweY09fAowj2sP6adyePm9zKGX+8AGR0Q7dyDcEXrAxuVNZkO5R19/AlJEsxAR14dUcg=@vger.kernel.org X-Gm-Message-State: AOJu0YzyNt6VCAaC/fyGkFASnB//yB4YAEvAaIOHdMwQyd31RpbwbWmD b7hnHu5ENrAFl8Q915yX9OsqZt3mQ4Ja5ZFXgiwQZDO59SvWkDO9ZkdTr7ZAWiw= X-Gm-Gg: ASbGnctdOFKKND+Qt9rbXIvnRMJcTclXIuspp+w0huTHmaHG3Pgv5W1w1KXSACfY/d7 cvBMtSEX/Hcw6xuhVVJuKvifk6/u5qFIgVoVQONerjzyANLHVvgNFMCWfklGAmKPl9dVCwZwBU3 xiLNAZIj9vnJcdk3QmMawQwrAqlULYWaQkGZ+gmJEyIubf1v+XViX8nDmuoV/CoZTkp/L3kVxq8 t1FrXBlUO518/ZGvGwsRmMAf4gMmf3xEv4C/wqIiZ5SakYoYBAssN7u78fW3UmzZQz8iNXdf1yV oMjsq6UCBbKakx9AtlzzXbMEsl+SnAnX9SimwAkQx7DkU0/AdzmIgoWU2OfBpgvCnkiMUnoEGcu pXPl42i7JTVxYbQ== X-Google-Smtp-Source: AGHT+IHsNDTIe/NXdxRfO7WQawDdywrVbLCIbfPNKwj4snYFs74Rqbnh+J4CCW3w7bAfdONDwtaabw== X-Received: by 2002:a05:6602:154c:b0:864:4a9c:1bd7 with SMTP id ca18e2360f4ac-86763392674mr160893439f.0.1746734058501; Thu, 08 May 2025 12:54:18 -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-4fa226850e1sm93983173.134.2025.05.08.12.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 12:54:18 -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 v7 3/6] clk: spacemit: set up reset auxiliary devices Date: Thu, 8 May 2025 14:54:05 -0500 Message-ID: <20250508195409.2962633-4-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250508195409.2962633-1-elder@riscstar.com> References: <20250508195409.2962633-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 in 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 --- v7: - The SPACEMIT_CCU config option now selects AUXILIARY_BUS drivers/clk/spacemit/Kconfig | 1 + drivers/clk/spacemit/ccu-k1.c | 89 ++++++++++++++++++++++++++++---- include/soc/spacemit/k1-syscon.h | 12 +++++ 3 files changed, 92 insertions(+), 10 deletions(-) diff --git a/drivers/clk/spacemit/Kconfig b/drivers/clk/spacemit/Kconfig index 4c4df845b3cb2..3854f6ae6d0ea 100644 --- a/drivers/clk/spacemit/Kconfig +++ b/drivers/clk/spacemit/Kconfig @@ -3,6 +3,7 @@ config SPACEMIT_CCU tristate "Clock support for SpacemiT SoCs" depends on ARCH_SPACEMIT || COMPILE_TEST + select AUXILIARY_BUS select MFD_SYSCON help Say Y to enable clock controller unit support for SpacemiT SoCs. diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 801150f4ff0f5..b9c574f9e0d7f 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,8 +712,9 @@ static struct clk_hw *k1_ccu_pll_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_pll_data =3D { - .hws =3D k1_ccu_pll_hws, - .num =3D ARRAY_SIZE(k1_ccu_pll_hws), + /* The PLL CCU implements no resets */ + .hws =3D k1_ccu_pll_hws, + .num =3D ARRAY_SIZE(k1_ccu_pll_hws), }; =20 static struct clk_hw *k1_ccu_mpmu_hws[] =3D { @@ -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/k1-syscon.h b/include/soc/spacemit/k1-sys= con.h index 039a448c51a07..53eff7691f33d 100644 --- a/include/soc/spacemit/k1-syscon.h +++ b/include/soc/spacemit/k1-syscon.h @@ -5,6 +5,18 @@ #ifndef __SOC_K1_SYSCON_H__ #define __SOC_K1_SYSCON_H__ =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:29:48 2025 Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) (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 3DD2F28C02E for ; Thu, 8 May 2025 19:54:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734064; cv=none; b=hzirlEZdmDxwqiGXrK/Ap6SSkN3IHVCE0GaPNoM0D9w/H4qGQlFz9T61OknDIgEQeyZW84e01p+VetNFA2eQJo1c4OxJGz8tb3cDcfCJr/zG3b+qGt9RZgD3FXz/MCRqGP/6ESxClkyygDFTcNBAZZRSF8UyX3ijZuWMaaRj8HE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734064; c=relaxed/simple; bh=UBWSqoOZjmP6IiSG6aFe387fpRSEbzGlj130Pe7dns0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KDQUCDQkqa1h1YB/PU+72kWId0FybTA8k+fZGjFjKr5bzZmvXxDhWy2dAJkZVrdthkf7jzWpD0BmAdgcRxt65KPa0SLp5Mv1/h9LME2od1dwYHzufSAQOUFmTU/PSjEdnKa/1acUFfgig5ufYKr/NprYzXsJDv1H+9ld/WnRYTQ= 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=cz7rorhW; arc=none smtp.client-ip=209.85.166.173 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="cz7rorhW" Received: by mail-il1-f173.google.com with SMTP id e9e14a558f8ab-3d9327d0720so11556845ab.3 for ; Thu, 08 May 2025 12:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746734060; x=1747338860; 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=xNg+Qv74tE1S2LOsVvWnSJqScgU8kceqboq9qGJuf6E=; b=cz7rorhW5mI35ct0/k+BDfu7RdGMT0XEVWi1qcNh4b+npj5LxfyCGom+3YDRQnJais esr59XJzayxOUydJFKhB9y1f78+3J2v7lILvzPd/HEohKUieKlTfy9y6/M6YuTfh+S+j eoL2OUZJ0/c9Wzh+dX5vV+BWHtkx1XgUwgSCp0UYRNcIT86Np/QtZyTcvnnA0n/U7VI7 T5zuvjZDo/n7AzRhEjzDsAEWYeSPssMqJbpmEtyRUfSJRu+1lJG6bqjS+e4sffcsPdZp bXpD2qlJ2QynvmlzC6nP6qiHrq5IkAgmjwPgTFGGALaNpvzHUizvpo3ScCdqJqhzydIV Pnzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746734060; x=1747338860; 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=xNg+Qv74tE1S2LOsVvWnSJqScgU8kceqboq9qGJuf6E=; b=l8oW9IQ8smU1aRsdcAOP1cATgkcrpqcJnEnB0a52RidZbl+FYI/HnRD6LqSNWtoJni nViPIK0A4e2uwWVucuAnyI6QoI9Mv5KMPc2pFI2k/GUxHJdYLGO7PoLfjr02fBUHmNzE a3zGkntqMKqWNGGb/0qNC6bj7AEpW2PeozD+5rywnWITMQEEtraM3fqh+ao8lodYTic+ xAWvC82z//WMl5pCxCPFtGW77aMzPJXYwKydGNKqI24VM0SezzDJ8w3eKO877lo3qhMo yhtleqT/TAukIBaRmqMs4Bh6fKSJLWcGzrlcoFHhU6rMylHPLT0I6un8tUEKWjsi+H9X L8Xw== X-Forwarded-Encrypted: i=1; AJvYcCVVwueRxczbrMagNN7fWAu1a4xmECpqF9JYCbhGyr9QELzwrnStuHAmmL2FosXU2gYFa9y0Y4cZ+W5v1yI=@vger.kernel.org X-Gm-Message-State: AOJu0YzhTWAfB9nxSPUPlVPq5rcxc3CFKaLHd4PC6FNI9NHhTkzMdJ/Y Np5rb3GO3cmqHTf6zqDAtP1mYxJ58VufTqNurcYjiOslUjnnok8tTu+l7BJyRhA= X-Gm-Gg: ASbGncutKRXHzjpabKqbe2Fe6MJffPZkGscrzL6JXQ/DLC5VBLqc5E1OIiYNbnOUFuc zXFfQVrZeq0FEONFFCV696HLs4pkTjIH7z6EAO3KcdPzVew7ti30QNoCjhrpSXdk9aS0Eu//09m TQzLIGLi4fd24NuZPIRjOv738xK9+KHiX6jTw4lVk5glNIPx9Rx4LNiy7gb0qTxIIKzXsPs8RCe Zjpqjt8KEqC6RzzMesNHSqeO4qUNlD3KZnkUnLV9nnY6GX2JZhDDzyJlja35DUbcpRZrk0aOEm8 XNGKXP7g/Ny3Oy6GDSh3lkUjNeyzMs7ZQl3BTY9oBgRbzTF4G80Cfqg1xzt8YXBlnE58KESNi49 NuZKzghkVCLo13g== X-Google-Smtp-Source: AGHT+IEmGEyv8ceQvA9Kc0KTkyWjwYNyROktjGVZ8fbHLRNe94mExwn/Tpkoc6/7rs5rKxC14c0ijw== X-Received: by 2002:a05:6e02:1aa8:b0:3d9:3adb:e589 with SMTP id e9e14a558f8ab-3da7e1e269cmr12586975ab.4.1746734060093; Thu, 08 May 2025 12:54:20 -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-4fa226850e1sm93983173.134.2025.05.08.12.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 12:54:19 -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 v7 4/6] reset: spacemit: add support for SpacemiT CCU resets Date: Thu, 8 May 2025 14:54:06 -0500 Message-ID: <20250508195409.2962633-5-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250508195409.2962633-1-elder@riscstar.com> References: <20250508195409.2962633-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. 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 define clock controllers. Signed-off-by: Alex Elder --- v7: - There is no SoC-specific config option; just SPACEMIT_CCU is used, as suggested by Philipp - The SPACEMIT_CCU config option now selects AUXILIARY_BUS, and it is now tristate, not bool, as suggested by Haylen - All code is concentrated into a single file "reset-spacemit.c" rather than in a directory, as suggested by Philipp - Without a separate source file for K1-specific definitions, a few symbols got a "k1_" prefix added. - MODULE_AUTHOR(), MODULE_DESCRIPTION(), and MODULE_LICENSE() are now supplied, as suggested by Haylen - A failure allocating the controller structure now returns -ENOMEM, as suggested by Philipp drivers/reset/Kconfig | 9 ++ drivers/reset/Makefile | 1 + drivers/reset/reset-spacemit.c | 246 +++++++++++++++++++++++++++++++++ 3 files changed, 256 insertions(+) create mode 100644 drivers/reset/reset-spacemit.c diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 99f6f9784e686..28fa84ea4dbcc 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -263,6 +263,15 @@ config RESET_SOCFPGA This enables the reset driver for the SoCFPGA ARMv7 platforms. This driver gets initialized early during platform init calls. =20 +config RESET_SPACEMIT + tristate "SpacemiT reset driver" + depends on ARCH_SPACEMIT || COMPILE_TEST + select AUXILIARY_BUS + default ARCH_SPACEMIT + help + This enables the reset controller driver for SpacemiT SoCs, + including the K1. + config RESET_SUNPLUS bool "Sunplus SoCs Reset Driver" if COMPILE_TEST default ARCH_SUNPLUS diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile index 31f9904d13f9c..84f90abf96846 100644 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_RESET_RASPBERRYPI) +=3D reset-raspberrypi.o obj-$(CONFIG_RESET_RZG2L_USBPHY_CTRL) +=3D reset-rzg2l-usbphy-ctrl.o obj-$(CONFIG_RESET_SCMI) +=3D reset-scmi.o obj-$(CONFIG_RESET_SIMPLE) +=3D reset-simple.o +obj-$(CONFIG_RESET_SPACEMIT) +=3D reset-spacemit.o obj-$(CONFIG_RESET_SOCFPGA) +=3D reset-socfpga.o obj-$(CONFIG_RESET_SUNPLUS) +=3D reset-sunplus.o obj-$(CONFIG_RESET_SUNXI) +=3D reset-sunxi.o diff --git a/drivers/reset/reset-spacemit.c b/drivers/reset/reset-spacemit.c new file mode 100644 index 0000000000000..eff67bdc8adba --- /dev/null +++ b/drivers/reset/reset-spacemit.c @@ -0,0 +1,246 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* SpacemiT reset controller driver */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +struct ccu_reset_data { + u32 offset; + u32 assert_mask; + u32 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; +}; + +#define RESET_DATA(_offset, _assert_mask, _deassert_mask) \ + { \ + .offset =3D (_offset), \ + .assert_mask =3D (_assert_mask), \ + .deassert_mask =3D (_deassert_mask), \ + } + +static const struct ccu_reset_data k1_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 k1_mpmu_resets, + .count =3D ARRAY_SIZE(k1_mpmu_resets), +}; + +static const struct ccu_reset_data k1_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 k1_apbc_resets, + .count =3D ARRAY_SIZE(k1_apbc_resets), +}; + +static const struct ccu_reset_data k1_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 k1_apmu_resets, + .count =3D ARRAY_SIZE(k1_apmu_resets), +}; + +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, +}; + +static 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); +} + +static int spacemit_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 -ENOMEM; + 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_reset_ids[] =3D { + K1_AUX_DEV_ID(mpmu), + K1_AUX_DEV_ID(apbc), + K1_AUX_DEV_ID(apmu), + { }, +}; +MODULE_DEVICE_TABLE(auxiliary, spacemit_reset_ids); + +static struct auxiliary_driver spacemit_k1_reset_driver =3D { + .probe =3D spacemit_reset_probe, + .id_table =3D spacemit_reset_ids, +}; +module_auxiliary_driver(spacemit_k1_reset_driver); + +MODULE_AUTHOR("Alex Elder "); +MODULE_DESCRIPTION("SpacemiT reset controller driver"); +MODULE_LICENSE("GPL"); --=20 2.45.2 From nobody Tue Dec 16 07:29:48 2025 Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) (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 9726228C2CE for ; Thu, 8 May 2025 19:54:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734064; cv=none; b=sm/UynkuTcHlwTXy2UDQfsct3dL6ytQDIx7Tr6T1LL/wocs4bYcWsXIn+6xD7NhAheJqgX/pceEQQrAO/6JDOYK3ny5FYM5DQRht8JBXMvi1+XIapXRlE/cOTwkPvqezpOTt9qQ8knwmpo4BmSdEFWQqrkbg3B9k+gvnRw/UMDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734064; c=relaxed/simple; bh=FAeZQx1DF1YFFGItqVSv62P6dO9wF2Bb0xkTzSlInZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YaFT+qob8v/9Rc9VEGukAea97W6Y/LlTH7Sw6YCL1YVFhfB4xn8KXbAgx09/dEezIeGQyFieioHypH5zcd4eMGHekxovSDYEYx9ClacIoK4I5MApVmRYyF2XP/lHaF/V5R3fYhK4D86QKebMrbzkjh4LCzwWPacRZvCvzcfqlCI= 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=AWcO9HGO; arc=none smtp.client-ip=209.85.166.169 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="AWcO9HGO" Received: by mail-il1-f169.google.com with SMTP id e9e14a558f8ab-3d93deba52fso3997485ab.0 for ; Thu, 08 May 2025 12:54:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746734061; x=1747338861; 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=nBjgP82oB8RJahq8T8A4o8pB1J1W5AQMcKd/UTcdoyE=; b=AWcO9HGOP6y2qd3tEYVU3XKZVYiYpMloVkT6D5Wi21h7QuXdt9lAW3/b4gywadMJQX Ubjs2nIG3UIUv+YNGiqLk2IUdrPqOs1BGwxXHEvkQuvFOpZ8zfbAUIOMPvPXIsMSd2gE iDBQc7/u35G42Lxx1z/L8gzEckObuMST/7GWknNqb0JmIw/QRGcMAmH7g93ASXLw63Q9 IbrYEsY+iXZD860lW5OXKSfY+36NWQ0thgAyMYopEu7W4IoAl7W1OdvxHCfId/zvG5UR AaHY6BhQQvpzZsC2KhPhsVziVfgTx30n10sfK4uc0UP4mrRbvWLq1XgkNJZ0kX/k5uF8 Xvgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746734061; x=1747338861; 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=nBjgP82oB8RJahq8T8A4o8pB1J1W5AQMcKd/UTcdoyE=; b=uzdZ1xis/s57ZgoWBV5R/my9rFqZIYiial75QUYVcHzmmUeJNbEmg+DitzofqzuX94 biWpAwoQwSTKjlMmTUmiSt/V0EBt0fNn2sQRxuJqhCtJmfBU8NVonsD5Glv247dc1+83 Dm0Qtlt5GNpWeTtyQ0+pDnvkJd3hmlZR4TL0rDSDLugEp1g6uCqzV8iHfYxL0Oz4uTTr w2Tg07GW/s9dLT5qA2AteAjl8m7lh/yyhBE0wt0siTYDGsFse1P/BtGpaVmsEzEaxS/6 GYk2ER6FWxv7VhwCWF1NQmNYjjNCuguGOtB3q3C9KXBtEntyOSqIigyuOfuX/kEC8kMM QiQQ== X-Forwarded-Encrypted: i=1; AJvYcCXlFsAfwr2CeBqkM489+qChgJmAxdKIaF6RKuFqrPKK7bZ7mpYgYIA/T9+RLsHEWMQ4akYmHrVSOLKrZmA=@vger.kernel.org X-Gm-Message-State: AOJu0YwqhWBZ42M1gzjnugzRDeg4y4CBcfBQL/CUp+HA9APWjKuXFcLi GQiIL7UQPEwBXvdsS8mPuknAb3oQsq9mpgt+ABgtuWyZxuLnJuc71wfJ18wK9zg= X-Gm-Gg: ASbGncurizZCN1zHdFEgqeQcCIWA1cJxJ1GDhZ25mmrl+f3+Wdu9R7Ads6jiwoWRPWd zc9Ychc+FpDFG6LpZvm3hLoj2kfGBDEEBcgxXQCPEOa/xPs04pveiywDZIo/w1uBsbP3CBFengz hZ8VDpaZbNp32ICUBxjW6j59sxEq7DoUxyjQtNRy5/xAGyuq30bgIjeNDhiy8bHQL7HWCV0yIXe 8hYmlW2sVXRVnoC7x9gYv3P8y+2dDR8I9450SBQHObajDuZDc/YloHVJVo1cWThuZOuVDocF0U/ 6M0O8cEtX3xNzvvtlss5e2/BHU+0+ubmcHRytgKOelfb2zFfXGcrTVClgVIg3R+6BDRwcGC2t1d 4KkYonwt/KNgzxg== X-Google-Smtp-Source: AGHT+IFqPpW9ZV56dgNGdAPO8AxfPep19nBaoJN7cldrZa2m1UBN8z5CblWaekx8UKOj1nkjLrqL6A== X-Received: by 2002:a05:6e02:1fc6:b0:3d3:f27a:9101 with SMTP id e9e14a558f8ab-3da7e1e2b8amr11948415ab.1.1746734061498; Thu, 08 May 2025 12:54:21 -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-4fa226850e1sm93983173.134.2025.05.08.12.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 12:54:21 -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 v7 5/6] reset: spacemit: define three more CCUs Date: Thu, 8 May 2025 14:54:07 -0500 Message-ID: <20250508195409.2962633-6-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250508195409.2962633-1-elder@riscstar.com> References: <20250508195409.2962633-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 --- v7: - Some irrelevant comments are removed, as suggested by Philipp - The ccu_reset_data arrays now have a "k1_" prefix in their name drivers/clk/spacemit/ccu-k1.c | 24 +++++++++++++++ drivers/reset/reset-spacemit.c | 51 ++++++++++++++++++++++++++++++++ include/soc/spacemit/k1-syscon.h | 30 +++++++++++++++++++ 3 files changed, 105 insertions(+) diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index b9c574f9e0d7f..4bfc837ce79ff 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/reset-spacemit.c b/drivers/reset/reset-spacemit.c index eff67bdc8adba..4137f4f8352d3 100644 --- a/drivers/reset/reset-spacemit.c +++ b/drivers/reset/reset-spacemit.c @@ -158,6 +158,54 @@ static const struct ccu_reset_controller_data k1_apmu_= reset_data =3D { .count =3D ARRAY_SIZE(k1_apmu_resets), }; =20 +static const struct ccu_reset_data k1_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 { + .reset_data =3D k1_rcpu_resets, + .count =3D ARRAY_SIZE(k1_rcpu_resets), +}; + +static const struct ccu_reset_data k1_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 { + .reset_data =3D k1_rcpu2_resets, + .count =3D ARRAY_SIZE(k1_rcpu2_resets), +}; + +static const struct ccu_reset_data k1_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 { + .reset_data =3D k1_apbc2_resets, + .count =3D ARRAY_SIZE(k1_apbc2_resets), +}; + static int spacemit_reset_update(struct reset_controller_dev *rcdev, unsigned long id, bool assert) { @@ -231,6 +279,9 @@ static const struct auxiliary_device_id spacemit_reset_= 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_reset_ids); diff --git a/include/soc/spacemit/k1-syscon.h b/include/soc/spacemit/k1-sys= con.h index 53eff7691f33d..c59bd7a38e5b4 100644 --- a/include/soc/spacemit/k1-syscon.h +++ b/include/soc/spacemit/k1-syscon.h @@ -127,4 +127,34 @@ to_spacemit_ccu_adev(struct auxiliary_device *adev) #define APMU_EMAC0_CLK_RES_CTRL 0x3e4 #define APMU_EMAC1_CLK_RES_CTRL 0x3ec =20 +/* 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 + #endif /* __SOC_K1_SYSCON_H__ */ --=20 2.45.2 From nobody Tue Dec 16 07:29:48 2025 Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) (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 DFE7A28C5CC for ; Thu, 8 May 2025 19:54:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734065; cv=none; b=rauudrRhgVTRERqX0a3xuiD5DLL/7cuCdJt2xyOeQ91RQ5qx4HW+U7lISkzlKCSro+qtPUWfYNn8BOAgpDeo4If7Ly+c6Rf9AXDs8DnAOUxuSPlNh3LggZDYDpb1+eS1ilGMPTiqU2StqPpxEOYynIAzL6skOlELZlztASMEFNw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746734065; c=relaxed/simple; bh=o+DTlUShzMqTWdpVptHXPZF7T6Hpe95l3FZm/2enEAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jFfkV3aaNxiNVdUd7HvJVQ6NkRUeYfQW6HU31ZIPcBEvsIkrFQ3/GsZ5cmOR1vFHo+whgx1uFSWiObCIYDg+Q7Nmd35VVGb5kaJfPLecvp2iIvIKVlLnSsbRwdzsUkno1otZEtl575YCs+PHWOPjRT+ifCaixzhunpFIySphIZ0= 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=2aXdKOav; arc=none smtp.client-ip=209.85.166.175 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="2aXdKOav" Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-3d817bc6eb0so7027265ab.1 for ; Thu, 08 May 2025 12:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746734063; x=1747338863; 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=2aXdKOavPUn9sAxWmYsuQ+EB/nmw+/n0y7Aa/BYfPwwslcWuase61qzV0M5vcUA5Vd /YSngQ3ZVuNg22tgxXI1vsAqeJqQyYyeU9ILOa72fMyiOsz4E2O2BdHBapCQTKC5cBld y0tzePEX/qXqGB6yAhGtOtPXP3/TmFIaU6udPQztcmcUF45GrF3Gf0cuENiqDPBfdouF Y2YDHq9DPjjMLmMuuoKJGsh5Zfu6BHloaNSHM+nNMu7QL3pk7/pAna7UMpP8dlyexMI4 mizZUmmGgAVza3mTOOya6UuJU1uvl3/3PQrSxsqYDap+lA81q2ucvo0QcSf5oehm/hIf i/eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746734063; x=1747338863; 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=vBr3P3oTumdvXvvhSRGILD0g8l9Sib0zYwToWpPp4Ufww86JB/3PpxCOUEzqoAC80j R05/ruR4f+9YFH1jry1erTLch8OC8MybDgm1a+zhmp1fLORcLpwi5J4PDYSX426mO1n4 pmtK3DEQl0+paMVK3LAEF47eIXa9KejOrwc6nW5JUYK8ap08OK2jRRvet3F1K+xGEXXu HSHirVhZY6AyuGNG74YGCQikJxWa9nhL1ULFocAKqIRShU6Ka0GdPubRL1iYN7m09cxq fzVhiH9lvKMo8k8xxuzf1uQR+yRRVQyJrOW9ilxTjT8EfEsJNZiXqPR2HfgdRj7Hbtw7 FjDg== X-Forwarded-Encrypted: i=1; AJvYcCUSSzOiOUu5fE3Ztd99Eirz4By3bOiIf3RPs1pRmA2ObyDPPKkkwNURCWA8FcHUytjeERk6QycTYx/nt8M=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9EfWtbioPmM0JW6LuVC+JF8Du4HRgFaetSEWoGREdtI5PkLxB 6xNtRZU9OLkmZHwFFtft0w2CdzdqV6l/wupFy/+m2E1IRnbMLheiwKzxqRuq6vEgMsaU/EZe9vf r X-Gm-Gg: ASbGnct9ylnz1gXr2Dxe822pmCi0bfdxiGbRd2oNhyFqz48BOKZNhhlTzVlp90EOoNz o14ZN4ygV8Y3CARq/e8ID3IRHlIBKFKgTrBCREcliwlpOejH+1pnAe7jjcKqd0BXRSzi6xT3Eqz J9aIRQWxjseUJto3CnAOGMkv+x76Op4cpgDr0eymIbAGdJwJfChCKzS/zpwI+Ky7zIBuPtv34TA DoiJe752cU8rM5BHke+lKNO1PudcoG4RhZfNKo/KuiOXdvCCPo6oj2NCyyOXyiZiTnAecdOvOgZ k6RgQYVrzhSFEv+e40P/7t9wOzM0rFrGxOyK8mIts83WDx+OpopkZvuxHT/SnMSmHDYaMhjeugW rNx+ZsVjSzM91Lw== X-Google-Smtp-Source: AGHT+IHxa0h5ENM9DziETWmuFGwasgRig2JIzf55dVO2uhr/X5qFkUD+e9t5JjAw/tigV8feMiv7Kw== X-Received: by 2002:a05:6e02:349f:b0:3d8:211c:9891 with SMTP id e9e14a558f8ab-3da7e1e26bfmr14255055ab.2.1746734063073; Thu, 08 May 2025 12:54:23 -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-4fa226850e1sm93983173.134.2025.05.08.12.54.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 12:54:22 -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 v7 6/6] riscv: dts: spacemit: add reset support for the K1 SoC Date: Thu, 8 May 2025 14:54:08 -0500 Message-ID: <20250508195409.2962633-7-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250508195409.2962633-1-elder@riscstar.com> References: <20250508195409.2962633-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