Unverified Commit 36bf0611 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas
Browse files

dt-bindings: display: ssd1307fb: Deprecate "-i2c" compatible strings 



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: default avatarJavier Martinez Canillas <javierm@redhat.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220419214824.335075-2-javierm@redhat.com
parent b76ecff8

Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml

+31 −13
Original line number Diff line number Diff line
@@ -12,12 +12,22 @@ maintainers: 


properties:

  compatible:

    enum:

      - sinowealth,sh1106-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>;