Skip to content

[bsp][rockchip] support RK3528 #11300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GuEe-GUI wants to merge 1 commit into
base: master
Choose a base branch
from
+2,332 −30
Open

[bsp][rockchip] support RK3528 #11300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions bsp/rockchip/dm/adc/adc-rockchip_saradc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,23 @@ static const struct rockchip_saradc_soc_data rk3399_saradc_data =
.power_down = rockchip_saradc_power_down_v1,
};

static const struct saradc_channel rockchip_rk3528_channels[] =
{
SARADC_CHANNEL(0, "adc0", 10),
SARADC_CHANNEL(1, "adc1", 10),
SARADC_CHANNEL(2, "adc2", 10),
SARADC_CHANNEL(3, "adc3", 10),
};

static const struct rockchip_saradc_soc_data rk3528_saradc_data =
{
.channels = rockchip_rk3528_channels,
.num_channels = RT_ARRAY_SIZE(rockchip_rk3528_channels),
.clk_rate = 1000000,
.start = rockchip_saradc_start_v2,
.read = rockchip_saradc_read_v2,
};

static const struct saradc_channel rk3568_saradc_channels[] =
{
SARADC_CHANNEL(0, "adc0", 10),
Expand Down Expand Up @@ -503,6 +520,7 @@ static const struct rt_ofw_node_id rockchip_saradc_ofw_ids[] =
{ .compatible = "rockchip,saradc", .data = &saradc_data },
{ .compatible = "rockchip,rk3066-tsadc", .data = &rk3066_tsadc_data },
{ .compatible = "rockchip,rk3399-saradc", .data = &rk3399_saradc_data },
{ .compatible = "rockchip,rk3528-saradc", .data = &rk3528_saradc_data, },
{ .compatible = "rockchip,rk3568-saradc", .data = &rk3568_saradc_data },
{ .compatible = "rockchip,rk3588-saradc", .data = &rk3588_saradc_data, },
{ /* sentinel */ }
Expand Down
5 changes: 5 additions & 0 deletions bsp/rockchip/dm/clk/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ config RT_CLK_ROCKCHIP_RK3308
depends on RT_CLK_ROCKCHIP
default n

config RT_CLK_ROCKCHIP_RK3528
bool "Rockchip RK3528 clock controller support"
depends on RT_CLK_ROCKCHIP
default n

config RT_CLK_ROCKCHIP_RK3568
bool "Rockchip RK3568 clock controller support"
depends on RT_CLK_ROCKCHIP
Expand Down
3 changes: 3 additions & 0 deletions bsp/rockchip/dm/clk/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ if GetDepend(['RT_CLK_ROCKCHIP']):
if GetDepend(['RT_CLK_ROCKCHIP_RK3308']):
src += ['clk-rk3308.c']

if GetDepend(['RT_CLK_ROCKCHIP_RK3528']):
src += ['clk-rk3528.c']

if GetDepend(['RT_CLK_ROCKCHIP_RK3568']):
src += ['clk-rk3568.c']

Expand Down
1,131 changes: 1,131 additions & 0 deletions bsp/rockchip/dm/clk/clk-rk3528.c
View file
Open in desktop

Large diffs are not rendered by default.

70 changes: 70 additions & 0 deletions bsp/rockchip/dm/hwcrypto/hw-rng-rockchip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,25 @@
#define TRNG_v1_VERSION_CODE 0x46bc
/* end of TRNG_V1 register define */

/* start of RKRNG register define */
#define RKRNG_CTRL 0x0010
#define RKRNG_CTRL_INST_REQ RT_BIT(0)
#define RKRNG_CTRL_RESEED_REQ RT_BIT(1)
#define RKRNG_CTRL_TEST_REQ RT_BIT(2)
#define RKRNG_CTRL_SW_DRNG_REQ RT_BIT(3)
#define RKRNG_CTRL_SW_TRNG_REQ RT_BIT(4)

#define RKRNG_STATE 0x0014
#define RKRNG_STATE_INST_ACK RT_BIT(0)
#define RKRNG_STATE_RESEED_ACK RT_BIT(1)
#define RKRNG_STATE_TEST_ACK RT_BIT(2)
#define RKRNG_STATE_SW_DRNG_ACK RT_BIT(3)
#define RKRNG_STATE_SW_TRNG_ACK RT_BIT(4)

/* DRNG_DATA_0 ~ DNG_DATA_7 */
#define RKRNG_DRNG_DATA_0 0x0070
#define RKRNG_DRNG_DATA_7 0x008C

struct rockchip_rng;

struct rockchip_rng_soc_data
Expand Down Expand Up @@ -319,6 +338,49 @@ static rt_uint32_t rockchip_trng_v1_read(struct rockchip_rng *rk_rng, void *buf,
return res;
}

static rt_err_t rkrng_init(struct rockchip_rng *rk_rng)
{
rt_uint32_t reg;

rockchip_rng_writel(rk_rng, HIWORD_UPDATE(0, 0xffff, 0), RKRNG_CTRL);
reg = rockchip_rng_readl(rk_rng, RKRNG_STATE);
rockchip_rng_writel(rk_rng, reg, RKRNG_STATE);

return 0;
}

static rt_uint32_t rkrng_read(struct rockchip_rng *rk_rng, void *buf,
rt_size_t max, rt_bool_t wait)
{
rt_err_t err;
rt_uint32_t reg_ctrl = RKRNG_CTRL_SW_DRNG_REQ;

rockchip_rng_writel(rk_rng, HIWORD_UPDATE(reg_ctrl, 0xffff, 0), RKRNG_CTRL);

err = readl_poll_timeout(rk_rng->regs + RKRNG_STATE, reg_ctrl,
(reg_ctrl & RKRNG_STATE_SW_DRNG_ACK),
ROCKCHIP_POLL_PERIOD_US,
ROCKCHIP_POLL_TIMEOUT_US);

if (err)
{
goto _exit;
}


rockchip_rng_writel(rk_rng, reg_ctrl, RKRNG_STATE);

err = rt_min_t(rt_size_t, max, RK_MAX_RNG_BYTE);

rockchip_rng_read_regs(rk_rng, RKRNG_DRNG_DATA_0, buf, err);

_exit:
/* Close TRNG */
rockchip_rng_writel(rk_rng, HIWORD_UPDATE(0, 0xffff, 0), RKRNG_CTRL);

return err;
}
Comment on lines +352 to +382
Copy link

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[bug/错误]: rkrng_read() returns a signed error via an unsigned return type

English: rkrng_read() uses readl_poll_timeout() which returns a negative error code on timeout/failure, but the function’s return type is rt_uint32_t and it returns that error value directly. This causes implementation-defined conversions and can break rockchip_rng_read()’s error handling (it expects negative values via its int read_len path).
Suggestion: Use a signed return type for the soc_data->read callback (e.g., rt_ssize_t) consistently, or (smaller change) keep rkrng_read() returning a byte count and return 0 on poll error like the other *_read implementations in this file.

中文：rkrng_read() 调用 readl_poll_timeout() 时失败会得到负错误码，但该函数返回类型是 rt_uint32_t，并直接返回 err。这样会触发实现定义的有符号/无符号转换，可能导致 rockchip_rng_read() 的错误判断失效（它依赖 read_len < 0 的路径）。
建议：统一把 soc_data->read 的返回类型改为有符号（如 rt_ssize_t），或（更小改动）让 rkrng_read() 始终返回读取字节数，poll 失败时返回 0（与本文件其它 *_read 实现保持一致）。

Copilot uses AI. Check for mistakes.

static rt_uint32_t rockchip_rng_read(struct rockchip_rng *rk_rng, void *buf,
rt_size_t max, rt_bool_t wait)
{
Expand Down Expand Up @@ -546,11 +608,19 @@ static const struct rockchip_rng_soc_data rk_trng_v1_soc_data =
.read = rockchip_trng_v1_read,
};

static const struct rockchip_rng_soc_data rkrng_soc_data =
{
.default_offset = 0,
.init = rkrng_init,
.read = rkrng_read,
};

static const struct rt_ofw_node_id rockchip_rng_ofw_ids[] =
{
{ .compatible = "rockchip,cryptov1-rng", .data = &rk_crypto_v1_soc_data, },
{ .compatible = "rockchip,cryptov2-rng", .data = &rk_crypto_v2_soc_data, },
{ .compatible = "rockchip,trngv1", .data = &rk_trng_v1_soc_data, },
{ .compatible = "rockchip,rkrng", .data = &rkrng_soc_data, },
{ /* sentinel */ }
};

Expand Down
Loading
Loading