From nobody Mon May 11 07:46: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 A5EE9C433FE for ; Mon, 11 Apr 2022 21:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350097AbiDKVPR (ORCPT ); Mon, 11 Apr 2022 17:15:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240850AbiDKVPJ (ORCPT ); Mon, 11 Apr 2022 17:15:09 -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 07A9828989 for ; Mon, 11 Apr 2022 14:12:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649711573; 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=qzdFnm3iaZLLnebsfstZZgMbexDrkf5tbznhbFumAH0=; b=A6sdiHEBckhhmhIcFvgyKfePsgCx7sJexl9+idDKx1EUnhqo/XccuEK1K+t3MU8nlwTCb7 LyD8u+3GBOql7Ft4RVsLVuaKFXBMx+mc6uJA+msawD2ZStIeJK3/M5R5foEkP4Lw+c0nq7 Svcm3b//9X2MVYwIkFeaWtnIDlhiuFU= 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-588-h1u-B8UmOxmM7tu-qT6gVg-1; Mon, 11 Apr 2022 17:12:52 -0400 X-MC-Unique: h1u-B8UmOxmM7tu-qT6gVg-1 Received: by mail-wm1-f72.google.com with SMTP id g13-20020a1c4e0d000000b0038eba16aa46so211491wmh.7 for ; Mon, 11 Apr 2022 14:12:51 -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=qzdFnm3iaZLLnebsfstZZgMbexDrkf5tbznhbFumAH0=; b=5DQqu7j6AK4t7ZtqEte8LksSB+A90LfD6A5n+z60Y3i4bwE5Z1BUednnXzpi2m+qUn +CPj3OlHR6d0hAsUHTJ7RfhwGwlB687lurf3T71aRL/QTtBeaUjJxmk5tC81vZLYh95u zOIb9Mv/zigRGgMNdVpL13+9MJ7UXEUPfQnKXJLHBDTujpXCz1ScbmjmZb9FWsHUwnWr QVrVf4cyXa3Py+U/11mb2JeJ6RTFPOLfNyqGqHEvZoIzWw9EcQ1isEunjx8Mpb1uwFGO HB/RRFaL27h1jYV+XZZSMfJsBSJToPNT5cfnoHNBafOp7VEYmguiTrrpBfWuRX94KT8b z5pw== X-Gm-Message-State: AOAM533e0IsuL3aKrjXZVEnthwUCaxJ17BJWcXD82/FlcoXuIKCh30k0 IQPz9OUh9ok1/OLGfP+7sTbEn4/uGn1zYvPcfsU0X1WSg7X/tdDPzJ8WyUB1yP3WEaybZknQIJ4 Ue/iQWpSNukI2eRAJIAZr9jCkAEcUe7yH/HUREwxB0uRcYhUzRa+JN8lWLnNnU56suREya6egbD g= X-Received: by 2002:a05:600c:2197:b0:38e:b80c:526a with SMTP id e23-20020a05600c219700b0038eb80c526amr955068wme.76.1649711570632; Mon, 11 Apr 2022 14:12:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyu/LM92/Nz7m6CMsPIAZGXuJG/QWu/2OUyuso56zJHaoEzz30UUplaSr4C67jCPONKtccaqw== X-Received: by 2002:a05:600c:2197:b0:38e:b80c:526a with SMTP id e23-20020a05600c219700b0038eb80c526amr955039wme.76.1649711570337; Mon, 11 Apr 2022 14:12:50 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id l9-20020a5d6d89000000b00203d62072c4sm28723722wrs.43.2022.04.11.14.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 14:12:50 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Rob Herring , dri-devel@lists.freedesktop.org, Neil Armstrong , Geert Uytterhoeven , Mark Brown , Andy Shevchenko , Chen-Yu Tsai , Javier Martinez Canillas , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v2 1/5] dt-bindings: display: ssd1307fb: Deprecate "-i2c" compatible strings Date: Mon, 11 Apr 2022 23:12:39 +0200 Message-Id: <20220411211243.11121-2-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411211243.11121-1-javierm@redhat.com> References: <20220411211243.11121-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. Signed-off-by: Javier Martinez Canillas Acked-by: Mark Brown Reviewed-by: Geert Uytterhoeven --- Changes in v2: - Drop the -i2c suffixes from the compatible strings too (Geert Uytterhoeve= n). .../bindings/display/solomon,ssd1307fb.yaml | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.ya= ml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml index ade61d502edd..6b9d0c72739a 100644 --- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml +++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml @@ -12,12 +12,23 @@ 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: + - sinowealth,sh1106-i2c + - 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 +147,7 @@ allOf: properties: compatible: contains: - const: sinowealth,sh1106-i2c + const: sinowealth,sh1106 then: properties: solomon,dclk-div: @@ -148,7 +159,7 @@ allOf: properties: compatible: contains: - const: solomon,ssd1305fb-i2c + const: solomon,ssd1305 then: properties: solomon,dclk-div: @@ -160,7 +171,7 @@ allOf: properties: compatible: contains: - const: solomon,ssd1306fb-i2c + const: solomon,ssd1306 then: properties: solomon,dclk-div: @@ -172,7 +183,7 @@ allOf: properties: compatible: contains: - const: solomon,ssd1307fb-i2c + const: solomon,ssd1307 then: properties: solomon,dclk-div: @@ -186,7 +197,7 @@ allOf: properties: compatible: contains: - const: solomon,ssd1309fb-i2c + const: solomon,ssd1309 then: properties: solomon,dclk-div: @@ -203,14 +214,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 07:46: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 3E5D8C433F5 for ; Mon, 11 Apr 2022 21:13:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350067AbiDKVPV (ORCPT ); Mon, 11 Apr 2022 17:15:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241827AbiDKVPK (ORCPT ); Mon, 11 Apr 2022 17:15:10 -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 1F6032A73A for ; Mon, 11 Apr 2022 14:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649711574; 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=zQ+QBfaH3h1Scl+hTaH0HyHu0TpM43OebOl6PoDY/RM=; b=O7UgSMvDea4s6LNfh4Ggk/XC5yGF3whpTdUniHCcFVSZxKhnDrgeg/UUH6Cl3OEOmwbkGj Ilde8KAZoRptjXuw9FIgqKYM6qhqFc/FzQAOm9wG9uDc8JMo34GAQmdkeTnxhqRv6j4j+U mCs2OpCElKMoxAJHtiXMnI2WAEytwPY= 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-359-wZIkvYxGMm-kHzO1cT2oaQ-1; Mon, 11 Apr 2022 17:12:53 -0400 X-MC-Unique: wZIkvYxGMm-kHzO1cT2oaQ-1 Received: by mail-wm1-f72.google.com with SMTP id l19-20020a05600c1d1300b0038e736f98faso5037534wms.4 for ; Mon, 11 Apr 2022 14:12:53 -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=zQ+QBfaH3h1Scl+hTaH0HyHu0TpM43OebOl6PoDY/RM=; b=Y2pkEVWuDbizs4r5+hYrVI86XdAX6wdO7QRwQR9OzQ6cO78S/PAMLWCHLaOVHeDdWg YN77sVJWrQOYlKoEc+BDFxHfwaM2jAg0VV+8Tbp18SBgIF+8b0yfFz1G/LT6L45ABKd6 bOpmTgHKP2NRHCJhrxiyaelJMhNcwazRhF6afKfyPkvGB1+mQKWGNvwJT9kQJZ9zEriX EGqN89Vf37MmHRKIwPx2BM9MRwV2SLJHjU8atH9kAGt7Spa8cSWegkkBNTXBtRShZv/j x0H5Q+ezGwODe6TOcogzSEG9cDiDEjcJihJJfK5n+TG91oCpvLoQ8/4w9ff/dyD9lpsN 11xA== X-Gm-Message-State: AOAM532kcMcJ5yAKdG8Bm1cPjesjnDFj7vGQ2kWI47MbzrBz/vCcr++7 A+Bn3CDuo3wNAdN2InTCbIOE+F7IfIzXOyvmgoeICBEpjneYAOF7+888SCfYQfwtxMOl7vPoTX/ 00Q9n3mAwboAfmMzxMb3V+/emtE5JReu9DwV08JJmY7PARpwPtifNqQSgV4p8U4gAHu4NfGHPI8 w= X-Received: by 2002:a1c:202:0:b0:38e:ab4b:ce72 with SMTP id 2-20020a1c0202000000b0038eab4bce72mr978225wmc.152.1649711571955; Mon, 11 Apr 2022 14:12:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfuB7hkZg8q50JjIIMsDyKbYBXK9LNBxTvZbXiee0cHgIO0ETUBqdWkPQZa7/y0oGvzWZVvw== X-Received: by 2002:a1c:202:0:b0:38e:ab4b:ce72 with SMTP id 2-20020a1c0202000000b0038eab4bce72mr978199wmc.152.1649711571661; Mon, 11 Apr 2022 14:12:51 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id l9-20020a5d6d89000000b00203d62072c4sm28723722wrs.43.2022.04.11.14.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 14:12:51 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Rob Herring , dri-devel@lists.freedesktop.org, Neil Armstrong , Geert Uytterhoeven , Mark Brown , Andy Shevchenko , Chen-Yu Tsai , Javier Martinez Canillas , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v2 2/5] dt-bindings: display: ssd1307fb: Extend schema for SPI controllers Date: Mon, 11 Apr 2022 23:12:40 +0200 Message-Id: <20220411211243.11121-3-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411211243.11121-1-javierm@redhat.com> References: <20220411211243.11121-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 --- Changes in v2: - Don't add compatible strings with an "-spi" suffix (Geert Uytterhoeven). .../bindings/display/solomon,ssd1307fb.yaml | 37 ++++++++++++++++++- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.ya= ml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml index 6b9d0c72739a..b58d2d7bd8c1 100644 --- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml +++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml @@ -39,9 +39,14 @@ properties: reset-gpios: maxItems: 1 =20 + dc-gpios: + maxItems: 1 + vbat-supply: description: The supply for VBAT =20 + spi-max-frequency: true + solomon,height: $ref: /schemas/types.yaml#/definitions/uint32 default: 16 @@ -160,6 +165,7 @@ allOf: compatible: contains: const: solomon,ssd1305 + then: properties: solomon,dclk-div: @@ -213,14 +219,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>; @@ -231,3 +237,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 07:46: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 00F7DC433EF for ; Mon, 11 Apr 2022 21:13:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350105AbiDKVP1 (ORCPT ); Mon, 11 Apr 2022 17:15:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344812AbiDKVPL (ORCPT ); Mon, 11 Apr 2022 17:15:11 -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 5ADA528989 for ; Mon, 11 Apr 2022 14:12:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649711575; 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=jOfEjGDhyNc9e2ZohfZoZhj46Tns/ai5DoWmszx5PGM=; b=YmvrdQc4Slg05Hihf/DbCBScyHU1E4xKAjalTQwnQ66iY6ckOg1itpjPlSYwwODwskzWy5 a0mFL2h9PjuVXiqoHV/0seeH+ZXr69BLkh3lqq2FRu66npY4GVLR4c2wP4bVvF6Ih1m+sZ OgraeYYHzBl98ciFN7fd3lYd9tWUI2w= 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-408-YEFfPAwjONmJd94Gt0mvVw-1; Mon, 11 Apr 2022 17:12:54 -0400 X-MC-Unique: YEFfPAwjONmJd94Gt0mvVw-1 Received: by mail-wm1-f71.google.com with SMTP id z16-20020a05600c0a1000b0038bebbd8548so212907wmp.3 for ; Mon, 11 Apr 2022 14:12:54 -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=jOfEjGDhyNc9e2ZohfZoZhj46Tns/ai5DoWmszx5PGM=; b=imLWPLN9FoaIBJe4yeqHwUPIylbtWjzXCyPS5V1s95xS2e8zqP8gF6bi2/IfWUP53Y PQ4rux1QA9BTagMP3XPEkP9TtTUWyRepOgv57vmRJYLHEWv5/37Go6OAVmgrVRQ2m4Lk EBLwMhMaJfjrJW/g12tzZduzZ42GBhBOZB5++HMCCKMYDkDuy81OgYMy7Ms1l6047uRy ky5ueyvkaNb7vT8ZnKDkmQg4eU07/HSiXt1uCY9uawiYruuSQ6QLhMoEozsrjbkMx3n4 4pyx8m0WNBnszjliJJUndJMHiaSl8uHIu7qol/ksLkfRii5Uoa59mNS4zshfXhtMsqEa kklg== X-Gm-Message-State: AOAM533Pu3U4dOIZKY87tEgMdYQpDvAXlRMgPNux71MT1xSjuW+yanco xA8Oa7AT0CfNJu4deOC+kMrAdp1aqvTywPfTxbqIxIFdXWj1RmxmGL5d/QMI7nL5DzaSz9fiT76 dUz2Kn4ueZsQ95DGx1ZNMBhka78qimxJNJxdHd2GVHaN6pqvg2LKBQwnD0kGK86hjRgBSBOJgUs s= X-Received: by 2002:adf:eb81:0:b0:1e3:2bf5:132 with SMTP id t1-20020adfeb81000000b001e32bf50132mr26144648wrn.246.1649711573012; Mon, 11 Apr 2022 14:12:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTCKXEjVBa6ZiAkJVgXv3Un1Fp+W8yDtHc844corf4v+tD4JqXCWEFTkdomwZsnwALRaVSUw== X-Received: by 2002:adf:eb81:0:b0:1e3:2bf5:132 with SMTP id t1-20020adfeb81000000b001e32bf50132mr26144630wrn.246.1649711572769; Mon, 11 Apr 2022 14:12:52 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id l9-20020a5d6d89000000b00203d62072c4sm28723722wrs.43.2022.04.11.14.12.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 14:12:52 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Rob Herring , dri-devel@lists.freedesktop.org, Neil Armstrong , Geert Uytterhoeven , Mark Brown , Andy Shevchenko , Chen-Yu Tsai , Javier Martinez Canillas , Daniel Vetter , David Airlie Subject: [PATCH v2 3/5] drm/solomon: Add ssd130x new compatible strings and deprecate old ones. Date: Mon, 11 Apr 2022 23:12:41 +0200 Message-Id: <20220411211243.11121-4-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411211243.11121-1-javierm@redhat.com> References: <20220411211243.11121-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 v1) drivers/gpu/drm/solomon/ssd130x-i2c.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomo= n/ssd130x-i2c.c index d099b241dd3f..87abe1fe31fc 100644 --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c @@ -87,6 +87,27 @@ static struct ssd130x_deviceinfo ssd130x_ssd1309_devicei= nfo =3D { }; =20 static const struct of_device_id ssd130x_of_match[] =3D { + { + .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 "sinowealth,sh1106-i2c", .data =3D &ssd130x_sh1106_deviceinfo, --=20 2.35.1 From nobody Mon May 11 07:46: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 37164C433F5 for ; Mon, 11 Apr 2022 21:13:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240850AbiDKVPc (ORCPT ); Mon, 11 Apr 2022 17:15:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348615AbiDKVPN (ORCPT ); Mon, 11 Apr 2022 17:15:13 -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 90F6828989 for ; Mon, 11 Apr 2022 14:12:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649711576; 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=9jEFGMcteZ+nA9cu4YEj6hFyYlLNIHH/8HV43Q6c+F0=; b=MwZlybIjMaixpGte644tSMW0qc2VXYsjeqH2lhsZIH14mO/gnhN+AA9A7MKUqYG71W5mwD RYAUfqIPFvv+g5WbpbLn/dSM0vxfdd8aoeRsDGk/yy4tGlwDJwGNJfRxeIt7oN9k05ycv4 Yxh2/axAlywzKqVARiQAZJ8KTVUZhTw= 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-617-M1YzHCEIOiCI_cy-Cgl2fw-1; Mon, 11 Apr 2022 17:12:55 -0400 X-MC-Unique: M1YzHCEIOiCI_cy-Cgl2fw-1 Received: by mail-wm1-f70.google.com with SMTP id l41-20020a05600c1d2900b0038ec007ac7fso207257wms.4 for ; Mon, 11 Apr 2022 14:12:55 -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=9jEFGMcteZ+nA9cu4YEj6hFyYlLNIHH/8HV43Q6c+F0=; b=A01/m43fjRws6DCyOwmOYSo6CiKInCPYok/nivOphma8T9bFaOWGFjzoQLAPHroUAK h+A09HkvYoY8RVHSHkLrShdG1IDfXfRCYFTkD5E984vAhADEsOj8TCog1k007CiUvX9U QsHNyHtvUaHo/WgwPzaB00rNNHiSk1eI3rAqnBToN8+p0qnaMvKtvW2l9gxbUC1DfkqV xkaYiSt54BpHa/HEgcfmtcuMvUdGyXbdku9Lwo3EcKZyEwdoypa9Eu9zZGk5GlaIdTff oHscXboRAZpoljVN9mfwXZqDiPrcAoZ2WdHQ0fmWt6LaTwBj2nSDKDR9QmZfm3LnaD1v OsPQ== X-Gm-Message-State: AOAM531mx74vmhB+4SNFUgwgMr55bxmCWpmRXsepeghbuyawspEKz4Td 0AuDv2ItXbRIv9jf4QiV6wvFOYnWATRlqphFDKZVH38rGOT7QGzHRt8vUr9c1pzwYRdIf9IjoYJ uV/UmafosiYWrpywMJW80he2Ln0JjBIVZxnGjCfSnBRRIGEpAGnzonyxvs8F2kbp89kUjtwfvdx M= X-Received: by 2002:a5d:6d0e:0:b0:207:8ecd:2dbf with SMTP id e14-20020a5d6d0e000000b002078ecd2dbfmr16797892wrq.660.1649711574164; Mon, 11 Apr 2022 14:12:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTmfCgkAAd79bXAApXOp928kNiObmsrvzqdhHe087nR1AzkXYxJTev+H7I9+izveEH7z5uMA== X-Received: by 2002:a5d:6d0e:0:b0:207:8ecd:2dbf with SMTP id e14-20020a5d6d0e000000b002078ecd2dbfmr16797873wrq.660.1649711573895; Mon, 11 Apr 2022 14:12:53 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id l9-20020a5d6d89000000b00203d62072c4sm28723722wrs.43.2022.04.11.14.12.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 14:12:53 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Rob Herring , dri-devel@lists.freedesktop.org, Neil Armstrong , Geert Uytterhoeven , Mark Brown , Andy Shevchenko , Chen-Yu Tsai , Javier Martinez Canillas , Daniel Vetter , David Airlie Subject: [PATCH v2 4/5] drm/solomon: Move device info from ssd130x-i2c to the core driver Date: Mon, 11 Apr 2022 23:12:42 +0200 Message-Id: <20220411211243.11121-5-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411211243.11121-1-javierm@redhat.com> References: <20220411211243.11121-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 are used by the I2C interface, it 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 Reported-by: kernel test robot Reviewed-by: Geert Uytterhoeven --- 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 | 45 +++++++++++++++++++++-- drivers/gpu/drm/solomon/ssd130x.h | 12 ++++++ 3 files changed, 63 insertions(+), 47 deletions(-) diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomo= n/ssd130x-i2c.c index 87abe1fe31fc..8259b10db966 100644 --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c @@ -53,80 +53,47 @@ 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 (void *)SH1106_ID, }, { .compatible =3D "solomon,ssd1305", - .data =3D &ssd130x_ssd1305_deviceinfo, + .data =3D (void *)SSD1305_ID, }, { .compatible =3D "solomon,ssd1306", - .data =3D &ssd130x_ssd1306_deviceinfo, + .data =3D (void *)SSD1306_ID, }, { .compatible =3D "solomon,ssd1307", - .data =3D &ssd130x_ssd1307_deviceinfo, + .data =3D (void *)SSD1307_ID, }, { .compatible =3D "solomon,ssd1309", - .data =3D &ssd130x_ssd1309_deviceinfo, + .data =3D (void *)SSD1309_ID, }, /* Deprecated but kept for backward compatibility */ { .compatible =3D "sinowealth,sh1106-i2c", - .data =3D &ssd130x_sh1106_deviceinfo, + .data =3D (void *)SH1106_ID, }, { .compatible =3D "solomon,ssd1305fb-i2c", - .data =3D &ssd130x_ssd1305_deviceinfo, + .data =3D (void *)SSD1305_ID, }, { .compatible =3D "solomon,ssd1306fb-i2c", - .data =3D &ssd130x_ssd1306_deviceinfo, + .data =3D (void *)SSD1306_ID, }, { .compatible =3D "solomon,ssd1307fb-i2c", - .data =3D &ssd130x_ssd1307_deviceinfo, + .data =3D (void *)SSD1307_ID, }, { .compatible =3D "solomon,ssd1309fb-i2c", - .data =3D &ssd130x_ssd1309_deviceinfo, + .data =3D (void *)SSD1309_ID, }, { /* sentinel */ } }; diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ss= d130x.c index a7e784518c69..7d5b43023213 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/drivers/gpu/drm/solomon/ssd130x.c @@ -39,11 +39,9 @@ #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 #define SSD130X_SET_COL_RANGE 0x21 #define SSD130X_SET_PAGE_RANGE 0x22 @@ -94,6 +92,37 @@ =20 #define MAX_CONTRAST 255 =20 +static 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, + } +}; + static inline struct ssd130x_device *drm_to_ssd130x(struct drm_device *drm) { return container_of(drm, struct ssd130x_device, drm); @@ -846,6 +875,7 @@ static int ssd130x_get_resources(struct ssd130x_device = *ssd130x) struct ssd130x_device *ssd130x_probe(struct device *dev, struct regmap *re= gmap) { struct ssd130x_device *ssd130x; + enum ssd130x_variants variant; struct backlight_device *bl; struct drm_device *drm; int ret; @@ -860,7 +890,14 @@ struct ssd130x_device *ssd130x_probe(struct device *de= v, struct regmap *regmap) =20 ssd130x->dev =3D dev; ssd130x->regmap =3D regmap; - ssd130x->device_info =3D device_get_match_data(dev); + + variant =3D (enum ssd130x_variants)device_get_match_data(dev); + + if (variant >=3D NR_SSD130X_VARIANTS) + return ERR_PTR(dev_err_probe(dev, -EINVAL, + "Invalid SSD130x variant\n")); + + ssd130x->device_info =3D &ssd130x_variants[variant]; =20 if (ssd130x->device_info->page_mode_only) ssd130x->page_address_mode =3D 1; diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ss= d130x.h index f5b062576fdf..ec349239e945 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; --=20 2.35.1 From nobody Mon May 11 07:46: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 30C97C433EF for ; Mon, 11 Apr 2022 21:13:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350118AbiDKVPg (ORCPT ); Mon, 11 Apr 2022 17:15:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350095AbiDKVPR (ORCPT ); Mon, 11 Apr 2022 17:15:17 -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 66B672AE20 for ; Mon, 11 Apr 2022 14:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649711580; 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=M95WJfrMn4Zy07mhQ4y0daSPzPIFGxeBWEMZH1/VxdI=; b=QgELhwWFbcU4vYpe/o7yxGGsLEpFy5FjCsLGuFLA/nXklRiEb2iMkKZ9y1OSaM16E2Qy6G Av9FLh2xTl4WdXC/pnO53k71d9jdk4kNNft7HWxRHW6qzJV7pUQLU2gbvsGKsMjm3ToGbF 1VEQ53CbNVQgQtZrP4WInr4F85mJNXk= 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-115-t6T5vSp-PUiUm895dDoEWw-1; Mon, 11 Apr 2022 17:12:57 -0400 X-MC-Unique: t6T5vSp-PUiUm895dDoEWw-1 Received: by mail-wm1-f71.google.com with SMTP id z16-20020a05600c0a1000b0038bebbd8548so212992wmp.3 for ; Mon, 11 Apr 2022 14:12:57 -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=M95WJfrMn4Zy07mhQ4y0daSPzPIFGxeBWEMZH1/VxdI=; b=sCzIqJm9YYLgYkGiH7hjEHp8NjC6HYBSJ7aWqobw6dH+KQrAcSJ5OMNq9e6qA3Q+CP iWt669wludt+1ddvhmjYhT5GGaeQIhReBJngt6AWqExxhhXgE15tDroEnzqMWaJBHLCK ejC7c1hiEW4T+H2zdjwDn1j7AiCLQP2G2Ry/bp2XmAV+lot1NdctTVg2iMVLasJwfkyA hGKaO+l7YwGcUixQaBr2lSk2Q4XK+0r2cS+ESJNUhOtzIT4Tk2+Jw8madwOvTHHXdCIY yK9pmYfuSpdJpARA/7fncCyLqFsRh8YnFoZNQHKloUMlOxOZQewPQDpS9+vObTfz4x5h 6zow== X-Gm-Message-State: AOAM531y2kbs7vY4P+vK1P8ctaEv7VU2jfWbR0u9kmcgsAxHR+iqbBIY ebBSSAEdPpNYW2lrvYNY9SA4Q7AfFp7ibPAhm9yle3N0G+nAOx7YVUctld3YrGIVGqG0EZejOYF cQHOZSDofdJoqH/VQ9RyFtrerjAqsX/RacxtVbPJmRK3iYY/t2MXdMiBpr7SbIAXIgtxdnypkkl Q= X-Received: by 2002:adf:eb86:0:b0:1e6:8c92:af6b with SMTP id t6-20020adfeb86000000b001e68c92af6bmr26342349wrn.116.1649711575908; Mon, 11 Apr 2022 14:12:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxvx0POEPQt1rNQq1OQWSMr6MX6jGMvV5y/3zA8cOpvVB60dnM/YE1MmkCed4WruaERKY1fQ== X-Received: by 2002:adf:eb86:0:b0:1e6:8c92:af6b with SMTP id t6-20020adfeb86000000b001e68c92af6bmr26342319wrn.116.1649711575506; Mon, 11 Apr 2022 14:12:55 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id l9-20020a5d6d89000000b00203d62072c4sm28723722wrs.43.2022.04.11.14.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 14:12:55 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Rob Herring , dri-devel@lists.freedesktop.org, Neil Armstrong , Geert Uytterhoeven , Mark Brown , Andy Shevchenko , Chen-Yu Tsai , Javier Martinez Canillas , Chen-Yu Tsai , Daniel Vetter , David Airlie , Maxime Ripard , YueHaibing Subject: [PATCH v2 5/5] drm/solomon: Add SSD130x OLED displays SPI support Date: Mon, 11 Apr 2022 23:12:43 +0200 Message-Id: <20220411211243.11121-6-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411211243.11121-1-javierm@redhat.com> References: <20220411211243.11121-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 Reported-by: kernel test robot --- (no changes since v1) drivers/gpu/drm/solomon/Kconfig | 9 ++ drivers/gpu/drm/solomon/Makefile | 1 + drivers/gpu/drm/solomon/ssd130x-spi.c | 184 ++++++++++++++++++++++++++ 3 files changed, 194 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..b6fee66a0c01 --- /dev/null +++ b/drivers/gpu/drm/solomon/ssd130x-spi.c @@ -0,0 +1,184 @@ +// 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 struct gpio_desc *ssd130x_spi_get_dc(struct device *dev) +{ + struct gpio_desc *dc =3D devm_gpiod_get(dev, "dc", GPIOD_OUT_LOW); + + if (IS_ERR(dc)) + return ERR_PTR(dev_err_probe(dev, PTR_ERR(dc), "Failed to get dc gpio\n"= )); + + return dc; +} + +static int ssd130x_spi_probe(struct spi_device *spi) +{ + struct ssd130x_spi_transport *t; + struct ssd130x_device *ssd130x; + struct regmap *regmap; + struct device *dev =3D &spi->dev; + + 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 ssd130x_spi_get_dc(&spi->dev); + if (IS_ERR(t->dc)) + return PTR_ERR(t->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 (void *)SH1106_ID, + }, + { + .compatible =3D "solomon,ssd1305", + .data =3D (void *)SSD1305_ID, + }, + { + .compatible =3D "solomon,ssd1306", + .data =3D (void *)SSD1306_ID, + }, + { + .compatible =3D "solomon,ssd1307", + .data =3D (void *)SSD1307_ID, + }, + { + .compatible =3D "solomon,ssd1309", + .data =3D (void *)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"); --=20 2.35.1