| Message ID | 20220419214824.335075-2-javierm@redhat.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | drm/solomon: Add SSD130x OLED displays SPI support | expand |
On Tue, 19 Apr 2022 23:48:19 +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. The required properties should still be enforced for old ones. > > While being there, just drop the "sinowealth,sh1106-i2c" compatible string > since that was never present in a released Linux version. > > Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> > Acked-by: Mark Brown <broonie@kernel.org> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > > (no changes since v3) > > Changes in v3: > - Drop the "sinowealth,sh1106-i2c", wasn't in a released version (Chen-Yu Tsai) > - Continue enforcing required properties for deprecated strings (Maxime Ripard) > > Changes in v2: > - Drop the -i2c suffixes from the compatible strings too (Geert Uytterhoeven) > > .../bindings/display/solomon,ssd1307fb.yaml | 44 +++++++++++++------ > 1 file changed, 31 insertions(+), 13 deletions(-) > Please add Acked-by/Reviewed-by tags when posting new versions. However, there's no need to repost patches *only* to add the tags. The upstream maintainer will do that for acks received on the version they apply. If a tag was not added on purpose, please state why and what changed.
Hello Rob, On 4/20/22 18:15, Rob Herring wrote: > On Tue, 19 Apr 2022 23:48:19 +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. The required properties should still be enforced for old ones. >> >> While being there, just drop the "sinowealth,sh1106-i2c" compatible string >> since that was never present in a released Linux version. >> >> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> >> Acked-by: Mark Brown <broonie@kernel.org> >> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> >> --- >> >> (no changes since v3) >> >> Changes in v3: >> - Drop the "sinowealth,sh1106-i2c", wasn't in a released version (Chen-Yu Tsai) >> - Continue enforcing required properties for deprecated strings (Maxime Ripard) >> >> Changes in v2: >> - Drop the -i2c suffixes from the compatible strings too (Geert Uytterhoeven) >> >> .../bindings/display/solomon,ssd1307fb.yaml | 44 +++++++++++++------ >> 1 file changed, 31 insertions(+), 13 deletions(-) >> > > > Please add Acked-by/Reviewed-by tags when posting new versions. However, > there's no need to repost patches *only* to add the tags. The upstream > maintainer will do that for acks received on the version they apply. > > If a tag was not added on purpose, please state why and what changed. > I meant to add your Acked-by but just forget before posting. Sorry about that. I'll add it myself before pushing.
diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml index ade61d502edd..7653b6c3fcb6 100644 --- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml +++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml @@ -12,12 +12,22 @@ 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: + - 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 +146,7 @@ allOf: properties: compatible: contains: - const: sinowealth,sh1106-i2c + const: sinowealth,sh1106 then: properties: solomon,dclk-div: @@ -148,7 +158,9 @@ allOf: properties: compatible: contains: - const: solomon,ssd1305fb-i2c + enum: + - solomon,ssd1305-i2c + - solomon,ssd1305 then: properties: solomon,dclk-div: @@ -160,7 +172,9 @@ allOf: properties: compatible: contains: - const: solomon,ssd1306fb-i2c + enum: + - solomon,ssd1306-i2c + - solomon,ssd1306 then: properties: solomon,dclk-div: @@ -172,7 +186,9 @@ allOf: properties: compatible: contains: - const: solomon,ssd1307fb-i2c + enum: + - solomon,ssd1307-i2c + - solomon,ssd1307 then: properties: solomon,dclk-div: @@ -186,7 +202,9 @@ allOf: properties: compatible: contains: - const: solomon,ssd1309fb-i2c + enum: + - solomon,ssd1309-i2c + - solomon,ssd1309 then: properties: solomon,dclk-div: @@ -203,14 +221,14 @@ examples: #size-cells = <0>; ssd1307: oled@3c { - compatible = "solomon,ssd1307fb-i2c"; + compatible = "solomon,ssd1307"; reg = <0x3c>; pwms = <&pwm 4 3000>; reset-gpios = <&gpio2 7>; }; ssd1306: oled@3d { - compatible = "solomon,ssd1306fb-i2c"; + compatible = "solomon,ssd1306"; reg = <0x3c>; pwms = <&pwm 4 3000>; reset-gpios = <&gpio2 7>;