From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C569C3ABBC for ; Fri, 9 May 2025 12:23:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lm+JH9XcfJIasE3i1GMePB+JJdVuCcBiKhcnFKcMwlY=; b=kyAY7Z6rN10qBK p8hQbL3Wg/wKezD0JqWzfNbJ8P1bNO9lTx53mx9ypFr5FUSNgfyPDS4TG+becOQAcvWG6NRQ/R21F FrbN/VtZLlXZoRqqqoW6erSJ9RmSJzIv+Rg+YPElsrihrLoPER8AP7YMCjnRDXjZwNLHo0NM1C1Gc WMhG31Z2gUXVW8rfADNQLibBO4n3OkohJvLqWMJvUqaM/LZqBhn57OyyMe0nswtdRAueRt9exLV6w fDhTvTk/ncVpGP2SsgSJZU3x6tCSlGujstxlBYustLi9hm4CQbcXIITOG0p4VDgYX1ZWe6rt0Df6B sYkuB4odwDvrraKzIE3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uDMlO-00000003ZSJ-2TlQ; Fri, 09 May 2025 12:23:38 +0000 Received: from mail-il1-x132.google.com ([2607:f8b0:4864:20::132]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uDLmY-00000003PqY-2pnp for linux-riscv@lists.infradead.org; Fri, 09 May 2025 11:20:47 +0000 Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-3d81ca1d436so16443175ab.2 for ; Fri, 09 May 2025 04:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746789645; x=1747394445; darn=lists.infradead.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=LypWPdgaVjchuyzEN8+eJ3ZeR9EetshiFPv+jfPk3YE=; b=XR/jLiA+UGfoUKw9r3Wc0cWqQVn4OwcbQfinlzeQ3hGvNT3NWTCC9kKm/wHuOSa2gO p7sJlJNbAVeLxZySsiGaN9JLoWfPkoAmRMyDNbAaikEnwllQQUfsT9nA2K6VU2BUAzMt yqmKonwQcmdiMrZyxg1eYOH+w3htCR/GL9YPhUZWeVp+fY/T48JQ0jTnjNHlYp8kp8Dq EJqqe4t6wu5BSB966sf39shCuhC1EnfFflq3krLhdgra5fPQYNm01zYS14K0i3LmQBeC jz09+Az28k3nbWh79wmfjPMWk9BJ+EvxD5L4MOg0HTjT1HSR9LGc0RPVNBXK3hQzSNoF G8Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746789645; x=1747394445; 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=LypWPdgaVjchuyzEN8+eJ3ZeR9EetshiFPv+jfPk3YE=; b=AFMCrLCGuaL0+axwjqOTXJlYBCWJ+KmtMdGB4t+sBE2BWFFGCz5jUZnedEWDir4oel OJtzyZLlB25Jum8iutX06wEewepe8SYC7IGVR5KhulMwOKF2Y4G3+ujdz3+IiahdPzBB 3DDnqug5bjcAYBTPO0tCIaZS+B67gbBrYq/jPkawVsFMKbuWG14wkwIfViUaBBsQsHgY 12gzCdzdED8GBeFpNzmo0rBLBrleDBO69OKtgcxYKf98FR44oBfIuBmsZS3uCw/h7oRO deNlGh8cbn4Wr/Q8f7D3Y/kZA/ca31x7zrYq/76Bfk1xdRYVToquhGf7DeDhVdM+Sc2M vFlw== X-Forwarded-Encrypted: i=1; AJvYcCXS7r+9FLn9iaO3EN25d1/MYTZMKx3DKXWcuAZ2w0gAah3mqqn784DGdsCs0nS7BktlvBa+GAWNo277uA==@lists.infradead.org X-Gm-Message-State: AOJu0YyZplbWn/xJWTDh55MGthYSu7SOg9fS9KlzoYKoDMiNIAU7jOTw kcNtvhqGOKhwIZLbTJcYPXA4I/sAZh9mFPpR9urwc0bcN457wW5+rBrqHG/xUJ4= X-Gm-Gg: ASbGncuxaF5c34/EisdJsQQ4teQ59yZcvZt0S5SuG8KsyFKX1P51qq5oZzXAzcfHHIJ cgpalrZQUw+puMRIi8Dx6lLFbqYR9SSkPQKzmktQ4vCcA8r/6uZUrLpxFbw88mYOs6KBeQNHTIh NYPvQgTlitsdbsjVfqg+IAkGQ6yU7Y+sJGRMe0MpLmKLLux1Y5SWWf0foGugb5MThTC5n1tqgvD ptIkfTOokPop6VpltL6so0HidT/8IwJiLHDdpfN6cYjhoMDe/Ns5WRkKeLDdNokDyYsQ2QNtsM2 tt7PhEBDCb8av1TUNno/f99BIZElhtDryuvBpa2dP8S2DaRRfWdY2Kjl1/vAW5m7lEX6XeYcsSX AZgvWdVZblEb+RA== X-Google-Smtp-Source: AGHT+IEwX5C7RFwHQhMzAQSgpNJvAZGgDS9jyrcBkOYqMAOvEfsJfi0NZkXxGG1Ik7wGvFzbALhLCw== X-Received: by 2002:a05:6e02:218a:b0:3d3:d00c:3602 with SMTP id e9e14a558f8ab-3da7e1e71abmr33874005ab.10.1746789645531; Fri, 09 May 2025 04:20: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 e9e14a558f8ab-3da7e10549fsm5136325ab.23.2025.05.09.04.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 04:20: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 Subject: [PATCH v8 5/6] reset: spacemit: define three more CCUs Date: Fri, 9 May 2025 06:20:30 -0500 Message-ID: <20250509112032.2980811-6-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250509112032.2980811-1-elder@riscstar.com> References: <20250509112032.2980811-1-elder@riscstar.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250509_042046_712665_32D3E892 X-CRM114-Status: GOOD ( 10.89 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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/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 551df9d076859..5db7abbfeb9ea 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -940,6 +940,18 @@ static const struct spacemit_ccu_data k1_ccu_apmu_data = { .num = ARRAY_SIZE(k1_ccu_apmu_hws), }; +static const struct spacemit_ccu_data k1_ccu_rcpu_data = { + .reset_name = "rcpu-reset", +}; + +static const struct spacemit_ccu_data k1_ccu_rcpu2_data = { + .reset_name = "rcpu2-reset", +}; + +static const struct spacemit_ccu_data k1_ccu_apbc2_data = { + .reset_name = "apbc2-reset", +}; + static int spacemit_ccu_register(struct device *dev, struct regmap *regmap, struct regmap *lock_regmap, @@ -1107,6 +1119,18 @@ static const struct of_device_id of_k1_ccu_match[] = { .compatible = "spacemit,k1-syscon-apmu", .data = &k1_ccu_apmu_data, }, + { + .compatible = "spacemit,k1-syscon-rcpu", + .data = &k1_ccu_rcpu_data, + }, + { + .compatible = "spacemit,k1-syscon-rcpu2", + .data = &k1_ccu_rcpu2_data, + }, + { + .compatible = "spacemit,k1-syscon-apbc2", + .data = &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 = { .count = ARRAY_SIZE(k1_apmu_resets), }; +static const struct ccu_reset_data k1_rcpu_resets[] = { + [RESET_RCPU_SSP0] = RESET_DATA(RCPU_SSP0_CLK_RST, 0, BIT(0)), + [RESET_RCPU_I2C0] = RESET_DATA(RCPU_I2C0_CLK_RST, 0, BIT(0)), + [RESET_RCPU_UART1] = RESET_DATA(RCPU_UART1_CLK_RST, 0, BIT(0)), + [RESET_RCPU_IR] = RESET_DATA(RCPU_CAN_CLK_RST, 0, BIT(0)), + [RESET_RCPU_CAN] = RESET_DATA(RCPU_IR_CLK_RST, 0, BIT(0)), + [RESET_RCPU_UART0] = RESET_DATA(RCPU_UART0_CLK_RST, 0, BIT(0)), + [RESET_RCPU_HDMI_AUDIO] = RESET_DATA(AUDIO_HDMI_CLK_CTRL, 0, BIT(0)), +}; + +static const struct ccu_reset_controller_data k1_rcpu_reset_data = { + .reset_data = k1_rcpu_resets, + .count = ARRAY_SIZE(k1_rcpu_resets), +}; + +static const struct ccu_reset_data k1_rcpu2_resets[] = { + [RESET_RCPU2_PWM0] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM1] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM2] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM3] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM4] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM5] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM6] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM7] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM8] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), + [RESET_RCPU2_PWM9] = RESET_DATA(RCPU2_PWM9_CLK_RST, BIT(2), BIT(0)), +}; + +static const struct ccu_reset_controller_data k1_rcpu2_reset_data = { + .reset_data = k1_rcpu2_resets, + .count = ARRAY_SIZE(k1_rcpu2_resets), +}; + +static const struct ccu_reset_data k1_apbc2_resets[] = { + [RESET_APBC2_UART1] = RESET_DATA(APBC2_UART1_CLK_RST, BIT(2), 0), + [RESET_APBC2_SSP2] = RESET_DATA(APBC2_SSP2_CLK_RST, BIT(2), 0), + [RESET_APBC2_TWSI3] = RESET_DATA(APBC2_TWSI3_CLK_RST, BIT(2), 0), + [RESET_APBC2_RTC] = RESET_DATA(APBC2_RTC_CLK_RST, BIT(2), 0), + [RESET_APBC2_TIMERS0] = RESET_DATA(APBC2_TIMERS0_CLK_RST, BIT(2), 0), + [RESET_APBC2_KPC] = RESET_DATA(APBC2_KPC_CLK_RST, BIT(2), 0), + [RESET_APBC2_GPIO] = RESET_DATA(APBC2_GPIO_CLK_RST, BIT(2), 0), +}; + +static const struct ccu_reset_controller_data k1_apbc2_reset_data = { + .reset_data = k1_apbc2_resets, + .count = 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[] = { 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-syscon.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 +/* 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__ */ -- 2.45.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv