Re: [PATCH v2 1/5] dt-bindings: display: ssd1307fb: Deprecate "-i2c" compatible strings
From: Maxime Ripard
Date: Tue Apr 12 2022 - 08:21:36 EST
On Mon, Apr 11, 2022 at 11:12:39PM +0200, Javier Martinez Canillas wrote:
> The current compatible strings for SSD130x I2C controllers contain both an
> "fb" and "-i2c" suffixes. It seems to indicate that are for a fbdev driver
> and also that are for devices that can be accessed over an I2C bus.
>
> But a DT is supposed to describe the hardware and not Linux implementation
> details. So let's deprecate those compatible strings and add new ones that
> only contain the vendor and device name, without any of these suffixes.
>
> These will just describe the device and can be matched by both I2C and SPI
> DRM drivers.
>
> Signed-off-by: Javier Martinez Canillas <javierm@xxxxxxxxxx>
> Acked-by: Mark Brown <broonie@xxxxxxxxxx>
> ---
>
> Changes in v2:
> - Drop the -i2c suffixes from the compatible strings too (Geert Uytterhoeven).
>
> .../bindings/display/solomon,ssd1307fb.yaml | 37 ++++++++++++-------
> 1 file changed, 24 insertions(+), 13 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
> index ade61d502edd..6b9d0c72739a 100644
> --- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
> +++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
> @@ -12,12 +12,23 @@ maintainers:
>
> properties:
> compatible:
> - enum:
> - - sinowealth,sh1106-i2c
> - - solomon,ssd1305fb-i2c
> - - solomon,ssd1306fb-i2c
> - - solomon,ssd1307fb-i2c
> - - solomon,ssd1309fb-i2c
> + oneOf:
> + # Deprecated compatible strings
> + - items:
> + - enum:
> + - sinowealth,sh1106-i2c
> + - solomon,ssd1305fb-i2c
> + - solomon,ssd1306fb-i2c
> + - solomon,ssd1307fb-i2c
> + - solomon,ssd1309fb-i2c
> + deprecated: true
> + - items:
> + - enum:
> + - sinowealth,sh1106
> + - solomon,ssd1305
> + - solomon,ssd1306
> + - solomon,ssd1307
> + - solomon,ssd1309
>
> reg:
> maxItems: 1
> @@ -136,7 +147,7 @@ allOf:
> properties:
> compatible:
> contains:
> - const: sinowealth,sh1106-i2c
> + const: sinowealth,sh1106
I think we should have both in the condition here, but it looks good
otherwise.
Maxime