The current compatible strings for SSD130x I2C controllers contain an -fb
suffix, this seems to indicate that are for a fbdev driver. But the DT is
supposed to describe the hardware and not Linux implementation details.
Let's deprecate those compatible strings and add a new enum that contains
compatible strings that don't have a -fb suffix. These will be matched by
the ssd130x-i2c DRM driver.
Signed-off-by: Javier Martinez Canillas <javierm@xxxxxxxxxx>
---
.../bindings/display/solomon,ssd1307fb.yaml | 36 ++++++++++++-------
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
index ade61d502edd..46207f2c12b8 100644
--- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
+++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
@@ -12,12 +12,24 @@ 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
+
+ # SSD130x I2C controllers
+ - items:
+ - enum:
+ - sinowealth,sh1106-i2c
+ - solomon,ssd1305-i2c
+ - solomon,ssd1306-i2c
+ - solomon,ssd1307-i2c
+ - solomon,ssd1309-i2c
reg:
maxItems: 1
@@ -148,7 +160,7 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1305fb-i2c
+ const: solomon,ssd1305-i2c
then:
properties:
solomon,dclk-div:
@@ -160,7 +172,7 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1306fb-i2c
+ const: solomon,ssd1306-i2c
then:
properties:
solomon,dclk-div:
@@ -172,7 +184,7 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1307fb-i2c
+ const: solomon,ssd1307-i2c
then:
properties:
solomon,dclk-div:
@@ -186,7 +198,7 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1309fb-i2c
+ const: solomon,ssd1309-i2c
then:
properties:
solomon,dclk-div:
@@ -203,14 +215,14 @@ examples:
#size-cells = <0>;
ssd1307: oled@3c {
- compatible = "solomon,ssd1307fb-i2c";
+ compatible = "solomon,ssd1307-i2c";
reg = <0x3c>;
pwms = <&pwm 4 3000>;
reset-gpios = <&gpio2 7>;
};
ssd1306: oled@3d {
- compatible = "solomon,ssd1306fb-i2c";
+ compatible = "solomon,ssd1306-i2c";
reg = <0x3c>;
pwms = <&pwm 4 3000>;
reset-gpios = <&gpio2 7>;
--
2.35.1
