From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Tsai) - Continue enforcing required properties for deprecated strings (Maxime Ripard) Changes in v2: - Drop the -i2c suffixes from the compatible strings too (Geert Uytterhoeven) .../bindings/display/solomon,ssd1307fb.yaml | 44 +++++++++++++------ 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml 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: 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 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 = <0>; ssd1307: oled@3c { - compatible = "solomon,ssd1307fb-i2c"; + compatible = "solomon,ssd1307"; reg = <0x3c>; pwms = <&pwm 4 3000>; reset-gpios = <&gpio2 7>; }; ssd1306: oled@3d { - compatible = "solomon,ssd1306fb-i2c"; + compatible = "solomon,ssd1306"; reg = <0x3c>; pwms = <&pwm 4 3000>; reset-gpios = <&gpio2 7>; -- 2.35.1