| Message ID | 20250110123923.270626-7-szemzo.andras@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | Support for Allwinner V853 SoC | expand |
On 10/01/2025 13:39, Andras Szemzo wrote: > As the device tree needs the clock/reset indices, add them to DT binding > headers. > > Signed-off-by: Andras Szemzo <szemzo.andras@gmail.com> That's never a separate commit from the binding. ... > --- /dev/null > +++ b/include/dt-bindings/clock/sun8i-v853-r-ccu.h > @@ -0,0 +1,16 @@ > +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > +/* Copyright(c) 2020 - 2023 Allwinner Technology Co.,Ltd. All rights reserved. > + * > + * Copyright (C) 2023 rengaomin@allwinnertech.com > + */ > +#ifndef _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ > +#define _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ > + > +#define CLK_R_TWD 0 > +#define CLK_R_PPU 1 > +#define CLK_R_RTC 2 > +#define CLK_R_CPUCFG 3 > + > +#define CLK_R_MAX_NO (CLK_R_CPUCFG + 1) Nope, drop. Not a binding. > + > +#endif > diff --git a/include/dt-bindings/reset/sun8i-v853-ccu.h b/include/dt-bindings/reset/sun8i-v853-ccu.h > new file mode 100644 > index 000000000000..89d94fcbdb55 > --- /dev/null > +++ b/include/dt-bindings/reset/sun8i-v853-ccu.h > @@ -0,0 +1,62 @@ > +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ Odd license. Did you copy the file with such license from the downstream? Best regards, Krzysztof
On Fri, Jan 10, 2025 at 01:39:17PM +0100, Andras Szemzo wrote: > As the device tree needs the clock/reset indices, add them to DT binding > headers. > > Signed-off-by: Andras Szemzo <szemzo.andras@gmail.com> > --- > include/dt-bindings/clock/sun8i-v853-ccu.h | 132 +++++++++++++++++++ Please use full compatible as filename. > include/dt-bindings/clock/sun8i-v853-r-ccu.h | 16 +++ > include/dt-bindings/reset/sun8i-v853-ccu.h | 62 +++++++++ > include/dt-bindings/reset/sun8i-v853-r-ccu.h | 14 ++ > 4 files changed, 224 insertions(+) > create mode 100644 include/dt-bindings/clock/sun8i-v853-ccu.h > create mode 100644 include/dt-bindings/clock/sun8i-v853-r-ccu.h > create mode 100644 include/dt-bindings/reset/sun8i-v853-ccu.h > create mode 100644 include/dt-bindings/reset/sun8i-v853-r-ccu.h > > diff --git a/include/dt-bindings/clock/sun8i-v853-ccu.h b/include/dt-bindings/clock/sun8i-v853-ccu.h > new file mode 100644 > index 000000000000..a405b982f914 > --- /dev/null > +++ b/include/dt-bindings/clock/sun8i-v853-ccu.h > @@ -0,0 +1,132 @@ > +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ BTW, also checkpatch warns about this... Best regards, Krzysztof
Thanks for your comments for the whole series! Not everything is clear for me yet, but I’ll clarify with sunxi community, and fix it based on your suggestions. > On 11 Jan 2025, at 11:34, Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On Fri, Jan 10, 2025 at 01:39:17PM +0100, Andras Szemzo wrote: >> As the device tree needs the clock/reset indices, add them to DT binding >> headers. >> >> Signed-off-by: Andras Szemzo <szemzo.andras@gmail.com> >> --- >> include/dt-bindings/clock/sun8i-v853-ccu.h | 132 +++++++++++++++++++ > > Please use full compatible as filename. > >> include/dt-bindings/clock/sun8i-v853-r-ccu.h | 16 +++ >> include/dt-bindings/reset/sun8i-v853-ccu.h | 62 +++++++++ >> include/dt-bindings/reset/sun8i-v853-r-ccu.h | 14 ++ >> 4 files changed, 224 insertions(+) >> create mode 100644 include/dt-bindings/clock/sun8i-v853-ccu.h >> create mode 100644 include/dt-bindings/clock/sun8i-v853-r-ccu.h >> create mode 100644 include/dt-bindings/reset/sun8i-v853-ccu.h >> create mode 100644 include/dt-bindings/reset/sun8i-v853-r-ccu.h >> >> diff --git a/include/dt-bindings/clock/sun8i-v853-ccu.h b/include/dt-bindings/clock/sun8i-v853-ccu.h >> new file mode 100644 >> index 000000000000..a405b982f914 >> --- /dev/null >> +++ b/include/dt-bindings/clock/sun8i-v853-ccu.h >> @@ -0,0 +1,132 @@ >> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > > BTW, also checkpatch warns about this... > > Best regards, > Krzysztof >
On Fri, Jan 10, 2025 at 9:56 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On 10/01/2025 13:39, Andras Szemzo wrote: > > As the device tree needs the clock/reset indices, add them to DT binding > > headers. > > > > Signed-off-by: Andras Szemzo <szemzo.andras@gmail.com> > > That's never a separate commit from the binding. > > > ... > > > --- /dev/null > > +++ b/include/dt-bindings/clock/sun8i-v853-r-ccu.h > > @@ -0,0 +1,16 @@ > > +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > > +/* Copyright(c) 2020 - 2023 Allwinner Technology Co.,Ltd. All rights reserved. > > + * > > + * Copyright (C) 2023 rengaomin@allwinnertech.com > > + */ > > +#ifndef _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ > > +#define _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ > > + > > +#define CLK_R_TWD 0 > > +#define CLK_R_PPU 1 > > +#define CLK_R_RTC 2 > > +#define CLK_R_CPUCFG 3 > > + > > +#define CLK_R_MAX_NO (CLK_R_CPUCFG + 1) > > Nope, drop. Not a binding. > > > + > > +#endif > > diff --git a/include/dt-bindings/reset/sun8i-v853-ccu.h b/include/dt-bindings/reset/sun8i-v853-ccu.h > > new file mode 100644 > > index 000000000000..89d94fcbdb55 > > --- /dev/null > > +++ b/include/dt-bindings/reset/sun8i-v853-ccu.h > > @@ -0,0 +1,62 @@ > > +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > > Odd license. Did you copy the file with such license from the downstream? AFAIK all the existing sunxi clock / reset binding header files are dual licensed. OOTH all the YAML files are GPL 2.0 only. IIRC we started out GPL 2.0 only, but then figured that the header files couldn't be shared with non-GPL projects, so we changed those to dual license. Hope that explains the current situation. Relicensing the whole lot to just MIT or BSD is probably doable. ChenYu > > Best regards, > Krzysztof >
On 13/01/2025 09:06, Chen-Yu Tsai wrote: > On Fri, Jan 10, 2025 at 9:56 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: >> >> On 10/01/2025 13:39, Andras Szemzo wrote: >>> As the device tree needs the clock/reset indices, add them to DT binding >>> headers. >>> >>> Signed-off-by: Andras Szemzo <szemzo.andras@gmail.com> >> >> That's never a separate commit from the binding. >> >> >> ... >> >>> --- /dev/null >>> +++ b/include/dt-bindings/clock/sun8i-v853-r-ccu.h >>> @@ -0,0 +1,16 @@ >>> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ >>> +/* Copyright(c) 2020 - 2023 Allwinner Technology Co.,Ltd. All rights reserved. >>> + * >>> + * Copyright (C) 2023 rengaomin@allwinnertech.com >>> + */ >>> +#ifndef _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ >>> +#define _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ >>> + >>> +#define CLK_R_TWD 0 >>> +#define CLK_R_PPU 1 >>> +#define CLK_R_RTC 2 >>> +#define CLK_R_CPUCFG 3 >>> + >>> +#define CLK_R_MAX_NO (CLK_R_CPUCFG + 1) >> >> Nope, drop. Not a binding. >> >>> + >>> +#endif >>> diff --git a/include/dt-bindings/reset/sun8i-v853-ccu.h b/include/dt-bindings/reset/sun8i-v853-ccu.h >>> new file mode 100644 >>> index 000000000000..89d94fcbdb55 >>> --- /dev/null >>> +++ b/include/dt-bindings/reset/sun8i-v853-ccu.h >>> @@ -0,0 +1,62 @@ >>> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ >> >> Odd license. Did you copy the file with such license from the downstream? > > AFAIK all the existing sunxi clock / reset binding header files are > dual licensed. OOTH all the YAML files are GPL 2.0 only. > > IIRC we started out GPL 2.0 only, but then figured that the header files > couldn't be shared with non-GPL projects, so we changed those to dual > license. > > Hope that explains the current situation. Relicensing the whole lot > to just MIT or BSD is probably doable. That's not what the comment is about. Dual license, as expressed by submitting bindings/patches and enforced by checkpatch are expected. But not GPLv3, GPLv4 and GPLv10. Best regards, Krzysztof
On Mon, Jan 13, 2025 at 4:21 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On 13/01/2025 09:06, Chen-Yu Tsai wrote: > > On Fri, Jan 10, 2025 at 9:56 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > >> > >> On 10/01/2025 13:39, Andras Szemzo wrote: > >>> As the device tree needs the clock/reset indices, add them to DT binding > >>> headers. > >>> > >>> Signed-off-by: Andras Szemzo <szemzo.andras@gmail.com> > >> > >> That's never a separate commit from the binding. > >> > >> > >> ... > >> > >>> --- /dev/null > >>> +++ b/include/dt-bindings/clock/sun8i-v853-r-ccu.h > >>> @@ -0,0 +1,16 @@ > >>> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > >>> +/* Copyright(c) 2020 - 2023 Allwinner Technology Co.,Ltd. All rights reserved. > >>> + * > >>> + * Copyright (C) 2023 rengaomin@allwinnertech.com > >>> + */ > >>> +#ifndef _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ > >>> +#define _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ > >>> + > >>> +#define CLK_R_TWD 0 > >>> +#define CLK_R_PPU 1 > >>> +#define CLK_R_RTC 2 > >>> +#define CLK_R_CPUCFG 3 > >>> + > >>> +#define CLK_R_MAX_NO (CLK_R_CPUCFG + 1) > >> > >> Nope, drop. Not a binding. > >> > >>> + > >>> +#endif > >>> diff --git a/include/dt-bindings/reset/sun8i-v853-ccu.h b/include/dt-bindings/reset/sun8i-v853-ccu.h > >>> new file mode 100644 > >>> index 000000000000..89d94fcbdb55 > >>> --- /dev/null > >>> +++ b/include/dt-bindings/reset/sun8i-v853-ccu.h > >>> @@ -0,0 +1,62 @@ > >>> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > >> > >> Odd license. Did you copy the file with such license from the downstream? > > > > AFAIK all the existing sunxi clock / reset binding header files are > > dual licensed. OOTH all the YAML files are GPL 2.0 only. > > > > IIRC we started out GPL 2.0 only, but then figured that the header files > > couldn't be shared with non-GPL projects, so we changed those to dual > > license. > > > > Hope that explains the current situation. Relicensing the whole lot > > to just MIT or BSD is probably doable. > That's not what the comment is about. Dual license, as expressed by > submitting bindings/patches and enforced by checkpatch are expected. But > not GPLv3, GPLv4 and GPLv10. I take back my statement. It seems we have a lot of GPLv2 or later going on. include/dt-bindings/clock/sun20i-d1-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/clock/sun20i-d1-r-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/clock/sun50i-a100-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/clock/sun50i-a100-r-ccu.h:/* SPDX-License-Identifier: GPL-2.0 */ include/dt-bindings/clock/sun50i-h6-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/clock/sun50i-h6-r-ccu.h:/* SPDX-License-Identifier: GPL-2.0 */ include/dt-bindings/clock/sun50i-h616-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/clock/sun5i-ccu.h:/* SPDX-License-Identifier: GPL-2.0-or-later */ include/dt-bindings/clock/sun6i-rtc.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/clock/sun8i-de2.h: * SPDX-License-Identifier: (GPL-2.0+ OR MIT) include/dt-bindings/clock/sun8i-tcon-top.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/clock/suniv-ccu-f1c100s.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) include/dt-bindings/reset/sun20i-d1-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/reset/sun20i-d1-r-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/reset/sun50i-a100-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/reset/sun50i-a100-r-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/reset/sun50i-h6-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/reset/sun50i-h6-r-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/reset/sun50i-h616-ccu.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ include/dt-bindings/reset/sun5i-ccu.h:/* SPDX-License-Identifier: GPL-2.0-or-later */ include/dt-bindings/reset/sun8i-de2.h: * SPDX-License-Identifier: (GPL-2.0+ OR MIT) include/dt-bindings/reset/suniv-ccu-f1c100s.h:/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) Is there a requirement that new files have to be GPL 2.0 only, not GPL 2.0 or later? Documentation/process/license-rules.rst says: The license described in the COPYING file applies to the kernel source as a whole, though individual source files can have a different license which is required to be compatible with the GPL-2.0:: GPL-1.0+ : GNU General Public License v1.0 or later GPL-2.0+ : GNU General Public License v2.0 or later ... Aside from that, individual files can be provided under a dual license, e.g. one of the compatible GPL variants and alternatively under a permissive license like BSD, MIT etc. ChenYu > Best regards, > Krzysztof >
On Mon, 13 Jan 2025 16:45:10 +0800 Chen-Yu Tsai <wens@csie.org> wrote: > On Mon, Jan 13, 2025 at 4:21 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > > > On 13/01/2025 09:06, Chen-Yu Tsai wrote: > > > On Fri, Jan 10, 2025 at 9:56 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > >> > > >> On 10/01/2025 13:39, Andras Szemzo wrote: > > >>> As the device tree needs the clock/reset indices, add them to DT binding > > >>> headers. > > >>> > > >>> Signed-off-by: Andras Szemzo <szemzo.andras@gmail.com> > > >> > > >> That's never a separate commit from the binding. > > >> > > >> > > >> ... > > >> > > >>> --- /dev/null > > >>> +++ b/include/dt-bindings/clock/sun8i-v853-r-ccu.h > > >>> @@ -0,0 +1,16 @@ > > >>> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > > >>> +/* Copyright(c) 2020 - 2023 Allwinner Technology Co.,Ltd. All rights reserved. > > >>> + * > > >>> + * Copyright (C) 2023 rengaomin@allwinnertech.com > > >>> + */ > > >>> +#ifndef _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ > > >>> +#define _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ > > >>> + > > >>> +#define CLK_R_TWD 0 > > >>> +#define CLK_R_PPU 1 > > >>> +#define CLK_R_RTC 2 > > >>> +#define CLK_R_CPUCFG 3 > > >>> + > > >>> +#define CLK_R_MAX_NO (CLK_R_CPUCFG + 1) > > >> > > >> Nope, drop. Not a binding. > > >> > > >>> + > > >>> +#endif > > >>> diff --git a/include/dt-bindings/reset/sun8i-v853-ccu.h b/include/dt-bindings/reset/sun8i-v853-ccu.h > > >>> new file mode 100644 > > >>> index 000000000000..89d94fcbdb55 > > >>> --- /dev/null > > >>> +++ b/include/dt-bindings/reset/sun8i-v853-ccu.h > > >>> @@ -0,0 +1,62 @@ > > >>> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > > >> > > >> Odd license. Did you copy the file with such license from the downstream? > > > > > > AFAIK all the existing sunxi clock / reset binding header files are > > > dual licensed. OOTH all the YAML files are GPL 2.0 only. > > > > > > IIRC we started out GPL 2.0 only, but then figured that the header files > > > couldn't be shared with non-GPL projects, so we changed those to dual > > > license. > > > > > > Hope that explains the current situation. Relicensing the whole lot > > > to just MIT or BSD is probably doable. > > That's not what the comment is about. Dual license, as expressed by > > submitting bindings/patches and enforced by checkpatch are expected. But > > not GPLv3, GPLv4 and GPLv10. > > I take back my statement. It seems we have a lot of GPLv2 or later going on. > > include/dt-bindings/clock/sun20i-d1-ccu.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun20i-d1-r-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun50i-a100-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun50i-a100-r-ccu.h:/* > SPDX-License-Identifier: GPL-2.0 */ > include/dt-bindings/clock/sun50i-h6-ccu.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun50i-h6-r-ccu.h:/* > SPDX-License-Identifier: GPL-2.0 */ > include/dt-bindings/clock/sun50i-h616-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun5i-ccu.h:/* SPDX-License-Identifier: > GPL-2.0-or-later */ > include/dt-bindings/clock/sun6i-rtc.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun8i-de2.h: * SPDX-License-Identifier: > (GPL-2.0+ OR MIT) > include/dt-bindings/clock/sun8i-tcon-top.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/suniv-ccu-f1c100s.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) > include/dt-bindings/reset/sun20i-d1-ccu.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun20i-d1-r-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-a100-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-a100-r-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-h6-ccu.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-h6-r-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-h616-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun5i-ccu.h:/* SPDX-License-Identifier: > GPL-2.0-or-later */ > include/dt-bindings/reset/sun8i-de2.h: * SPDX-License-Identifier: > (GPL-2.0+ OR MIT) > include/dt-bindings/reset/suniv-ccu-f1c100s.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > Is there a requirement that new files have to be GPL 2.0 only, not > GPL 2.0 or later? > > Documentation/process/license-rules.rst says: > The license described in the COPYING file applies to the kernel source > as a whole, though individual source files can have a different license > which is required to be compatible with the GPL-2.0:: > > GPL-1.0+ : GNU General Public License v1.0 or later > GPL-2.0+ : GNU General Public License v2.0 or later > ... > > Aside from that, individual files can be provided under a dual license, > e.g. one of the compatible GPL variants and alternatively under a > permissive license like BSD, MIT etc. Documentation/devicetree/bindings/submitting-patches.rst overrides the general rule, for binding files, and it says (GPL-2.0-only OR BSD-2-Clause) is preferred. Also when I checked checkpatch indeed warned about this. As for the existing files: yes, many of them are not compliant atm: $ git grep -h SPDX include/dt-bindings | sort | uniq -c | sort -n | tail -13 10 /* SPDX-License-Identifier: GPL-2.0 OR MIT */ 13 /* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ 13 /* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */ 14 /* SPDX-License-Identifier: GPL-2.0+ 19 /* SPDX-License-Identifier: GPL-2.0 27 /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ 31 /* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */ 31 /* SPDX-License-Identifier: GPL-2.0-or-later */ 33 /* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ 36 /* SPDX-License-Identifier: GPL-2.0+ */ 176 /* SPDX-License-Identifier: GPL-2.0-only */ 192 /* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ 281 /* SPDX-License-Identifier: GPL-2.0 */ But for new patches we should definitely aim to be correct. Differing license requirements are one price we pay for not having a separate DT repository. Cheers, Andre
On 13/01/2025 09:45, Chen-Yu Tsai wrote: > On Mon, Jan 13, 2025 at 4:21 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: >> >> On 13/01/2025 09:06, Chen-Yu Tsai wrote: >>> On Fri, Jan 10, 2025 at 9:56 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: >>>> >>>> On 10/01/2025 13:39, Andras Szemzo wrote: >>>>> As the device tree needs the clock/reset indices, add them to DT binding >>>>> headers. >>>>> >>>>> Signed-off-by: Andras Szemzo <szemzo.andras@gmail.com> >>>> >>>> That's never a separate commit from the binding. >>>> >>>> >>>> ... >>>> >>>>> --- /dev/null >>>>> +++ b/include/dt-bindings/clock/sun8i-v853-r-ccu.h >>>>> @@ -0,0 +1,16 @@ >>>>> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ >>>>> +/* Copyright(c) 2020 - 2023 Allwinner Technology Co.,Ltd. All rights reserved. >>>>> + * >>>>> + * Copyright (C) 2023 rengaomin@allwinnertech.com >>>>> + */ >>>>> +#ifndef _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ >>>>> +#define _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ >>>>> + >>>>> +#define CLK_R_TWD 0 >>>>> +#define CLK_R_PPU 1 >>>>> +#define CLK_R_RTC 2 >>>>> +#define CLK_R_CPUCFG 3 >>>>> + >>>>> +#define CLK_R_MAX_NO (CLK_R_CPUCFG + 1) >>>> >>>> Nope, drop. Not a binding. >>>> >>>>> + >>>>> +#endif >>>>> diff --git a/include/dt-bindings/reset/sun8i-v853-ccu.h b/include/dt-bindings/reset/sun8i-v853-ccu.h >>>>> new file mode 100644 >>>>> index 000000000000..89d94fcbdb55 >>>>> --- /dev/null >>>>> +++ b/include/dt-bindings/reset/sun8i-v853-ccu.h >>>>> @@ -0,0 +1,62 @@ >>>>> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ >>>> >>>> Odd license. Did you copy the file with such license from the downstream? >>> >>> AFAIK all the existing sunxi clock / reset binding header files are >>> dual licensed. OOTH all the YAML files are GPL 2.0 only. >>> >>> IIRC we started out GPL 2.0 only, but then figured that the header files >>> couldn't be shared with non-GPL projects, so we changed those to dual >>> license. >>> >>> Hope that explains the current situation. Relicensing the whole lot >>> to just MIT or BSD is probably doable. >> That's not what the comment is about. Dual license, as expressed by >> submitting bindings/patches and enforced by checkpatch are expected. But >> not GPLv3, GPLv4 and GPLv10. > > I take back my statement. It seems we have a lot of GPLv2 or later going on. There are a lot of bugs, so we can add them as well? > > include/dt-bindings/clock/sun20i-d1-ccu.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun20i-d1-r-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun50i-a100-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun50i-a100-r-ccu.h:/* > SPDX-License-Identifier: GPL-2.0 */ > include/dt-bindings/clock/sun50i-h6-ccu.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun50i-h6-r-ccu.h:/* > SPDX-License-Identifier: GPL-2.0 */ > include/dt-bindings/clock/sun50i-h616-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun5i-ccu.h:/* SPDX-License-Identifier: > GPL-2.0-or-later */ > include/dt-bindings/clock/sun6i-rtc.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/sun8i-de2.h: * SPDX-License-Identifier: > (GPL-2.0+ OR MIT) > include/dt-bindings/clock/sun8i-tcon-top.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/clock/suniv-ccu-f1c100s.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) > include/dt-bindings/reset/sun20i-d1-ccu.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun20i-d1-r-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-a100-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-a100-r-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-h6-ccu.h:/* SPDX-License-Identifier: > (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-h6-r-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun50i-h616-ccu.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > include/dt-bindings/reset/sun5i-ccu.h:/* SPDX-License-Identifier: > GPL-2.0-or-later */ > include/dt-bindings/reset/sun8i-de2.h: * SPDX-License-Identifier: > (GPL-2.0+ OR MIT) > include/dt-bindings/reset/suniv-ccu-f1c100s.h:/* > SPDX-License-Identifier: (GPL-2.0+ OR MIT) > > Is there a requirement that new files have to be GPL 2.0 only, not > GPL 2.0 or later? I think that's obvious preference and brought to the list multiple times already. And that's easy to justify reversing the question: why would GPLv4 be okay here? If you can find the reason, sure we can go with 2.0+. If you cannot find the reason, well, it's obvious, right? Best regards, Krzysztof
diff --git a/include/dt-bindings/clock/sun8i-v853-ccu.h b/include/dt-bindings/clock/sun8i-v853-ccu.h new file mode 100644 index 000000000000..a405b982f914 --- /dev/null +++ b/include/dt-bindings/clock/sun8i-v853-ccu.h @@ -0,0 +1,132 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* + * Copyright (C) 2020 huangzhenwei@allwinnertech.com + * Copyright (C) 2023 Andras Szemzo <szemzo.andras@gmail.com.com> + */ + +#ifndef _DT_BINDINGS_CLK_SUN8I_V85X_CCU_H_ +#define _DT_BINDINGS_CLK_SUN8I_V85X_CCU_H_ + +#define CLK_OSC12M 0 +#define CLK_PLL_CPU 1 +#define CLK_PLL_DDR 2 +#define CLK_PLL_PERIPH_4X 3 +#define CLK_PLL_PERIPH_2X 4 +#define CLK_PLL_PERIPH_800M 5 +#define CLK_PLL_PERIPH_480M 6 +#define CLK_PLL_PERIPH_600M 7 +#define CLK_PLL_PERIPH_400M 8 +#define CLK_PLL_PERIPH_300M 9 +#define CLK_PLL_PERIPH_200M 10 +#define CLK_PLL_PERIPH_160M 11 +#define CLK_PLL_PERIPH_150M 12 +#define CLK_PLL_VIDEO_4X 13 +#define CLK_PLL_VIDEO_2X 14 +#define CLK_PLL_VIDEO_1X 15 +#define CLK_PLL_CSI_4X 16 +#define CLK_PLL_AUDIO_DIV2 17 +#define CLK_PLL_AUDIO_DIV5 18 +#define CLK_PLL_AUDIO_4X 19 +#define CLK_PLL_AUDIO_1X 20 +#define CLK_PLL_NPU_4X 21 +#define CLK_CPU 22 +#define CLK_CPU_AXI 23 +#define CLK_CPU_APB 24 +#define CLK_AHB 25 +#define CLK_APB0 26 +#define CLK_APB1 27 +#define CLK_MBUS 28 +#define CLK_DE 29 +#define CLK_BUS_DE 30 +#define CLK_G2D 31 +#define CLK_BUS_G2D 32 +#define CLK_CE 33 +#define CLK_BUS_CE 34 +#define CLK_VE 35 +#define CLK_BUS_VE 36 +#define CLK_NPU 37 +#define CLK_BUS_NPU 38 +#define CLK_BUS_DMA 39 +#define CLK_BUS_MSGBOX0 40 +#define CLK_BUS_MSGBOX1 41 +#define CLK_BUS_SPINLOCK 42 +#define CLK_BUS_HSTIMER 43 +#define CLK_AVS 44 +#define CLK_BUS_DBG 45 +#define CLK_BUS_PWM 46 +#define CLK_BUS_IOMMU 47 +#define CLK_DRAM 48 +#define CLK_MBUS_DMA 49 +#define CLK_MBUS_VE 50 +#define CLK_MBUS_CE 51 +#define CLK_MBUS_CSI 52 +#define CLK_MBUS_ISP 53 +#define CLK_MBUS_G2D 54 +#define CLK_BUS_DRAM 55 +#define CLK_MMC0 56 +#define CLK_MMC1 57 +#define CLK_MMC2 58 +#define CLK_BUS_MMC0 59 +#define CLK_BUS_MMC1 60 +#define CLK_BUS_MMC2 61 +#define CLK_BUS_UART0 62 +#define CLK_BUS_UART1 63 +#define CLK_BUS_UART2 64 +#define CLK_BUS_UART3 65 +#define CLK_BUS_I2C0 66 +#define CLK_BUS_I2C1 67 +#define CLK_BUS_I2C2 68 +#define CLK_BUS_I2C3 69 +#define CLK_BUS_I2C4 70 +#define CLK_SPI0 71 +#define CLK_SPI1 72 +#define CLK_SPI2 73 +#define CLK_SPI3 74 +#define CLK_BUS_SPI0 75 +#define CLK_BUS_SPI1 76 +#define CLK_BUS_SPI2 77 +#define CLK_BUS_SPI3 78 +#define CLK_SPIF 79 +#define CLK_BUS_SPIF 80 +#define CLK_EMAC_25M 81 +#define CLK_BUS_EMAC 82 +#define CLK_BUS_GPADC 83 +#define CLK_BUS_THS 84 +#define CLK_I2S0 85 +#define CLK_I2S1 86 +#define CLK_BUS_I2S0 87 +#define CLK_BUS_I2S1 88 +#define CLK_DMIC 89 +#define CLK_BUS_DMIC 90 +#define CLK_AUDIO_CODEC_DAC 91 +#define CLK_AUDIO_CODEC_ADC 92 +#define CLK_BUS_AUDIO_CODEC 93 +#define CLK_USB_OHCI 94 +#define CLK_BUS_OHCI 95 +#define CLK_BUS_EHCI 96 +#define CLK_BUS_OTG 97 +#define CLK_BUS_DPSS_TOP 98 +#define CLK_MIPI_DSI 99 +#define CLK_BUS_MIPI_DSI 100 +#define CLK_TCON_LCD 101 +#define CLK_BUS_TCON_LCD 102 +#define CLK_CSI_TOP 103 +#define CLK_CSI_MCLK0 104 +#define CLK_CSI_MCLK1 105 +#define CLK_CSI_MCLK2 106 +#define CLK_BUS_CSI 107 +#define CLK_BUS_WIEGAND 108 +#define CLK_RISCV 109 +#define CLK_RISCV_AXI 110 +#define CLK_RISCV_CFG 111 +#define CLK_FANOUT_24M 112 +#define CLK_FANOUT_12M 113 +#define CLK_FANOUT_16M 114 +#define CLK_FANOUT_25M 115 +#define CLK_FANOUT_27M 116 +#define CLK_FANOUT_PCLK 117 +#define CLK_FANOUT0 118 +#define CLK_FANOUT1 119 +#define CLK_FANOUT2 120 + +#endif /* _DT_BINDINGS_CLK_SUN8I_V85X_CCU_H_ */ diff --git a/include/dt-bindings/clock/sun8i-v853-r-ccu.h b/include/dt-bindings/clock/sun8i-v853-r-ccu.h new file mode 100644 index 000000000000..0c10295c6d9c --- /dev/null +++ b/include/dt-bindings/clock/sun8i-v853-r-ccu.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* Copyright(c) 2020 - 2023 Allwinner Technology Co.,Ltd. All rights reserved. + * + * Copyright (C) 2023 rengaomin@allwinnertech.com + */ +#ifndef _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ +#define _DT_BINDINGS_CLK_SUN8I_V85X_R_CCU_H_ + +#define CLK_R_TWD 0 +#define CLK_R_PPU 1 +#define CLK_R_RTC 2 +#define CLK_R_CPUCFG 3 + +#define CLK_R_MAX_NO (CLK_R_CPUCFG + 1) + +#endif diff --git a/include/dt-bindings/reset/sun8i-v853-ccu.h b/include/dt-bindings/reset/sun8i-v853-ccu.h new file mode 100644 index 000000000000..89d94fcbdb55 --- /dev/null +++ b/include/dt-bindings/reset/sun8i-v853-ccu.h @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* + * Copyright (c) 2020 huangzhenwei@allwinnertech.com + * Copyright (C) 2023 Andras Szemzo <szemzo.andras@gmail.com> + */ + +#ifndef _DT_BINDINGS_RST_SUN8I_V85X_CCU_H_ +#define _DT_BINDINGS_RST_SUN8I_V85X_CCU_H_ + +#define RST_MBUS 0 +#define RST_BUS_DE 1 +#define RST_BUS_G2D 2 +#define RST_BUS_CE 3 +#define RST_BUS_VE 4 +#define RST_BUS_NPU 5 +#define RST_BUS_DMA 6 +#define RST_BUS_MSGBOX0 7 +#define RST_BUS_MSGBOX1 8 +#define RST_BUS_SPINLOCK 9 +#define RST_BUS_HSTIMER 10 +#define RST_BUS_DBG 11 +#define RST_BUS_PWM 12 +#define RST_BUS_DRAM 13 +#define RST_BUS_MMC0 14 +#define RST_BUS_MMC1 15 +#define RST_BUS_MMC2 16 +#define RST_BUS_UART0 17 +#define RST_BUS_UART1 18 +#define RST_BUS_UART2 19 +#define RST_BUS_UART3 20 +#define RST_BUS_I2C0 21 +#define RST_BUS_I2C1 22 +#define RST_BUS_I2C2 23 +#define RST_BUS_I2C3 24 +#define RST_BUS_I2C4 25 +#define RST_BUS_SPIF 26 +#define RST_BUS_SPI0 27 +#define RST_BUS_SPI1 28 +#define RST_BUS_SPI2 29 +#define RST_BUS_SPI3 30 +#define RST_BUS_EMAC 31 +#define RST_BUS_GPADC 32 +#define RST_BUS_THS 33 +#define RST_BUS_I2S0 34 +#define RST_BUS_I2S1 35 +#define RST_BUS_DMIC 36 +#define RST_BUS_AUDIO_CODEC 37 +#define RST_USB_PHY 38 +#define RST_BUS_OHCI 39 +#define RST_BUS_EHCI 40 +#define RST_BUS_OTG 41 +#define RST_BUS_DPSS_TOP 42 +#define RST_BUS_MIPI_DSI 43 +#define RST_BUS_TCON_LCD 44 +#define RST_BUS_CSI 45 +#define RST_BUS_WIEGAND 46 +#define RST_RISCV_SYS_APB 47 +#define RST_RISCV_SOFT 48 +#define RST_RISCV_CLK_GATING 49 +#define RST_RISCV_CFG 50 + +#endif /* _DT_BINDINGS_RST_SUN8I_V85X_CCU_H_ */ diff --git a/include/dt-bindings/reset/sun8i-v853-r-ccu.h b/include/dt-bindings/reset/sun8i-v853-r-ccu.h new file mode 100644 index 000000000000..4420f7dbbcdc --- /dev/null +++ b/include/dt-bindings/reset/sun8i-v853-r-ccu.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* Copyright(c) 2020 - 2023 Allwinner Technology Co.,Ltd. All rights reserved. + * + * Copyright (c) 2023 rengaomin@allwinnertech.com + */ + +#ifndef _DT_BINDINGS_RESET_SUN8IW21_R_CCU_H_ +#define _DT_BINDINGS_RESET_SUN8IW21_R_CCU_H_ + +#define RST_BUS_R_PPU 0 +#define RST_BUS_R_RTC 1 +#define RST_BUS_R_CPUCFG 2 + +#endif /* _DT_BINDINGS_RESET_SUN8IW21_R_CCU_H_ */
As the device tree needs the clock/reset indices, add them to DT binding headers. Signed-off-by: Andras Szemzo <szemzo.andras@gmail.com> --- include/dt-bindings/clock/sun8i-v853-ccu.h | 132 +++++++++++++++++++ include/dt-bindings/clock/sun8i-v853-r-ccu.h | 16 +++ include/dt-bindings/reset/sun8i-v853-ccu.h | 62 +++++++++ include/dt-bindings/reset/sun8i-v853-r-ccu.h | 14 ++ 4 files changed, 224 insertions(+) create mode 100644 include/dt-bindings/clock/sun8i-v853-ccu.h create mode 100644 include/dt-bindings/clock/sun8i-v853-r-ccu.h create mode 100644 include/dt-bindings/reset/sun8i-v853-ccu.h create mode 100644 include/dt-bindings/reset/sun8i-v853-r-ccu.h