Hello All,
There has been ongoing discussion[1] surrounding the issue of having K3
prefix included in the compatible for dt bindings. This series removes this
prefix from both the device tree binding as well as the driver. Updating
the binding will not break the ABI at this point as the driver is still
only in linux-next.
Changes in v3:
- Update example in dt bindings to match new compatible
Changes in v2:
- Include more context surrounding patch
- Fix style issues addressed by Krzysztof
[1] https://lore.kernel.org/all/20231201063309.tingjc3cjhsqb6r7@confusing/
Brandon Brnich (2):
dt-bindings: media: Remove K3 Family Prefix from Compatible
media: chips-media: wave5: Remove K3 References
Documentation/devicetree/bindings/media/cnm,wave521c.yaml | 4 ++--
drivers/media/platform/chips-media/wave5/wave5-vpu.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
2.34.1
K3 family prefix is not included in other TI compatible strings. Remove
this prefix to keep naming convention consistent.
Fixes: de4b9f7e371a ("dt-bindings: media: wave5: add yaml devicetree bindings")
Reported-by: Geert Uytterhoeven <[email protected]>
Closes: https://lore.kernel.org/all/CAMuHMdUYOq=q1j=d+Eac28hthOUAaNUkuvxmRu-mUN1pLKq69g@mail.gmail.com/
Signed-off-by: Brandon Brnich <[email protected]>
---
V2 -> V3: Update compatible in example
Bindings currently reside in linux-next, meaning that the ABI will not be
broken with the removal of K3 prefix. Important to get this merged in
prior to being moved to master so that K3 prefix does not need to be
permanately included.
Documentation/devicetree/bindings/media/cnm,wave521c.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/cnm,wave521c.yaml b/Documentation/devicetree/bindings/media/cnm,wave521c.yaml
index 6d5569e77b7a..6a11c1d11fb5 100644
--- a/Documentation/devicetree/bindings/media/cnm,wave521c.yaml
+++ b/Documentation/devicetree/bindings/media/cnm,wave521c.yaml
@@ -17,7 +17,7 @@ properties:
compatible:
items:
- enum:
- - ti,k3-j721s2-wave521c
+ - ti,j721s2-wave521c
- const: cnm,wave521c
reg:
@@ -53,7 +53,7 @@ additionalProperties: false
examples:
- |
vpu: video-codec@12345678 {
- compatible = "ti,k3-j721s2-wave521c", "cnm,wave521c";
+ compatible = "ti,j721s2-wave521c", "cnm,wave521c";
reg = <0x12345678 0x1000>;
clocks = <&clks 42>;
interrupts = <42>;
--
2.34.1
Change compatible string to match dt bindings for TI devices. K3 family
prefix should not be included as it deviates from naming convention.
Fixes: 9707a6254a8a ("media: chips-media: wave5: Add the v4l2 layer")
Reported-by: Geert Uytterhoeven <[email protected]>
Closes: https://lore.kernel.org/all/CAMuHMdUYOq=q1j=d+Eac28hthOUAaNUkuvxmRu-mUN1pLKq69g@mail.gmail.com/
Signed-off-by: Brandon Brnich <[email protected]>
---
drivers/media/platform/chips-media/wave5/wave5-vpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
index bfe4caa79cc9..0d90b5820bef 100644
--- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c
+++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
@@ -272,7 +272,7 @@ static const struct wave5_match_data ti_wave521c_data = {
};
static const struct of_device_id wave5_dt_ids[] = {
- { .compatible = "ti,k3-j721s2-wave521c", .data = &ti_wave521c_data },
+ { .compatible = "ti,j721s2-wave521c", .data = &ti_wave521c_data },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, wave5_dt_ids);
--
2.34.1
On 11/12/2023 21:59, Brandon Brnich wrote:
> K3 family prefix is not included in other TI compatible strings. Remove
> this prefix to keep naming convention consistent.
>
> Fixes: de4b9f7e371a ("dt-bindings: media: wave5: add yaml devicetree bindings")
> Reported-by: Geert Uytterhoeven <[email protected]>
> Closes: https://lore.kernel.org/all/CAMuHMdUYOq=q1j=d+Eac28hthOUAaNUkuvxmRu-mUN1pLKq69g@mail.gmail.com/
> Signed-off-by: Brandon Brnich <[email protected]>
> ---
> V2 -> V3: Update compatible in example
I guess this was the reason for dropping the tags.
Acked-by: Krzysztof Kozlowski <[email protected]>
Best regards,
Krzysztof
On 14:59-20231211, Brandon Brnich wrote:
> K3 family prefix is not included in other TI compatible strings. Remove
> this prefix to keep naming convention consistent.
>
> Fixes: de4b9f7e371a ("dt-bindings: media: wave5: add yaml devicetree bindings")
> Reported-by: Geert Uytterhoeven <[email protected]>
> Closes: https://lore.kernel.org/all/CAMuHMdUYOq=q1j=d+Eac28hthOUAaNUkuvxmRu-mUN1pLKq69g@mail.gmail.com/
> Signed-off-by: Brandon Brnich <[email protected]>
> ---
> V2 -> V3: Update compatible in example
>
> Bindings currently reside in linux-next, meaning that the ABI will not be
> broken with the removal of K3 prefix. Important to get this merged in
> prior to being moved to master so that K3 prefix does not need to be
> permanately included.
>
> Documentation/devicetree/bindings/media/cnm,wave521c.yaml | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/media/cnm,wave521c.yaml b/Documentation/devicetree/bindings/media/cnm,wave521c.yaml
> index 6d5569e77b7a..6a11c1d11fb5 100644
> --- a/Documentation/devicetree/bindings/media/cnm,wave521c.yaml
> +++ b/Documentation/devicetree/bindings/media/cnm,wave521c.yaml
> @@ -17,7 +17,7 @@ properties:
> compatible:
> items:
> - enum:
> - - ti,k3-j721s2-wave521c
> + - ti,j721s2-wave521c
> - const: cnm,wave521c
>
> reg:
> @@ -53,7 +53,7 @@ additionalProperties: false
> examples:
> - |
> vpu: video-codec@12345678 {
> - compatible = "ti,k3-j721s2-wave521c", "cnm,wave521c";
> + compatible = "ti,j721s2-wave521c", "cnm,wave521c";
> reg = <0x12345678 0x1000>;
> clocks = <&clks 42>;
> interrupts = <42>;
> --
> 2.34.1
>
Reviewed-by: Nishanth Menon <[email protected]>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
On 14:59-20231211, Brandon Brnich wrote:
> Change compatible string to match dt bindings for TI devices. K3 family
> prefix should not be included as it deviates from naming convention.
>
> Fixes: 9707a6254a8a ("media: chips-media: wave5: Add the v4l2 layer")
> Reported-by: Geert Uytterhoeven <[email protected]>
> Closes: https://lore.kernel.org/all/CAMuHMdUYOq=q1j=d+Eac28hthOUAaNUkuvxmRu-mUN1pLKq69g@mail.gmail.com/
> Signed-off-by: Brandon Brnich <[email protected]>
> ---
> drivers/media/platform/chips-media/wave5/wave5-vpu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu.c b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
> index bfe4caa79cc9..0d90b5820bef 100644
> --- a/drivers/media/platform/chips-media/wave5/wave5-vpu.c
> +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu.c
> @@ -272,7 +272,7 @@ static const struct wave5_match_data ti_wave521c_data = {
> };
>
> static const struct of_device_id wave5_dt_ids[] = {
> - { .compatible = "ti,k3-j721s2-wave521c", .data = &ti_wave521c_data },
> + { .compatible = "ti,j721s2-wave521c", .data = &ti_wave521c_data },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, wave5_dt_ids);
> --
> 2.34.1
>
Reviewed-by: Nishanth Menon <[email protected]>
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Hello,
> -----Original Message-----
> Subject: [PATCH v3 0/2] Update Wave521c Compatible for TI Devices
>
> Hello All,
>
> There has been ongoing discussion[1] surrounding the issue of having K3
> prefix included in the compatible for dt bindings. This series removes this
> prefix from both the device tree binding as well as the driver. Updating the
> binding will not break the ABI at this point as the driver is still only in linux-
> next.
I noticed this series has still not made it in linux-next. I assume this is because
I improperly dropped the tags on the second patch [0] in the series between v2
and v3. This series should only be applied before bindings make it into release,
or the ABI breaks. Should I resend the series picking up proper tags this time?
Or is it too late for 6.8 at this point?
[0] https://patchwork.kernel.org/project/linux-media/patch/[email protected]/
>
> Changes in v3:
> - Update example in dt bindings to match new compatible
>
> Changes in v2:
> - Include more context surrounding patch
> - Fix style issues addressed by Krzysztof
>
> [1] https://lore.kernel.org/all/20231201063309.tingjc3cjhsqb6r7@confusing/
>
>
> Brandon Brnich (2):
> dt-bindings: media: Remove K3 Family Prefix from Compatible
> media: chips-media: wave5: Remove K3 References
>
> Documentation/devicetree/bindings/media/cnm,wave521c.yaml | 4 ++--
> drivers/media/platform/chips-media/wave5/wave5-vpu.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> --
> 2.34.1
Thanks,
Brandon Brnich
Hi Brandon,
On 28/12/2023 16:00, Brnich, Brandon wrote:
> Hello,
>
>> -----Original Message-----
>> Subject: [PATCH v3 0/2] Update Wave521c Compatible for TI Devices
>>
>> Hello All,
>>
>> There has been ongoing discussion[1] surrounding the issue of having K3
>> prefix included in the compatible for dt bindings. This series removes this
>> prefix from both the device tree binding as well as the driver. Updating the
>> binding will not break the ABI at this point as the driver is still only in linux-
>> next.
>
> I noticed this series has still not made it in linux-next. I assume this is because
> I improperly dropped the tags on the second patch [0] in the series between v2
> and v3. This series should only be applied before bindings make it into release,
> or the ABI breaks. Should I resend the series picking up proper tags this time?
> Or is it too late for 6.8 at this point?
This will have to be a 'fixes' pull request for v6.8 once v6.8-rc1 is released.
These patches came in too late to make it into our staging tree. (Christmas vacation...)
Keep an eye out for this, if it is not in rc3/rc4, then ping me and Sebastian.
Regards,
Hans
>
> [0] https://patchwork.kernel.org/project/linux-media/patch/[email protected]/
>
>>
>> Changes in v3:
>> - Update example in dt bindings to match new compatible
>>
>> Changes in v2:
>> - Include more context surrounding patch
>> - Fix style issues addressed by Krzysztof
>>
>> [1] https://lore.kernel.org/all/20231201063309.tingjc3cjhsqb6r7@confusing/
>>
>>
>> Brandon Brnich (2):
>> dt-bindings: media: Remove K3 Family Prefix from Compatible
>> media: chips-media: wave5: Remove K3 References
>>
>> Documentation/devicetree/bindings/media/cnm,wave521c.yaml | 4 ++--
>> drivers/media/platform/chips-media/wave5/wave5-vpu.c | 2 +-
>> 2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> --
>> 2.34.1
>
> Thanks,
>
> Brandon Brnich
>