[PATCH 2/2] reset: spacemit: fix auxiliary device id

Yixun Lan posted 2 patches 1 month, 3 weeks ago
There is a newer version of this series
[PATCH 2/2] reset: spacemit: fix auxiliary device id
Posted by Yixun Lan 1 month, 3 weeks ago
Due to the auxiliary register procedure moved to ccu common module,
the auxiliary device id need to be adjusted, otherwise reset driver
will fail to probe.

Signed-off-by: Yixun Lan <dlan@gentoo.org>
---
 drivers/reset/reset-spacemit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/reset/reset-spacemit.c b/drivers/reset/reset-spacemit.c
index e1272aff28f7..0bfd90567011 100644
--- a/drivers/reset/reset-spacemit.c
+++ b/drivers/reset/reset-spacemit.c
@@ -278,7 +278,7 @@ static int spacemit_reset_probe(struct auxiliary_device *adev,
 
 #define K1_AUX_DEV_ID(_unit) \
 	{ \
-		.name = "spacemit_ccu_k1." #_unit "-reset", \
+		.name = "spacemit_ccu." #_unit "-reset", \
 		.driver_data = (kernel_ulong_t)&k1_ ## _unit ## _reset_data, \
 	}
 

-- 
2.52.0
Re: [PATCH 2/2] reset: spacemit: fix auxiliary device id
Posted by Yao Zi 1 month, 3 weeks ago
On Sat, Dec 20, 2025 at 09:11:20AM +0800, Yixun Lan wrote:
> Due to the auxiliary register procedure moved to ccu common module,
> the auxiliary device id need to be adjusted, otherwise reset driver
> will fail to probe.

Does it mean the reset driver fails to probe with only PATCH 1 in the
series applied? If so these two patches should probably be merged, or we
will get unfunctional commits.

Regards,
Yao Zi

> Signed-off-by: Yixun Lan <dlan@gentoo.org>
Re: [PATCH 2/2] reset: spacemit: fix auxiliary device id
Posted by Yixun Lan 1 month, 3 weeks ago
Hi Yao,

On 02:40 Sat 20 Dec     , Yao Zi wrote:
> On Sat, Dec 20, 2025 at 09:11:20AM +0800, Yixun Lan wrote:
> > Due to the auxiliary register procedure moved to ccu common module,
> > the auxiliary device id need to be adjusted, otherwise reset driver
> > will fail to probe.
> 
> Does it mean the reset driver fails to probe with only PATCH 1 in the
> series applied? If so these two patches should probably be merged, or we
> will get unfunctional commits.
yes, it will fail with only patch 1

and no, I do not want to combine them together as they belong to
different subsystem. it shouldn't be a problem if they are accepted in
same merge window, or if people too picky to worry bisectable breakage,
then I would ask reset/clock maintainer an ack instead to make it go
via clock tree in one combined PR

-- 
Yixun Lan (dlan)
Re: [PATCH 2/2] reset: spacemit: fix auxiliary device id
Posted by Yixun Lan 1 month, 2 weeks ago
Hi Philipp Zabel,

I'd like to see your preference for this issue, see my comment below

On 10:59 Sat 20 Dec     , Yixun Lan wrote:
> Hi Yao,
> 
> On 02:40 Sat 20 Dec     , Yao Zi wrote:
> > On Sat, Dec 20, 2025 at 09:11:20AM +0800, Yixun Lan wrote:
> > > Due to the auxiliary register procedure moved to ccu common module,
> > > the auxiliary device id need to be adjusted, otherwise reset driver
> > > will fail to probe.
> > 
> > Does it mean the reset driver fails to probe with only PATCH 1 in the
> > series applied? If so these two patches should probably be merged, or we
> > will get unfunctional commits.
> yes, it will fail with only patch 1
> 
> and no, I do not want to combine them together as they belong to
> different subsystem. it shouldn't be a problem if they are accepted in
> same merge window, or if people too picky to worry bisectable breakage,
> then I would ask reset/clock maintainer an ack instead to make it go
> via clock tree in one combined PR
> 
I'd consider above approach is less optimal, would it ok if I create an
immutable tag for this single patch, and send it to you? so can be shared
by both clock and reset subsystem.. eventually reset driver should go via
reset tree, and I also know Guodong is working on new reset driver to
add support for incoming K3 SoC, which means potential conflicts or
extra dependency..

-- 
Yixun Lan (dlan)
Re: [PATCH 2/2] reset: spacemit: fix auxiliary device id
Posted by Yixun Lan 1 month, 1 week ago
Hi Philipp Zabel,

 I still need your opinion in order to know which direction I should
go..

On 19:48 Wed 24 Dec     , Yixun Lan wrote:
> Hi Philipp Zabel,
> 
> I'd like to see your preference for this issue, see my comment below
> 
> On 10:59 Sat 20 Dec     , Yixun Lan wrote:
> > Hi Yao,
> > 
> > On 02:40 Sat 20 Dec     , Yao Zi wrote:
> > > On Sat, Dec 20, 2025 at 09:11:20AM +0800, Yixun Lan wrote:
> > > > Due to the auxiliary register procedure moved to ccu common module,
> > > > the auxiliary device id need to be adjusted, otherwise reset driver
> > > > will fail to probe.
> > > 
> > > Does it mean the reset driver fails to probe with only PATCH 1 in the
> > > series applied? If so these two patches should probably be merged, or we
> > > will get unfunctional commits.
> > yes, it will fail with only patch 1
> > 
> > and no, I do not want to combine them together as they belong to
> > different subsystem. it shouldn't be a problem if they are accepted in
> > same merge window, or if people too picky to worry bisectable breakage,
> > then I would ask reset/clock maintainer an ack instead to make it go
> > via clock tree in one combined PR
> > 
..
> I'd consider above approach is less optimal, would it ok if I create an
> immutable tag for this single patch, and send it to you? so can be shared
> by both clock and reset subsystem.. eventually reset driver should go via
> reset tree, and I also know Guodong is working on new reset driver to
> add support for incoming K3 SoC, which means potential conflicts or
> extra dependency..
> 
see my above comment

although I've updated this series[1] to v3, the problem still exist,
for this refactoring work, taking this single patch[2] should be enough

but for incoming K3 reset driver, a shared header file[3] also need to go
with same approach.. as both clock and reset driver need it
(we could postpone this for now, and take action once things really happen)

[1] https://lore.kernel.org/spacemit/20260103-06-k1-clk-common-v3-0-6061d9f69eef@gentoo.org/
[2] https://lore.kernel.org/spacemit/20260103-06-k1-clk-common-v3-4-6061d9f69eef@gentoo.org/
[3] https://lore.kernel.org/spacemit/20260103-k3-clk-v4-4-4cccba2360f0@gentoo.org/

-- 
Yixun Lan (dlan)
Re: [PATCH 2/2] reset: spacemit: fix auxiliary device id
Posted by Philipp Zabel 1 month ago
On So, 2026-01-04 at 06:00 +0800, Yixun Lan wrote:
> Hi Philipp Zabel,
> 
>  I still need your opinion in order to know which direction I should
> go..

I say merge via clock tree. I'll comment on v3.

regards
Philipp
Re: [PATCH 2/2] reset: spacemit: fix auxiliary device id
Posted by Yixun Lan 1 month, 2 weeks ago
Hi All,

On 09:11 Sat 20 Dec     , Yixun Lan wrote:
> Due to the auxiliary register procedure moved to ccu common module,
> the auxiliary device id need to be adjusted, otherwise reset driver
> will fail to probe.
> 
> Signed-off-by: Yixun Lan <dlan@gentoo.org>
> ---
>  drivers/reset/reset-spacemit.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/reset/reset-spacemit.c b/drivers/reset/reset-spacemit.c
> index e1272aff28f7..0bfd90567011 100644
> --- a/drivers/reset/reset-spacemit.c
> +++ b/drivers/reset/reset-spacemit.c
> @@ -278,7 +278,7 @@ static int spacemit_reset_probe(struct auxiliary_device *adev,
>  
>  #define K1_AUX_DEV_ID(_unit) \
>  	{ \
> -		.name = "spacemit_ccu_k1." #_unit "-reset", \
> +		.name = "spacemit_ccu." #_unit "-reset", \
To distinguish support from K3 SoC, the k1 namespace still need to be
kept, I will update this in next version

-- 
Yixun Lan (dlan)