From nobody Mon May 11 05:34:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5A8BC433FE for ; Wed, 13 Apr 2022 16:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236806AbiDMQ0v (ORCPT ); Wed, 13 Apr 2022 12:26:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236797AbiDMQ0q (ORCPT ); Wed, 13 Apr 2022 12:26:46 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B28E4E81 for ; Wed, 13 Apr 2022 09:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649867062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ao+QLGVykP8whEqJzniS6nnN6H0GlmSyDd2RtpQtg0Q=; b=WtGe88J5tQe5XK6jyC5xZzd8f3XYdv7Tl+rmoJdCe1t8SdiG2NogbsaG2FCh0Qle8CWo1P oSXju3k0Ejawjq3xlaN6YmcFXSAGcCTk1aypToLCfrdQZarXDDeFmfBOfttUkIHfWYXP34 OiR7fGKtqRakmJq7NYARtFoYDbdE7UE= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-593-nLFJHR2qM2aCB5Roj-4JeA-1; Wed, 13 Apr 2022 12:24:21 -0400 X-MC-Unique: nLFJHR2qM2aCB5Roj-4JeA-1 Received: by mail-wr1-f71.google.com with SMTP id 65-20020adf8147000000b00207982c3692so510086wrm.15 for ; Wed, 13 Apr 2022 09:24:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ao+QLGVykP8whEqJzniS6nnN6H0GlmSyDd2RtpQtg0Q=; b=XHkKQKr8muz47i1+dBPuine8lWeBN6nfP8zEtv6s1cFYXlPnRH+zelPPTt+MBVLXbN RArW2hOCWKs2mM9KG2jyxhhFSIkYH/WOjyb4yoS4kcFNSdATq/pk1iY934tTfCugVcnB GeFE4NJ6M7FaOqjADUJryxokpFrCdvZ0ikf8EitIubYgFA36O6C4kVwGdkVxvC0rQPAU oyS/Pg/ipFuYF2pJGLcC7CGl5NVPBePY7VZQnfLY7C6v59IzYzAp0jK0Zchdhcl+86Rn F+k3VakdYSPyd+gEKBYKQ8kFCQlr+MV0jrb+W6OhJG9RjfBKwwQbWXJKGQ7dCqOBWKQz Qy4g== X-Gm-Message-State: AOAM531DYTHv8sclaxTVlwL4yirtknE6mZQ90csNJzagl/ZGXSBd0/2V cgOI7uhApidhArsSJ3o1pD1lkc2CUb+jWu/oOBhXB7KjouRszX9wbfnyZsg99v2/8H/aAwaYvTO urtzC59ywyXtskW5dW3w2NUsdAkktIsOy/SGxEIF07aTkpUHV2uv0diwOkrv7pRmnIxuWyRmQz9 Y= X-Received: by 2002:a05:600c:1c1f:b0:38e:c425:5b1a with SMTP id j31-20020a05600c1c1f00b0038ec4255b1amr9406107wms.69.1649867060434; Wed, 13 Apr 2022 09:24:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztW50EuLGrFp4OqBMvgmg4aBfvttQJcfps4djZfXBpZPbWUvbcwrvp9RGGBXzqwCY7Wlu6aQ== X-Received: by 2002:a05:600c:1c1f:b0:38e:c425:5b1a with SMTP id j31-20020a05600c1c1f00b0038ec4255b1amr9406070wms.69.1649867060173; Wed, 13 Apr 2022 09:24:20 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t9-20020adfa2c9000000b002061561d4a7sm25446096wra.96.2022.04.13.09.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 09:24:19 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Mark Brown , Neil Armstrong , Chen-Yu Tsai , Rob Herring , Andy Shevchenko , Geert Uytterhoeven , dri-devel@lists.freedesktop.org, Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v4 1/5] dt-bindings: display: ssd1307fb: Deprecate "-i2c" compatible strings Date: Wed, 13 Apr 2022 18:23:54 +0200 Message-Id: <20220413162359.325021-2-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220413162359.325021-1-javierm@redhat.com> References: <20220413162359.325021-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Acked-by: Mark Brown Reviewed-by: Geert Uytterhoeven Reviewed-by: Rob Herring --- (no changes since v3) Changes in v3: - Drop the "sinowealth,sh1106-i2c", wasn't in a released version (Chen-Yu T= sai) - Continue enforcing required properties for deprecated strings (Maxime Rip= ard) Changes in v2: - Drop the -i2c suffixes from the compatible strings too (Geert Uytterhoeve= n) .../bindings/display/solomon,ssd1307fb.yaml | 44 +++++++++++++------ 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.ya= ml 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: =20 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 =20 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 =3D <0>; =20 ssd1307: oled@3c { - compatible =3D "solomon,ssd1307fb-i2c"; + compatible =3D "solomon,ssd1307"; reg =3D <0x3c>; pwms =3D <&pwm 4 3000>; reset-gpios =3D <&gpio2 7>; }; =20 ssd1306: oled@3d { - compatible =3D "solomon,ssd1306fb-i2c"; + compatible =3D "solomon,ssd1306"; reg =3D <0x3c>; pwms =3D <&pwm 4 3000>; reset-gpios =3D <&gpio2 7>; --=20 2.35.1 From nobody Mon May 11 05:34:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 419D6C433F5 for ; Wed, 13 Apr 2022 16:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236817AbiDMQ04 (ORCPT ); Wed, 13 Apr 2022 12:26:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236798AbiDMQ0r (ORCPT ); Wed, 13 Apr 2022 12:26:47 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 13A7B26FC for ; Wed, 13 Apr 2022 09:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649867064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yuVpQPzDh+Rwb2RTdR6emxMGJ2dG4YXzHB3chPiyWZo=; b=gKsZOsOtHYgz2tCzzhexs9y72dEb08/SQVn9tvqHc7cH0zS6P+vXOPr1Qy7YsHcQ1HgklY yga+/2HOS9cAyN2t1uw1dPC2kTdcK8//WNFWgJjX84yT1oBDLXJGvBQYgueCrifduO+bd2 FneX6JPHKdOqFEpYLb+6AhxsYVeihRY= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-403-s-1dhBhRM76nWJ-c4fFPAQ-1; Wed, 13 Apr 2022 12:24:23 -0400 X-MC-Unique: s-1dhBhRM76nWJ-c4fFPAQ-1 Received: by mail-wr1-f72.google.com with SMTP id k20-20020adfc714000000b001e305cd1597so507366wrg.19 for ; Wed, 13 Apr 2022 09:24:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yuVpQPzDh+Rwb2RTdR6emxMGJ2dG4YXzHB3chPiyWZo=; b=10xAamK5imeYXIiFD/u/imn0FiVOolANT22Ity9dkvu4Eix3ja7Wp3hY0a/Ya0zwvJ SzIglW7s5H4+7ujM1jiIsELdVTIuisyV5zcyVwftSfc4HrLsrrysC5Gh7E1Ndb6U81Kr I0IkpDe/kQb83dz5fVMP85MDBhWlmNPL1Hif3MHmF3fvZVQj6OiJnTsN0P3pWAVBIkI1 iWUifqR6O26PP6c/ZTfcOAHt3YaxcT5g1+EGObsPlkP4OxIullaBhm8uQSSIAt/Zl09j UBCeJ13BgJkFpbAJzb37LBTHyCI2FJrlzzeB0JoamkvmcEgJeBZxTLW0I3x+9Mi5IdW9 2+JQ== X-Gm-Message-State: AOAM531PRqEioTrn4HlZ0RalrJX3lEJYmkPsPMGG3bQgbiTnZfLUpGYr AcGePskW5oQSD6lssGYUpfmIbCX+f7EoqK2Y429OUXgr5/Q/bmLFNaQbaOVNhLDeAXhBD2yNncW lI+b6McPONk07fEDf7Ynz7iASnksFNfVkybr3ZntZi0X4QWmJBtKJjB4FbX4UtA7BnrNy+XOEkh g= X-Received: by 2002:a05:600c:1d29:b0:38e:c4d1:a41b with SMTP id l41-20020a05600c1d2900b0038ec4d1a41bmr9497938wms.70.1649867061830; Wed, 13 Apr 2022 09:24:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKmw84FX/JGt75DbPlGr5AZDD0foCMNRbtDmvyN2j0buGx4eZZgYEVHwxZOulmN72MmRJVDA== X-Received: by 2002:a05:600c:1d29:b0:38e:c4d1:a41b with SMTP id l41-20020a05600c1d2900b0038ec4d1a41bmr9497897wms.70.1649867061461; Wed, 13 Apr 2022 09:24:21 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t9-20020adfa2c9000000b002061561d4a7sm25446096wra.96.2022.04.13.09.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 09:24:21 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Mark Brown , Neil Armstrong , Chen-Yu Tsai , Rob Herring , Andy Shevchenko , Geert Uytterhoeven , dri-devel@lists.freedesktop.org, Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v4 2/5] dt-bindings: display: ssd1307fb: Extend schema for SPI controllers Date: Wed, 13 Apr 2022 18:23:55 +0200 Message-Id: <20220413162359.325021-3-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220413162359.325021-1-javierm@redhat.com> References: <20220413162359.325021-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Solomon SSD130x OLED displays can either have an I2C or SPI interface, add to the schema the properties and examples for OLED devices under SPI. Signed-off-by: Javier Martinez Canillas Acked-by: Mark Brown Reviewed-by: Geert Uytterhoeven Reviewed-by: Rob Herring --- Changes in v4: - Add a description for the dc-gpios property for SPI (Geert Uytterhoeven) Changes in v3: - Add a comment to the properties required for SPI (Geert Uytterhoeven) Changes in v2: - Don't add compatible strings with an "-spi" suffix (Geert Uytterhoeven) .../bindings/display/solomon,ssd1307fb.yaml | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.ya= ml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml index 7653b6c3fcb6..3fbd87c2c120 100644 --- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml +++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml @@ -38,9 +38,20 @@ properties: reset-gpios: maxItems: 1 =20 + # Only required for SPI + dc-gpios: + description: + GPIO connected to the controller's D/C# (Data/Command) pin, + that is needed for 4-wire SPI to tell the controller if the + data sent is for a command register or the display data RAM + maxItems: 1 + vbat-supply: description: The supply for VBAT =20 + # Only required for SPI + spi-max-frequency: true + solomon,height: $ref: /schemas/types.yaml#/definitions/uint32 default: 16 @@ -220,14 +231,14 @@ examples: #address-cells =3D <1>; #size-cells =3D <0>; =20 - ssd1307: oled@3c { + ssd1307_i2c: oled@3c { compatible =3D "solomon,ssd1307"; reg =3D <0x3c>; pwms =3D <&pwm 4 3000>; reset-gpios =3D <&gpio2 7>; }; =20 - ssd1306: oled@3d { + ssd1306_i2c: oled@3d { compatible =3D "solomon,ssd1306"; reg =3D <0x3c>; pwms =3D <&pwm 4 3000>; @@ -238,3 +249,30 @@ examples: solomon,lookup-table =3D /bits/ 8 <0x3f 0x3f 0x3f 0x3f= >; }; }; + - | + spi { + #address-cells =3D <1>; + #size-cells =3D <0>; + + ssd1307_spi: oled@0 { + compatible =3D "solomon,ssd1307"; + reg =3D <0x0>; + pwms =3D <&pwm 4 3000>; + reset-gpios =3D <&gpio2 7>; + dc-gpios =3D <&gpio2 8>; + spi-max-frequency =3D <10000000>; + }; + + ssd1306_spi: oled@1 { + compatible =3D "solomon,ssd1306"; + reg =3D <0x1>; + pwms =3D <&pwm 4 3000>; + reset-gpios =3D <&gpio2 7>; + dc-gpios =3D <&gpio2 8>; + spi-max-frequency =3D <10000000>; + solomon,com-lrremap; + solomon,com-invdir; + solomon,com-offset =3D <32>; + solomon,lookup-table =3D /bits/ 8 <0x3f 0x3f 0x3f 0x3f= >; + }; + }; --=20 2.35.1 From nobody Mon May 11 05:34:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CC71C433EF for ; Wed, 13 Apr 2022 16:24:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236809AbiDMQ1C (ORCPT ); Wed, 13 Apr 2022 12:27:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236804AbiDMQ0t (ORCPT ); Wed, 13 Apr 2022 12:26:49 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CF864E87 for ; Wed, 13 Apr 2022 09:24:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649867066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gRH7/XsoiL6rwdT/9IqjyebTEGbdFQMOqcD3x5JmGak=; b=AHg3WV8TPilpa6zJV6pVXwkPiPvCSrg9srF5Kpdo6nT7AKfQz6BCg2Tm0BXnx3zik0oL6S KEm2Y02xucwbtJUQ6o7+0y6j5pKT5kCaGqQhCnu65x6uE/Gecgv42ACOr8+1BguwNSjZSU vgYZiy70duEvmhVT0HEMwX+sQ505C3Y= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-645-O57zgDETPCKWEBlHzGr8ZQ-1; Wed, 13 Apr 2022 12:24:24 -0400 X-MC-Unique: O57zgDETPCKWEBlHzGr8ZQ-1 Received: by mail-wm1-f70.google.com with SMTP id r132-20020a1c448a000000b0038eaca2b8c9so676115wma.7 for ; Wed, 13 Apr 2022 09:24:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gRH7/XsoiL6rwdT/9IqjyebTEGbdFQMOqcD3x5JmGak=; b=flerCP+QoBU0R6tam/B7Ua7KbZpGyp0XTXgcFXVdDCpdqsXwMbolqHygsOHHtuL2zp MT7eBWEKjNVo7CCQRNVGcI2uEyETigkGnLdudKVySWtBDKj94W7aVR47CCCrutKi4fSR zzMT2+E8To0j47G2Btzcv2mH4qMCHAGodkVP01Jf9Otn4ANirlZdH7GA+Oi/0qFOtrv9 eF5VsuB9M+gH90XWqhmORoMPFy6H4j3ogJW8Z+UXQYY92+qWLNaf65Bge2+wyLn+k5eG sN59vAL3QG+BIEiFM93FP2BQ6VNoVy6ssWUtDrRCrxathWErUEzOH0a46Qcdz/cZD8Ly 9fAg== X-Gm-Message-State: AOAM533bSsGNGAUYn6ebtP63Bpu20SebFo1BB5naXIZLcwBrvaTBTVzx iZlZIDvXDpogEX661DUBn541WgF7NsUnPebpCv5q1AtcJtxwTKyHa4luz+QRac9w2k0VIK7k13P my56U7YPdNKoIGPIIB/nMNBFpfHr6nF75vJzVvOPsZ48Y/1q3t/L5AIrHccZ9mg05h+Gx+KbkPD 8= X-Received: by 2002:a05:600c:5010:b0:38e:d68c:3ee9 with SMTP id n16-20020a05600c501000b0038ed68c3ee9mr3410419wmr.158.1649867063211; Wed, 13 Apr 2022 09:24:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4kxMf3Cb6KxS8vVPDjgV7H72PDtBNHtSPxx4KJwLTukyhZMKu3eWr6UzlQdZRlAZKV6UnsA== X-Received: by 2002:a05:600c:5010:b0:38e:d68c:3ee9 with SMTP id n16-20020a05600c501000b0038ed68c3ee9mr3410388wmr.158.1649867062911; Wed, 13 Apr 2022 09:24:22 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t9-20020adfa2c9000000b002061561d4a7sm25446096wra.96.2022.04.13.09.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 09:24:22 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Mark Brown , Neil Armstrong , Chen-Yu Tsai , Rob Herring , Andy Shevchenko , Geert Uytterhoeven , dri-devel@lists.freedesktop.org, Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie Subject: [PATCH v4 3/5] drm/solomon: Add ssd130x new compatible strings and deprecate old ones. Date: Wed, 13 Apr 2022 18:23:56 +0200 Message-Id: <20220413162359.325021-4-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220413162359.325021-1-javierm@redhat.com> References: <20220413162359.325021-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The current compatible strings for SSD130x I2C controllers contain an "fb" and "-i2c" suffixes. These have been deprecated and more correct ones were added, that don't encode a subsystem or bus used to interface the devices. Signed-off-by: Javier Martinez Canillas Acked-by: Mark Brown Reviewed-by: Geert Uytterhoeven --- (no changes since v3) Changes in v3: - Drop the "sinowealth,sh1106-i2c", wasn't in a released version (Chen-Yu T= sai) Changes in v2: - Use the compatible strings that don't have "fb-i2c" (Geert Uytterhoeven). drivers/gpu/drm/solomon/ssd130x-i2c.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomo= n/ssd130x-i2c.c index d099b241dd3f..45867ef2bc8b 100644 --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c @@ -88,9 +88,26 @@ static struct ssd130x_deviceinfo ssd130x_ssd1309_devicei= nfo =3D { =20 static const struct of_device_id ssd130x_of_match[] =3D { { - .compatible =3D "sinowealth,sh1106-i2c", + .compatible =3D "sinowealth,sh1106", .data =3D &ssd130x_sh1106_deviceinfo, }, + { + .compatible =3D "solomon,ssd1305", + .data =3D &ssd130x_ssd1305_deviceinfo, + }, + { + .compatible =3D "solomon,ssd1306", + .data =3D &ssd130x_ssd1306_deviceinfo, + }, + { + .compatible =3D "solomon,ssd1307", + .data =3D &ssd130x_ssd1307_deviceinfo, + }, + { + .compatible =3D "solomon,ssd1309", + .data =3D &ssd130x_ssd1309_deviceinfo, + }, + /* Deprecated but kept for backward compatibility */ { .compatible =3D "solomon,ssd1305fb-i2c", .data =3D &ssd130x_ssd1305_deviceinfo, --=20 2.35.1 From nobody Mon May 11 05:34:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E319C433EF for ; Wed, 13 Apr 2022 16:24:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236829AbiDMQ1G (ORCPT ); Wed, 13 Apr 2022 12:27:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236808AbiDMQ0v (ORCPT ); Wed, 13 Apr 2022 12:26:51 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BD26426FC for ; Wed, 13 Apr 2022 09:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649867066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gLAWvv3DBB15A0w65Z9x4dMDjed4RBkXVK9BlI/ZARY=; b=JXv6zeKWUQEsxy1XcYRV/JmlTI+VdW3D19l7FKHb2YuT27iVgt6ig8YBiZ6wUX9xjWYdUe GCXcM/XGBDbgblr1Ho7Qwemqtd2yDXnqMOI2U1N3KhZGCYx46IQqHBSFeQzd0ePv7kygTj Y1LKxe4VAm6IyZn3AnGeUt3S9DtWJlM= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-620-Y4_i10dJMByK1dnrFpkWRQ-1; Wed, 13 Apr 2022 12:24:25 -0400 X-MC-Unique: Y4_i10dJMByK1dnrFpkWRQ-1 Received: by mail-wm1-f70.google.com with SMTP id j20-20020a05600c1c1400b0038eb5cb35ecso3033410wms.9 for ; Wed, 13 Apr 2022 09:24:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gLAWvv3DBB15A0w65Z9x4dMDjed4RBkXVK9BlI/ZARY=; b=oONzdBIs+iumDXkRMAQgO/3KDaNbRYkkKPpeKeK5AG6pizolytuFqZA3t/gQN/IheK M2yToU7FUPV30pYjRc8dB/kzupX0cQf5w4sPlmqONWv91ko8FB66//3L4nvbk7h7Rga6 SJJfHQIauwDZCzYY41D+nsS9rKxfDfHYDvrdPaw54IgsblMou7O2O6AlqeWTy32zw3/8 nz2wv8+FY7+AI99gsk3JchA0JBlGAbyQtn3lD9oT7IkPrYVN9URUI5lXVJoYUrlPPl+5 46VHm5MaxnMoBYBcvOIfb/a3EtygbjUWMoFYZ/FwSBQjsKtpdWc4wkCaSdRD8ihEQsq2 1tmQ== X-Gm-Message-State: AOAM533d9mS2nOHx8wQJQHnMnVP90bIi/mcTjSyWpLQPcWWv/N6VNiXG onFhDHQvgG8o3l0SZFlnij2+vG+Qoz8nUzIVuyQhoRpD8rPSn0SYX1IocF9aI4nbHlGMQ2Rv5xx sqt3Zh+pBCRa7UemEsUAjHbvTg2s2/FBmf9LKE0iXP34yGaxhW9zJfWcIaNkW+n4QTRtiblVtR8 Q= X-Received: by 2002:a05:600c:4f10:b0:38c:ae36:d305 with SMTP id l16-20020a05600c4f1000b0038cae36d305mr9314838wmq.34.1649867064490; Wed, 13 Apr 2022 09:24:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZDXUz/pNL5Ei0UJZSqLYTOe1kFuMsi4p/6EK1KlLy9h1/uSiECIFiK/i26jAKZfTa0+UjmQ== X-Received: by 2002:a05:600c:4f10:b0:38c:ae36:d305 with SMTP id l16-20020a05600c4f1000b0038cae36d305mr9314797wmq.34.1649867064202; Wed, 13 Apr 2022 09:24:24 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t9-20020adfa2c9000000b002061561d4a7sm25446096wra.96.2022.04.13.09.24.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 09:24:23 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Mark Brown , Neil Armstrong , Chen-Yu Tsai , Rob Herring , Andy Shevchenko , Geert Uytterhoeven , dri-devel@lists.freedesktop.org, Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie Subject: [PATCH v4 4/5] drm/solomon: Move device info from ssd130x-i2c to the core driver Date: Wed, 13 Apr 2022 18:23:57 +0200 Message-Id: <20220413162359.325021-5-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220413162359.325021-1-javierm@redhat.com> References: <20220413162359.325021-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" These are declared in the ssd130x-i2c transport driver but the information is not I2C specific, and could be used by other SSD130x transport drivers. Move them to the ssd130x core driver and just set the OF device entries to an ID that could be used to lookup the correct device info from an array. While being there, also move the SSD130X_DATA and SSD130X_COMMAND control bytes. Since even though they are used by the I2C interface, they could also be useful for other transport protocols such as SPI. Suggested-by: Chen-Yu Tsai Signed-off-by: Javier Martinez Canillas Acked-by: Mark Brown Reviewed-by: Geert Uytterhoeven --- Changes in v4: - Export ssd13x_variants array using EXPORT_SYMBOL_NS_GPL() (Andy Shevchenk= o) - Use MODULE_IMPORT_NS(DRM_SSD130X) in the ssd130x-i2c driver (Andy Shevche= nko) Changes in v3: - s/it/they in the commit description (Geert Uytterhoeven) - Drop unnecessary blank line (Geert Uytterhoeven) - Export variants array and use &info[ID] in device table (Andy Shevchenko) Changes in v2: - Drop ssd13x_variant_to_info() and just use the array index (Neil Armstron= g). drivers/gpu/drm/solomon/ssd130x-i2c.c | 53 ++++++--------------------- drivers/gpu/drm/solomon/ssd130x.c | 35 ++++++++++++++++-- drivers/gpu/drm/solomon/ssd130x.h | 14 +++++++ 3 files changed, 57 insertions(+), 45 deletions(-) diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomo= n/ssd130x-i2c.c index 45867ef2bc8b..b0dd218da13c 100644 --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c @@ -53,76 +53,43 @@ static void ssd130x_i2c_shutdown(struct i2c_client *cli= ent) ssd130x_shutdown(ssd130x); } =20 -static struct ssd130x_deviceinfo ssd130x_sh1106_deviceinfo =3D { - .default_vcomh =3D 0x40, - .default_dclk_div =3D 1, - .default_dclk_frq =3D 5, - .page_mode_only =3D 1, -}; - -static struct ssd130x_deviceinfo ssd130x_ssd1305_deviceinfo =3D { - .default_vcomh =3D 0x34, - .default_dclk_div =3D 1, - .default_dclk_frq =3D 7, -}; - -static struct ssd130x_deviceinfo ssd130x_ssd1306_deviceinfo =3D { - .default_vcomh =3D 0x20, - .default_dclk_div =3D 1, - .default_dclk_frq =3D 8, - .need_chargepump =3D 1, -}; - -static struct ssd130x_deviceinfo ssd130x_ssd1307_deviceinfo =3D { - .default_vcomh =3D 0x20, - .default_dclk_div =3D 2, - .default_dclk_frq =3D 12, - .need_pwm =3D 1, -}; - -static struct ssd130x_deviceinfo ssd130x_ssd1309_deviceinfo =3D { - .default_vcomh =3D 0x34, - .default_dclk_div =3D 1, - .default_dclk_frq =3D 10, -}; - static const struct of_device_id ssd130x_of_match[] =3D { { .compatible =3D "sinowealth,sh1106", - .data =3D &ssd130x_sh1106_deviceinfo, + .data =3D &ssd130x_variants[SH1106_ID], }, { .compatible =3D "solomon,ssd1305", - .data =3D &ssd130x_ssd1305_deviceinfo, + .data =3D &ssd130x_variants[SSD1305_ID], }, { .compatible =3D "solomon,ssd1306", - .data =3D &ssd130x_ssd1306_deviceinfo, + .data =3D &ssd130x_variants[SSD1306_ID], }, { .compatible =3D "solomon,ssd1307", - .data =3D &ssd130x_ssd1307_deviceinfo, + .data =3D &ssd130x_variants[SSD1307_ID], }, { .compatible =3D "solomon,ssd1309", - .data =3D &ssd130x_ssd1309_deviceinfo, + .data =3D &ssd130x_variants[SSD1309_ID], }, /* Deprecated but kept for backward compatibility */ { .compatible =3D "solomon,ssd1305fb-i2c", - .data =3D &ssd130x_ssd1305_deviceinfo, + .data =3D &ssd130x_variants[SSD1305_ID], }, { .compatible =3D "solomon,ssd1306fb-i2c", - .data =3D &ssd130x_ssd1306_deviceinfo, + .data =3D &ssd130x_variants[SSD1306_ID], }, { .compatible =3D "solomon,ssd1307fb-i2c", - .data =3D &ssd130x_ssd1307_deviceinfo, + .data =3D &ssd130x_variants[SSD1307_ID], }, { .compatible =3D "solomon,ssd1309fb-i2c", - .data =3D &ssd130x_ssd1309_deviceinfo, + .data =3D &ssd130x_variants[SSD1309_ID], }, { /* sentinel */ } }; @@ -139,6 +106,8 @@ static struct i2c_driver ssd130x_i2c_driver =3D { }; module_i2c_driver(ssd130x_i2c_driver); =20 + MODULE_DESCRIPTION(DRIVER_DESC); MODULE_AUTHOR("Javier Martinez Canillas "); MODULE_LICENSE("GPL v2"); +MODULE_IMPORT_NS(DRM_SSD130X); diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ss= d130x.c index a7e784518c69..ba2de93d00f0 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/drivers/gpu/drm/solomon/ssd130x.c @@ -39,9 +39,6 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 =20 -#define SSD130X_DATA 0x40 -#define SSD130X_COMMAND 0x80 - #define SSD130X_PAGE_COL_START_LOW 0x00 #define SSD130X_PAGE_COL_START_HIGH 0x10 #define SSD130X_SET_ADDRESS_MODE 0x20 @@ -94,6 +91,38 @@ =20 #define MAX_CONTRAST 255 =20 +const struct ssd130x_deviceinfo ssd130x_variants[] =3D { + [SH1106_ID] =3D { + .default_vcomh =3D 0x40, + .default_dclk_div =3D 1, + .default_dclk_frq =3D 5, + .page_mode_only =3D 1, + }, + [SSD1305_ID] =3D { + .default_vcomh =3D 0x34, + .default_dclk_div =3D 1, + .default_dclk_frq =3D 7, + }, + [SSD1306_ID] =3D { + .default_vcomh =3D 0x20, + .default_dclk_div =3D 1, + .default_dclk_frq =3D 8, + .need_chargepump =3D 1, + }, + [SSD1307_ID] =3D { + .default_vcomh =3D 0x20, + .default_dclk_div =3D 2, + .default_dclk_frq =3D 12, + .need_pwm =3D 1, + }, + [SSD1309_ID] =3D { + .default_vcomh =3D 0x34, + .default_dclk_div =3D 1, + .default_dclk_frq =3D 10, + } +}; +EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X); + static inline struct ssd130x_device *drm_to_ssd130x(struct drm_device *drm) { return container_of(drm, struct ssd130x_device, drm); diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ss= d130x.h index f5b062576fdf..d14f78c2eb07 100644 --- a/drivers/gpu/drm/solomon/ssd130x.h +++ b/drivers/gpu/drm/solomon/ssd130x.h @@ -18,6 +18,18 @@ =20 #include =20 +#define SSD130X_DATA 0x40 +#define SSD130X_COMMAND 0x80 + +enum ssd130x_variants { + SH1106_ID, + SSD1305_ID, + SSD1306_ID, + SSD1307_ID, + SSD1309_ID, + NR_SSD130X_VARIANTS +}; + struct ssd130x_deviceinfo { u32 default_vcomh; u32 default_dclk_div; @@ -71,6 +83,8 @@ struct ssd130x_device { u8 page_end; }; =20 +extern const struct ssd130x_deviceinfo ssd130x_variants[]; + struct ssd130x_device *ssd130x_probe(struct device *dev, struct regmap *re= gmap); int ssd130x_remove(struct ssd130x_device *ssd130x); void ssd130x_shutdown(struct ssd130x_device *ssd130x); --=20 2.35.1 From nobody Mon May 11 05:34:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D4D6C433EF for ; Wed, 13 Apr 2022 16:24:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236837AbiDMQ1J (ORCPT ); Wed, 13 Apr 2022 12:27:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236807AbiDMQ0v (ORCPT ); Wed, 13 Apr 2022 12:26:51 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5EE1B13D74 for ; Wed, 13 Apr 2022 09:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649867068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vT3qGhdQjfehGHhWMMA/PSxHxvxcnWmgzyvpoMXaxY4=; b=N1rG0lAH6osL8JTBZpbrK+FS9j4TuLsd/YNHGfdJSedoGw1ufH2YNK2v2fskbvAp3mmSqQ qvmfsGSTArsymhy3lD1c52lWVXiX7LWhqZ65SBF6S2K+V2iN9ZXN3y1XCq3W5YeT/IYUdy KQlwoz+dPpkJqmrQhwk8NVq9nhFnLFE= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-349-YdQnt95XOC6ey2NhwGXngg-1; Wed, 13 Apr 2022 12:24:27 -0400 X-MC-Unique: YdQnt95XOC6ey2NhwGXngg-1 Received: by mail-wm1-f71.google.com with SMTP id y11-20020a7bc18b000000b0038eac019fc0so966545wmi.9 for ; Wed, 13 Apr 2022 09:24:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vT3qGhdQjfehGHhWMMA/PSxHxvxcnWmgzyvpoMXaxY4=; b=dUPSSm1Jx1a9hs/sZ1jAqUluOlynb4fCnXPrbg8bSyw0weu2cJrJDaVfe2OUPTMTWR NxpO5QAQQDSm4cw4kZIxou9E+/UjSqWWZiuUX+Vcv42QDyEZH4xdregQ0fQAUxHGlSJw lfnczmHBeyZJf00KbEFSAuBP/3QfG50jE2RfATzuvKEgG3tzc7weFKvkAz4DPWrpdLOh crSXfrvBgwpWLJAU0n9spLMh2PsG0l2kf6clPIYJ/pTbLQWWGA3cIZundYRg1STHGyNn 0Qk99w2Rsw6ZQa+nAuQfWtmgRrIJg4cw4d1pmqLbBHpo/VAXRadNJO3ZO0xQ1WsokDA1 6a/A== X-Gm-Message-State: AOAM531r3bmuU2ml36nliYzy2ctKQ8WftcMVj3bLiuWmLXb6wNEcLaBh Jm+9orB/mDdqyG6UC/tEX8ABPegkv+rNX3Zo7YVDduZMr9aVjA3oPesZig97SxWnAjSLOhUqINr gncynRK5GmYgW3LcA3HyGqJOcs69xaHxuovToEUFSRA1uybNJ/HPms9TnTyQYLSb1zOk/8MFolG E= X-Received: by 2002:a7b:c8cd:0:b0:38e:c2c1:5219 with SMTP id f13-20020a7bc8cd000000b0038ec2c15219mr9119946wml.151.1649867065832; Wed, 13 Apr 2022 09:24:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzV6ZCJi9p1JvOzvuZMyVvp1n2LAn9t2OyFPmaw9Q/nskwT4EpL/rGoRB3/lHhNYNgYGlINGw== X-Received: by 2002:a7b:c8cd:0:b0:38e:c2c1:5219 with SMTP id f13-20020a7bc8cd000000b0038ec2c15219mr9119899wml.151.1649867065384; Wed, 13 Apr 2022 09:24:25 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t9-20020adfa2c9000000b002061561d4a7sm25446096wra.96.2022.04.13.09.24.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 09:24:25 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Mark Brown , Neil Armstrong , Chen-Yu Tsai , Rob Herring , Andy Shevchenko , Geert Uytterhoeven , dri-devel@lists.freedesktop.org, Javier Martinez Canillas , Chen-Yu Tsai , Daniel Vetter , David Airlie , Maxime Ripard , YueHaibing Subject: [PATCH v4 5/5] drm/solomon: Add SSD130x OLED displays SPI support Date: Wed, 13 Apr 2022 18:23:58 +0200 Message-Id: <20220413162359.325021-6-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220413162359.325021-1-javierm@redhat.com> References: <20220413162359.325021-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The ssd130x driver only provides the core support for these devices but it does not have any bus transport logic. Add a driver to interface over SPI. There is a difference in the communication protocol when using 4-wire SPI instead of I2C. For the latter, a control byte that contains a D/C# field has to be sent. This field tells the controller whether the data has to be written to the command register or to the graphics display data memory. But for 4-wire SPI that control byte is not used, instead a real D/C# line must be pulled HIGH for commands data and LOW for graphics display data. For this reason the standard SPI regmap can't be used and a custom .write bus handler is needed. Signed-off-by: Javier Martinez Canillas Acked-by: Mark Brown Reviewed-by: Geert Uytterhoeven --- Changes in v4: - Use MODULE_IMPORT_NS(DRM_SSD130X) in the ssd130x-spi driver (Andy Shevche= nko) Changes in v3: - Drop ssd130x_spi_get_dc() helper and open code it (Geert Uytterhoeven) - Export variants array and use &info[ID] in device table (Andy Shevchenko) Changes in v2: - Add the same compatible strings than I2C (Geert Uytterhoeven) drivers/gpu/drm/solomon/Kconfig | 9 ++ drivers/gpu/drm/solomon/Makefile | 1 + drivers/gpu/drm/solomon/ssd130x-spi.c | 178 ++++++++++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 drivers/gpu/drm/solomon/ssd130x-spi.c diff --git a/drivers/gpu/drm/solomon/Kconfig b/drivers/gpu/drm/solomon/Kcon= fig index 8c0a0c788385..e170716d976b 100644 --- a/drivers/gpu/drm/solomon/Kconfig +++ b/drivers/gpu/drm/solomon/Kconfig @@ -20,3 +20,12 @@ config DRM_SSD130X_I2C I2C bus. =20 If M is selected the module will be called ssd130x-i2c. + +config DRM_SSD130X_SPI + tristate "DRM support for Solomon SSD130X OLED displays (SPI bus)" + depends on DRM_SSD130X && SPI + select REGMAP + help + Say Y here if the SSD130x OLED display is connected via SPI bus. + + If M is selected the module will be called ssd130x-spi. diff --git a/drivers/gpu/drm/solomon/Makefile b/drivers/gpu/drm/solomon/Mak= efile index 4bfc5acb0447..b5fc792257d7 100644 --- a/drivers/gpu/drm/solomon/Makefile +++ b/drivers/gpu/drm/solomon/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_DRM_SSD130X) +=3D ssd130x.o obj-$(CONFIG_DRM_SSD130X_I2C) +=3D ssd130x-i2c.o +obj-$(CONFIG_DRM_SSD130X_SPI) +=3D ssd130x-spi.o diff --git a/drivers/gpu/drm/solomon/ssd130x-spi.c b/drivers/gpu/drm/solomo= n/ssd130x-spi.c new file mode 100644 index 000000000000..c94bbaa731da --- /dev/null +++ b/drivers/gpu/drm/solomon/ssd130x-spi.c @@ -0,0 +1,178 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * DRM driver for Solomon SSD130X OLED displays (SPI bus) + * + * Copyright 2022 Red Hat Inc. + * Authors: Javier Martinez Canillas + */ +#include +#include + +#include "ssd130x.h" + +#define DRIVER_NAME "ssd130x-spi" +#define DRIVER_DESC "DRM driver for Solomon SSD130X OLED displays (SPI)" + +struct ssd130x_spi_transport { + struct spi_device *spi; + struct gpio_desc *dc; +}; + +static const struct regmap_config ssd130x_spi_regmap_config =3D { + .reg_bits =3D 8, + .val_bits =3D 8, +}; + +/* + * The regmap bus .write handler, it is just a wrapper around spi_write() + * but toggling the Data/Command control pin (D/C#). Since for 4-wire SPI + * a D/C# pin is used, in contrast with I2C where a control byte is sent, + * prior to every data byte, that contains a bit with the D/C# value. + * + * These control bytes are considered registers by the ssd130x core driver + * and can be used by the ssd130x SPI driver to determine if the data sent + * is for a command register or for the Graphic Display Data RAM (GDDRAM). + */ +static int ssd130x_spi_write(void *context, const void *data, size_t count) +{ + struct ssd130x_spi_transport *t =3D context; + struct spi_device *spi =3D t->spi; + const u8 *reg =3D data; + + if (*reg =3D=3D SSD130X_COMMAND) + gpiod_set_value_cansleep(t->dc, 0); + + if (*reg =3D=3D SSD130X_DATA) + gpiod_set_value_cansleep(t->dc, 1); + + /* Remove the control byte since is not used by the 4-wire SPI */ + return spi_write(spi, ((u8 *)data) + 1, count - 1); +} + +/* The ssd130x driver does not read registers but regmap expects a .read */ +static int ssd130x_spi_read(void *context, const void *reg, size_t reg_siz= e, + void *val, size_t val_size) +{ + return -EOPNOTSUPP; +} + +/* + * A custom bus is needed due the special write that toggles a D/C# pin, + * another option could be to just have a .reg_write() callback but that + * will prevent to do data writes in bulk. + * + * Once the regmap API is extended to support defining a bulk write handler + * in the struct regmap_config, this can be simplified and the bus dropped. + */ +static struct regmap_bus regmap_ssd130x_spi_bus =3D { + .write =3D ssd130x_spi_write, + .read =3D ssd130x_spi_read, +}; + +static int ssd130x_spi_probe(struct spi_device *spi) +{ + struct ssd130x_spi_transport *t; + struct ssd130x_device *ssd130x; + struct regmap *regmap; + struct gpio_desc *dc; + struct device *dev =3D &spi->dev; + + dc =3D devm_gpiod_get(dev, "dc", GPIOD_OUT_LOW); + if (IS_ERR(dc)) + return dev_err_probe(dev, PTR_ERR(dc), + "Failed to get dc gpio\n"); + + t =3D devm_kzalloc(dev, sizeof(*t), GFP_KERNEL); + if (!t) + return dev_err_probe(dev, -ENOMEM, + "Failed to allocate SPI transport data\n"); + + t->spi =3D spi; + t->dc =3D dc; + + regmap =3D devm_regmap_init(dev, ®map_ssd130x_spi_bus, t, + &ssd130x_spi_regmap_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + ssd130x =3D ssd130x_probe(dev, regmap); + if (IS_ERR(ssd130x)) + return PTR_ERR(ssd130x); + + spi_set_drvdata(spi, ssd130x); + + return 0; +} + +static void ssd130x_spi_remove(struct spi_device *spi) +{ + struct ssd130x_device *ssd130x =3D spi_get_drvdata(spi); + + ssd130x_remove(ssd130x); +} + +static void ssd130x_spi_shutdown(struct spi_device *spi) +{ + struct ssd130x_device *ssd130x =3D spi_get_drvdata(spi); + + ssd130x_shutdown(ssd130x); +} + +static const struct of_device_id ssd130x_of_match[] =3D { + { + .compatible =3D "sinowealth,sh1106", + .data =3D &ssd130x_variants[SH1106_ID], + }, + { + .compatible =3D "solomon,ssd1305", + .data =3D &ssd130x_variants[SSD1305_ID], + }, + { + .compatible =3D "solomon,ssd1306", + .data =3D &ssd130x_variants[SSD1306_ID], + }, + { + .compatible =3D "solomon,ssd1307", + .data =3D &ssd130x_variants[SSD1307_ID], + }, + { + .compatible =3D "solomon,ssd1309", + .data =3D &ssd130x_variants[SSD1309_ID], + }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, ssd130x_of_match); + +/* + * The SPI core always reports a MODALIAS uevent of the form "spi:", = even + * if the device was registered via OF. This means that the module will no= t be + * auto loaded, unless it contains an alias that matches the MODALIAS repo= rted. + * + * To workaround this issue, add a SPI device ID table. Even when this sho= uld + * not be needed for this driver to match the registered SPI devices. + */ +static const struct spi_device_id ssd130x_spi_table[] =3D { + { "sh1106", SH1106_ID }, + { "ssd1305", SSD1305_ID }, + { "ssd1306", SSD1306_ID }, + { "ssd1307", SSD1307_ID }, + { "ssd1309", SSD1309_ID }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(spi, ssd130x_spi_table); + +static struct spi_driver ssd130x_spi_driver =3D { + .driver =3D { + .name =3D DRIVER_NAME, + .of_match_table =3D ssd130x_of_match, + }, + .probe =3D ssd130x_spi_probe, + .remove =3D ssd130x_spi_remove, + .shutdown =3D ssd130x_spi_shutdown, +}; +module_spi_driver(ssd130x_spi_driver); + +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_AUTHOR("Javier Martinez Canillas "); +MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS(DRM_SSD130X); --=20 2.35.1