From nobody Mon May 11 00:45:14 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 1083CC433F5 for ; Tue, 19 Apr 2022 21:48:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354771AbiDSVvU (ORCPT ); Tue, 19 Apr 2022 17:51:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345484AbiDSVvS (ORCPT ); Tue, 19 Apr 2022 17:51:18 -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 0FCD23FD8F for ; Tue, 19 Apr 2022 14:48:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650404914; 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=Fw7enXeVX6gLbTtDMbe6iQqhw50i472ZTelsML6rRsFayPscRxss8N/a8Zg3z+h7WPGJvW L439zgN+JROPOa4bdSFKYlc+4bqFiIMpUfAKO7W+XalD0pb63XAhYyIEKGQBYgMalmC727 EyJhuHVbu6HuVdzCEpiNB9DTPiLucFI= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-658-SMws2ZCxMjWyDUbnNXxExQ-1; Tue, 19 Apr 2022 17:48:33 -0400 X-MC-Unique: SMws2ZCxMjWyDUbnNXxExQ-1 Received: by mail-wm1-f72.google.com with SMTP id m125-20020a1c2683000000b00391893a2febso6804605wmm.4 for ; Tue, 19 Apr 2022 14:48:32 -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=6ZhKDdV8vkgiqLyN7woQKio/AXhbjgKvCXe3PdDBA76cZCkBGt0g2PxycEJtxAT7HT UHE7SxB0A8+KKZF4iqXDn0uhBIwjgtZo0VkFN+5Sm2QHdt7HvwJpUPJGQISFLdBL33w7 09wcaqGLpq36SaeygfFFvYaSBzY4AHRokeguFxmmOfzQhqAKUyQtqWgPiwYT14lxWRn/ 022l/TbtCFDUf54lh6+OvzUOXJEyakT1+4osiEFt57UZ0unVYUMWmOSS5Z9wf/3w+HPT oijRKKYeE+CNcMw7e+tp+0ibyI2erWBfUwas84cZBx1R6Ox63I1KkoSysqq7CaXSLelW w2vg== X-Gm-Message-State: AOAM531am+8omWeZll5makwIpznx2dXv2FJq6bRJOOZidvHzTZ6ZF45F DvpmkMRkpSHyjD8crngwyk8yYLKZyBlLLLJloXmUYl1dn9F+r1BJ011Yj89lUryIH9oyTvokq1T FfYfd5bPCk6U2gyAE5teiVqJaEK4H40r5ZCxO1Wp7q9KOHma1hd7D4Du3apE9/K1piAn9qeB5cu 0= X-Received: by 2002:a1c:7408:0:b0:38e:b7af:c503 with SMTP id p8-20020a1c7408000000b0038eb7afc503mr556008wmc.58.1650404911634; Tue, 19 Apr 2022 14:48:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1gaQ3suhLg9SEod8ZyG+DXS89puSlsOl7NF/Ht6muE6d9H9FpIgRAib149d2EYzLX5Lni2w== X-Received: by 2002:a1c:7408:0:b0:38e:b7af:c503 with SMTP id p8-20020a1c7408000000b0038eb7afc503mr555977wmc.58.1650404911359; Tue, 19 Apr 2022 14:48:31 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id i7-20020a5d5587000000b00207a8cde900sm13333699wrv.19.2022.04.19.14.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 14:48:31 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Mark Brown , Rob Herring , Geert Uytterhoeven , Chen-Yu Tsai , Andy Shevchenko , Neil Armstrong , Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v5 1/5] dt-bindings: display: ssd1307fb: Deprecate "-i2c" compatible strings Date: Tue, 19 Apr 2022 23:48:19 +0200 Message-Id: <20220419214824.335075-2-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419214824.335075-1-javierm@redhat.com> References: <20220419214824.335075-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 --- (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 00:45:14 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 D6473C433EF for ; Tue, 19 Apr 2022 21:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358066AbiDSVvY (ORCPT ); Tue, 19 Apr 2022 17:51:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348967AbiDSVvU (ORCPT ); Tue, 19 Apr 2022 17:51:20 -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 9DF5A3FD8F for ; Tue, 19 Apr 2022 14:48:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650404915; 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=tOWD5uHxwjIw4P4KTgLk1c7Fc4yJRbBCDK06WY08/Ts=; b=FAUmgzu72tSxk3WOPP53YnRGSBhp3YB2uXd78pWoudAkj6JxtnmzIcFuGqgL2ZPJxA/PyI v68HYma6Gzd4tJwwmNr5/GmvXUCtRowBpSn4Co5+OZBM0c9txuhsnpmddQ/nTXfwbNKoOv k7lbDxg4HGupQTiVS3iukX377Q9v49s= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-267-BiDILdG2PNWBTxjexCVgkw-1; Tue, 19 Apr 2022 17:48:34 -0400 X-MC-Unique: BiDILdG2PNWBTxjexCVgkw-1 Received: by mail-wm1-f72.google.com with SMTP id az19-20020a05600c601300b003914ac8efb8so21881wmb.2 for ; Tue, 19 Apr 2022 14:48:34 -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=tOWD5uHxwjIw4P4KTgLk1c7Fc4yJRbBCDK06WY08/Ts=; b=tktoE32pc1KFggHdHmTwAyKM3S4wbIpmyPl9etUbGX997Bl2dZD80u3uBNNrwOUMKC mUMX0lUgm4ZqcPY2NB3fgYx0NT3la+6zKGzy7zcYD9RzlvXeIvg5w2z/iUy6LSh6egXY dpxPQXifH16zgr3SbkibNPwPt3MdCjGG57/QXwrp4grFfJ1hcBZ5pR1jMi56Vl46SuOE OR+SbRfwKzwZl7C/yykKdNUS+CxnDuRFkFLEyyILvw6uBlnWNNnzm8H7gLnbBahvx/8k DyhdfvprXgeptuHCWqC4T5ivlUjMlS8sEDNG3I1vSjuqe8ffDJ6jxVbhC0LhpLvWULuJ GT4g== X-Gm-Message-State: AOAM533EK3mq/1ZNpNOD/ZQqiGHlPGgxII8elW9dzDJGdLmk25k/pTci frJ5lRPqN59qpQ8gyVhhMpXzI+GfFy/F0HYA73DpjRjhwSo8nsdo0Ey8XnLuXSrSMnQLybjKBOS g1BaOqTg5xfZ15D7MKmBCzJQtQ/tqk+VunBN+OHKtDprgufSxXXGN6J6T/rzRRBZIPEtCWlIxHr Y= X-Received: by 2002:a5d:4e4c:0:b0:207:a883:cf3a with SMTP id r12-20020a5d4e4c000000b00207a883cf3amr13440378wrt.534.1650404912838; Tue, 19 Apr 2022 14:48:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtK/nKbkXvYZOyVAfoxwqPAU4d5VNvQn2+OPjUudoKqzOB3izC+Q3htlXoreIBc6gm8H2luw== X-Received: by 2002:a5d:4e4c:0:b0:207:a883:cf3a with SMTP id r12-20020a5d4e4c000000b00207a883cf3amr13440351wrt.534.1650404912596; Tue, 19 Apr 2022 14:48:32 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id i7-20020a5d5587000000b00207a8cde900sm13333699wrv.19.2022.04.19.14.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 14:48:32 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Mark Brown , Rob Herring , Geert Uytterhoeven , Chen-Yu Tsai , Andy Shevchenko , Neil Armstrong , Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v5 2/5] dt-bindings: display: ssd1307fb: Extend schema for SPI controllers Date: Tue, 19 Apr 2022 23:48:20 +0200 Message-Id: <20220419214824.335075-3-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419214824.335075-1-javierm@redhat.com> References: <20220419214824.335075-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 --- (no changes since v4) 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 00:45:14 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 8B99EC433F5 for ; Tue, 19 Apr 2022 21:48:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358072AbiDSVv1 (ORCPT ); Tue, 19 Apr 2022 17:51:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346095AbiDSVvU (ORCPT ); Tue, 19 Apr 2022 17:51:20 -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 23BC33FDA5 for ; Tue, 19 Apr 2022 14:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650404916; 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=LkNua0P5ijUdj9CfvFVZtEDMMoPqKQ9SEZRQyvcW3AyyVrCNfzC19eURRGnzvG3I6kimYd vbf7J+AKW8mHknOkm1Qsj9Hz2TF/1EtJ6KXDdYPjseT0m+j2CLyQT0Z5iKWR9bAGGFPTXc zTXUJ8ZIFNbm0plsotvrAjhl4u8JsF0= 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-355-njbaI5_IN82BCqtnuA7rRQ-1; Tue, 19 Apr 2022 17:48:35 -0400 X-MC-Unique: njbaI5_IN82BCqtnuA7rRQ-1 Received: by mail-wm1-f70.google.com with SMTP id b12-20020a05600c4e0c00b003914432b970so8274wmq.8 for ; Tue, 19 Apr 2022 14:48:35 -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=ytbr/07W0hPlOvkIoci8hLIyLCC065g/feUmnmuRrGYRoKjLsz28fRwg1FGt4N0Cyk K9PenOIpAQl0HQrLwTznGMmbI8DQDc+V3vlsfJIqZyAptNFgr3mEcD/ramvtCon9COzO RrCvX5YIsrZbJ4zIZRm8gxGxKL3faQFXO0ZONEDSnaHaUKRCrb7buTo0WA22LsU30DKd 1XLT1FbE2o18NwjvmcQ1hS09dVn+dWXrLisiMEuVPOzfj/DqO2KBnpTTTSUOP2KmR6/w IOZcxGqRMn7UptqF/phLTTUpnGT0/EHzMHXYNYeIJL7wviQ5jx4sgg+gTvI8bGQJicE+ 11bA== X-Gm-Message-State: AOAM530Ha4/WfnQx+iskYZhkH18selsEaUiXwDlIEAMEV0tx0W1pZsWs tARra5csG6KN056QpUt19edmK3qhfwlp+9k4NeKuKn1InYMZAw++H2zVo4OYYW8sO+aF/cdQOg/ qS6OloypuxWYGZACoDofK4XKxhMA1qrSKauv/Y67oa5kCLoG3xrbmwo3vTPQsztlRAf9fRFdkEY Y= X-Received: by 2002:a5d:50ce:0:b0:207:bb5e:ad27 with SMTP id f14-20020a5d50ce000000b00207bb5ead27mr13329530wrt.84.1650404913978; Tue, 19 Apr 2022 14:48:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGiUWXSsU4DetoBt3ut0OT5Db3AG0bTsAxOWQgbdm53BhlvdW/DOLJi54rlv1isl8O0rnW9Q== X-Received: by 2002:a5d:50ce:0:b0:207:bb5e:ad27 with SMTP id f14-20020a5d50ce000000b00207bb5ead27mr13329512wrt.84.1650404913690; Tue, 19 Apr 2022 14:48:33 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id i7-20020a5d5587000000b00207a8cde900sm13333699wrv.19.2022.04.19.14.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 14:48:33 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Mark Brown , Rob Herring , Geert Uytterhoeven , Chen-Yu Tsai , Andy Shevchenko , Neil Armstrong , Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie Subject: [PATCH v5 3/5] drm/solomon: Add ssd130x new compatible strings and deprecate old ones. Date: Tue, 19 Apr 2022 23:48:21 +0200 Message-Id: <20220419214824.335075-4-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419214824.335075-1-javierm@redhat.com> References: <20220419214824.335075-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 00:45:14 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 C7690C433EF for ; Tue, 19 Apr 2022 21:48:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234477AbiDSVvd (ORCPT ); Tue, 19 Apr 2022 17:51:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357635AbiDSVvW (ORCPT ); Tue, 19 Apr 2022 17:51:22 -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 6FB8A3FDA1 for ; Tue, 19 Apr 2022 14:48:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650404917; 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=xVLLH9C759FHMpXQwwKHJScD/DCbIHfB8SwIPo2nJQ0=; b=L8qntPQQoD/x1hXShQOnkCNfrFIv3sWUWBgbk4a5g2asVttKOH8mIfwjTibOQ/SM3Z8xDv ctPWP7ObzCqyatfdGbTh/LTlUsDKL0viHGmcuQUJkA/aT6By2HyutHGRMQk6JN14WIEqcx Sc6xZfk6LCUDoaZNajdC5H2q4gye3tk= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-672-EmQMZfQUOaeajES1avP6eg-1; Tue, 19 Apr 2022 17:48:36 -0400 X-MC-Unique: EmQMZfQUOaeajES1avP6eg-1 Received: by mail-wm1-f69.google.com with SMTP id r204-20020a1c44d5000000b0038eaca2b8c9so1939766wma.7 for ; Tue, 19 Apr 2022 14:48:36 -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=xVLLH9C759FHMpXQwwKHJScD/DCbIHfB8SwIPo2nJQ0=; b=Nn0OhHhKzHVaLoZ+aBD7zr99GV9+spjMtR4z5lPr2fjxtxSInl1hRTvj+CQanQR8OX xhsxY6q+gdzXqLY3Idh8dMUlOoezu59s+PkcGtTlz1+3GkR2hKh/58JzQQYYwVGE0zdB 3JUj97D1ZVDj8gJr6m8EoYbT+v8iA6IFevp5WAjDy6hTR6RKGXtDwajsZKDF+VL+nVrJ TdfLd7uJ4nCvA9WGS8HG4hq1l9E2vcgW0sVHabEEGnt3fIxxfDJfkkB8twq6rSM7FQen h5wvhF2unBPqa8B5fH8R+jEJoYYyUBdZWPRBM7gk81XK+zls4Y0CLSKxhdakF3mRlPol P+eg== X-Gm-Message-State: AOAM5300c1PCQrxNuco1Bvccjz9euVkph3ROpsT9dRFL6R1r3VlGqWCH q90EheauAr2ATNbGBbl3WGsXa6pY+1eqfzim56EZGWkYtCEO0cGVIDA8NEcfeu28OOMJi+DzU57 wYJFE9dHKqcCS6Nmx3BFPAAQS1eoY4gdW4qW8KJZkYPEeA1+1mEmS4kZ9q3kzrIhByF16TaGa5r 8= X-Received: by 2002:a5d:588b:0:b0:20a:9570:de77 with SMTP id n11-20020a5d588b000000b0020a9570de77mr9040559wrf.27.1650404915052; Tue, 19 Apr 2022 14:48:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzatn+dYelnkGoOsI6bvv8PKpP08+CPJhO0Hu57/jsMjYH4dmAtg8p9Rd0YiNjJRCa9cn9xbg== X-Received: by 2002:a5d:588b:0:b0:20a:9570:de77 with SMTP id n11-20020a5d588b000000b0020a9570de77mr9040539wrf.27.1650404914803; Tue, 19 Apr 2022 14:48:34 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id i7-20020a5d5587000000b00207a8cde900sm13333699wrv.19.2022.04.19.14.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 14:48:34 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Mark Brown , Rob Herring , Geert Uytterhoeven , Chen-Yu Tsai , Andy Shevchenko , Neil Armstrong , Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie Subject: [PATCH v5 4/5] drm/solomon: Move device info from ssd130x-i2c to the core driver Date: Tue, 19 Apr 2022 23:48:22 +0200 Message-Id: <20220419214824.335075-5-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419214824.335075-1-javierm@redhat.com> References: <20220419214824.335075-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 v5: - Remove unnecessary blank line added by mistake in v4 (Andy Shevchenko). 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 | 52 ++++++--------------------- drivers/gpu/drm/solomon/ssd130x.c | 35 ++++++++++++++++-- drivers/gpu/drm/solomon/ssd130x.h | 14 ++++++++ 3 files changed, 56 insertions(+), 45 deletions(-) diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomo= n/ssd130x-i2c.c index 45867ef2bc8b..d6835ec71c39 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 */ } }; @@ -142,3 +109,4 @@ module_i2c_driver(ssd130x_i2c_driver); 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 00:45:14 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 17370C433EF for ; Tue, 19 Apr 2022 21:48:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355759AbiDSVvg (ORCPT ); Tue, 19 Apr 2022 17:51:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358064AbiDSVvX (ORCPT ); Tue, 19 Apr 2022 17:51:23 -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 8BCBF3FD8F for ; Tue, 19 Apr 2022 14:48:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650404918; 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=7BABEWfImdlFz6h6c/n67mZugkGxrntzCJH3oamrW2E=; b=Ai0Kjoeaio+CIPspI8ARsI9MIAmlvr9A5HoCFYqTQVpzPCT2XZuxDGw0rEx8kxQfMmuCB+ 9TLDxBPJZqq2mVgB9A5HAF34CLyxD1O6mhw3lEyPOBvswOoHrw7lTSjYw5IKp78xinAnIy SRXghHMb7AqkHFi/vlAZKclLqhRKdVI= 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-48-5XIQTabpMvGNsIPyvRDgeQ-1; Tue, 19 Apr 2022 17:48:37 -0400 X-MC-Unique: 5XIQTabpMvGNsIPyvRDgeQ-1 Received: by mail-wm1-f70.google.com with SMTP id n37-20020a05600c502500b0038fdc1394c6so9247387wmr.6 for ; Tue, 19 Apr 2022 14:48:37 -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=7BABEWfImdlFz6h6c/n67mZugkGxrntzCJH3oamrW2E=; b=NZ8Va2l3e0QnIllYXPG43N49R+8nIl/J8QHGYlfYUuRxV+wUBlrzsSVP7RROmpM0+A muOfU+gCz95VtRzxR7BModmH9RcpPxjEpjyRa0d1KFDs/jQWwercSHxvW2BrN8uhsMYj i5on375kIEAU1xIvVkc8Wev0Xi4FhLOaxw3cuvL5Jm0DeCNoqQYjvOkcTwTqXO7ls7mT vDwCXvQ4pAnz6PRG/A/wXE3OZInsZ1dkZlsh2Xzq7fl1oRqeQqhhn8kcMxn+LmaHDkCj 6YpU78SsUmBc1zYBE8h5y/c9KH9Xl+PF3G4tuYIUKcJwGG9+YBL8spDikTgOAPH2boFR Be6Q== X-Gm-Message-State: AOAM530o9k9dXmb5QsKOGAAVl4n1868sW9JrY7u8zPpKyNSF2gw+fvRU yipQRTmjR3z4HmAdFoT6iRJ9YeEp+ZWAQ8iyWFOqWhUIiwoIIoYgdGipUftCJyfNBrwQ4eNwFRC bn56ZFK7E1brNcej36QfrueAvIj1ECwQHldKMGK4i8dGxQQF1cKiKRSrk4ssJhJOAFen3dppnIu I= X-Received: by 2002:a05:6000:1f83:b0:207:a4d8:5173 with SMTP id bw3-20020a0560001f8300b00207a4d85173mr13509744wrb.556.1650404916209; Tue, 19 Apr 2022 14:48:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwF2skj/V3EtDOGqDPbahJ0c56qmLcV68R71JLptBPDt4NcJfm0DW9YIY+OPcNJy8tLV2Jqxw== X-Received: by 2002:a05:6000:1f83:b0:207:a4d8:5173 with SMTP id bw3-20020a0560001f8300b00207a4d85173mr13509714wrb.556.1650404915863; Tue, 19 Apr 2022 14:48:35 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id i7-20020a5d5587000000b00207a8cde900sm13333699wrv.19.2022.04.19.14.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 14:48:35 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Mark Brown , Rob Herring , Geert Uytterhoeven , Chen-Yu Tsai , Andy Shevchenko , Neil Armstrong , Javier Martinez Canillas , Geert Uytterhoeven , Chen-Yu Tsai , Daniel Vetter , David Airlie , Maxime Ripard , YueHaibing Subject: [PATCH v5 5/5] drm/solomon: Add SSD130x OLED displays SPI support Date: Tue, 19 Apr 2022 23:48:23 +0200 Message-Id: <20220419214824.335075-6-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419214824.335075-1-javierm@redhat.com> References: <20220419214824.335075-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 v5: - Remove cast by just using u8 *reg instead of void *data (Geert Uytterhoev= en). - Add Geert Uytterhoeven's Reviewed-by tag to patch 5/5. 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..43722adab1f8 --- /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 control byte since is not used in a 4-wire SPI interface */ + return spi_write(spi, reg + 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