From nobody Thu Dec 18 19:21:46 2025 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 93351CDB46E for ; Thu, 12 Oct 2023 06:59:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377684AbjJLG70 (ORCPT ); Thu, 12 Oct 2023 02:59:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377629AbjJLG7Q (ORCPT ); Thu, 12 Oct 2023 02:59:16 -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 ESMTPS id EEC8690 for ; Wed, 11 Oct 2023 23:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697093912; 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=Mbymuqok05VINAfw8cxu/tPwEjlcj5Oue+IDRMaC16g=; b=AG5lfWdxUaKJQkgLagvjIE+Iwi1Fot+jWShTPliF9k6F0mrOrQ5R6ae6wDldlMsX++wsp3 NBLKbLI7+ehlbyU+w+0ccK+9F8tMN0UDZkJqo5TA2xL1mWenHwUxDEvof45VJBi9cFj/9Z DtL9gpAB2rUNyN7iEmubGeRQe/Dz2pE= 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-62-pUYlyj4UMbCTG_uzpm2UVg-1; Thu, 12 Oct 2023 02:58:29 -0400 X-MC-Unique: pUYlyj4UMbCTG_uzpm2UVg-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-32172e3679bso399526f8f.2 for ; Wed, 11 Oct 2023 23:58:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697093908; x=1697698708; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mbymuqok05VINAfw8cxu/tPwEjlcj5Oue+IDRMaC16g=; b=HQc7CXquRSlyhHsYQ5SZZ9+o7MfHnpfhyagbu+jjIMfq5J5lEHZyv+ycQmhMHXN2y5 RssgACyphBYD+XGaBYI2uHvAhQqw0qDLx6dUeqWcjt6mimil5fINvMvuE3zpiEmdhMhP 8holOA9KJ9rxulYbAEiFk+WXrmvyLdXNK3252b5ltnmjrpe0otExFyU+MkwGeJZUlVd0 QAWEz8+HthbPmOTCFQz4h3zKyVlVm8HVRdacUu2c64iIfbZNlEEr3BPVxbtAeKyp7yEc 8geB9ztTEpXXeO8fNBAG+c9V9E6GGpp/7x0uUfioWFUP6smY7ZYo8P4cxA97wuhFTN29 C8FQ== X-Gm-Message-State: AOJu0YzXMe1TQVhyQSvcz6lpPjjnr14+iNEF17pSt1rwnnF1rPGDwmop IC9q0NWL5vrQyiwmBp9hgizhmgZLF7/8o8pbvGj0wMT9Xc7vQ210oIGCR73M4vBqz2bd822EpDh CZ/+mtfES+vO6qnhYajf/djCWw9AC1vxCh/GbyXZoF2/t8T6GnrtBoyDQpZuBbcMCm0P5yxrY25 CRt68vrLM= X-Received: by 2002:a05:6000:a14:b0:32c:a930:fe0e with SMTP id co20-20020a0560000a1400b0032ca930fe0emr7866711wrb.14.1697093907742; Wed, 11 Oct 2023 23:58:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyFeT+2x5WBZld6FVhLFSCPrBl+EViMXQ3LHhy0Jx56i32BtM/idfewL94KsllK10JzCqiEA== X-Received: by 2002:a05:6000:a14:b0:32c:a930:fe0e with SMTP id co20-20020a0560000a1400b0032ca930fe0emr7866681wrb.14.1697093907430; Wed, 11 Oct 2023 23:58:27 -0700 (PDT) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id r18-20020adfe692000000b0031912c0ffebsm17460772wrm.23.2023.10.11.23.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 23:58:26 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Conor Dooley , Peter Robinson , Rob Herring , Maxime Ripard , Geert Uytterhoeven , Javier Martinez Canillas , Geert Uytterhoeven , Daniel Vetter , David Airlie , Maarten Lankhorst , dri-devel@lists.freedesktop.org Subject: [PATCH v2 1/6] drm/ssd130x: Replace .page_height field in device info with a constant Date: Thu, 12 Oct 2023 08:58:10 +0200 Message-ID: <20231012065822.1007930-2-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012065822.1007930-1-javierm@redhat.com> References: <20231012065822.1007930-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" This deemed useful to avoid hardcoding a page height and allow to support other Solomon controller families, but dividing the screen in pages seems to be something that is specific to the SSD130x chip family. For example, SSD132x chip family divides the screen in segments (columns) and common outputs (rows), so the concept of screen pages does not exist for the SSD132x family. Let's drop this field from the device info struct and just use a constant SSD130X_PAGE_HEIGHT macro to define the page height. While being there, replace hardcoded 8 values in places where it is used as the page height. Signed-off-by: Javier Martinez Canillas Reviewed-by: Geert Uytterhoeven --- Changes in v2: - Add Geert Uytterhoeven's Reviewed-by tag to patch #1. drivers/gpu/drm/solomon/ssd130x.c | 37 +++++++++++++++---------------- drivers/gpu/drm/solomon/ssd130x.h | 1 - 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ss= d130x.c index 6dcf3e041113..2852cddb098b 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/drivers/gpu/drm/solomon/ssd130x.c @@ -42,6 +42,8 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 =20 +#define SSD130X_PAGE_HEIGHT 8 + #define SSD130X_PAGE_COL_START_LOW 0x00 #define SSD130X_PAGE_COL_START_HIGH 0x10 #define SSD130X_SET_ADDRESS_MODE 0x20 @@ -102,7 +104,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .default_width =3D 132, .default_height =3D 64, .page_mode_only =3D 1, - .page_height =3D 8, }, [SSD1305_ID] =3D { .default_vcomh =3D 0x34, @@ -110,7 +111,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .default_dclk_frq =3D 7, .default_width =3D 132, .default_height =3D 64, - .page_height =3D 8, }, [SSD1306_ID] =3D { .default_vcomh =3D 0x20, @@ -119,7 +119,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .need_chargepump =3D 1, .default_width =3D 128, .default_height =3D 64, - .page_height =3D 8, }, [SSD1307_ID] =3D { .default_vcomh =3D 0x20, @@ -128,7 +127,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .need_pwm =3D 1, .default_width =3D 128, .default_height =3D 39, - .page_height =3D 8, }, [SSD1309_ID] =3D { .default_vcomh =3D 0x34, @@ -136,7 +134,6 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .default_dclk_frq =3D 10, .default_width =3D 128, .default_height =3D 64, - .page_height =3D 8, } }; EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X); @@ -465,13 +462,13 @@ static int ssd130x_update_rect(struct ssd130x_device = *ssd130x, unsigned int width =3D drm_rect_width(rect); unsigned int height =3D drm_rect_height(rect); unsigned int line_length =3D DIV_ROUND_UP(width, 8); - unsigned int page_height =3D ssd130x->device_info->page_height; + unsigned int page_height =3D SSD130X_PAGE_HEIGHT; unsigned int pages =3D DIV_ROUND_UP(height, page_height); struct drm_device *drm =3D &ssd130x->drm; u32 array_idx =3D 0; int ret, i, j, k; =20 - drm_WARN_ONCE(drm, y % 8 !=3D 0, "y must be aligned to screen page\n"); + drm_WARN_ONCE(drm, y % page_height !=3D 0, "y must be aligned to screen p= age\n"); =20 /* * The screen is divided in pages, each having a height of 8 @@ -503,27 +500,32 @@ static int ssd130x_update_rect(struct ssd130x_device = *ssd130x, */ =20 if (!ssd130x->page_address_mode) { + u8 page_start; + /* Set address range for horizontal addressing mode */ ret =3D ssd130x_set_col_range(ssd130x, ssd130x->col_offset + x, width); if (ret < 0) return ret; =20 - ret =3D ssd130x_set_page_range(ssd130x, ssd130x->page_offset + y / 8, pa= ges); + page_start =3D ssd130x->page_offset + y / page_height; + ret =3D ssd130x_set_page_range(ssd130x, page_start, pages); if (ret < 0) return ret; } =20 for (i =3D 0; i < pages; i++) { - int m =3D 8; + int m =3D page_height; =20 /* Last page may be partial */ - if (8 * (y / 8 + i + 1) > ssd130x->height) - m =3D ssd130x->height % 8; + if (page_height * (y / page_height + i + 1) > ssd130x->height) + m =3D ssd130x->height % page_height; + for (j =3D 0; j < width; j++) { u8 data =3D 0; =20 for (k =3D 0; k < m; k++) { - u8 byte =3D buf[(8 * i + k) * line_length + j / 8]; + u32 idx =3D (page_height * i + k) * line_length + j / 8; + u8 byte =3D buf[idx]; u8 bit =3D (byte >> (j % 8)) & 1; =20 data |=3D bit << k; @@ -559,8 +561,7 @@ static int ssd130x_update_rect(struct ssd130x_device *s= sd130x, =20 static void ssd130x_clear_screen(struct ssd130x_device *ssd130x, u8 *data_= array) { - unsigned int page_height =3D ssd130x->device_info->page_height; - unsigned int pages =3D DIV_ROUND_UP(ssd130x->height, page_height); + unsigned int pages =3D DIV_ROUND_UP(ssd130x->height, SSD130X_PAGE_HEIGHT); unsigned int width =3D ssd130x->width; int ret, i; =20 @@ -605,14 +606,13 @@ static int ssd130x_fb_blit_rect(struct drm_framebuffe= r *fb, u8 *buf, u8 *data_array) { struct ssd130x_device *ssd130x =3D drm_to_ssd130x(fb->dev); - unsigned int page_height =3D ssd130x->device_info->page_height; struct iosys_map dst; unsigned int dst_pitch; int ret =3D 0; =20 /* Align y to display page boundaries */ - rect->y1 =3D round_down(rect->y1, page_height); - rect->y2 =3D min_t(unsigned int, round_up(rect->y2, page_height), ssd130x= ->height); + rect->y1 =3D round_down(rect->y1, SSD130X_PAGE_HEIGHT); + rect->y2 =3D min_t(unsigned int, round_up(rect->y2, SSD130X_PAGE_HEIGHT),= ssd130x->height); =20 dst_pitch =3D DIV_ROUND_UP(drm_rect_width(rect), 8); =20 @@ -814,8 +814,7 @@ static int ssd130x_crtc_atomic_check(struct drm_crtc *c= rtc, struct ssd130x_device *ssd130x =3D drm_to_ssd130x(drm); struct drm_crtc_state *crtc_state =3D drm_atomic_get_new_crtc_state(state= , crtc); struct ssd130x_crtc_state *ssd130x_state =3D to_ssd130x_crtc_state(crtc_s= tate); - unsigned int page_height =3D ssd130x->device_info->page_height; - unsigned int pages =3D DIV_ROUND_UP(ssd130x->height, page_height); + unsigned int pages =3D DIV_ROUND_UP(ssd130x->height, SSD130X_PAGE_HEIGHT); int ret; =20 ret =3D drm_crtc_helper_atomic_check(crtc, state); diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ss= d130x.h index aa39b13615eb..bbe374453605 100644 --- a/drivers/gpu/drm/solomon/ssd130x.h +++ b/drivers/gpu/drm/solomon/ssd130x.h @@ -39,7 +39,6 @@ struct ssd130x_deviceinfo { u32 default_dclk_frq; u32 default_width; u32 default_height; - u32 page_height; bool need_pwm; bool need_chargepump; bool page_mode_only; --=20 2.41.0 From nobody Thu Dec 18 19:21:46 2025 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 05AEDCDB46E for ; Thu, 12 Oct 2023 06:59:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377887AbjJLG7k (ORCPT ); Thu, 12 Oct 2023 02:59:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377697AbjJLG7X (ORCPT ); Thu, 12 Oct 2023 02:59:23 -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 ESMTPS id 2B3EDB8 for ; Wed, 11 Oct 2023 23:58:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697093912; 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=VPTiBn27phzNUMwFu1grsxXoxNWjXfYdrR6MN2Opoxg=; b=C8X+Usc5qMRL4P04zbrCa7uUpjEQtP1izFRhz/uT6xw6u2WVxHlaEVFrKfrt95VgiDsaUp c0zTgH9NQm05+g0hfy25HWPc9rcv4jIrHkQ1/2256yejCtmNSlB9yoJicx/jmgbCUbSc03 E40rBWWcRX22IW5u4uGaPI7siWhKyP4= 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-355-lTG6Grs2P7SaQEaitBFwqg-1; Thu, 12 Oct 2023 02:58:30 -0400 X-MC-Unique: lTG6Grs2P7SaQEaitBFwqg-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4059475c174so5493175e9.0 for ; Wed, 11 Oct 2023 23:58:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697093909; x=1697698709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VPTiBn27phzNUMwFu1grsxXoxNWjXfYdrR6MN2Opoxg=; b=RM/Kp3rxiivjuT2PLizcaD+qauOfzYFk4lY9ZrYND0QCmFa4JInA5qQqS/9YditMjn RT8YwBUWo3hIvF91fobibaCR6hK+hQfjl+whsf/nzhDN4Fd3q9NGKUNx0dSD8yxKf7ss 2FII6lVXgpGX+CnZxK9RKir4oJ9OUZqD8t4/L4VuQEeACOUzMxeKPr7yp5ochqDgZOw3 3etoJZSVMn3Y/kg2O0YX3nLLNLTCS0r7sJBSUWC7ModW2PwhRowbA7s0E37cSSGJRXKT qWlkRpLB3gLKVRA6El71Nu0THyyIPSIb2H0qspPNvbtGb2haH4/IV2IfDkbVDPYVzWgy RsKw== X-Gm-Message-State: AOJu0YyBL6k7cCZ1Ivjg5AcsTEHkkzIScLiAkzsRWMTBtXG6PvYJ8o2m jymc8jgmSEOfIsBTjO5a494WBnausp/fUdeSx/l2CY4Xa4Bv6dWHn3FOL/W31F6KkF2Wjr8V0be LJjjV017tZiSjaM04o3m7+Dipi1tuH0GLP2V6ju8mnE7XkFv0M6Z8rah9+yIti3sjhv5dchUppL 9uz0edS70= X-Received: by 2002:a05:600c:3652:b0:3fb:a0fc:1ba1 with SMTP id y18-20020a05600c365200b003fba0fc1ba1mr21622393wmq.35.1697093909227; Wed, 11 Oct 2023 23:58:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH2VzFJ33q86Q2iUjuYjhhol7ahstCiajrALxDA5ZWPV2Y2N3UvpQDCLZl7eWt/0A+ksBJAlw== X-Received: by 2002:a05:600c:3652:b0:3fb:a0fc:1ba1 with SMTP id y18-20020a05600c365200b003fba0fc1ba1mr21622366wmq.35.1697093908792; Wed, 11 Oct 2023 23:58:28 -0700 (PDT) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id az17-20020a05600c601100b003fef5e76f2csm2016567wmb.0.2023.10.11.23.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 23:58:28 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Conor Dooley , Peter Robinson , Rob Herring , Maxime Ripard , Geert Uytterhoeven , Javier Martinez Canillas , Daniel Vetter , David Airlie , Maarten Lankhorst , dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/6] drm/ssd130x: Add a per controller family functions table Date: Thu, 12 Oct 2023 08:58:11 +0200 Message-ID: <20231012065822.1007930-3-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012065822.1007930-1-javierm@redhat.com> References: <20231012065822.1007930-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" To allow the driver to decouple the common logic in the function callbacks from the behaviour that is specific of a given Solomon controller family. For this, include a chip family to the device info and add fields to the driver-private device struct, to store the hardware buffer maximum size, the intermediate buffer maximum size and pixel format, and a set of per chip family function handlers. While doing this change, also use drm_format_info_min_pitch() to calculate the dest_pitch. This avoids to assume a 1 bpp and instead the pixel format info for the intermediate buffer is used. Signed-off-by: Javier Martinez Canillas --- Changes in v2: - Squash patch that uses drm_format_info_min_pitch() to calculate dest_pitch with the following patch (Geert Uytterhoeven). - Store ssd13xx_family_funcs[SSD130X_FAMILY] in struct ssd130x_deviceinfo (Geert Uytterhoeven). - Don't mix switch (family_id) and ssd13xx_funcs[family_id] (Geert Uytterho= even). - Replace switch (family_id) by an .set_buffer_sizes (Geert Uytterhoeven). - Move the rect alignment to a per chip family function (Geert Uytterhoeven= ). drivers/gpu/drm/solomon/ssd130x-i2c.c | 1 + drivers/gpu/drm/solomon/ssd130x-spi.c | 2 + drivers/gpu/drm/solomon/ssd130x.c | 95 ++++++++++++++++++++------- drivers/gpu/drm/solomon/ssd130x.h | 24 +++++++ 4 files changed, 99 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomo= n/ssd130x-i2c.c index b4eb2d64bf6e..8f89b89d553f 100644 --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c @@ -54,6 +54,7 @@ static void ssd130x_i2c_shutdown(struct i2c_client *clien= t) } =20 static const struct of_device_id ssd130x_of_match[] =3D { + /* ssd130x family */ { .compatible =3D "sinowealth,sh1106", .data =3D &ssd130x_variants[SH1106_ID], diff --git a/drivers/gpu/drm/solomon/ssd130x-spi.c b/drivers/gpu/drm/solomo= n/ssd130x-spi.c index 19ab4942cb33..257819bccbc8 100644 --- a/drivers/gpu/drm/solomon/ssd130x-spi.c +++ b/drivers/gpu/drm/solomon/ssd130x-spi.c @@ -108,6 +108,7 @@ static void ssd130x_spi_shutdown(struct spi_device *spi) } =20 static const struct of_device_id ssd130x_of_match[] =3D { + /* ssd130x family */ { .compatible =3D "sinowealth,sh1106", .data =3D &ssd130x_variants[SH1106_ID], @@ -142,6 +143,7 @@ MODULE_DEVICE_TABLE(of, ssd130x_of_match); * not be needed for this driver to match the registered SPI devices. */ static const struct spi_device_id ssd130x_spi_table[] =3D { + /* ssd130x family */ { "sh1106", SH1106_ID }, { "ssd1305", SSD1305_ID }, { "ssd1306", SSD1306_ID }, diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ss= d130x.c index 2852cddb098b..08885c33e1a6 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/drivers/gpu/drm/solomon/ssd130x.c @@ -96,6 +96,12 @@ =20 #define MAX_CONTRAST 255 =20 +enum ssd130x_family_ids { + SSD130X_FAMILY +}; + +static const struct ssd130x_funcs ssd130x_family_funcs[]; + const struct ssd130x_deviceinfo ssd130x_variants[] =3D { [SH1106_ID] =3D { .default_vcomh =3D 0x40, @@ -104,6 +110,7 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .default_width =3D 132, .default_height =3D 64, .page_mode_only =3D 1, + .funcs =3D &ssd130x_family_funcs[SSD130X_FAMILY], }, [SSD1305_ID] =3D { .default_vcomh =3D 0x34, @@ -111,6 +118,7 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .default_dclk_frq =3D 7, .default_width =3D 132, .default_height =3D 64, + .funcs =3D &ssd130x_family_funcs[SSD130X_FAMILY], }, [SSD1306_ID] =3D { .default_vcomh =3D 0x20, @@ -119,6 +127,7 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .need_chargepump =3D 1, .default_width =3D 128, .default_height =3D 64, + .funcs =3D &ssd130x_family_funcs[SSD130X_FAMILY], }, [SSD1307_ID] =3D { .default_vcomh =3D 0x20, @@ -127,6 +136,7 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .need_pwm =3D 1, .default_width =3D 128, .default_height =3D 39, + .funcs =3D &ssd130x_family_funcs[SSD130X_FAMILY], }, [SSD1309_ID] =3D { .default_vcomh =3D 0x34, @@ -134,6 +144,7 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D { .default_dclk_frq =3D 10, .default_width =3D 128, .default_height =3D 64, + .funcs =3D &ssd130x_family_funcs[SSD130X_FAMILY], } }; EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X); @@ -453,6 +464,33 @@ static int ssd130x_init(struct ssd130x_device *ssd130x) SSD130X_SET_ADDRESS_MODE_HORIZONTAL); } =20 +static int ssd130x_set_buffer_sizes(struct ssd130x_device *ssd130x) +{ + unsigned int buffer_pitch; + unsigned int pages =3D DIV_ROUND_UP(ssd130x->height, SSD130X_PAGE_HEIGHT); + + ssd130x->data_array_size =3D ssd130x->width * pages; + + ssd130x->buffer_fi =3D drm_format_info(DRM_FORMAT_R1); + + if (!ssd130x->buffer_fi) + return -EINVAL; + + buffer_pitch =3D drm_format_info_min_pitch(ssd130x->buffer_fi, 0, ssd130x= ->width); + ssd130x->buffer_size =3D buffer_pitch * ssd130x->height; + + return 0; +} + +static void ssd130x_align_rect(struct ssd130x_device *ssd130x, + struct drm_rect *rect) +{ + /* Align y to display page boundaries */ + rect->y1 =3D round_down(rect->y1, SSD130X_PAGE_HEIGHT); + rect->y2 =3D min_t(unsigned int, round_up(rect->y2, SSD130X_PAGE_HEIGHT), + ssd130x->height); +} + static int ssd130x_update_rect(struct ssd130x_device *ssd130x, struct drm_rect *rect, u8 *buf, u8 *data_array) @@ -600,34 +638,43 @@ static void ssd130x_clear_screen(struct ssd130x_devic= e *ssd130x, u8 *data_array) } } =20 +static const struct ssd130x_funcs ssd130x_family_funcs[] =3D { + [SSD130X_FAMILY] =3D { + .init =3D ssd130x_init, + .set_buffer_sizes =3D ssd130x_set_buffer_sizes, + .align_rect =3D ssd130x_align_rect, + .update_rect =3D ssd130x_update_rect, + .clear_screen =3D ssd130x_clear_screen, + .fmt_convert =3D drm_fb_xrgb8888_to_mono, + }, +}; + static int ssd130x_fb_blit_rect(struct drm_framebuffer *fb, const struct iosys_map *vmap, - struct drm_rect *rect, - u8 *buf, u8 *data_array) + struct drm_rect *rect, u8 *buf, + const struct drm_format_info *fi, + u8 *data_array) { struct ssd130x_device *ssd130x =3D drm_to_ssd130x(fb->dev); + const struct ssd130x_funcs *ssd130x_funcs =3D ssd130x->device_info->funcs; struct iosys_map dst; unsigned int dst_pitch; int ret =3D 0; =20 - /* Align y to display page boundaries */ - rect->y1 =3D round_down(rect->y1, SSD130X_PAGE_HEIGHT); - rect->y2 =3D min_t(unsigned int, round_up(rect->y2, SSD130X_PAGE_HEIGHT),= ssd130x->height); + ssd130x_funcs->align_rect(ssd130x, rect); =20 - dst_pitch =3D DIV_ROUND_UP(drm_rect_width(rect), 8); + dst_pitch =3D drm_format_info_min_pitch(fi, 0, drm_rect_width(rect)); =20 ret =3D drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE); if (ret) return ret; =20 iosys_map_set_vaddr(&dst, buf); - drm_fb_xrgb8888_to_mono(&dst, &dst_pitch, vmap, fb, rect); + ssd130x_funcs->fmt_convert(&dst, &dst_pitch, vmap, fb, rect); =20 drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE); =20 - ssd130x_update_rect(ssd130x, rect, buf, data_array); - - return ret; + return ssd130x_funcs->update_rect(ssd130x, rect, buf, data_array); } =20 static int ssd130x_primary_plane_atomic_check(struct drm_plane *plane, @@ -639,8 +686,6 @@ static int ssd130x_primary_plane_atomic_check(struct dr= m_plane *plane, struct ssd130x_plane_state *ssd130x_state =3D to_ssd130x_plane_state(plan= e_state); struct drm_crtc *crtc =3D plane_state->crtc; struct drm_crtc_state *crtc_state; - const struct drm_format_info *fi; - unsigned int pitch; int ret; =20 if (!crtc) @@ -654,13 +699,7 @@ static int ssd130x_primary_plane_atomic_check(struct d= rm_plane *plane, if (ret) return ret; =20 - fi =3D drm_format_info(DRM_FORMAT_R1); - if (!fi) - return -EINVAL; - - pitch =3D drm_format_info_min_pitch(fi, 0, ssd130x->width); - - ssd130x_state->buffer =3D kcalloc(pitch, ssd130x->height, GFP_KERNEL); + ssd130x_state->buffer =3D kzalloc(ssd130x->buffer_size, GFP_KERNEL); if (!ssd130x_state->buffer) return -ENOMEM; =20 @@ -679,6 +718,7 @@ static void ssd130x_primary_plane_atomic_update(struct = drm_plane *plane, struct drm_framebuffer *fb =3D plane_state->fb; struct drm_atomic_helper_damage_iter iter; struct drm_device *drm =3D plane->dev; + struct ssd130x_device *ssd130x =3D drm_to_ssd130x(drm); struct drm_rect dst_clip; struct drm_rect damage; int idx; @@ -695,6 +735,7 @@ static void ssd130x_primary_plane_atomic_update(struct = drm_plane *plane, =20 ssd130x_fb_blit_rect(fb, &shadow_plane_state->data[0], &dst_clip, ssd130x_plane_state->buffer, + ssd130x->buffer_fi, ssd130x_crtc_state->data_array); } =20 @@ -706,6 +747,7 @@ static void ssd130x_primary_plane_atomic_disable(struct= drm_plane *plane, { struct drm_device *drm =3D plane->dev; struct ssd130x_device *ssd130x =3D drm_to_ssd130x(drm); + const struct ssd130x_funcs *ssd130x_funcs =3D ssd130x->device_info->funcs; struct drm_plane_state *plane_state =3D drm_atomic_get_new_plane_state(st= ate, plane); struct drm_crtc_state *crtc_state; struct ssd130x_crtc_state *ssd130x_crtc_state; @@ -720,7 +762,7 @@ static void ssd130x_primary_plane_atomic_disable(struct= drm_plane *plane, if (!drm_dev_enter(drm, &idx)) return; =20 - ssd130x_clear_screen(ssd130x, ssd130x_crtc_state->data_array); + ssd130x_funcs->clear_screen(ssd130x, ssd130x_crtc_state->data_array); =20 drm_dev_exit(idx); } @@ -814,14 +856,13 @@ static int ssd130x_crtc_atomic_check(struct drm_crtc = *crtc, struct ssd130x_device *ssd130x =3D drm_to_ssd130x(drm); struct drm_crtc_state *crtc_state =3D drm_atomic_get_new_crtc_state(state= , crtc); struct ssd130x_crtc_state *ssd130x_state =3D to_ssd130x_crtc_state(crtc_s= tate); - unsigned int pages =3D DIV_ROUND_UP(ssd130x->height, SSD130X_PAGE_HEIGHT); int ret; =20 ret =3D drm_crtc_helper_atomic_check(crtc, state); if (ret) return ret; =20 - ssd130x_state->data_array =3D kmalloc(ssd130x->width * pages, GFP_KERNEL); + ssd130x_state->data_array =3D kmalloc(ssd130x->data_array_size, GFP_KERNE= L); if (!ssd130x_state->data_array) return -ENOMEM; =20 @@ -899,13 +940,14 @@ static void ssd130x_encoder_atomic_enable(struct drm_= encoder *encoder, { struct drm_device *drm =3D encoder->dev; struct ssd130x_device *ssd130x =3D drm_to_ssd130x(drm); + const struct ssd130x_funcs *ssd130x_funcs =3D ssd130x->device_info->funcs; int ret; =20 ret =3D ssd130x_power_on(ssd130x); if (ret) return; =20 - ret =3D ssd130x_init(ssd130x); + ret =3D ssd130x_funcs->init(ssd130x); if (ret) goto power_off; =20 @@ -1191,6 +1233,7 @@ static int ssd130x_get_resources(struct ssd130x_devic= e *ssd130x) =20 struct ssd130x_device *ssd130x_probe(struct device *dev, struct regmap *re= gmap) { + const struct ssd130x_funcs *ssd130x_funcs; struct ssd130x_device *ssd130x; struct backlight_device *bl; struct drm_device *drm; @@ -1213,6 +1256,12 @@ struct ssd130x_device *ssd130x_probe(struct device *= dev, struct regmap *regmap) =20 ssd130x_parse_properties(ssd130x); =20 + ssd130x_funcs =3D ssd130x->device_info->funcs; + + ret =3D ssd130x_funcs->set_buffer_sizes(ssd130x); + if (ret) + return ERR_PTR(ret); + ret =3D ssd130x_get_resources(ssd130x); if (ret) return ERR_PTR(ret); diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ss= d130x.h index bbe374453605..5af251676587 100644 --- a/drivers/gpu/drm/solomon/ssd130x.h +++ b/drivers/gpu/drm/solomon/ssd130x.h @@ -20,11 +20,13 @@ #include =20 #include +#include =20 #define SSD130X_DATA 0x40 #define SSD130X_COMMAND 0x80 =20 enum ssd130x_variants { + /* ssd130x family */ SH1106_ID, SSD1305_ID, SSD1306_ID, @@ -42,6 +44,9 @@ struct ssd130x_deviceinfo { bool need_pwm; bool need_chargepump; bool page_mode_only; + + /* Chip family specific operations */ + const struct ssd130x_funcs *funcs; }; =20 struct ssd130x_device { @@ -76,6 +81,12 @@ struct ssd130x_device { u32 col_offset; u32 prechargep1; u32 prechargep2; + /* HW format buffer size */ + u32 data_array_size; + /* Intermediate buffer size */ + u32 buffer_size; + /* Pixel format info for the intermediate buffer */ + const struct drm_format_info *buffer_fi; =20 struct backlight_device *bl_dev; struct pwm_device *pwm; @@ -90,6 +101,19 @@ struct ssd130x_device { u8 page_end; }; =20 +struct ssd130x_funcs { + int (*init)(struct ssd130x_device *ssd130x); + int (*set_buffer_sizes)(struct ssd130x_device *ssd130x); + void (*align_rect)(struct ssd130x_device *ssd130x, struct drm_rect *rect); + int (*update_rect)(struct ssd130x_device *ssd130x, struct drm_rect *rect, + u8 *buf, u8 *data_array); + void (*clear_screen)(struct ssd130x_device *ssd130x, + u8 *data_array); + void (*fmt_convert)(struct iosys_map *dst, const unsigned int *dst_pitch, + const struct iosys_map *src, const struct drm_framebuffer *fb, + const struct drm_rect *clip); +}; + extern const struct ssd130x_deviceinfo ssd130x_variants[]; =20 struct ssd130x_device *ssd130x_probe(struct device *dev, struct regmap *re= gmap); --=20 2.41.0 From nobody Thu Dec 18 19:21:46 2025 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 1FE10CDB46E for ; Thu, 12 Oct 2023 06:59:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377669AbjJLG7b (ORCPT ); Thu, 12 Oct 2023 02:59:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377633AbjJLG7Q (ORCPT ); Thu, 12 Oct 2023 02:59:16 -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 ESMTPS id 070CED7 for ; Wed, 11 Oct 2023 23:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697093916; 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=pbsERzeT3jnb5o5YFZrdLE3LWYsb5XXvHLDGk8NAZlo=; b=VK2+7NRsGBx/+gqdrTMm7tTepxI6abJS4MGnQ1FhYTZUu4EYAmuj0yRaHcHuARd/fqRmHS BCInq7bvTySWcXDt4E2PCsXHmyBxXn49gh01McVhL0Zj1WTQNrdi02ZZzSJRfgrGzfSJ5D DwmFRYj7O+1hEdFhTF4oO+A/Fh9ojAA= 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-246-iuHLaqC0PJiqjxvFbSfDKg-1; Thu, 12 Oct 2023 02:58:32 -0400 X-MC-Unique: iuHLaqC0PJiqjxvFbSfDKg-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4066e59840eso4360145e9.1 for ; Wed, 11 Oct 2023 23:58:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697093910; x=1697698710; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pbsERzeT3jnb5o5YFZrdLE3LWYsb5XXvHLDGk8NAZlo=; b=QMGsXjgtCVqF+mBsx52cxM3/X/b0K9GpVZQox88bO+T4jgYj4LPyhW/WUfA0yqpwXA 0gXGQ4hbWCwI7hm2lXtq7JpaPKShfY5D1kMo2/GloZTbKMX/DXRT4shL35q51T+foaSf Ql21jhGIYBV2RNe4G4C4YIrSr6nSpK9ZiAsvzx9mzRO9/4+0K1q1hlUSDccpLjL6FQl4 8tj1Xz72UfDVP8G4+LklMgm4+JsCx1ec7MV5ptBTMZsN1nt8aJPMPXHptq21Tgr1o4Qh qifXNksJmqZMie2H3X4KHueogV4QKmczsv7UDWnfFlMeLk1g/muxmse23EhEEGINrO// ghhw== X-Gm-Message-State: AOJu0Yw/d9o3eWxseRrfstcHoKEcFCn73aNu7hRPSDtoqK8CXzX/Jfgs 8/WkHd/1VojYEp1VzhgbAA0hGTaBTlU7MIgZlId4LKlJ4Iz6Z9Oi24SpcUO2j6jDSkfO/DbdwB1 X+4R2kguynMvMHLNGFFhKtbtWa9ZtlzpTVpkSmY7GSLYV+DLcIJPpSSkP+9CkV1CnGMP2HUkiOq ofM8hRg+A= X-Received: by 2002:a05:600c:2a4e:b0:405:7b92:4558 with SMTP id x14-20020a05600c2a4e00b004057b924558mr20487267wme.38.1697093910733; Wed, 11 Oct 2023 23:58:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgJzbQNEzAB6ZdCvzsNzh6fsLq1aZMB/U2BnI6StTZOdjov24IXGVQE30teq0qC1byjrf3hQ== X-Received: by 2002:a05:600c:2a4e:b0:405:7b92:4558 with SMTP id x14-20020a05600c2a4e00b004057b924558mr20487243wme.38.1697093910332; Wed, 11 Oct 2023 23:58:30 -0700 (PDT) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id a4-20020a05600c224400b003fe2b081661sm21102290wmm.30.2023.10.11.23.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 23:58:29 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Conor Dooley , Peter Robinson , Rob Herring , Maxime Ripard , Geert Uytterhoeven , Javier Martinez Canillas , Daniel Vetter , David Airlie , Maarten Lankhorst , dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/6] drm/ssd130x: Rename commands that are shared across chip families Date: Thu, 12 Oct 2023 08:58:12 +0200 Message-ID: <20231012065822.1007930-4-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012065822.1007930-1-javierm@redhat.com> References: <20231012065822.1007930-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" There are some commands that are shared between the SSD130x and SSD132x controller families, define these as a common SSD13XX set of commands. Signed-off-by: Javier Martinez Canillas --- (no changes since v1) drivers/gpu/drm/solomon/ssd130x-spi.c | 4 +-- drivers/gpu/drm/solomon/ssd130x.c | 47 +++++++++++++++------------ drivers/gpu/drm/solomon/ssd130x.h | 4 +-- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/solomon/ssd130x-spi.c b/drivers/gpu/drm/solomo= n/ssd130x-spi.c index 257819bccbc8..89989da705d7 100644 --- a/drivers/gpu/drm/solomon/ssd130x-spi.c +++ b/drivers/gpu/drm/solomon/ssd130x-spi.c @@ -34,10 +34,10 @@ static int ssd130x_spi_write(void *context, const void = *data, size_t count) struct spi_device *spi =3D t->spi; const u8 *reg =3D data; =20 - if (*reg =3D=3D SSD130X_COMMAND) + if (*reg =3D=3D SSD13XX_COMMAND) gpiod_set_value_cansleep(t->dc, 0); =20 - if (*reg =3D=3D SSD130X_DATA) + if (*reg =3D=3D SSD13XX_DATA) gpiod_set_value_cansleep(t->dc, 1); =20 /* Remove control byte since is not used in a 4-wire SPI interface */ diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ss= d130x.c index 08885c33e1a6..4bdc06d6aed4 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/drivers/gpu/drm/solomon/ssd130x.c @@ -44,18 +44,24 @@ =20 #define SSD130X_PAGE_HEIGHT 8 =20 +/* ssd13xx commands */ +#define SSD13XX_CONTRAST 0x81 +#define SSD13XX_SET_SEG_REMAP 0xa0 +#define SSD13XX_SET_MULTIPLEX_RATIO 0xa8 +#define SSD13XX_DISPLAY_OFF 0xae +#define SSD13XX_DISPLAY_ON 0xaf + +#define SSD13XX_SET_SEG_REMAP_MASK GENMASK(0, 0) +#define SSD13XX_SET_SEG_REMAP_SET(val) FIELD_PREP(SSD13XX_SET_SEG_REMAP_M= ASK, (val)) + +/* ssd130x commands */ #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 -#define SSD130X_CONTRAST 0x81 #define SSD130X_SET_LOOKUP_TABLE 0x91 #define SSD130X_CHARGE_PUMP 0x8d -#define SSD130X_SET_SEG_REMAP 0xa0 -#define SSD130X_DISPLAY_OFF 0xae -#define SSD130X_SET_MULTIPLEX_RATIO 0xa8 -#define SSD130X_DISPLAY_ON 0xaf #define SSD130X_START_PAGE_ADDRESS 0xb0 #define SSD130X_SET_COM_SCAN_DIR 0xc0 #define SSD130X_SET_DISPLAY_OFFSET 0xd3 @@ -65,13 +71,12 @@ #define SSD130X_SET_COM_PINS_CONFIG 0xda #define SSD130X_SET_VCOMH 0xdb =20 +/* ssd130x commands accessors */ #define SSD130X_PAGE_COL_START_MASK GENMASK(3, 0) #define SSD130X_PAGE_COL_START_HIGH_SET(val) FIELD_PREP(SSD130X_PAGE_COL_S= TART_MASK, (val) >> 4) #define SSD130X_PAGE_COL_START_LOW_SET(val) FIELD_PREP(SSD130X_PAGE_COL_ST= ART_MASK, (val)) #define SSD130X_START_PAGE_ADDRESS_MASK GENMASK(2, 0) #define SSD130X_START_PAGE_ADDRESS_SET(val) FIELD_PREP(SSD130X_START_PAGE_= ADDRESS_MASK, (val)) -#define SSD130X_SET_SEG_REMAP_MASK GENMASK(0, 0) -#define SSD130X_SET_SEG_REMAP_SET(val) FIELD_PREP(SSD130X_SET_SEG_REMAP_M= ASK, (val)) #define SSD130X_SET_COM_SCAN_DIR_MASK GENMASK(3, 3) #define SSD130X_SET_COM_SCAN_DIR_SET(val) FIELD_PREP(SSD130X_SET_COM_SCAN_= DIR_MASK, (val)) #define SSD130X_SET_CLOCK_DIV_MASK GENMASK(3, 0) @@ -177,20 +182,20 @@ static inline struct ssd130x_device *drm_to_ssd130x(s= truct drm_device *drm) } =20 /* - * Helper to write data (SSD130X_DATA) to the device. + * Helper to write data (SSD13XX_DATA) to the device. */ static int ssd130x_write_data(struct ssd130x_device *ssd130x, u8 *values, = int count) { - return regmap_bulk_write(ssd130x->regmap, SSD130X_DATA, values, count); + return regmap_bulk_write(ssd130x->regmap, SSD13XX_DATA, values, count); } =20 /* - * Helper to write command (SSD130X_COMMAND). The fist variadic argument + * Helper to write command (SSD13XX_COMMAND). The fist variadic argument * is the command to write and the following are the command options. * - * Note that the ssd130x protocol requires each command and option to be - * written as a SSD130X_COMMAND device register value. That is why a call - * to regmap_write(..., SSD130X_COMMAND, ...) is done for each argument. + * Note that the ssd13xx protocol requires each command and option to be + * written as a SSD13XX_COMMAND device register value. That is why a call + * to regmap_write(..., SSD13XX_COMMAND, ...) is done for each argument. */ static int ssd130x_write_cmd(struct ssd130x_device *ssd130x, int count, /* u8 cmd, u8 option, ... */...) @@ -203,7 +208,7 @@ static int ssd130x_write_cmd(struct ssd130x_device *ssd= 130x, int count, =20 do { value =3D va_arg(ap, int); - ret =3D regmap_write(ssd130x->regmap, SSD130X_COMMAND, value); + ret =3D regmap_write(ssd130x->regmap, SSD13XX_COMMAND, value); if (ret) goto out_end; } while (--count); @@ -347,13 +352,13 @@ static int ssd130x_init(struct ssd130x_device *ssd130= x) int ret; =20 /* Set initial contrast */ - ret =3D ssd130x_write_cmd(ssd130x, 2, SSD130X_CONTRAST, ssd130x->contrast= ); + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD13XX_CONTRAST, ssd130x->contrast= ); if (ret < 0) return ret; =20 /* Set segment re-map */ - seg_remap =3D (SSD130X_SET_SEG_REMAP | - SSD130X_SET_SEG_REMAP_SET(ssd130x->seg_remap)); + seg_remap =3D (SSD13XX_SET_SEG_REMAP | + SSD13XX_SET_SEG_REMAP_SET(ssd130x->seg_remap)); ret =3D ssd130x_write_cmd(ssd130x, 1, seg_remap); if (ret < 0) return ret; @@ -366,7 +371,7 @@ static int ssd130x_init(struct ssd130x_device *ssd130x) return ret; =20 /* Set multiplex ratio value */ - ret =3D ssd130x_write_cmd(ssd130x, 2, SSD130X_SET_MULTIPLEX_RATIO, ssd130= x->height - 1); + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD13XX_SET_MULTIPLEX_RATIO, ssd130= x->height - 1); if (ret < 0) return ret; =20 @@ -951,7 +956,7 @@ static void ssd130x_encoder_atomic_enable(struct drm_en= coder *encoder, if (ret) goto power_off; =20 - ssd130x_write_cmd(ssd130x, 1, SSD130X_DISPLAY_ON); + ssd130x_write_cmd(ssd130x, 1, SSD13XX_DISPLAY_ON); =20 backlight_enable(ssd130x->bl_dev); =20 @@ -970,7 +975,7 @@ static void ssd130x_encoder_atomic_disable(struct drm_e= ncoder *encoder, =20 backlight_disable(ssd130x->bl_dev); =20 - ssd130x_write_cmd(ssd130x, 1, SSD130X_DISPLAY_OFF); + ssd130x_write_cmd(ssd130x, 1, SSD13XX_DISPLAY_OFF); =20 ssd130x_power_off(ssd130x); } @@ -1046,7 +1051,7 @@ static int ssd130x_update_bl(struct backlight_device = *bdev) =20 ssd130x->contrast =3D brightness; =20 - ret =3D ssd130x_write_cmd(ssd130x, 1, SSD130X_CONTRAST); + ret =3D ssd130x_write_cmd(ssd130x, 1, SSD13XX_CONTRAST); if (ret < 0) return ret; =20 diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ss= d130x.h index 5af251676587..b508ab98be2f 100644 --- a/drivers/gpu/drm/solomon/ssd130x.h +++ b/drivers/gpu/drm/solomon/ssd130x.h @@ -22,8 +22,8 @@ #include #include =20 -#define SSD130X_DATA 0x40 -#define SSD130X_COMMAND 0x80 +#define SSD13XX_DATA 0x40 +#define SSD13XX_COMMAND 0x80 =20 enum ssd130x_variants { /* ssd130x family */ --=20 2.41.0 From nobody Thu Dec 18 19:21:46 2025 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 36E07CDB46E for ; Thu, 12 Oct 2023 06:59:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377854AbjJLG7d (ORCPT ); Thu, 12 Oct 2023 02:59:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377691AbjJLG7V (ORCPT ); Thu, 12 Oct 2023 02:59: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 ESMTPS id 1D676C9 for ; Wed, 11 Oct 2023 23:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697093915; 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=Ua/s/6zVxVPQdvrXk/5nO3FL9GEurLmhO2C94hV695w=; b=MdTP5CV7U5rwsnxCVDMd9otBtbVowluNz0AkPBy7Qggw9DAGRHut2JiBWNf6FYvqjFud5/ DXGZbu3Rnjqb6u1df8vfeY4az3jkJ4mRldFjeWhJAncskeQeGGxZap9wO32S4AguT3CacE u7yanfq1X/HzcnsvTGvlZjluAkJ/014= 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-m0-FtfAgNliZnc88vj3Bcg-1; Thu, 12 Oct 2023 02:58:33 -0400 X-MC-Unique: m0-FtfAgNliZnc88vj3Bcg-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-40554735995so5725665e9.1 for ; Wed, 11 Oct 2023 23:58:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697093912; x=1697698712; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ua/s/6zVxVPQdvrXk/5nO3FL9GEurLmhO2C94hV695w=; b=YISqj58GJq4dC0wpFVJ+FyoE7F5hqmm7ZH4xRXNSB0PrvaYQryMmk9vc85VJjplqa3 4oFi53UEtDQY3bvZC9047xzKSslXmSVw3OZ/ibPcPl0sakGJS6SgK7HOIjNoyUrK8q5x Vd/bZUR8Lw7pudTTI+/iQ2g4QIbxWr9yF8fhdJqxyQV7Mow6ryf7yn3dtHXxbHMRFRPx l9GwYfLLlWAVrSo7O0IKfZjzPClVsQChZbbL4nYCcY1zjyHf0DjOTWGIitO0fEtOHKbn 3hJzMHXkfefICPouQwyYMXK5SAeIHlOuXzAaP3oOvyK/99AWUekG+zT69nx08ixJkPGh B6EQ== X-Gm-Message-State: AOJu0YxhyNQbTehTnb7cdBMrNX3WTtKrT3jVekRp2vTzUpagFy/snItM IY7T/FvCeTqYkMg8Sk367c7rIQ7f3qmh0NDiSug2pEik5QavSZBDNyiqDC46P5mS8PsWFojobL7 /EDaBwnXxwFj8OwvJOAx/mcHTwhjd7mBU58YK3kCM9glyg6dezhvEBQnEBLgyYKKgEb5sSIR1wC PZDt5Zblg= X-Received: by 2002:a1c:7c0a:0:b0:405:39c1:a98b with SMTP id x10-20020a1c7c0a000000b0040539c1a98bmr20087092wmc.20.1697093912072; Wed, 11 Oct 2023 23:58:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIbLhskul3YFdQuyDqRXpXMAL/mqUAmd1upTu1Ygb/xaNHEaBpTlnl3AhDuQ709YUQh4rT+Q== X-Received: by 2002:a1c:7c0a:0:b0:405:39c1:a98b with SMTP id x10-20020a1c7c0a000000b0040539c1a98bmr20087063wmc.20.1697093911577; Wed, 11 Oct 2023 23:58:31 -0700 (PDT) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id f17-20020a1c6a11000000b004063ea92492sm18631540wmc.22.2023.10.11.23.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 23:58:31 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Conor Dooley , Peter Robinson , Rob Herring , Maxime Ripard , Geert Uytterhoeven , Javier Martinez Canillas , Daniel Vetter , David Airlie , Maarten Lankhorst , dri-devel@lists.freedesktop.org Subject: [PATCH v2 4/6] drm/ssd130x: Add support for the SSD132x OLED controller family Date: Thu, 12 Oct 2023 08:58:13 +0200 Message-ID: <20231012065822.1007930-5-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012065822.1007930-1-javierm@redhat.com> References: <20231012065822.1007930-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 SSD132x controllers (such as the SSD1322, SSD1325 and SSD1327) are used by 16 grayscale dot matrix OLED panels, extend the driver to also support this chip family. Signed-off-by: Javier Martinez Canillas --- Changes in v2: - Align the rectangle to the segment width (Geert Uytterhoeven). drivers/gpu/drm/solomon/Kconfig | 12 +- drivers/gpu/drm/solomon/ssd130x-i2c.c | 17 +- drivers/gpu/drm/solomon/ssd130x-spi.c | 21 ++- drivers/gpu/drm/solomon/ssd130x.c | 234 +++++++++++++++++++++++++- drivers/gpu/drm/solomon/ssd130x.h | 4 + 5 files changed, 275 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/solomon/Kconfig b/drivers/gpu/drm/solomon/Kcon= fig index e170716d976b..c3ee956c2bb9 100644 --- a/drivers/gpu/drm/solomon/Kconfig +++ b/drivers/gpu/drm/solomon/Kconfig @@ -1,31 +1,31 @@ config DRM_SSD130X - tristate "DRM support for Solomon SSD130x OLED displays" + tristate "DRM support for Solomon SSD13xx OLED displays" depends on DRM && MMU select BACKLIGHT_CLASS_DEVICE select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER help - DRM driver for the SSD130x Solomon and SINO WEALTH SH110x OLED + DRM driver for the SSD13xx Solomon and SINO WEALTH SH110x OLED controllers. This is only for the core driver, a driver for the appropriate bus transport in your chip also must be selected. =20 If M is selected the module will be called ssd130x. =20 config DRM_SSD130X_I2C - tristate "DRM support for Solomon SSD130x OLED displays (I2C bus)" + tristate "DRM support for Solomon SSD13xx OLED displays (I2C bus)" depends on DRM_SSD130X && I2C select REGMAP_I2C help - Say Y here if the SSD130x or SH110x OLED display is connected via + Say Y here if the SSD13xx or SH110x OLED display is connected via I2C bus. =20 If M is selected the module will be called ssd130x-i2c. =20 config DRM_SSD130X_SPI - tristate "DRM support for Solomon SSD130X OLED displays (SPI bus)" + tristate "DRM support for Solomon SSD13xx 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. + Say Y here if the SSD13xx OLED display is connected via SPI bus. =20 If M is selected the module will be called ssd130x-spi. diff --git a/drivers/gpu/drm/solomon/ssd130x-i2c.c b/drivers/gpu/drm/solomo= n/ssd130x-i2c.c index 8f89b89d553f..f2ccab9c06d9 100644 --- a/drivers/gpu/drm/solomon/ssd130x-i2c.c +++ b/drivers/gpu/drm/solomon/ssd130x-i2c.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * DRM driver for Solomon SSD130x OLED displays (I2C bus) + * DRM driver for Solomon SSD13xx OLED displays (I2C bus) * * Copyright 2022 Red Hat Inc. * Author: Javier Martinez Canillas @@ -14,7 +14,7 @@ #include "ssd130x.h" =20 #define DRIVER_NAME "ssd130x-i2c" -#define DRIVER_DESC "DRM driver for Solomon SSD130x OLED displays (I2C)" +#define DRIVER_DESC "DRM driver for Solomon SSD13xx OLED displays (I2C)" =20 static const struct regmap_config ssd130x_i2c_regmap_config =3D { .reg_bits =3D 8, @@ -92,6 +92,19 @@ static const struct of_device_id ssd130x_of_match[] =3D { .compatible =3D "solomon,ssd1309fb-i2c", .data =3D &ssd130x_variants[SSD1309_ID], }, + /* ssd132x family */ + { + .compatible =3D "solomon,ssd1322", + .data =3D &ssd130x_variants[SSD1322_ID], + }, + { + .compatible =3D "solomon,ssd1325", + .data =3D &ssd130x_variants[SSD1325_ID], + }, + { + .compatible =3D "solomon,ssd1327", + .data =3D &ssd130x_variants[SSD1327_ID], + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, ssd130x_of_match); diff --git a/drivers/gpu/drm/solomon/ssd130x-spi.c b/drivers/gpu/drm/solomo= n/ssd130x-spi.c index 89989da705d7..84e035a7ab3f 100644 --- a/drivers/gpu/drm/solomon/ssd130x-spi.c +++ b/drivers/gpu/drm/solomon/ssd130x-spi.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * DRM driver for Solomon SSD130X OLED displays (SPI bus) + * DRM driver for Solomon SSD13xx OLED displays (SPI bus) * * Copyright 2022 Red Hat Inc. * Authors: Javier Martinez Canillas @@ -11,7 +11,7 @@ #include "ssd130x.h" =20 #define DRIVER_NAME "ssd130x-spi" -#define DRIVER_DESC "DRM driver for Solomon SSD130X OLED displays (SPI)" +#define DRIVER_DESC "DRM driver for Solomon SSD13xx OLED displays (SPI)" =20 struct ssd130x_spi_transport { struct spi_device *spi; @@ -129,6 +129,19 @@ static const struct of_device_id ssd130x_of_match[] = =3D { .compatible =3D "solomon,ssd1309", .data =3D &ssd130x_variants[SSD1309_ID], }, + /* ssd132x family */ + { + .compatible =3D "solomon,ssd1322", + .data =3D &ssd130x_variants[SSD1322_ID], + }, + { + .compatible =3D "solomon,ssd1325", + .data =3D &ssd130x_variants[SSD1325_ID], + }, + { + .compatible =3D "solomon,ssd1327", + .data =3D &ssd130x_variants[SSD1327_ID], + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, ssd130x_of_match); @@ -149,6 +162,10 @@ static const struct spi_device_id ssd130x_spi_table[] = =3D { { "ssd1306", SSD1306_ID }, { "ssd1307", SSD1307_ID }, { "ssd1309", SSD1309_ID }, + /* ssd132x family */ + { "ssd1322", SSD1322_ID }, + { "ssd1325", SSD1325_ID }, + { "ssd1327", SSD1327_ID }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(spi, ssd130x_spi_table); diff --git a/drivers/gpu/drm/solomon/ssd130x.c b/drivers/gpu/drm/solomon/ss= d130x.c index 4bdc06d6aed4..94a6a6ebd6e8 100644 --- a/drivers/gpu/drm/solomon/ssd130x.c +++ b/drivers/gpu/drm/solomon/ssd130x.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * DRM driver for Solomon SSD130x OLED displays + * DRM driver for Solomon SSD13xx OLED displays * * Copyright 2022 Red Hat Inc. * Author: Javier Martinez Canillas @@ -37,13 +37,15 @@ #include "ssd130x.h" =20 #define DRIVER_NAME "ssd130x" -#define DRIVER_DESC "DRM driver for Solomon SSD130x OLED displays" +#define DRIVER_DESC "DRM driver for Solomon SSD13xx OLED displays" #define DRIVER_DATE "20220131" #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 =20 #define SSD130X_PAGE_HEIGHT 8 =20 +#define SSD132X_SEGMENT_WIDTH 2 + /* ssd13xx commands */ #define SSD13XX_CONTRAST 0x81 #define SSD13XX_SET_SEG_REMAP 0xa0 @@ -99,10 +101,29 @@ #define SSD130X_SET_AREA_COLOR_MODE_ENABLE 0x1e #define SSD130X_SET_AREA_COLOR_MODE_LOW_POWER 0x05 =20 +/* ssd132x commands */ +#define SSD132X_SET_COL_RANGE 0x15 +#define SSD132X_SET_DEACTIVATE_SCROLL 0x2e +#define SSD132X_SET_ROW_RANGE 0x75 +#define SSD132X_SET_DISPLAY_START 0xa1 +#define SSD132X_SET_DISPLAY_OFFSET 0xa2 +#define SSD132X_SET_DISPLAY_NORMAL 0xa4 +#define SSD132X_SET_FUNCTION_SELECT_A 0xab +#define SSD132X_SET_PHASE_LENGTH 0xb1 +#define SSD132X_SET_CLOCK_FREQ 0xb3 +#define SSD132X_SET_GPIO 0xb5 +#define SSD132X_SET_PRECHARGE_PERIOD 0xb6 +#define SSD132X_SET_GRAY_SCALE_TABLE 0xb8 +#define SSD132X_SELECT_DEFAULT_TABLE 0xb9 +#define SSD132X_SET_PRECHARGE_VOLTAGE 0xbc +#define SSD130X_SET_VCOMH_VOLTAGE 0xbe +#define SSD132X_SET_FUNCTION_SELECT_B 0xd5 + #define MAX_CONTRAST 255 =20 enum ssd130x_family_ids { - SSD130X_FAMILY + SSD130X_FAMILY, + SSD132X_FAMILY }; =20 static const struct ssd130x_funcs ssd130x_family_funcs[]; @@ -150,6 +171,22 @@ const struct ssd130x_deviceinfo ssd130x_variants[] =3D= { .default_width =3D 128, .default_height =3D 64, .funcs =3D &ssd130x_family_funcs[SSD130X_FAMILY], + }, + /* ssd132x family */ + [SSD1322_ID] =3D { + .default_width =3D 480, + .default_height =3D 128, + .funcs =3D &ssd130x_family_funcs[SSD132X_FAMILY], + }, + [SSD1325_ID] =3D { + .default_width =3D 128, + .default_height =3D 80, + .funcs =3D &ssd130x_family_funcs[SSD132X_FAMILY], + }, + [SSD1327_ID] =3D { + .default_width =3D 128, + .default_height =3D 128, + .funcs =3D &ssd130x_family_funcs[SSD132X_FAMILY], } }; EXPORT_SYMBOL_NS_GPL(ssd130x_variants, DRM_SSD130X); @@ -643,6 +680,189 @@ static void ssd130x_clear_screen(struct ssd130x_devic= e *ssd130x, u8 *data_array) } } =20 +static int ssd132x_init(struct ssd130x_device *ssd130x) +{ + int ret; + + /* Set initial contrast */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD13XX_CONTRAST, 0x80); + if (ret < 0) + return ret; + + /* Set column start and end */ + ret =3D ssd130x_write_cmd(ssd130x, 3, SSD132X_SET_COL_RANGE, 0x00, + ssd130x->width / SSD132X_SEGMENT_WIDTH - 1); + if (ret < 0) + return ret; + + /* Set row start and end */ + ret =3D ssd130x_write_cmd(ssd130x, 3, SSD132X_SET_ROW_RANGE, 0x00, ssd130= x->height - 1); + if (ret < 0) + return ret; + /* + * Horizontal Address Increment + * Re-map for Column Address, Nibble and COM + * COM Split Odd Even + */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD13XX_SET_SEG_REMAP, 0x53); + if (ret < 0) + return ret; + + /* Set display start and offset */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_DISPLAY_START, 0x00); + if (ret < 0) + return ret; + + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_DISPLAY_OFFSET, 0x00); + if (ret < 0) + return ret; + + /* Set display mode normal */ + ret =3D ssd130x_write_cmd(ssd130x, 1, SSD132X_SET_DISPLAY_NORMAL); + if (ret < 0) + return ret; + + /* Set multiplex ratio value */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD13XX_SET_MULTIPLEX_RATIO, ssd130= x->height - 1); + if (ret < 0) + return ret; + + /* Set phase length */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_PHASE_LENGTH, 0x55); + if (ret < 0) + return ret; + + /* Select default linear gray scale table */ + ret =3D ssd130x_write_cmd(ssd130x, 1, SSD132X_SELECT_DEFAULT_TABLE); + if (ret < 0) + return ret; + + /* Set clock frequency */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_CLOCK_FREQ, 0x01); + if (ret < 0) + return ret; + + /* Enable internal VDD regulator */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_FUNCTION_SELECT_A, 0x1); + if (ret < 0) + return ret; + + /* Set pre-charge period */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_PRECHARGE_PERIOD, 0x01); + if (ret < 0) + return ret; + + /* Set pre-charge voltage */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_PRECHARGE_VOLTAGE, 0x08= ); + if (ret < 0) + return ret; + + /* Set VCOMH voltage */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD130X_SET_VCOMH_VOLTAGE, 0x07); + if (ret < 0) + return ret; + + /* Enable second pre-charge and internal VSL */ + ret =3D ssd130x_write_cmd(ssd130x, 2, SSD132X_SET_FUNCTION_SELECT_B, 0x62= ); + if (ret < 0) + return ret; + + return 0; +} + +static int ssd132x_set_buffer_sizes(struct ssd130x_device *ssd130x) +{ + unsigned int buffer_pitch; + unsigned int columns =3D DIV_ROUND_UP(ssd130x->width, SSD132X_SEGMENT_WID= TH); + unsigned int rows =3D ssd130x->height; + + ssd130x->data_array_size =3D columns * rows; + + ssd130x->buffer_fi =3D drm_format_info(DRM_FORMAT_R8); + + if (!ssd130x->buffer_fi) + return -EINVAL; + + buffer_pitch =3D drm_format_info_min_pitch(ssd130x->buffer_fi, 0, ssd130x= ->width); + ssd130x->buffer_size =3D buffer_pitch * ssd130x->height; + + return 0; +} + +static void ssd132x_align_rect(struct ssd130x_device *ssd130x, + struct drm_rect *rect) +{ + /* Align x to display segment boundaries */ + rect->x1 =3D round_down(rect->x1, SSD132X_SEGMENT_WIDTH); + rect->x2 =3D min_t(unsigned int, round_up(rect->x2, SSD132X_SEGMENT_WIDTH= ), + ssd130x->width); +} + +static int ssd132x_update_rect(struct ssd130x_device *ssd130x, + struct drm_rect *rect, u8 *buf, + u8 *data_array) +{ + unsigned int x =3D rect->x1; + unsigned int y =3D rect->y1; + unsigned int segment_width =3D SSD132X_SEGMENT_WIDTH; + unsigned int width =3D drm_rect_width(rect); + unsigned int height =3D drm_rect_height(rect); + unsigned int columns =3D DIV_ROUND_UP(width, segment_width); + unsigned int rows =3D height; + struct drm_device *drm =3D &ssd130x->drm; + u32 array_idx =3D 0; + int ret, i, j; + + drm_WARN_ONCE(drm, x % segment_width !=3D 0, "x must be aligned to screen= segment\n"); + + /* + * The screen is divided in Segment and Common outputs, where + * COM0 to COM[N - 1] are the rows and SEG0 to SEG[M - 1] are + * the columns. + * + * Each Segment has a 4-bit pixel and each Common output has a + * row of pixels. When using the (default) horizontal address + * increment mode, each byte of data sent to the controller has + * two Segments (e.g: SEG0 and SEG1) that are stored in the lower + * and higher nibbles of a single byte representing one column. + * That is, the first byte are SEG0 (D0[3:0]) and SEG1 (D0[7:4]), + * the second byte are SEG2 (D1[3:0]) and SEG3 (D1[7:4]) and so on. + */ + + /* Set column start and end */ + ret =3D ssd130x_write_cmd(ssd130x, 3, SSD132X_SET_COL_RANGE, x / segment_= width, columns - 1); + if (ret < 0) + return ret; + + /* Set row start and end */ + ret =3D ssd130x_write_cmd(ssd130x, 3, SSD132X_SET_ROW_RANGE, y, rows - 1); + if (ret < 0) + return ret; + + for (i =3D 0; i < height; i++) { + /* Process pair of pixels and combine them into a single byte */ + for (j =3D 0; j < width; j +=3D segment_width) { + u8 n1 =3D buf[i * width + j]; + u8 n2 =3D buf[i * width + j + 1]; + + data_array[array_idx++] =3D (n2 << 4) | n1; + } + } + + /* Write out update in one go since horizontal addressing mode is used */ + ret =3D ssd130x_write_data(ssd130x, data_array, columns * rows); + + return ret; +} + +static void ssd132x_clear_screen(struct ssd130x_device *ssd130x, u8 *data_= array) +{ + memset(data_array, 0, ssd130x->data_array_size); + + /* Write out update in one go since horizontal addressing mode is used */ + ssd130x_write_data(ssd130x, data_array, ssd130x->data_array_size); +} + static const struct ssd130x_funcs ssd130x_family_funcs[] =3D { [SSD130X_FAMILY] =3D { .init =3D ssd130x_init, @@ -652,6 +872,14 @@ static const struct ssd130x_funcs ssd130x_family_funcs= [] =3D { .clear_screen =3D ssd130x_clear_screen, .fmt_convert =3D drm_fb_xrgb8888_to_mono, }, + [SSD132X_FAMILY] =3D { + .init =3D ssd132x_init, + .set_buffer_sizes =3D ssd132x_set_buffer_sizes, + .align_rect =3D ssd132x_align_rect, + .update_rect =3D ssd132x_update_rect, + .clear_screen =3D ssd132x_clear_screen, + .fmt_convert =3D drm_fb_xrgb8888_to_gray8, + } }; =20 static int ssd130x_fb_blit_rect(struct drm_framebuffer *fb, diff --git a/drivers/gpu/drm/solomon/ssd130x.h b/drivers/gpu/drm/solomon/ss= d130x.h index b508ab98be2f..e93288b5a9c2 100644 --- a/drivers/gpu/drm/solomon/ssd130x.h +++ b/drivers/gpu/drm/solomon/ssd130x.h @@ -32,6 +32,10 @@ enum ssd130x_variants { SSD1306_ID, SSD1307_ID, SSD1309_ID, + /* ssd132x family */ + SSD1322_ID, + SSD1325_ID, + SSD1327_ID, NR_SSD130X_VARIANTS }; =20 --=20 2.41.0 From nobody Thu Dec 18 19:21:46 2025 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 06D49CDB46E for ; Thu, 12 Oct 2023 06:59:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347106AbjJLG76 (ORCPT ); Thu, 12 Oct 2023 02:59:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377672AbjJLG7a (ORCPT ); Thu, 12 Oct 2023 02:59:30 -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 ESMTPS id E42D5C0 for ; Wed, 11 Oct 2023 23:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697093926; 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=jYJU3nXdqvdbwcO4hjpDrp2WLD9hkGzJJegB/jryqJY=; b=FH0u6JkXowLLQuqWh7v8YLqvbcQrajCwJIa2Ldg/zLYVKl4MoKRk1UGkdv/DO4y79b0rLg kJ3ZhnwTJJvtXuuSbIc42O5/6KSE8DKWodW53OlkUWqhOPDv7ieNKVMcQOETXO8np5eT8o +OL5MgJJkDDD8LDSdjjVI9nGvWWMpR8= 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-518-hsWQRJVxPZuojSn8iqB8aQ-1; Thu, 12 Oct 2023 02:58:35 -0400 X-MC-Unique: hsWQRJVxPZuojSn8iqB8aQ-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-405917470e8so5183085e9.1 for ; Wed, 11 Oct 2023 23:58:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697093913; x=1697698713; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jYJU3nXdqvdbwcO4hjpDrp2WLD9hkGzJJegB/jryqJY=; b=QlR9rqrrE2TW4XtnlgLLRPSvECEWxmTSNfqWb0h9bBXenZzKjN6Q3mpQ3PXU1qTbmP gxhqtXM34rUef1R4UDXLX0mQlJgoEeBdm3xrX5mm3cFgKIdS0o/0DKnk7SZQi3+0ogun lu5wSHT8JD5WfO/KcPZjAY3Yk/F3I7ucEFsK3q9l/ti93rBIGy9vVKdHI1X9v4hkZ/pS hZGSPHVwf4QwVqVhZvhhrsBE66K/5m4lmN8K+K+//f+hlmI6o9PqYBhKYxOTGopoDkL7 YBaHDTPoNI3rcgPqvQyOXuZhchfjjv60yiPUpGp2BRn4Anhg2C/rq/T+P+W125lv7YjM +GGg== X-Gm-Message-State: AOJu0YxkZf2cLYCRqX2WC2vij9s4+q2MR0O3yAtrm9AjofKT1Lmr+qxc 7i+Yj5mGibvUd7zLliNuNP4w/LTxPSui53gCCd2AJOgmnEvKNN/fGyXtdDG6fT3pXmSAQNGPEs9 gZl59klmFeu92wd0naGbNwh9j6TJn8ge2bN9YoRAbc1qUQKbz0UFido/YjQibZNqRI7DLxe2DYe Nyh5YS8Qc= X-Received: by 2002:a1c:7c17:0:b0:401:bcb4:f133 with SMTP id x23-20020a1c7c17000000b00401bcb4f133mr20319567wmc.22.1697093913629; Wed, 11 Oct 2023 23:58:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE/Zp3Zrz43RsQjG2vKEMh7eT170A6k+ET5dAqpQw8c1vnh7x5XOF7CxlUvEz3D5sC4MMmtWw== X-Received: by 2002:a1c:7c17:0:b0:401:bcb4:f133 with SMTP id x23-20020a1c7c17000000b00401bcb4f133mr20319536wmc.22.1697093913204; Wed, 11 Oct 2023 23:58:33 -0700 (PDT) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id q5-20020a7bce85000000b0040596352951sm21102422wmj.5.2023.10.11.23.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 23:58:32 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Conor Dooley , Peter Robinson , Rob Herring , Maxime Ripard , Geert Uytterhoeven , Javier Martinez Canillas , Conor Dooley , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maarten Lankhorst , Rob Herring , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 5/6] dt-bindings: display: Split common Solomon properties in their own schema Date: Thu, 12 Oct 2023 08:58:14 +0200 Message-ID: <20231012065822.1007930-6-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012065822.1007930-1-javierm@redhat.com> References: <20231012065822.1007930-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" There are DT properties that can be shared across different Solomon OLED Display Controller families. Split them into a separate common schema to avoid these properties to be duplicated in different DT bindings schemas. Suggested-by: Rob Herring Signed-off-by: Javier Martinez Canillas Reviewed-by: Rob Herring --- (no changes since v1) .../bindings/display/solomon,ssd-common.yaml | 42 +++++++++++++++++++ .../bindings/display/solomon,ssd1307fb.yaml | 28 +------------ MAINTAINERS | 1 + 3 files changed, 44 insertions(+), 27 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/solomon,ssd-c= ommon.yaml diff --git a/Documentation/devicetree/bindings/display/solomon,ssd-common.y= aml b/Documentation/devicetree/bindings/display/solomon,ssd-common.yaml new file mode 100644 index 000000000000..677fd2b90960 --- /dev/null +++ b/Documentation/devicetree/bindings/display/solomon,ssd-common.yaml @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/solomon,ssd-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Common properties for Solomon OLED Display Controllers + +maintainers: + - Javier Martinez Canillas + +properties: + reg: + maxItems: 1 + + reset-gpios: + maxItems: 1 + + # 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 + + solomon,height: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Height in pixel of the screen driven by the controller. + The default value is controller-dependent. + + solomon,width: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Width in pixel of the screen driven by the controller. + The default value is controller-dependent. + +allOf: + - $ref: /schemas/spi/spi-peripheral-props.yaml# + +additionalProperties: true \ No newline at end of file diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.ya= ml b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml index 20e2bd15d4d2..3afbb52d1b7f 100644 --- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml +++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml @@ -27,38 +27,12 @@ properties: - solomon,ssd1307 - solomon,ssd1309 =20 - reg: - maxItems: 1 - pwms: maxItems: 1 =20 - reset-gpios: - maxItems: 1 - - # 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 - solomon,height: - $ref: /schemas/types.yaml#/definitions/uint32 - description: - Height in pixel of the screen driven by the controller. - The default value is controller-dependent. - - solomon,width: - $ref: /schemas/types.yaml#/definitions/uint32 - description: - Width in pixel of the screen driven by the controller. - The default value is controller-dependent. - solomon,page-offset: $ref: /schemas/types.yaml#/definitions/uint32 default: 1 @@ -148,7 +122,7 @@ required: - reg =20 allOf: - - $ref: /schemas/spi/spi-peripheral-props.yaml# + - $ref: solomon,ssd-common.yaml# =20 - if: properties: diff --git a/MAINTAINERS b/MAINTAINERS index 46ca5c4affdb..4a3baf970839 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6732,6 +6732,7 @@ DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS M: Javier Martinez Canillas S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc +F: Documentation/devicetree/bindings/display/solomon,ssd-common.yaml F: Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml F: drivers/gpu/drm/solomon/ssd130x* =20 --=20 2.41.0 From nobody Thu Dec 18 19:21:46 2025 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 9924BCDB46E for ; Thu, 12 Oct 2023 06:59:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377872AbjJLG7g (ORCPT ); Thu, 12 Oct 2023 02:59:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377695AbjJLG7X (ORCPT ); Thu, 12 Oct 2023 02:59: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 ESMTPS id C7642DB for ; Wed, 11 Oct 2023 23:58:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697093918; 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=HDry+FhkIeT/NRPHa1BVdFItba2J4DOxCsv4jEZYJSQ=; b=WqtLo3q7RDWC9yzz9ohRQTVKpV1zSkmyqhya8qOoFPSoBOoM1oE95C/zSA4tKz+UsGd6p+ 0oaOebi7x0YvsLVfPuju86D0wNG339dhoZM5J3T9/dITWp9KO6GGMzTBa0uCqcdGN/gs94 Hl4N/RSB5R7AR1kiwlIy/FpmXZUdH1o= 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-662-kGnHv1GMNOWiC_mhWFR4IA-1; Thu, 12 Oct 2023 02:58:36 -0400 X-MC-Unique: kGnHv1GMNOWiC_mhWFR4IA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40540179bcdso6143225e9.2 for ; Wed, 11 Oct 2023 23:58:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697093914; x=1697698714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HDry+FhkIeT/NRPHa1BVdFItba2J4DOxCsv4jEZYJSQ=; b=SyB1jxMazZIshFo7GnVcpVo9tFwGMOiq71uzUXPZwvNzjA7w2RcGuIB2px8R+2rDcc AZg3yPaq4I68SPeFRqyms7ZgPH1b4WCQHk2cVm5j7O206I/rbRVf1Luy3W9PTvZkToly dnx2rRKLybWoyLFDplVrLuUIPWyfgBv9rumBL7mLpGEsiPxbWrQM2Nl4baZegsaX9whp /c6BN9poenWOC6X8teQqxatvEi7WdYQtxJ/XLn66a/R/wYrtVRmD5VeC9sl5uFAOkjKG v0crgH4Wqj1HH+8rKh1fFIyS3XRmF8mGoRVaqxJlHzgvRGukkxKc3phrEyo3bGhELq/G FCkg== X-Gm-Message-State: AOJu0Yw0X/n9v7OtqhKrZL57Qodx/9zFE+bd18FltalwS+qCjeH90L5p ZXrlDu2DU/5cpi1458f+BS8ahfdO/vFPnYyGrrudow1uiVGFEoDqdiuTXSWZ6pRC9qdlFDv9opf jVyv3rsDvyJQEiIR3GCGywCgDAiVJxzmZtslHnUYe4f4uZrVvCaNNZaveOdT9o/DJlHUCQgWCua EwhsML3LI= X-Received: by 2002:a05:600c:c8b:b0:401:b2c7:34aa with SMTP id fj11-20020a05600c0c8b00b00401b2c734aamr20358197wmb.33.1697093914626; Wed, 11 Oct 2023 23:58:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJUdJAE+J+1gnbUCfPDDysmAo9MVCsBEBf74Ya+bU1awzyJ/Fc2/4hxnuN0VxAQe5EBOIOFQ== X-Received: by 2002:a05:600c:c8b:b0:401:b2c7:34aa with SMTP id fj11-20020a05600c0c8b00b00401b2c734aamr20358177wmb.33.1697093914403; Wed, 11 Oct 2023 23:58:34 -0700 (PDT) Received: from localhost (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id 6-20020a05600c22c600b0040303a9965asm21113713wmg.40.2023.10.11.23.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 23:58:34 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Conor Dooley , Peter Robinson , Rob Herring , Maxime Ripard , Geert Uytterhoeven , Javier Martinez Canillas , Conor Dooley , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Maarten Lankhorst , Rob Herring , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 6/6] dt-bindings: display: Add SSD132x OLED controllers Date: Thu, 12 Oct 2023 08:58:15 +0200 Message-ID: <20231012065822.1007930-7-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012065822.1007930-1-javierm@redhat.com> References: <20231012065822.1007930-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" Add a Device Tree binding schema for the OLED panels based on the Solomon SSD132x family of controllers. Signed-off-by: Javier Martinez Canillas Reviewed-by: Rob Herring --- Changes in v2: - Remove unnecessary 'oneOf' in the SSD132x DT binding schema (Conor Dooley= ). - Remove unused DT nodes labels in the binding schema examples (Conor Doole= y). - Split out common Solomon properties into a separate schema (Rob Herring). .../bindings/display/solomon,ssd132x.yaml | 89 +++++++++++++++++++ MAINTAINERS | 2 +- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/display/solomon,ssd13= 2x.yaml diff --git a/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml= b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml new file mode 100644 index 000000000000..0aa41bd9ddca --- /dev/null +++ b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml @@ -0,0 +1,89 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/solomon,ssd132x.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Solomon SSD132x OLED Display Controllers + +maintainers: + - Javier Martinez Canillas + +properties: + compatible: + - enum: + - solomon,ssd1322 + - solomon,ssd1325 + - solomon,ssd1327 + +required: + - compatible + - reg + +allOf: + - $ref: solomon,ssd-common.yaml# + + - if: + properties: + compatible: + contains: + const: solomon,ssd1322 + then: + properties: + width: + default: 480 + height: + default: 128 + + - if: + properties: + compatible: + contains: + const: solomon,ssd1325 + then: + properties: + width: + default: 128 + height: + default: 80 + + - if: + properties: + compatible: + contains: + const: solomon,ssd1327 + then: + properties: + width: + default: 128 + height: + default: 128 + +unevaluatedProperties: false + +examples: + - | + i2c { + #address-cells =3D <1>; + #size-cells =3D <0>; + + oled@3c { + compatible =3D "solomon,ssd1327"; + reg =3D <0x3c>; + reset-gpios =3D <&gpio2 7>; + }; + + }; + - | + spi { + #address-cells =3D <1>; + #size-cells =3D <0>; + + oled@0 { + compatible =3D "solomon,ssd1327"; + reg =3D <0x0>; + reset-gpios =3D <&gpio2 7>; + dc-gpios =3D <&gpio2 8>; + spi-max-frequency =3D <10000000>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 4a3baf970839..5257e0074f2b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6733,7 +6733,7 @@ M: Javier Martinez Canillas S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/devicetree/bindings/display/solomon,ssd-common.yaml -F: Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml +F: Documentation/devicetree/bindings/display/solomon,ssd13*.yaml F: drivers/gpu/drm/solomon/ssd130x* =20 DRM DRIVER FOR ST-ERICSSON MCDE --=20 2.41.0