Re: [PATCH v3 1/2] i2c: rtl9300: add realtek,rtl9607c-i2c compatible

[Rustam Adilov <adilov@disroot.org>]

On 2026-11-15 08:08, Michael Zavertkin wrote:
> RTL9607C was already supported by realtek,rtl9607-i2c, which is
> confusing, because there are another SoCs such as RTL9607F, RTL9607
> (without letter) and a few more. So more correct compatible was added.

Yeah, that makes sense. Yesterday i spent some time documenting the rtl960x
tree [1] and rtl9607 falls into apollomp rather than rtl9607c family.

We should ideally check if RTL9607 and RTL9607C have similar enough i2c
controllers to use same compatible but maybe for another time. Cause if
it turns out they are different then the rtl9607-i2c should not be
deprecated? I don't know what the rules are for this particular case
where due to lack of knowledge at a time we have been using a wrong 
compatible all this time.

[1] https://github.com/Anime4000/RTL960x#rtl960x-families-and-their-subtypes

> New compatible doesn't use IO_MODE_EN register, leaving it to pinctrl
> driver. Old one left for backward compatibility.
> 
> Signed-off-by: Michael Zavertkin <misha.zavertkin@mail.ru>
> ---
>  drivers/i2c/busses/i2c-rtl9300.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9300.c
> index a9dd85a286d4..ae20fbdc307a 100644
> --- a/drivers/i2c/busses/i2c-rtl9300.c
> +++ b/drivers/i2c/busses/i2c-rtl9300.c
> @@ -200,10 +200,12 @@ static int rtl9607_i2c_config_chan(struct rtl9300_i2c *i2c, struct rtl9300_i2c_c
>  	if (ret)
>  		return ret;
>  
> -	drv_data = device_get_match_data(i2c->dev);
> -	ret = drv_data->select_scl(i2c, i2c->scl_num);
> -	if (ret)
> -		return ret;
> +	if (device_is_compatible(i2c->dev, "realtek,rtl9607-i2c")) {
> +		drv_data = device_get_match_data(i2c->dev);
> +		ret = drv_data->select_scl(i2c, i2c->scl_num);
> +		if (ret)
> +			return ret;
> +	}
>  
>  	i2c->sda_num = chan->sda_num;
>  	return 0;
> @@ -494,6 +496,10 @@ static int rtl9300_i2c_probe(struct platform_device *pdev)
>  		scl_num = 0;
>  	i2c->scl_num = (u8)scl_num;
>  
> +	if (device_is_compatible(i2c->dev, "realtek,rtl9607-i2c"))
> +		dev_warn(dev, "Compatible 'realtek,rtl9607-i2c' is deprecated. "
> +			      "Use 'realtek,rtl9607c-i2c' instead\n");
> +
>  	platform_set_drvdata(pdev, i2c);
>  
>  	drv_data = device_get_match_data(i2c->dev);
> @@ -652,6 +658,7 @@ static const struct of_device_id i2c_rtl9300_dt_ids[] = {
>  	{ .compatible = "realtek,rtl9312-i2c", .data = (void *) &rtl9310_i2c_drv_data },
>  	{ .compatible = "realtek,rtl9313-i2c", .data = (void *) &rtl9310_i2c_drv_data },
>  	{ .compatible = "realtek,rtl9607-i2c", .data = (void *) &rtl9607_i2c_drv_data },
> +	{ .compatible = "realtek,rtl9607c-i2c", .data = (void *) &rtl9607_i2c_drv_data },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(of, i2c_rtl9300_dt_ids);