The preferred form for Renesas' compatible strings is:
"<vendor>,<family>-<module>"
Somehow the compatible string for the r9a09g011 I2C IP was upstreamed
as renesas,i2c-r9a09g011 instead of renesas,r9a09g011-i2c, which
is really confusing, especially considering the generic fallback
is renesas,rzv2m-i2c.
The first user of renesas,i2c-r9a09g011 in the kernel is not yet in
a kernel release, it will be in v6.1, therefore it can still be
fixed in v6.1.
Even if we don't fix it before v6.2, I don't think there is any
harm in making such a change.
s/renesas,i2c-r9a09g011/renesas,r9a09g011-i2c/g for consistency.
Fixes: 54ac6794df9d ("arm64: dts: renesas: r9a09g011: Add i2c nodes")
Signed-off-by: Fabrizio Castro <[email protected]>
---
v2 - Improved changelog, as suggested by Geert and Krzysztof
arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r9a09g011.dtsi b/arch/arm64/boot/dts/renesas/r9a09g011.dtsi
index 1948d2e6bcae..2ccd48ee9880 100644
--- a/arch/arm64/boot/dts/renesas/r9a09g011.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a09g011.dtsi
@@ -126,7 +126,7 @@ cpg: clock-controller@a3500000 {
i2c0: i2c@a4030000 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "renesas,i2c-r9a09g011", "renesas,rzv2m-i2c";
+ compatible = "renesas,r9a09g011-i2c", "renesas,rzv2m-i2c";
reg = <0 0xa4030000 0 0x80>;
interrupts = <GIC_SPI 232 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 236 IRQ_TYPE_EDGE_RISING>;
@@ -140,7 +140,7 @@ i2c0: i2c@a4030000 {
i2c2: i2c@a4030100 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "renesas,i2c-r9a09g011", "renesas,rzv2m-i2c";
+ compatible = "renesas,r9a09g011-i2c", "renesas,rzv2m-i2c";
reg = <0 0xa4030100 0 0x80>;
interrupts = <GIC_SPI 234 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 238 IRQ_TYPE_EDGE_RISING>;
--
2.34.1
On Mon, Nov 7, 2022 at 5:50 PM Fabrizio Castro
<[email protected]> wrote:
> The preferred form for Renesas' compatible strings is:
> "<vendor>,<family>-<module>"
>
> Somehow the compatible string for the r9a09g011 I2C IP was upstreamed
> as renesas,i2c-r9a09g011 instead of renesas,r9a09g011-i2c, which
> is really confusing, especially considering the generic fallback
> is renesas,rzv2m-i2c.
>
> The first user of renesas,i2c-r9a09g011 in the kernel is not yet in
> a kernel release, it will be in v6.1, therefore it can still be
> fixed in v6.1.
> Even if we don't fix it before v6.2, I don't think there is any
> harm in making such a change.
>
> s/renesas,i2c-r9a09g011/renesas,r9a09g011-i2c/g for consistency.
>
> Fixes: 54ac6794df9d ("arm64: dts: renesas: r9a09g011: Add i2c nodes")
> Signed-off-by: Fabrizio Castro <[email protected]>
> ---
>
> v2 - Improved changelog, as suggested by Geert and Krzysztof
Reviewed-by: Geert Uytterhoeven <[email protected]>
i.e. will queue in renesas-devel for v6.2.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds