From nobody Mon May 11 07:05:13 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 54F98C4332F for ; Tue, 12 Apr 2022 16:28:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357583AbiDLQaW (ORCPT ); Tue, 12 Apr 2022 12:30:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241925AbiDLQaT (ORCPT ); Tue, 12 Apr 2022 12:30:19 -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 32F1E5D5E6 for ; Tue, 12 Apr 2022 09:27:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649780871; 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=lNkIh3s/MmgoDL5lCW8RMnOGrRWko9L2n938dHPssSQ=; b=LGcewioG0DHHyGZ6yawOgYP78uIBon/eyGGtOvgCxsNfJGE7ETFCuBPRdZJTAj9sAE7Z8c Gp2pOoFiH2FZ28g9zE/ik521rAHHLc+1LBT4ADo4gYd2D9bWZNf0ey2tBhex5DA8t23eea HQXGkUcA4yCckO7q9+tJMbWXmb93Qac= 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-240-LpXB0QFmPWeBwaQ9IffVyg-1; Tue, 12 Apr 2022 12:27:50 -0400 X-MC-Unique: LpXB0QFmPWeBwaQ9IffVyg-1 Received: by mail-wm1-f70.google.com with SMTP id 10-20020a1c020a000000b0038ece714a1fso587096wmc.1 for ; Tue, 12 Apr 2022 09:27:50 -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=lNkIh3s/MmgoDL5lCW8RMnOGrRWko9L2n938dHPssSQ=; b=wrzaAFE6Af7PlHcpui5xfdTxOmS9OUdWdMcrWbKj38kLuk7hXaNvf2uknHDx4041lq w9GHWgAoBGQ24OL1pl/AGEpH84z4uDQe4bf5JIOq291FGUq/JQfikQhM22Q+IzjSPEr9 d8DFLx37odWWHd9PsnKZzYQChxA49QqRvW39W04pxb0UAyl9bK+2sBSJSBZNzpFk0HQX eOT+FWt7rURfy0F6bc6xWGQCdrg85axNRM9ZtQsJJbvHfdI+Q842ysv3/9XlNZRXpYCJ +bVIn9FvYLaqB+FWoR2EDAinn+kSSQrK5EZaS63dqpghofhLMlQZiuonWW0B7zHPIIVe W9pQ== X-Gm-Message-State: AOAM530ijYzegt7J7g9U4O7Htekb9tUmEb6oYFBrhImR5iBUwKWNb8Kk dkvRd3YM9sjLa55rFDrZEFQAY8yv3tNeDXUnVUDLT4p/uYGwlJE/f81Iv1aFmmx4KwX/quWjQe1 ewqckNt1eOc6xmqIq20YIys81yPJa7pXSHE4SvaZVKQME+tfDdOLVozpHhvqiFTJlhI68eX2iIv M= X-Received: by 2002:a7b:c153:0:b0:38e:c1a6:453e with SMTP id z19-20020a7bc153000000b0038ec1a6453emr4837656wmi.131.1649780868953; Tue, 12 Apr 2022 09:27:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuK57qDkY8R1p2LLEEpMuisu8JsTVLrJ82aX9dqUSkB8Bs7AwhFUi2INqI4nghMgjRBWz+Rw== X-Received: by 2002:a7b:c153:0:b0:38e:c1a6:453e with SMTP id z19-20020a7bc153000000b0038ec1a6453emr4837621wmi.131.1649780868698; Tue, 12 Apr 2022 09:27:48 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id g8-20020a5d4888000000b00207a49fa6a1sm7700358wrq.81.2022.04.12.09.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 09:27:48 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Geert Uytterhoeven , Neil Armstrong , Rob Herring , Andy Shevchenko , dri-devel@lists.freedesktop.org, Mark Brown , Chen-Yu Tsai , Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v3 1/5] dt-bindings: display: ssd1307fb: Deprecate "-i2c" compatible strings Date: Tue, 12 Apr 2022 18:27:25 +0200 Message-Id: <20220412162729.184783-2-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412162729.184783-1-javierm@redhat.com> References: <20220412162729.184783-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 --- 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 07:05:13 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 22219C433F5 for ; Tue, 12 Apr 2022 16:28:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357604AbiDLQab (ORCPT ); Tue, 12 Apr 2022 12:30:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351892AbiDLQaU (ORCPT ); Tue, 12 Apr 2022 12:30: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 D44EB5D5E9 for ; Tue, 12 Apr 2022 09:27:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649780872; 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=M///uq33RMEHTxjoVs129eG8XW6VZX+ANQltzYppS6w=; b=PALWjQjIeP/7sRCh8zv3gyPfpAJbEBiYCNvRsjcnQytliO7rilfsEu/6pVoQHsB0kjnTkN moggwOKNkpWP11ratsaLjUZYjs3R44sXLRfMp69Sgxj3UwmDWx3scQQSvarHoXn/tK2Jjq xH0hiiK1DbNu73GbSEylCzPAtHTBi2A= 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-515-1yxcwYl4Ojugmel_Mzj-eQ-1; Tue, 12 Apr 2022 12:27:51 -0400 X-MC-Unique: 1yxcwYl4Ojugmel_Mzj-eQ-1 Received: by mail-wr1-f71.google.com with SMTP id s8-20020adfc548000000b00207a28e0583so1636301wrf.23 for ; Tue, 12 Apr 2022 09:27: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=M///uq33RMEHTxjoVs129eG8XW6VZX+ANQltzYppS6w=; b=p6m3LvWT/RYef5GbYQOKHlgV7pSiOYIp+AEVy2D1x1ZiE4nwlENK8y1HT2A6qvvSRp Yc81RaW9vxhm8QDAlHDEFnekNoRwm7ij2mGZCPMpjZZVcK13dTAJxsHSjU3jOQVbjeLl TZfvhrE2tS3tlsJG0m+GHOuqrNseSb5mmhYLq/XLk+DYecXiLEtaVIizeaYiHvfzWg5Q +lQLgVlGmZ004cMR9xj5tXKSsqnAci8/8glOr8edE9IuJlqV5I3iviFAatut/H7/wxjc CBHqa3Mgi+lf3pNelVgJ6p7EaZL4uUSiAAQOCW2OFpeaT5xAhO1bokF3kM38Vwa7afNY 7Ivg== X-Gm-Message-State: AOAM533iLL+efvs3NPmx8Z3QmjbWzMRHfWXhn4bz6p68DNVDUh2kTdGI i95FfpWJqa36vgN5hzFnOE1ErP/1cj4djV2/bI1VaD14Azo02hpYt7RAOz59vHcHBaG7+RYD9wl 8A6H9RZZ7CEjwCXOnZuHEP0/sKAt+ylcgCCTt563IwkyPydSSgbGWM3pS0Eeh4gexXAikooa0s5 o= X-Received: by 2002:a05:600c:3588:b0:38c:6d7f:6fd8 with SMTP id p8-20020a05600c358800b0038c6d7f6fd8mr4795596wmq.25.1649780870474; Tue, 12 Apr 2022 09:27:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzryxA9KF33Y/kGHkOm+XLc/HDsLdgWiUOLZYjTIDFY5X+9rR3gPvbvCQWHVPnx1wiijk1LQQ== X-Received: by 2002:a05:600c:3588:b0:38c:6d7f:6fd8 with SMTP id p8-20020a05600c358800b0038c6d7f6fd8mr4795565wmq.25.1649780870214; Tue, 12 Apr 2022 09:27:50 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id g8-20020a5d4888000000b00207a49fa6a1sm7700358wrq.81.2022.04.12.09.27.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 09:27:49 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Geert Uytterhoeven , Neil Armstrong , Rob Herring , Andy Shevchenko , dri-devel@lists.freedesktop.org, Mark Brown , Chen-Yu Tsai , Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v3 2/5] dt-bindings: display: ssd1307fb: Extend schema for SPI controllers Date: Tue, 12 Apr 2022 18:27:26 +0200 Message-Id: <20220412162729.184783-3-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412162729.184783-1-javierm@redhat.com> References: <20220412162729.184783-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 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 | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.ya= ml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml index 7653b6c3fcb6..7d7de92df86f 100644 --- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml +++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml @@ -38,9 +38,16 @@ properties: reset-gpios: maxItems: 1 =20 + # Only required for SPI + dc-gpios: + 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 +227,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 +245,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:05:13 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 81511C433F5 for ; Tue, 12 Apr 2022 16:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357628AbiDLQal (ORCPT ); Tue, 12 Apr 2022 12:30:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357318AbiDLQaV (ORCPT ); Tue, 12 Apr 2022 12:30:21 -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 D4A855D5F2 for ; Tue, 12 Apr 2022 09:27:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649780874; 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=mo5J49WlO6IQDZ+qlm/WdbORrfFgaHGgkwawEPzuzxE=; b=FGW/tSP91WZhMTmZBM39rSA0BFvvq4f3WsWaZTYQ1om9jQzY+l5XX9Eb6S+WsIuZ2jrPw7 Ul1kpz42XYnLZZOYtXu+IEqDUWpjGwQLuCwdIKxN2HfP71cUlFL05Q+27NVib9FBHvBn6X SEEU9MAaw017VSjRD/1eC4A0Ojao9W4= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-2-RghSxd3GMcCATcLNtZm_kw-1; Tue, 12 Apr 2022 12:27:52 -0400 X-MC-Unique: RghSxd3GMcCATcLNtZm_kw-1 Received: by mail-wr1-f70.google.com with SMTP id f2-20020a056000036200b00207a14a1f96so1705531wrf.3 for ; Tue, 12 Apr 2022 09:27:52 -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=mo5J49WlO6IQDZ+qlm/WdbORrfFgaHGgkwawEPzuzxE=; b=LUIJ2S+oAUcrHReTmwK8aVrhqruLKJhHwg1tXKR0qWEtJLLMsEKaqZZRM5ftonvYm5 y5ArhNzcLFKJmGTUb4oXmVh489HKHYis1x2ttmOWrT4RVdJ1MwrjysSFdENI48hiMnfq YB8+n+/eROC2XI5i2fYLW+qYcbaUIV8+HK0m2eEkrJJ4AIj6dMkXDHn/LsQslmLnd4J5 oGg5AK1RvJoFAnT1vr2W2GPDCceFYUWDVj5IZ7BbG3JCbwV3pp4tKTJcB1fos3DFHPuk zdgzL/dB46i9YJWS/l5kR4M+sEEC4y/0K7T1/h7goN4B0fJ8/EBCxOnLvZx0FjRWmn1X s9BA== X-Gm-Message-State: AOAM530M970PUV3dBtgq8V1ButOZ7MRbSQOtB2JNePPJdSs6OOzT35ZN 9SIONQ1g5OD1OVWWp9jvBZNQgYGKnJb1Jn/Fi1vTgL7WYmhrK7xGNXx2/+WwgrwMK6LLSV2P3gK 15T3nh1lLfVYpfYTekRO1fNCxCC98fFyCyIwIRdGawwSK4CiwPxEAYa/RpYxtcCB9X0w5iIoHsh Q= X-Received: by 2002:a05:600c:4f15:b0:38c:b729:4838 with SMTP id l21-20020a05600c4f1500b0038cb7294838mr4905867wmq.132.1649780871564; Tue, 12 Apr 2022 09:27:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxFwQJtMdTDB/u8o8piRC+wUS5qF5b+LUpWOn//PSBN3fYXg6a2kN8KjW30Vy8Ka6FUFNzvg== X-Received: by 2002:a05:600c:4f15:b0:38c:b729:4838 with SMTP id l21-20020a05600c4f1500b0038cb7294838mr4905834wmq.132.1649780871306; Tue, 12 Apr 2022 09:27:51 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id g8-20020a5d4888000000b00207a49fa6a1sm7700358wrq.81.2022.04.12.09.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 09:27:51 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Geert Uytterhoeven , Neil Armstrong , Rob Herring , Andy Shevchenko , dri-devel@lists.freedesktop.org, Mark Brown , Chen-Yu Tsai , Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie Subject: [PATCH v3 3/5] drm/solomon: Add ssd130x new compatible strings and deprecate old ones. Date: Tue, 12 Apr 2022 18:27:27 +0200 Message-Id: <20220412162729.184783-4-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412162729.184783-1-javierm@redhat.com> References: <20220412162729.184783-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 --- 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 07:05:13 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 12AA7C433EF for ; Tue, 12 Apr 2022 16:28:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357632AbiDLQaw (ORCPT ); Tue, 12 Apr 2022 12:30:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357569AbiDLQaV (ORCPT ); Tue, 12 Apr 2022 12:30:21 -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 D48ED5D5ED for ; Tue, 12 Apr 2022 09:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649780875; 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=4qHKa3ZaE0n6rBQ9YSS4vax+vsIDK3+3iyrOxfgB78w=; b=Y3BQ35HJJlcHBgj8dc9v4L0wzojdSxtCTWT46M4CA8Btjothu14aLFFhadZLcQNTnKP8vW PAa/XQP87L8ZkUGkPTp0ZYy8HQrJjTYoMpqOhY5qkJUqYeRBuE9tlEPN97D9gQtvVjCkXo lRzYQnNBbDlQN+4zWuqk75MMFG/Uiio= 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-60-YwF-ivU5O7yoi6xujPKAug-1; Tue, 12 Apr 2022 12:27:54 -0400 X-MC-Unique: YwF-ivU5O7yoi6xujPKAug-1 Received: by mail-wm1-f69.google.com with SMTP id q25-20020a1ce919000000b0038ead791083so1478045wmc.6 for ; Tue, 12 Apr 2022 09:27: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=4qHKa3ZaE0n6rBQ9YSS4vax+vsIDK3+3iyrOxfgB78w=; b=WBuiPUeoDPKmLsH4ZXEnq0wXIZJMRKWFYO2saqBzDThnAG1waxMlW7geWI2VlkNusQ DTaOXEXmVi7OnwZ9SoQ15CsTitC+iUcbaABdD1UK2DZdigCe+7PtjAvpzQO16t7GBjJ9 nhgIq6R/ykto2wuUq1DsNkUmpcbshsvkyB/WX7/sk4vzLxcOq2AUY9LzzHzfqsRWArPV 7UO5L7MfyYyCX29LjPi1E/xxVIKLnEAQVOaFSPWhhG8AqpMXu62tkiYzhihVIkcL6Tbp HwZBUynpxMx/NSCP0+VJTU42zD7H4lEEQmKcypZAMC1HY7IsEJVhNGgELDSms/QV3GA6 ajwQ== X-Gm-Message-State: AOAM530tRnjPw6NkWjTOBZES1otQLT+gf4cAaVgenTbLw7KQsP2Jeghj ijCPHw9orKDsqT3CxfbfrX7Xn50PIrQvrPBGRw/7Y55gpjA752/P1FpE7NRvMcgvlgImvqYKO5+ prkSq1gZ2Fp5lCGxYpA0Z71+HeeDpMlbP3OEH4LRsCh2z6gF1FPjiGSWvl/TAaqBDk6d0xPugfv k= X-Received: by 2002:a05:600c:281:b0:38e:bc6e:5971 with SMTP id 1-20020a05600c028100b0038ebc6e5971mr4861385wmk.111.1649780872811; Tue, 12 Apr 2022 09:27:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQpDf/vKaz+nFjHprARrN0OuUEjxREzyZtfW6KM/URrKifXWZjC6q7NkGzTQjVmLslypRy6Q== X-Received: by 2002:a05:600c:281:b0:38e:bc6e:5971 with SMTP id 1-20020a05600c028100b0038ebc6e5971mr4861351wmk.111.1649780872578; Tue, 12 Apr 2022 09:27:52 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id g8-20020a5d4888000000b00207a49fa6a1sm7700358wrq.81.2022.04.12.09.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 09:27:52 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Geert Uytterhoeven , Neil Armstrong , Rob Herring , Andy Shevchenko , dri-devel@lists.freedesktop.org, Mark Brown , Chen-Yu Tsai , Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie Subject: [PATCH v3 4/5] drm/solomon: Move device info from ssd130x-i2c to the core driver Date: Tue, 12 Apr 2022 18:27:28 +0200 Message-Id: <20220412162729.184783-5-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412162729.184783-1-javierm@redhat.com> References: <20220412162729.184783-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 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 | 51 +++++---------------------- drivers/gpu/drm/solomon/ssd130x.c | 36 +++++++++++++++++-- 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..13b0713e31ad 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 */ } }; diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ss= d130x.c index a7e784518c69..c9b80ab8727b 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,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_GPL(ssd130x_variants); + 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 07:05:13 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 B72D2C433F5 for ; Tue, 12 Apr 2022 16:28:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357648AbiDLQbF (ORCPT ); Tue, 12 Apr 2022 12:31:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357558AbiDLQaV (ORCPT ); Tue, 12 Apr 2022 12:30:21 -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 D4C925D5F3 for ; Tue, 12 Apr 2022 09:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649780876; 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=fiitAF+obi/0SZz4a7WRaAtgx4DdchhRvhz/qzB643E=; b=iz2g3j/dKCHQR1egfrYrnvjEGFUkYXJaglzyx+SNiMXu5YOx40zCipj4JLc39UZnV8emOI vJmduLqpCb9P94zubTimxF2tWOpydOwOR4y/nGk7iDvie5lhtNv2ofp+RugcjQ0phRREqy w2CB3qiLuxND8QiV3BpFlHNY+8KKL+c= 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-663-ip6bh1ORMUqndWm_mHA6Hg-1; Tue, 12 Apr 2022 12:27:55 -0400 X-MC-Unique: ip6bh1ORMUqndWm_mHA6Hg-1 Received: by mail-wr1-f72.google.com with SMTP id a12-20020a5d6cac000000b002079e81d09eso1741541wra.4 for ; Tue, 12 Apr 2022 09:27: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=fiitAF+obi/0SZz4a7WRaAtgx4DdchhRvhz/qzB643E=; b=Itx2DIiyR2wFKGDHcxp+DCMMMsySZH4RQIoWtgp3rGTR6pfvJIj95BkZ5RvBdrKRgR INVu8ACm4czCN7OItIeYbVrjRb+a59VJk3Xs0VPqJXY2ciSpWD9U5OLnX4vt3GIedA2J vUeJCR2jax9nfJ8UCVgBTpSlP6ia/jFgYa7BRxL5IjSNKh2aRoQ3vvGWL8JNUUL++Mun HXnZVHZnwbkdrKui9GJw+wd7IM3muB8xkgNafs6z52dRWLeVv7o/cNX/1fHCbd96SYEf iNOXsvZFIV8tUMm6QzzLTgnNKMRVNtp/bal3z0fDJ/WUZMV90lbe/3ZoMe7ZmeQ0xJkP PgsA== X-Gm-Message-State: AOAM53203FwWcYk2WQpVOlGQLJlpp0sazmUBH3xAi0PYSNvpCstHHaGm ned5Hb1LV26uneLzRZd3FC5OB+pn7meEcKCkUYrdsH6C89LrpRUOafnibU3gXG2E/HREWjzqywm 3gruUAxia3/tUok8FivlTNUwi7WVb3ZUqTtW7GrHDJ01hFPm+x2G5xXQqRmfHVX/BU+Vciatms1 E= X-Received: by 2002:a05:6000:1566:b0:204:20d9:a5b0 with SMTP id 6-20020a056000156600b0020420d9a5b0mr31136660wrz.207.1649780874037; Tue, 12 Apr 2022 09:27:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZk0MWTuuvHqtVROhBDnTpdj23O58Hyyzt/iYLuFJGH3Qm6i0aohCcnZ+MQb5YSi1vkdpJ4w== X-Received: by 2002:a05:6000:1566:b0:204:20d9:a5b0 with SMTP id 6-20020a056000156600b0020420d9a5b0mr31136615wrz.207.1649780873653; Tue, 12 Apr 2022 09:27:53 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id g8-20020a5d4888000000b00207a49fa6a1sm7700358wrq.81.2022.04.12.09.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 09:27:53 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Geert Uytterhoeven , Neil Armstrong , Rob Herring , Andy Shevchenko , dri-devel@lists.freedesktop.org, Mark Brown , Chen-Yu Tsai , Javier Martinez Canillas , Chen-Yu Tsai , Daniel Vetter , David Airlie , Maxime Ripard , YueHaibing Subject: [PATCH v3 5/5] drm/solomon: Add SSD130x OLED displays SPI support Date: Tue, 12 Apr 2022 18:27:29 +0200 Message-Id: <20220412162729.184783-6-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412162729.184783-1-javierm@redhat.com> References: <20220412162729.184783-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 --- 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 | 177 ++++++++++++++++++++++++++ 3 files changed, 187 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..4fda420ae0a6 --- /dev/null +++ b/drivers/gpu/drm/solomon/ssd130x-spi.c @@ -0,0 +1,177 @@ +// 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"); --=20 2.35.1