On Sat, 4 Jan 2025 11:33:23 +0100
Krzysztof Kozlowski <krzk@xxxxxxxxxx> wrote:
> On 04/01/2025 11:23, Chen-Yu Tsai wrote:
> > On Sat, Jan 4, 2025 at 3:40 PM Vasily Khoruzhick <anarsoul@xxxxxxxxx> wrote:
> >>
> >> Export PLL_VIDEO_2X and PLL_MIPI, these will be used to explicitly
> >> select TCON0 clock parent in dts
> >>
> >> Fixes: ca1170b69968 ("clk: sunxi-ng: a64: force select PLL_MIPI in TCON0 mux")
> >> Reviewed-by: Dragan Simic <dsimic@xxxxxxxxxxx>
> >> Reviewed-by: Chen-Yu Tsai <wens@xxxxxxxx>
> >> Tested-by: Frank Oltmanns <frank@xxxxxxxxxxxx> # on PinePhone
> >> Tested-by: Stuart Gathman <stuart@xxxxxxxxxxx> # on OG Pinebook
> >> Signed-off-by: Vasily Khoruzhick <anarsoul@xxxxxxxxx>
> >> ---
> >> include/dt-bindings/clock/sun50i-a64-ccu.h | 2 ++
> >> 1 file changed, 2 insertions(+)
> >>
> >> diff --git a/include/dt-bindings/clock/sun50i-a64-ccu.h b/include/dt-bindings/clock/sun50i-a64-ccu.h
> >> index 175892189e9d..4f220ea7a23c 100644
> >> --- a/include/dt-bindings/clock/sun50i-a64-ccu.h
> >> +++ b/include/dt-bindings/clock/sun50i-a64-ccu.h
> >> @@ -44,7 +44,9 @@
> >> #define _DT_BINDINGS_CLK_SUN50I_A64_H_
> >>
> >> #define CLK_PLL_VIDEO0 7
> >> +#define CLK_PLL_VIDEO0_2X 8
> >> #define CLK_PLL_PERIPH0 11
> >> +#define CLK_PLL_MIPI 17
> >
> > You can't really split code movement into two patches.
> >
> > With this patch applied the clk driver will fail to build because
> > the macros are now redefined in both header files.
>
> Are you sure? The values seem the same to me... I don't see how this
> could fail.
Yes, IIRC the C standard allows repeated definitions with the same
value. And I definitely tested this before (and hence recommended this
approach to Vasily) and it compiled without any warnings here.
Cheers,
Andre
>
> >
> > Barring recombining the patches, please add a patch before this
> > adding #ifndef's around the two macros that are moved.
> >
>
> No, not necessary, just churn,
>
>
> Best regards,
> Krzysztof
>
