From: Javier Martinez Canillas <javierm@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Chen-Yu Tsai <wens@kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Mark Brown <broonie@kernel.org>,
Javier Martinez Canillas <javierm@redhat.com>,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@linux.ie>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Maxime Ripard <mripard@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org
Subject: [PATCH 2/5] dt-bindings: display: ssd1307fb: Extend schema for SPI controllers
Date: Thu, 7 Apr 2022 22:02:01 +0200 [thread overview]
Message-ID: <20220407200205.28838-3-javierm@redhat.com> (raw)
In-Reply-To: <20220407200205.28838-1-javierm@redhat.com>
The Solomon SSD130x OLED displays can either have an I2C or SPI interface,
add to the schema the compatible strings, properties and examples for SPI.
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---
.../bindings/display/solomon,ssd1307fb.yaml | 89 +++++++++++++++----
1 file changed, 71 insertions(+), 18 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
index 46207f2c12b8..05e7975296a7 100644
--- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
+++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
@@ -31,6 +31,15 @@ properties:
- solomon,ssd1307-i2c
- solomon,ssd1309-i2c
+ # SSD130x SPI controllers
+ - items:
+ - enum:
+ - sinowealth,sh1106-spi
+ - solomon,ssd1305-spi
+ - solomon,ssd1306-spi
+ - solomon,ssd1307-spi
+ - solomon,ssd1309-spi
+
reg:
maxItems: 1
@@ -40,9 +49,14 @@ properties:
reset-gpios:
maxItems: 1
+ dc-gpios:
+ maxItems: 1
+
vbat-supply:
description: The supply for VBAT
+ spi-max-frequency: true
+
solomon,height:
$ref: /schemas/types.yaml#/definitions/uint32
default: 16
@@ -148,19 +162,10 @@ allOf:
properties:
compatible:
contains:
- const: sinowealth,sh1106-i2c
- then:
- properties:
- solomon,dclk-div:
- default: 1
- solomon,dclk-frq:
- default: 5
-
- - if:
- properties:
- compatible:
- contains:
- const: solomon,ssd1305-i2c
+ enum:
+ - sinowealth,sh1106-i2c
+ - solomon,ssd1305-i2c
+ - solomon,ssd1305-spi
then:
properties:
solomon,dclk-div:
@@ -172,7 +177,9 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1306-i2c
+ enum:
+ - solomon,ssd1306-i2c
+ - solomon,ssd1306-spi
then:
properties:
solomon,dclk-div:
@@ -184,7 +191,9 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1307-i2c
+ enum:
+ - solomon,ssd1307-i2c
+ - solomon,ssd1307-spi
then:
properties:
solomon,dclk-div:
@@ -198,7 +207,9 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1309-i2c
+ enum:
+ - solomon,ssd1309-i2c
+ - solomon,ssd1309-spi
then:
properties:
solomon,dclk-div:
@@ -206,6 +217,21 @@ allOf:
solomon,dclk-frq:
default: 10
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - sinowealth,sh1106-spi
+ - solomon,ssd1305-spi
+ - solomon,ssd1306-spi
+ - solomon,ssd1307-spi
+ - solomon,ssd1309-spi
+ then:
+ required:
+ - spi-max-frequency
+ - dc-gpios
+
additionalProperties: false
examples:
@@ -214,14 +240,14 @@ examples:
#address-cells = <1>;
#size-cells = <0>;
- ssd1307: oled@3c {
+ ssd1307_i2c: oled@3c {
compatible = "solomon,ssd1307-i2c";
reg = <0x3c>;
pwms = <&pwm 4 3000>;
reset-gpios = <&gpio2 7>;
};
- ssd1306: oled@3d {
+ ssd1306_i2c: oled@3d {
compatible = "solomon,ssd1306-i2c";
reg = <0x3c>;
pwms = <&pwm 4 3000>;
@@ -232,3 +258,30 @@ examples:
solomon,lookup-table = /bits/ 8 <0x3f 0x3f 0x3f 0x3f>;
};
};
+ - |
+ spi {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ssd1307_spi: oled@0 {
+ compatible = "solomon,ssd1307-spi";
+ reg = <0x0>;
+ pwms = <&pwm 4 3000>;
+ reset-gpios = <&gpio2 7>;
+ dc-gpios = <&gpio2 8>;
+ spi-max-frequency = <10000000>;
+ };
+
+ ssd1306_spi: oled@1 {
+ compatible = "solomon,ssd1306-spi";
+ reg = <0x1>;
+ pwms = <&pwm 4 3000>;
+ reset-gpios = <&gpio2 7>;
+ dc-gpios = <&gpio2 8>;
+ spi-max-frequency = <10000000>;
+ solomon,com-lrremap;
+ solomon,com-invdir;
+ solomon,com-offset = <32>;
+ solomon,lookup-table = /bits/ 8 <0x3f 0x3f 0x3f 0x3f>;
+ };
+ };
--
2.35.1
WARNING: multiple messages have this Message-ID (diff)
From: Javier Martinez Canillas <javierm@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org, Chen-Yu Tsai <wens@kernel.org>,
David Airlie <airlied@linux.ie>,
Javier Martinez Canillas <javierm@redhat.com>,
dri-devel@lists.freedesktop.org, Rob Herring <robh+dt@kernel.org>,
Mark Brown <broonie@kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH 2/5] dt-bindings: display: ssd1307fb: Extend schema for SPI controllers
Date: Thu, 7 Apr 2022 22:02:01 +0200 [thread overview]
Message-ID: <20220407200205.28838-3-javierm@redhat.com> (raw)
In-Reply-To: <20220407200205.28838-1-javierm@redhat.com>
The Solomon SSD130x OLED displays can either have an I2C or SPI interface,
add to the schema the compatible strings, properties and examples for SPI.
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---
.../bindings/display/solomon,ssd1307fb.yaml | 89 +++++++++++++++----
1 file changed, 71 insertions(+), 18 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
index 46207f2c12b8..05e7975296a7 100644
--- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
+++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
@@ -31,6 +31,15 @@ properties:
- solomon,ssd1307-i2c
- solomon,ssd1309-i2c
+ # SSD130x SPI controllers
+ - items:
+ - enum:
+ - sinowealth,sh1106-spi
+ - solomon,ssd1305-spi
+ - solomon,ssd1306-spi
+ - solomon,ssd1307-spi
+ - solomon,ssd1309-spi
+
reg:
maxItems: 1
@@ -40,9 +49,14 @@ properties:
reset-gpios:
maxItems: 1
+ dc-gpios:
+ maxItems: 1
+
vbat-supply:
description: The supply for VBAT
+ spi-max-frequency: true
+
solomon,height:
$ref: /schemas/types.yaml#/definitions/uint32
default: 16
@@ -148,19 +162,10 @@ allOf:
properties:
compatible:
contains:
- const: sinowealth,sh1106-i2c
- then:
- properties:
- solomon,dclk-div:
- default: 1
- solomon,dclk-frq:
- default: 5
-
- - if:
- properties:
- compatible:
- contains:
- const: solomon,ssd1305-i2c
+ enum:
+ - sinowealth,sh1106-i2c
+ - solomon,ssd1305-i2c
+ - solomon,ssd1305-spi
then:
properties:
solomon,dclk-div:
@@ -172,7 +177,9 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1306-i2c
+ enum:
+ - solomon,ssd1306-i2c
+ - solomon,ssd1306-spi
then:
properties:
solomon,dclk-div:
@@ -184,7 +191,9 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1307-i2c
+ enum:
+ - solomon,ssd1307-i2c
+ - solomon,ssd1307-spi
then:
properties:
solomon,dclk-div:
@@ -198,7 +207,9 @@ allOf:
properties:
compatible:
contains:
- const: solomon,ssd1309-i2c
+ enum:
+ - solomon,ssd1309-i2c
+ - solomon,ssd1309-spi
then:
properties:
solomon,dclk-div:
@@ -206,6 +217,21 @@ allOf:
solomon,dclk-frq:
default: 10
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - sinowealth,sh1106-spi
+ - solomon,ssd1305-spi
+ - solomon,ssd1306-spi
+ - solomon,ssd1307-spi
+ - solomon,ssd1309-spi
+ then:
+ required:
+ - spi-max-frequency
+ - dc-gpios
+
additionalProperties: false
examples:
@@ -214,14 +240,14 @@ examples:
#address-cells = <1>;
#size-cells = <0>;
- ssd1307: oled@3c {
+ ssd1307_i2c: oled@3c {
compatible = "solomon,ssd1307-i2c";
reg = <0x3c>;
pwms = <&pwm 4 3000>;
reset-gpios = <&gpio2 7>;
};
- ssd1306: oled@3d {
+ ssd1306_i2c: oled@3d {
compatible = "solomon,ssd1306-i2c";
reg = <0x3c>;
pwms = <&pwm 4 3000>;
@@ -232,3 +258,30 @@ examples:
solomon,lookup-table = /bits/ 8 <0x3f 0x3f 0x3f 0x3f>;
};
};
+ - |
+ spi {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ssd1307_spi: oled@0 {
+ compatible = "solomon,ssd1307-spi";
+ reg = <0x0>;
+ pwms = <&pwm 4 3000>;
+ reset-gpios = <&gpio2 7>;
+ dc-gpios = <&gpio2 8>;
+ spi-max-frequency = <10000000>;
+ };
+
+ ssd1306_spi: oled@1 {
+ compatible = "solomon,ssd1306-spi";
+ reg = <0x1>;
+ pwms = <&pwm 4 3000>;
+ reset-gpios = <&gpio2 7>;
+ dc-gpios = <&gpio2 8>;
+ spi-max-frequency = <10000000>;
+ solomon,com-lrremap;
+ solomon,com-invdir;
+ solomon,com-offset = <32>;
+ solomon,lookup-table = /bits/ 8 <0x3f 0x3f 0x3f 0x3f>;
+ };
+ };
--
2.35.1
next prev parent reply other threads:[~2022-04-07 20:15 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 20:01 [PATCH 0/5] drm/solomon: Add SSD130x OLED displays SPI support Javier Martinez Canillas
2022-04-07 20:01 ` Javier Martinez Canillas
2022-04-07 20:02 ` [PATCH 1/5] dt-bindings: display: ssd1307fb: Deprecate fbdev compatible strings Javier Martinez Canillas
2022-04-07 20:02 ` Javier Martinez Canillas
2022-04-08 18:22 ` Rob Herring
2022-04-08 18:22 ` Rob Herring
2022-04-08 19:19 ` Javier Martinez Canillas
2022-04-08 19:19 ` Javier Martinez Canillas
2022-04-08 19:25 ` Javier Martinez Canillas
2022-04-08 19:25 ` Javier Martinez Canillas
2022-04-11 13:47 ` Geert Uytterhoeven
2022-04-11 13:47 ` Geert Uytterhoeven
2022-04-11 14:48 ` Javier Martinez Canillas
2022-04-11 14:48 ` Javier Martinez Canillas
2022-04-07 20:02 ` Javier Martinez Canillas [this message]
2022-04-07 20:02 ` [PATCH 2/5] dt-bindings: display: ssd1307fb: Extend schema for SPI controllers Javier Martinez Canillas
2022-04-07 20:02 ` [PATCH 3/5] drm/solomon: Add ssd130x-i2c compatible strings without an -fb suffix Javier Martinez Canillas
2022-04-07 20:02 ` Javier Martinez Canillas
2022-04-07 20:02 ` [PATCH 4/5] drm/solomon: Move device info from ssd130x-i2c to the core driver Javier Martinez Canillas
2022-04-07 20:02 ` Javier Martinez Canillas
2022-04-08 7:49 ` Neil Armstrong
2022-04-08 8:23 ` Javier Martinez Canillas
2022-04-07 20:02 ` [PATCH 5/5] drm/solomon: Add SSD130x OLED displays SPI support Javier Martinez Canillas
2022-04-07 20:02 ` Javier Martinez Canillas
2022-04-08 11:18 ` Mark Brown
2022-04-08 11:18 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220407200205.28838-3-javierm@redhat.com \
--to=javierm@redhat.com \
--cc=airlied@linux.ie \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=geert@linux-m68k.org \
--cc=krzk+dt@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mripard@kernel.org \
--cc=robh+dt@kernel.org \
--cc=wens@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.