From patchwork Mon Feb 13 12:10:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 56244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2308825wrn; Mon, 13 Feb 2023 04:15:51 -0800 (PST) X-Google-Smtp-Source: AK7set/8AW7++f5G5dL3SZfMzq+dq4V5IKPX2RJuyZXmif/iePmRlcsEZtT4fgkdJebfF61HLvLE X-Received: by 2002:a17:902:c946:b0:19a:8549:966 with SMTP id i6-20020a170902c94600b0019a85490966mr8124966pla.24.1676290550946; Mon, 13 Feb 2023 04:15:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676290550; cv=none; d=google.com; s=arc-20160816; b=wRI7IMNNKnJRwOFei5oCGkb/sEPd3Dqg5m2UpQSC9qrYRXIutJIHnxDje5qbReyn79 6S2jzQmhQQWU9f/ymR59bYoAIMdc8rKWGP1nIfwvObW1Osub9vNjeip+br1RdQY2P0U6 SyoIBHdKFcZmFZwjKTnF2jbLTSKOx6eLfpG5c6Mc8YSTPD1k9toy/3NArB1afcEvpsBp e42O9TlgaKIXQiYZuCF9JMMSJgvK1MM2jRysC9iP//wbgimrtgwJklVYZy4MxOm6DKVt LZ8fJ1DlzVGuXrlNR6FF7SPCxySuKviQMjsM7drQWE9rorLw21pJUMRSuM6dheCL83Zd oiYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sLkh67ooWyVObn1J2I1Qu7dXdNbX+Cd0UoL9axKT34o=; b=DKxNKOf7WsR1PjebuATcz3+rMsi1ivNpyMkL8w6hYTIYaR/BFiJ4dETJ7Dc+fbUOHR YKLQ/VcBsGdQJuKwHQmEiG33XbWl+aNwQGMkZGfIjlB+tDAd5yq/NFjMfMRa69Hnq07e uT+kc8w2cP0BSWxRqThsJEAQkvyfqVwP0WMQJUykBRkQ4uDcZa0ICPTTIaAKzq8H9vHD lKaKbdgz2+0voDJ3bqdOlRilnVDnH916ZXnOyr5S6pBJcD8+9dka0RKm97LvIAzeP6DL 7WseIuc7H7Sc1TM4CYsCRkqSDQ0TN9YUpVNBpmzP2fDh8M4Qt7mBxQ8ZcjRmh5ulcUwW LdnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p8WGCP9v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m10-20020a170902c44a00b00198df327f0esi6102787plm.314.2023.02.13.04.15.37; Mon, 13 Feb 2023 04:15:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p8WGCP9v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229598AbjBMMKn (ORCPT + 99 others); Mon, 13 Feb 2023 07:10:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231179AbjBMMK3 (ORCPT ); Mon, 13 Feb 2023 07:10:29 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92A0C1A947 for ; Mon, 13 Feb 2023 04:10:19 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id lu11so31315531ejb.3 for ; Mon, 13 Feb 2023 04:10:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sLkh67ooWyVObn1J2I1Qu7dXdNbX+Cd0UoL9axKT34o=; b=p8WGCP9v5yIWbqJlLQRmMt4chiH79pIdn/7AB+4u36M/TTmmzVK1ZVLXeajFDjlSHT cOO6it7vveZEhpkGjAAqnz+csbNPwy1aG25sAbzN4xBu1iIBCSLIb+fADM842f8D4gU1 vQ4YjvIWiUj59NG7bCE+aUwx3nanN3FFInJXJjsDakUUBBnZAw+6/B6KYznfiPE7vDgR x/+Qq/jef9admT0KChEbH1aLvyLMslwfGF3JUJ/gV2UvFeChYwTlEswgOF0tTQtk4ig4 SmoFfdXxu1QehBVPm4G9hbjnzNCyjRlo/EIr6YaxVp4mWcB6aW2elIkYazjylBN6HoKN 8Xrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=sLkh67ooWyVObn1J2I1Qu7dXdNbX+Cd0UoL9axKT34o=; b=kv92onUwi0HIQYjMqfhGvo8ABB8x4XByVbpZb62qZyCrPs5L9O03ehClMAuciXjwvj I/EXkxZ1RpObszBQ0C9NDdhvvljCja02noigCirou+LLrqVavLGD/QrMHhWPSWRW3gMr p7t8u2dUxOLbxMpNwNYZ3x63kGIctUxXW0Lb8PdpHvPCjpTtGRWmR8gHXkcsA0BG1RJ6 bIhBboTzKJsSCW6njNcPh5P+JDETy4rx/gtLtiOxAOHPWN8IgWpsdwmtiKRuBuZ++2fm VMRgbteF29FmjfpHWhdiaFLuc2aPIx8x0NMaWMTc45nLaPtdNiDCTgSboQ60PA/tmDio Oeow== X-Gm-Message-State: AO0yUKXSHLzAHTHbToXw6k9zLgmdOuIWVMIvMgcwCYoTF3kX+ZLjkdis 8RxUwWx4xIbVmQxmdn96VqVMAA== X-Received: by 2002:a17:906:1908:b0:878:5f8e:26c0 with SMTP id a8-20020a170906190800b008785f8e26c0mr17900635eje.7.1676290217679; Mon, 13 Feb 2023 04:10:17 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:17 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Krishna Manikandan , "Bryan O'Donoghue" , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/9] dt-bindings: display/msm: dsi-controller-main: Fix deprecated QCM2290 compatible Date: Mon, 13 Feb 2023 13:10:04 +0100 Message-Id: <20230213121012.1768296-2-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757718040872114359?= X-GMAIL-MSGID: =?utf-8?q?1757718040872114359?= The qcom, prefix was missed previously. Fix it. Fixes: 0c0f65c6dd44 ("dt-bindings: msm: dsi-controller-main: Add compatible strings for every current SoC") Signed-off-by: Konrad Dybcio Acked-by: Rob Herring Reviewed-by: Marijn Suijten --- .../devicetree/bindings/display/msm/dsi-controller-main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index e75a3efe4dac..2494817c1bd6 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -33,7 +33,7 @@ properties: - const: qcom,mdss-dsi-ctrl - items: - enum: - - dsi-ctrl-6g-qcm2290 + - qcom,dsi-ctrl-6g-qcm2290 - const: qcom,mdss-dsi-ctrl deprecated: true From patchwork Mon Feb 13 12:10:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 56245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2308860wrn; Mon, 13 Feb 2023 04:15:55 -0800 (PST) X-Google-Smtp-Source: AK7set+gFoNeWfORJmciXUtWxftFzm/gB2kX5iNsLp7iHTelgqd5g676gpzmrKvDYcynmOsSIotF X-Received: by 2002:a17:902:c40b:b0:194:9b4e:1c90 with SMTP id k11-20020a170902c40b00b001949b4e1c90mr29212508plk.57.1676290555194; Mon, 13 Feb 2023 04:15:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676290555; cv=none; d=google.com; s=arc-20160816; b=ylbvIpyXF5fjvTi+ua19nsLzRaifduHtDBr2b0nO71IY8n0l3MpEK96FjmJg6ljEKI T1z9OucckCS3VTeaji01rKWLVUa/QMFxamWdUYW/uMfJtNQgefgm/gWYLMm3nY6NZHVm J+jBrjrFnlRlz3Yv7LbyfqCvuCM4sj8ZdCkBxhNev9M8SekG5pa9TI6/fi/T2ogt57Ir GtJcxta2e+Lq4EPG7D2FP1U8IPP4MaxUcCYLB0he+87c35KP9gvU7rn+Rti2Tobkrutr IsaF2MpFncJdeBhMtHVpdWDtcm74f+dNiH8ro4Xx98ipV6Rsy1xkJ7R+uisuytbvOLNa bhfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XBhzuhNM7NkSSplcxwh545i2vRIYXp6Q58I+x2Dr50w=; b=Fgyf++65/m0vaiiewerjbJhnhSaqIscXUk+c1suQ6BZMQ0rW96kD9l2Sd8A89L6P4R USzwoD3RmgWHrl7L5MzNw5wMJ0rmhP6kbwNhSHItQPXyQ53D/GsVRsukhuJA7JDL59EF 4zmbf59Lc+2PtqfTT2cI+YvZM/rU6DkJJ8nVYd+yExEG5FMd940md7d4+UBS46FxRuz1 MdUOIkmCGKMNZp5T23yLAH+DkldpKhYfy2BMbp5T0YpflTXqOfOJHFv+Qd8OjKPABXx1 9BnldYJLzGOFzmMFuBz4IyEw70BzRKhwa9bepDH1yJdgG6GZLUDYNZz24YdpQ3ryDWjQ 15Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BBuNyU0G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b3-20020a170902d50300b0019aa5b2e122si2074576plg.504.2023.02.13.04.15.43; Mon, 13 Feb 2023 04:15:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BBuNyU0G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231334AbjBMMLD (ORCPT + 99 others); Mon, 13 Feb 2023 07:11:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231363AbjBMMKj (ORCPT ); Mon, 13 Feb 2023 07:10:39 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D8DD61AC for ; Mon, 13 Feb 2023 04:10:23 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id p26so31216317ejx.13 for ; Mon, 13 Feb 2023 04:10:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XBhzuhNM7NkSSplcxwh545i2vRIYXp6Q58I+x2Dr50w=; b=BBuNyU0GRinWhiIGAaqfLo2auMIm4XY8zH2oQBzzD4CYEcfunorOoPuNGmPjbO4DYJ y0/TrHQkiGt8g1wgslyWUtUJrHiHWTfUsgBy49+aLu5ZfOB7vIwTNherccZAlrfYPv1a CZYgfpu5wF/nRvVv/BYdFGlPEsxRBNM/1OPPYYrVHBPmK7IrgbRGxOiSm4W5uLah8Mms QEsi9/yxznsMOo+efvp9xoOeNP3ZM+0KjZ1HdFfkL/pYYhOLNyYYDjZYmG0D9mKCgaFS SFouTDAxrB6JxTys43yJmZiD+/GF6ECQgbT0Q7co4Wt2H7ZVRGJDOAVniKjS5qASTAPp jOGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=XBhzuhNM7NkSSplcxwh545i2vRIYXp6Q58I+x2Dr50w=; b=C6+1TSX/upPsdds6aq5OOWjH7Onf4vsA5/UrvaT0YxlYyaVosf3YV4cksWQDfwP1Z6 xL93BT1BXRHH8A9eXE7xo9Vg0mATvsL7vMEk4iPpc4aTygbuA5fIocRIHAyPoGMdM/tI QZJ5o2v8QWMRuNbYcpl7W21eed3Ah3OOLtNHcECTWc5noJNLyulz/4Y5wmEhOQqFxWIl o7nF6fKLBEj8VWsSorBJAyFpIqbj1NvYhKB5EcR8ktVMLRM0vczLvnotF9+myE2eJ+HC 8Jk2bEKvbF+oWy/2o41PWwhLL9OAyKYmrQKThPXt7i8AY/WsN7UBx3gSg0YaAHQWoOlX DmeQ== X-Gm-Message-State: AO0yUKUYfMlOlolIPpCspC03P+nElP7QG6jWETYwYlGz48Y33A27eRa3 M2RpDqgl8nHOmhVjd+MsxM+Vqg== X-Received: by 2002:a17:906:4913:b0:88c:9b39:23c6 with SMTP id b19-20020a170906491300b0088c9b3923c6mr24353289ejq.14.1676290221727; Mon, 13 Feb 2023 04:10:21 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:21 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Neil Armstrong , Loic Poulain , Vinod Koul , Vladimir Lypak , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/9] drm/msm/dsi: Get rid of msm_dsi_config::num_dsi Date: Mon, 13 Feb 2023 13:10:05 +0100 Message-Id: <20230213121012.1768296-3-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757718045100155538?= X-GMAIL-MSGID: =?utf-8?q?1757718045100155538?= In preparation for supporting multiple sets of possible base registers, remove the num_dsi variable. We're comparing the io_start array contents with the reg value from the DTS, so it will either match one of the expected values or don't match against a zero (which we get from partial array initialization). Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 13 ------------- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 - drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 6d21f0b33411..4515f52b407a 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -22,7 +22,6 @@ static const struct msm_dsi_config apq8064_dsi_cfg = { .bus_clk_names = dsi_v2_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_bus_clk_names), .io_start = { 0x4700000, 0x5800000 }, - .num_dsi = 2, }; static const char * const dsi_6g_bus_clk_names[] = { @@ -42,7 +41,6 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = { .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start = { 0xfd922800, 0xfd922b00 }, - .num_dsi = 2, }; static const char * const dsi_8916_bus_clk_names[] = { @@ -61,7 +59,6 @@ static const struct msm_dsi_config msm8916_dsi_cfg = { .bus_clk_names = dsi_8916_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names), .io_start = { 0x1a98000 }, - .num_dsi = 1, }; static const char * const dsi_8976_bus_clk_names[] = { @@ -80,7 +77,6 @@ static const struct msm_dsi_config msm8976_dsi_cfg = { .bus_clk_names = dsi_8976_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names), .io_start = { 0x1a94000, 0x1a96000 }, - .num_dsi = 2, }; static const struct regulator_bulk_data msm8994_dsi_regulators[] = { @@ -99,7 +95,6 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start = { 0xfd998000, 0xfd9a0000 }, - .num_dsi = 2, }; static const char * const dsi_8996_bus_clk_names[] = { @@ -119,7 +114,6 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { .bus_clk_names = dsi_8996_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), .io_start = { 0x994000, 0x996000 }, - .num_dsi = 2, }; static const char * const dsi_msm8998_bus_clk_names[] = { @@ -138,7 +132,6 @@ static const struct msm_dsi_config msm8998_dsi_cfg = { .bus_clk_names = dsi_msm8998_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_msm8998_bus_clk_names), .io_start = { 0xc994000, 0xc996000 }, - .num_dsi = 2, }; static const char * const dsi_sdm660_bus_clk_names[] = { @@ -156,7 +149,6 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { .bus_clk_names = dsi_sdm660_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm660_bus_clk_names), .io_start = { 0xc994000, 0xc996000 }, - .num_dsi = 2, }; static const char * const dsi_sdm845_bus_clk_names[] = { @@ -178,7 +170,6 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), .io_start = { 0xae94000, 0xae96000 }, - .num_dsi = 2, }; static const struct regulator_bulk_data sm8550_dsi_regulators[] = { @@ -192,7 +183,6 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), .io_start = { 0xae94000, 0xae96000 }, - .num_dsi = 2, }; static const struct regulator_bulk_data sc7180_dsi_regulators[] = { @@ -206,7 +196,6 @@ static const struct msm_dsi_config sc7180_dsi_cfg = { .bus_clk_names = dsi_sc7180_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names), .io_start = { 0xae94000 }, - .num_dsi = 1, }; static const char * const dsi_sc7280_bus_clk_names[] = { @@ -224,7 +213,6 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { .bus_clk_names = dsi_sc7280_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), .io_start = { 0xae94000, 0xae96000 }, - .num_dsi = 2, }; static const char * const dsi_qcm2290_bus_clk_names[] = { @@ -242,7 +230,6 @@ static const struct msm_dsi_config qcm2290_dsi_cfg = { .bus_clk_names = dsi_qcm2290_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_qcm2290_bus_clk_names), .io_start = { 0x5e94000 }, - .num_dsi = 1, }; static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = { diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h index 44be4a88aa83..6b6b16c5fd25 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h @@ -39,7 +39,6 @@ struct msm_dsi_config { const char * const *bus_clk_names; const int num_bus_clks; const resource_size_t io_start[DSI_MAX]; - const int num_dsi; }; struct msm_dsi_host_cfg_ops { diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 18fa30e1e858..9021f0d65515 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1868,7 +1868,7 @@ static int dsi_host_get_id(struct msm_dsi_host *msm_host) if (!res) return -EINVAL; - for (i = 0; i < cfg->num_dsi; i++) { + for (i = 0; i < DSI_MAX; i++) { if (cfg->io_start[i] == res->start) return i; } From patchwork Mon Feb 13 12:10:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 56249 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2309092wrn; Mon, 13 Feb 2023 04:16:24 -0800 (PST) X-Google-Smtp-Source: AK7set8QEyi5DL2LDFco1PgxyMEf9N7OWOn9wI6sybgPzYFe3BBVqgSLacmDgdODammejDffS6Rm X-Received: by 2002:a17:907:96a2:b0:89f:1a76:e2dc with SMTP id hd34-20020a17090796a200b0089f1a76e2dcmr32621745ejc.0.1676290584560; Mon, 13 Feb 2023 04:16:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676290584; cv=none; d=google.com; s=arc-20160816; b=rRZyX9Qz18lML6QIHYILRxekAP8unWS0ZfqcoI4BSeG6NKaDdV6rOYtmPTPT/4oGcG WDFEq9fdA8wdekC8oRkcvz0noMWpwESqK7DtXruBqhMGd2JBzgcy7Ot8DnP8DU47/dzK nRBMqYTwaVp3KxX2G2N1D7dZeGFdp0Dnc4/hDtX6VsGpI8B3a41iZp1apW1L4/fSAJyJ 49FHTYvNujEmvgGyUk1lCV8VsIZme5ljSjW+TM3Oy9KJnTbmUUGXZAAN53hfeVm8byr/ qDO1y72F2ckbiytLx6k7Vtfn81c1ht1XRZxrVvgaaub4P8e7bBjoSWtHE8MKjHuyC/V+ ebNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X1p7GyMiFl6B+M8ooZ4rzUDYUkYWhAen7YZQHaQlBug=; b=ooORHqNYQZKxCTuGlMkJCKh9cdnZH2KzTkQIgmlDmnYRUs/EHXAD4y4tdPlGAGDZ8D 4hahz1Kd28GDeaf+jNHX1tAEY2PIwW7ahbhZOXklLVS+bT65Bx658zxVS0rTtFQ+0Vbd VVb2Qv2f7b9xl0AlGtv5cTwCltWEW55iYYgsgKCfh/NLaoWdEvmCO0ylkvb/GBXaFDKP H1K8sfpAZh3z6+7F+1P6X8WrGRl/AG4UwS1ZqlTrq/i6TGm1IW35qzaSk5uuA36RpeCK MiJMUpqHfBtS04EtkkOX7BUF9SVkep6OhpPvmnT/k5RzHh8p6I+bVYCr8ZEakA1kQyD6 cbZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a+N9Hh9V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f4-20020a1709063f4400b00890ac8da46asi15297581ejj.832.2023.02.13.04.16.01; Mon, 13 Feb 2023 04:16:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a+N9Hh9V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231332AbjBMMLT (ORCPT + 99 others); Mon, 13 Feb 2023 07:11:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231416AbjBMMKs (ORCPT ); Mon, 13 Feb 2023 07:10:48 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1375C199D6 for ; Mon, 13 Feb 2023 04:10:32 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id sa10so31226716ejc.9 for ; Mon, 13 Feb 2023 04:10:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X1p7GyMiFl6B+M8ooZ4rzUDYUkYWhAen7YZQHaQlBug=; b=a+N9Hh9Vvx8QQvZ7yjPj1W8RXjvaTVSookTsfjtBbnhF4iWdP5UYFfla4icv/UhdFF kFKkASlSY5Ws3D+qr4rwDfpg7StZ96z29PZqRo/24qeYlz5y3yQKWwUd5uR55Kvmljg9 uDCDGIsvKaPI8xcw/xY/yfKg/S9UdLPkZY9Vieb8S6VKyZVI/GCPTG4tdYb5esG/ilDB vqlk10DphZox1A4YdJBoPyqIFVkCeBIS4m9Xx0gFAsUkdu8wJwIJ0hfPFy7ncc2Xs3MB Nc23cVGrAaqcXWbY0rHkXf+lf9w79WpqXBYMwrOdQBnyLE77AESXetvBVjF+CScfSjex fL5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=X1p7GyMiFl6B+M8ooZ4rzUDYUkYWhAen7YZQHaQlBug=; b=Ze3oooR5mR83XUQuX5tJC2B1rXGmXgsRHL7I5Xm7g7vgu4VPxrKmpVkehOAk6jmC0y npBlSfM7KATwD75dJwXKPJ6Vpi32inE2aeXz/EBuithhaFJBoNSRKrJSGekO0+0FCeGU Gx5KiGtWpcUebxvCNV2myIiNfzOKD3Cwe7fVL3oDuuh9HOKsASS/Lgpk556xoGCONKlF I7+9B5dD/NZHgn7vl9vdAOTi6ng8nxk5BU3RX9ZzFfcIFZln5zuKnBLVeZzukvSqeRcU bAiEE9NFUqCf1/fyeCkxA6SmMqz7wBa+kByDVty74JBWz/Bci8ZgbphIV2Qy1dTphnNe x8yg== X-Gm-Message-State: AO0yUKWZYhKQDA9Yfat7WIOco6i2S4/LBa/+Jtsfn5hE882LlEIbiYIp It2irqgIJgkrJYtwmWqdA+o+yg== X-Received: by 2002:a17:906:fe4c:b0:8aa:be5c:b7c5 with SMTP id wz12-20020a170906fe4c00b008aabe5cb7c5mr28378785ejb.41.1676290225707; Mon, 13 Feb 2023 04:10:25 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:25 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Loic Poulain , Neil Armstrong , Vinod Koul , Vladimir Lypak , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/9] drm/msm/dsi: Fix DSI index detection when version clash occurs Date: Mon, 13 Feb 2023 13:10:06 +0100 Message-Id: <20230213121012.1768296-4-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757718075604748925?= X-GMAIL-MSGID: =?utf-8?q?1757718075604748925?= Currently, we allow for MAX_DSI entries in io_start to facilitate for MAX_DSI number of DSI hosts at different addresses. The configuration is matched against the DSI CTRL hardware revision read back from the component. We need a way to resolve situations where multiple SoCs with different register maps may use the same version of DSI CTRL. In preparation to do so, make msm_dsi_config a 2d array where each entry represents a set of configurations adequate for a given SoC. This is totally fine to do, as the only differentiating factors between same-version-different-SoCs configurations are the number of DSI hosts (1 or 2, at least as of today) and the set of base registers. The regulator setup is the same, because the DSI hardware is the same, regardless of the SoC it was implemented in. In addition to that, update the matching logic such that it will loop over VARIANTS_MAX variants, making sure they are all taken into account. Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 52 ++++++++++++++++++++++-------- drivers/gpu/drm/msm/dsi/dsi_cfg.h | 5 ++- drivers/gpu/drm/msm/dsi/dsi_host.c | 10 +++--- 3 files changed, 48 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 4515f52b407a..6c192963c100 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -21,7 +21,9 @@ static const struct msm_dsi_config apq8064_dsi_cfg = { .num_regulators = ARRAY_SIZE(apq8064_dsi_regulators), .bus_clk_names = dsi_v2_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_bus_clk_names), - .io_start = { 0x4700000, 0x5800000 }, + .io_start = { + { 0x4700000, 0x5800000 }, + }, }; static const char * const dsi_6g_bus_clk_names[] = { @@ -40,7 +42,9 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8974_apq8084_regulators), .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), - .io_start = { 0xfd922800, 0xfd922b00 }, + .io_start = { + { 0xfd922800, 0xfd922b00 }, + }, }; static const char * const dsi_8916_bus_clk_names[] = { @@ -58,7 +62,9 @@ static const struct msm_dsi_config msm8916_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8916_dsi_regulators), .bus_clk_names = dsi_8916_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names), - .io_start = { 0x1a98000 }, + .io_start = { + { 0x1a98000 }, + }, }; static const char * const dsi_8976_bus_clk_names[] = { @@ -76,7 +82,9 @@ static const struct msm_dsi_config msm8976_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8976_dsi_regulators), .bus_clk_names = dsi_8976_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names), - .io_start = { 0x1a94000, 0x1a96000 }, + .io_start = { + { 0x1a94000, 0x1a96000 }, + }, }; static const struct regulator_bulk_data msm8994_dsi_regulators[] = { @@ -94,7 +102,9 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8994_dsi_regulators), .bus_clk_names = dsi_6g_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), - .io_start = { 0xfd998000, 0xfd9a0000 }, + .io_start = { + { 0xfd998000, 0xfd9a0000 }, + }, }; static const char * const dsi_8996_bus_clk_names[] = { @@ -113,7 +123,9 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8996_dsi_regulators), .bus_clk_names = dsi_8996_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), - .io_start = { 0x994000, 0x996000 }, + .io_start = { + { 0x994000, 0x996000 }, + }, }; static const char * const dsi_msm8998_bus_clk_names[] = { @@ -131,7 +143,9 @@ static const struct msm_dsi_config msm8998_dsi_cfg = { .num_regulators = ARRAY_SIZE(msm8998_dsi_regulators), .bus_clk_names = dsi_msm8998_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_msm8998_bus_clk_names), - .io_start = { 0xc994000, 0xc996000 }, + .io_start = { + { 0xc994000, 0xc996000 }, + }, }; static const char * const dsi_sdm660_bus_clk_names[] = { @@ -148,7 +162,9 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { .num_regulators = ARRAY_SIZE(sdm660_dsi_regulators), .bus_clk_names = dsi_sdm660_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm660_bus_clk_names), - .io_start = { 0xc994000, 0xc996000 }, + .io_start = { + { 0xc994000, 0xc996000 }, + }, }; static const char * const dsi_sdm845_bus_clk_names[] = { @@ -169,7 +185,9 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .num_regulators = ARRAY_SIZE(sdm845_dsi_regulators), .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), - .io_start = { 0xae94000, 0xae96000 }, + .io_start = { + { 0xae94000, 0xae96000 }, + }, }; static const struct regulator_bulk_data sm8550_dsi_regulators[] = { @@ -182,7 +200,9 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { .num_regulators = ARRAY_SIZE(sm8550_dsi_regulators), .bus_clk_names = dsi_sdm845_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), - .io_start = { 0xae94000, 0xae96000 }, + .io_start = { + { 0xae94000, 0xae96000 }, + }, }; static const struct regulator_bulk_data sc7180_dsi_regulators[] = { @@ -195,7 +215,9 @@ static const struct msm_dsi_config sc7180_dsi_cfg = { .num_regulators = ARRAY_SIZE(sc7180_dsi_regulators), .bus_clk_names = dsi_sc7180_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names), - .io_start = { 0xae94000 }, + .io_start = { + { 0xae94000 }, + }, }; static const char * const dsi_sc7280_bus_clk_names[] = { @@ -212,7 +234,9 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { .num_regulators = ARRAY_SIZE(sc7280_dsi_regulators), .bus_clk_names = dsi_sc7280_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), - .io_start = { 0xae94000, 0xae96000 }, + .io_start = { + { 0xae94000, 0xae96000 }, + }, }; static const char * const dsi_qcm2290_bus_clk_names[] = { @@ -229,7 +253,9 @@ static const struct msm_dsi_config qcm2290_dsi_cfg = { .num_regulators = ARRAY_SIZE(qcm2290_dsi_cfg_regulators), .bus_clk_names = dsi_qcm2290_bus_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_qcm2290_bus_clk_names), - .io_start = { 0x5e94000 }, + .io_start = { + { 0x5e94000 }, + }, }; static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = { diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.h b/drivers/gpu/drm/msm/dsi/dsi_cfg.h index 6b6b16c5fd25..8772a3631ac1 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.h +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.h @@ -32,13 +32,16 @@ #define DSI_6G_REG_SHIFT 4 +/* Maximum number of configurations matched against the same hw revision */ +#define VARIANTS_MAX 2 + struct msm_dsi_config { u32 io_offset; const struct regulator_bulk_data *regulator_data; int num_regulators; const char * const *bus_clk_names; const int num_bus_clks; - const resource_size_t io_start[DSI_MAX]; + const resource_size_t io_start[VARIANTS_MAX][DSI_MAX]; }; struct msm_dsi_host_cfg_ops { diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 9021f0d65515..9cfb9e91bfea 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1862,16 +1862,16 @@ static int dsi_host_get_id(struct msm_dsi_host *msm_host) struct platform_device *pdev = msm_host->pdev; const struct msm_dsi_config *cfg = msm_host->cfg_hnd->cfg; struct resource *res; - int i; + int i, j; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dsi_ctrl"); if (!res) return -EINVAL; - for (i = 0; i < DSI_MAX; i++) { - if (cfg->io_start[i] == res->start) - return i; - } + for (i = 0; i < VARIANTS_MAX; i++) + for (j = 0; j < DSI_MAX; j++) + if (cfg->io_start[i][j] == res->start) + return j; return -EINVAL; } From patchwork Mon Feb 13 12:10:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 56248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2308949wrn; Mon, 13 Feb 2023 04:16:05 -0800 (PST) X-Google-Smtp-Source: AK7set+Gntx/8qwQuu5gNxNMOxgOhrwO0PsIKJHESfIK3xbfre+oiifOqkhwkdT39WH37YLzpt/f X-Received: by 2002:a05:6a20:144e:b0:bf:73d:485e with SMTP id a14-20020a056a20144e00b000bf073d485emr28597353pzi.54.1676290565138; Mon, 13 Feb 2023 04:16:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676290565; cv=none; d=google.com; s=arc-20160816; b=LW5oZgGsNfjUAecncXT91UCZUcSBDx82AqfYuRmypHIFvYZnybcdWoYAVddohwovC1 6PODn5wj6srYZ8nFS42mxTsSUTWZsvQfBcgLu0GOe3RGBwngfveNtQcPCScyxIH6i2Sd Qf7dRxpTks6XqoUCZyyKo3588+44w8pEMt2UN3V1g82PRmb/CGfC+9sHuEFr5hLiuk5e DrWY+cL/m0/2SJRnIYz980X9um/AuPqtK7uUQLsRUKsxA6k9R4dpYKazGt+jchlwuHob NhOkwZeCzJFO3M7C77gnP5nXe0dIiWD0mAo2HyYiwoy71SVb6IUpwSHpYzv+5AeD/Jp9 mpuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vNtO6TjtSJEcp8uPwtQuefcLvw6u6ONtxjs37g8Gm+4=; b=QldsNe5cxZQyqJ5m+SJUYCs4E6PXYsNUb2wxLGLpJruNp5aXCJ1kWnJJKssqhLYUWF pMlTSIhgJntj8kYteNeYhw+VA3PX2NxAL0rxl/NVTNECK/yTmm9Pg3s7W04/GpuSVDK3 iio5t6YaKvJbS+lMXuAjY01K88yaY6OjicVT+sl2xTFIwsdlxHWCg+lCxfb7NbZzHCvS qVuyX/LZ1eec57l2wZ30t7g+flHAf4r82UTMS7eAeiE6s7W6UvKasVYaqrMjW5iF4A9R B9E/UAXukX5Ht1bE8BuDyrT2Nr0OvLu099KP38gFb1OVYkQkZhSKcItPHzWRTbUe1k+H uC9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=toYQaFXO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s5-20020a63b405000000b004f2200cade5si11709202pgf.359.2023.02.13.04.15.52; Mon, 13 Feb 2023 04:16:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=toYQaFXO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230510AbjBMMLK (ORCPT + 99 others); Mon, 13 Feb 2023 07:11:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229688AbjBMMKr (ORCPT ); Mon, 13 Feb 2023 07:10:47 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 217BA199EA for ; Mon, 13 Feb 2023 04:10:32 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id qw12so31327109ejc.2 for ; Mon, 13 Feb 2023 04:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vNtO6TjtSJEcp8uPwtQuefcLvw6u6ONtxjs37g8Gm+4=; b=toYQaFXONrXRhcBi2/hw4dFUyhYBRB7y87GTU4Y3klK3WIh2/uojlLE5PuGh5xcMTo i4tnKd/9xLb6WIiHTyIVSfDnRmJp6YE/wtXaunfK2/hlmGOlKcJ2+D7LG4ZvuV8ilmk9 3Bue5mpoKtVVoa8G0pnbWlKaxmTQZVMxOPJJTc4UxtNn27hpuHtphGJMZI8N1YQjCGC0 EIMfxN3ypFRJMClIQ2Zfb9sckLN/A9nDfpSB4tFeiFAsfZUZF+chkCbH3N7rB7Ib6itM DAK8Uh31Rrf/AAEuPq/JAtje50o8BBtM8UA7qsrFLsl6AEBUpE1OyFB5HjQT6Eiv+OIv B18w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=vNtO6TjtSJEcp8uPwtQuefcLvw6u6ONtxjs37g8Gm+4=; b=GHOVbdNX6pOQTez2NVjHIoe2K6kM5LoUmq58DrcdF8WlLdvKqx46ifiupmSvew8FWT pcAG4FyG8MIIDfaEmPLXrqu9U/VpujNnO9M3wMgAEFe0hyIVPdAa/zAkYMgAsZ309H3/ 1c2EXbp4C6yCLmWwewobkcjCdDn8QvoMwUbrR4Ty3/ipI3FfwyX5SRajIfnyY3TrEQOE 7PcZWithBHbSKPNNLYVEC3xU8Rbsz2P1nFSU6529bB2vUxTgCEjDcLXinCdYZ7NB6i7S DwPbwfZXI123Wrjv+5wM5yeZw84hmFshXFo0koXRvvZCmTB1n6A/HjDHz7uM0d/zgJNs +uLA== X-Gm-Message-State: AO0yUKVkvu9ta6F0gLOG7t20vMyJfpfjLJ/kuPQWFw4nQpXvewo8DFaa y6jMPf9+tMqzAAxioYqaGFKxvA== X-Received: by 2002:a17:907:6090:b0:8ae:3380:ff56 with SMTP id ht16-20020a170907609000b008ae3380ff56mr22903380ejc.63.1676290228220; Mon, 13 Feb 2023 04:10:28 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:27 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Dmitry Baryshkov , Rob Clark , Abhinav Kumar , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Neil Armstrong , Loic Poulain , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/9] drm/msm/dsi: dsi_cfg: Deduplicate identical structs Date: Mon, 13 Feb 2023 13:10:07 +0100 Message-Id: <20230213121012.1768296-5-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757718055235436976?= X-GMAIL-MSGID: =?utf-8?q?1757718055235436976?= Some structs were defined multiple times for no apparent reason. Deduplicate them. Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 77 +++++++++++-------------------- 1 file changed, 26 insertions(+), 51 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 6c192963c100..d39521850018 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -47,41 +47,32 @@ static const struct msm_dsi_config msm8974_apq8084_dsi_cfg = { }, }; -static const char * const dsi_8916_bus_clk_names[] = { +static const char * const dsi_v1_3_1_clk_names[] = { "mdp_core", "iface", "bus", }; -static const struct regulator_bulk_data msm8916_dsi_regulators[] = { +static const struct regulator_bulk_data dsi_v1_3_1_regulators[] = { { .supply = "vdda", .init_load_uA = 100000 }, /* 1.2 V */ { .supply = "vddio", .init_load_uA = 100000 }, /* 1.8 V */ }; static const struct msm_dsi_config msm8916_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = msm8916_dsi_regulators, - .num_regulators = ARRAY_SIZE(msm8916_dsi_regulators), - .bus_clk_names = dsi_8916_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_8916_bus_clk_names), + .regulator_data = dsi_v1_3_1_regulators, + .num_regulators = ARRAY_SIZE(dsi_v1_3_1_regulators), + .bus_clk_names = dsi_v1_3_1_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v1_3_1_clk_names), .io_start = { { 0x1a98000 }, }, }; -static const char * const dsi_8976_bus_clk_names[] = { - "mdp_core", "iface", "bus", -}; - -static const struct regulator_bulk_data msm8976_dsi_regulators[] = { - { .supply = "vdda", .init_load_uA = 100000 }, /* 1.2 V */ - { .supply = "vddio", .init_load_uA = 100000 }, /* 1.8 V */ -}; - static const struct msm_dsi_config msm8976_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = msm8976_dsi_regulators, - .num_regulators = ARRAY_SIZE(msm8976_dsi_regulators), - .bus_clk_names = dsi_8976_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_8976_bus_clk_names), + .regulator_data = dsi_v1_3_1_regulators, + .num_regulators = ARRAY_SIZE(dsi_v1_3_1_regulators), + .bus_clk_names = dsi_v1_3_1_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v1_3_1_clk_names), .io_start = { { 0x1a94000, 0x1a96000 }, }, @@ -107,10 +98,6 @@ static const struct msm_dsi_config msm8994_dsi_cfg = { }, }; -static const char * const dsi_8996_bus_clk_names[] = { - "mdp_core", "iface", "bus", "core_mmss", -}; - static const struct regulator_bulk_data msm8996_dsi_regulators[] = { { .supply = "vdda", .init_load_uA = 18160 }, /* 1.25 V */ { .supply = "vcca", .init_load_uA = 17000 }, /* 0.925 V */ @@ -121,8 +108,8 @@ static const struct msm_dsi_config msm8996_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, .regulator_data = msm8996_dsi_regulators, .num_regulators = ARRAY_SIZE(msm8996_dsi_regulators), - .bus_clk_names = dsi_8996_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_8996_bus_clk_names), + .bus_clk_names = dsi_6g_bus_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_6g_bus_clk_names), .io_start = { { 0x994000, 0x996000 }, }, @@ -167,24 +154,20 @@ static const struct msm_dsi_config sdm660_dsi_cfg = { }, }; -static const char * const dsi_sdm845_bus_clk_names[] = { +static const char * const dsi_v2_4_clk_names[] = { "iface", "bus", }; -static const char * const dsi_sc7180_bus_clk_names[] = { - "iface", "bus", -}; - -static const struct regulator_bulk_data sdm845_dsi_regulators[] = { +static const struct regulator_bulk_data dsi_v2_4_regulators[] = { { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */ }; static const struct msm_dsi_config sdm845_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = sdm845_dsi_regulators, - .num_regulators = ARRAY_SIZE(sdm845_dsi_regulators), - .bus_clk_names = dsi_sdm845_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), + .regulator_data = dsi_v2_4_regulators, + .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), + .bus_clk_names = dsi_v2_4_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { { 0xae94000, 0xae96000 }, }, @@ -198,32 +181,24 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, .regulator_data = sm8550_dsi_regulators, .num_regulators = ARRAY_SIZE(sm8550_dsi_regulators), - .bus_clk_names = dsi_sdm845_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_sdm845_bus_clk_names), + .bus_clk_names = dsi_v2_4_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { { 0xae94000, 0xae96000 }, }, }; -static const struct regulator_bulk_data sc7180_dsi_regulators[] = { - { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */ -}; - static const struct msm_dsi_config sc7180_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = sc7180_dsi_regulators, - .num_regulators = ARRAY_SIZE(sc7180_dsi_regulators), - .bus_clk_names = dsi_sc7180_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_sc7180_bus_clk_names), + .regulator_data = dsi_v2_4_regulators, + .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), + .bus_clk_names = dsi_v2_4_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { { 0xae94000 }, }, }; -static const char * const dsi_sc7280_bus_clk_names[] = { - "iface", "bus", -}; - static const struct regulator_bulk_data sc7280_dsi_regulators[] = { { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ }; @@ -232,8 +207,8 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, .regulator_data = sc7280_dsi_regulators, .num_regulators = ARRAY_SIZE(sc7280_dsi_regulators), - .bus_clk_names = dsi_sc7280_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_sc7280_bus_clk_names), + .bus_clk_names = dsi_v2_4_clk_names, + .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { { 0xae94000, 0xae96000 }, }, From patchwork Mon Feb 13 12:10:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 56253 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2309509wrn; Mon, 13 Feb 2023 04:17:29 -0800 (PST) X-Google-Smtp-Source: AK7set88cUmc5+XwuYGM1nPFSswS6MdXGDP2BzsEbHs+xyNgCswdo7nrE/V3YjDEfEiGRVjONrBK X-Received: by 2002:a05:6a21:3297:b0:ac:82ff:9f9e with SMTP id yt23-20020a056a21329700b000ac82ff9f9emr17940819pzb.22.1676290648671; Mon, 13 Feb 2023 04:17:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676290648; cv=none; d=google.com; s=arc-20160816; b=LR1guCJZpwlwXz8yOdnq7Sk8ER4wENfUxqKc2mJS6nCgLD3ivx6crdTJN91aj2R6aV YimUL7T4dFuCVB6p3xwojFVw0JQb292+p/mU8K4n/xAWgqRaZ44GUTF/enDnsxOEPnq+ /OM8K4kHOMfi/boganJUnZG/ppS+X42Grk6BNegEGikxAxeig80N8Prlffpyi2iDGzPD GAPv8qOlLRLICEsz1KR73E5p4kjwySB8qxX87ncT2c8AipONWLmAq/Ls/aDVWhVWBk00 sOixqkfXZGpH6kGFAMF3Q6YkNiPo5l6T9NhUfTdf65Jz6tHaS6Z7CVeVaHMkldLuTT2d kqDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5CCpIfLPbXHR0+gI6eH61855DNORB1t4V7ruf8s/UBM=; b=D39LNYiAnvFgwMBuRQ7meiXt37sLUEOG/pk4inD1NtlAZkMgOdYH5zfGAu/SxSL/IV 9mBAR6mJCrYcGz4+pu3vksrcpWnjVvLb5EH266yr7FDyXXVlIbgEFmzjoNhedn1AEmTa znrOT5Wi3ICuncBETUcTnlbWOdvKwYoJiR8s2efev27VEHtMFOWD0t9bl+TPgGS3cQJk nGfzuPBDmTSxf/543APFLnKWDtHJLXEgBw12fn3KnQMRxzb94pd8wubFtO585rJIr3Nt V8jglcO57qGBGkVyFUfULEV3B78CeZVxmP7xnHMpKRY4GsAXGYBQAfnvGH2zUMo6Sn9m jYOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e6Aan7qt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q14-20020a63ae0e000000b004faef96aa43si11221189pgf.237.2023.02.13.04.17.15; Mon, 13 Feb 2023 04:17:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e6Aan7qt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230490AbjBMML3 (ORCPT + 99 others); Mon, 13 Feb 2023 07:11:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230290AbjBMMKw (ORCPT ); Mon, 13 Feb 2023 07:10:52 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA4621A660 for ; Mon, 13 Feb 2023 04:10:32 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id jg8so31298073ejc.6 for ; Mon, 13 Feb 2023 04:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5CCpIfLPbXHR0+gI6eH61855DNORB1t4V7ruf8s/UBM=; b=e6Aan7qtCOxr5uDXtDUzG8ZzspEzCH1OWMJ0ANGQcXzyajvonRNGcX6E0PQhMK4ubp EsPdEK1Wt604WHWLzA3gocqn/O1Yq94/qGEba8CgTeyagFyb7flx3QKyfofC3W/xkCgX o+sXtRr2XFkzKQ1IHWlOe974Tx8NyoXi7U1wDyvxRwE9dY5XiLtkhS4ZD1H0NH8ZWpoL QmsZQtnpFQUC6s9T5aIBzqb3aZSSAp8pptCpVljhu8TnskssVtGavxxFQh6KU+/uJ2Ku jWqb8xl9JCMUm2kAVGuq7rgS1xyblVvB4EaXZwNwCI1JYGR/a6KtL9g0vx2gUxCoc6p/ BErQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=5CCpIfLPbXHR0+gI6eH61855DNORB1t4V7ruf8s/UBM=; b=DnLyK0tZevfI3va01/AjQXt4PpzWQxdHo7/zDEGWXw1y2iyBkYPZnaPLbMs3efrXzE FdKr9j6pxo+aRTZ9vs89OmX+gaCjKf+DRs3rNZEc3Q0JqyWPQyaSE1107TjBHmdqcP5l ha/RchqQg6qQQAH8G1Po3nGsk6y6AvcsU+nb80lYy+uPHKmDMtUpmqto/z3TrHeDSei6 OPX9zpsU+HkCW9qCSxZCXqqO8sgLI3EhQBJZ/XcdqvQ9pn8icmF1tmfC7vuRBMGXJtYV MUhrNovDTQVD7l5WWmhlvbzlb5IRJUs/cEpkxd0J+ujy1kl0yZKdsbfEM+dC+q0Pvbdt CiBw== X-Gm-Message-State: AO0yUKUx/N6YWQ1n4OxBNQCrgwqxf5YWXsu4A7f1KYIzaQjbf14mdUD/ Q1jeAlGPRqgXkOHOQKAMvTrCzw== X-Received: by 2002:a17:906:584:b0:888:6294:a1fa with SMTP id 4-20020a170906058400b008886294a1famr24306942ejn.14.1676290230754; Mon, 13 Feb 2023 04:10:30 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:30 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Dmitry Baryshkov , Rob Clark , Abhinav Kumar , Sean Paul , David Airlie , Daniel Vetter , Douglas Anderson , Loic Poulain , Neil Armstrong , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/9] drm/msm/dsi: dsi_cfg: Merge SC7180 config into SDM845 Date: Mon, 13 Feb 2023 13:10:08 +0100 Message-Id: <20230213121012.1768296-6-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757718143382896568?= X-GMAIL-MSGID: =?utf-8?q?1757718143382896568?= The configs are identical, other than the number of *maximum* DSI hosts allowed. This isn't an issue, unless somebody deliberately tries to access the inexistent host by adding a dt node for it. Remove the SC7180 struct and point the hw revision match to the SDM845's one. On a note, this could have been done back when 7180 support was introduced. Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index d39521850018..6d4b2ce4b918 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -169,7 +169,7 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .bus_clk_names = dsi_v2_4_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { - { 0xae94000, 0xae96000 }, + { 0xae94000, 0xae96000 }, /* SDM845 / SDM670 / SC7180 */ }, }; @@ -188,17 +188,6 @@ static const struct msm_dsi_config sm8550_dsi_cfg = { }, }; -static const struct msm_dsi_config sc7180_dsi_cfg = { - .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = dsi_v2_4_regulators, - .num_regulators = ARRAY_SIZE(dsi_v2_4_regulators), - .bus_clk_names = dsi_v2_4_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), - .io_start = { - { 0xae94000 }, - }, -}; - static const struct regulator_bulk_data sc7280_dsi_regulators[] = { { .supply = "vdda", .init_load_uA = 8350 }, /* 1.2 V */ }; @@ -299,7 +288,7 @@ static const struct msm_dsi_cfg_handler dsi_cfg_handlers[] = { {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_0, &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_4_1, - &sc7180_dsi_cfg, &msm_dsi_6g_v2_host_ops}, + &sdm845_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_5_0, &sc7280_dsi_cfg, &msm_dsi_6g_v2_host_ops}, {MSM_DSI_VER_MAJOR_6G, MSM_DSI_6G_VER_MINOR_V2_6_0, From patchwork Mon Feb 13 12:10:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 56250 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2309178wrn; Mon, 13 Feb 2023 04:16:38 -0800 (PST) X-Google-Smtp-Source: AK7set/o5/MUrmCNjrr/efCBpx1NlUxn/cnBH9lyejMm4BvhLD8PuVLtLKNr82MFQepcO/OOqO2X X-Received: by 2002:a17:907:6d29:b0:7c1:6e08:4c20 with SMTP id sa41-20020a1709076d2900b007c16e084c20mr31922924ejc.7.1676290598453; Mon, 13 Feb 2023 04:16:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676290598; cv=none; d=google.com; s=arc-20160816; b=aHB5U25W14IStlpTn9lxjc5qk6c4hhzHPBncTGFkVhlMLB3K/dYf9srXyo59+KoRHc V3y+43XcDzshSvup62wN98TDHMffGhihxVAffB+HlXcV+bgURgsfLkqfmIeLvJIxPE0l ilaWwEAW05M7sER0KqLLdcDUN0qNJ6+FaHrmydYC9hiisXzEQt693m2EsUsnxiGB0Wmd v0EShMEK09S0PgUcvxYAjj35Y2Oeq7d9i4Xclm4PfGgi0MxbvAaVtvm+ZSrsWtKf/iOR qMUpEmox3sEvDxcK1X8mqBRFB+sK8Xrcr2YgK/YXTpWuE6wHSDfIIFWz7qwXrPOs8Q3d ef/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8/ijGdXUpk/bOx95tYb/G/O+ZlxWtjcaYyWfUGg3pEc=; b=zw2ofyQfVm4T0B9Z49aIRkjqQqBuFB3QoLHv5j/ZOw4DhryPJClaT6Loe2U2woMOIm Hko0Uh2JfcB/oOYYv+uNa5wJ0wbskE/ASJYYVPdfuc3FSouOQAanl9cFYyoeObcY0Ovs Qi/1F0IVHJntViisKRhecYFNHhHRLWyhW0+0ju5xUfpZ3Pm+YOHN6Oj9ayBkmR6yz2QT TGG4R4XNBEvk+vcsvJv6ED4OeH9hBa6va263AWf2rt2KR2IogF9MsjFlsyGM1lD6O47v Ilgv3zEmpfo5V2yNk/zGj17VUc2Bg5xHOknMG2MwA3HdgIOmDAUpWPpH+pyds5dRYEhu uqPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DQNyvOFF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l7-20020a056402028700b004ac089b971dsi9462222edv.114.2023.02.13.04.16.15; Mon, 13 Feb 2023 04:16:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DQNyvOFF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231469AbjBMMLw (ORCPT + 99 others); Mon, 13 Feb 2023 07:11:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231388AbjBMMLE (ORCPT ); Mon, 13 Feb 2023 07:11:04 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26EAB9EF4 for ; Mon, 13 Feb 2023 04:10:35 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id c26so26505392ejz.10 for ; Mon, 13 Feb 2023 04:10:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8/ijGdXUpk/bOx95tYb/G/O+ZlxWtjcaYyWfUGg3pEc=; b=DQNyvOFFReWgBK1ik8krxhrLtoU4RC3T3FNeQZM+IOH5fE25SpEsOmynkFIcOly4zE 5vTQcN9tsmTUaOxhE1XWjX74cAr31Fv7gx3dNDnI4FAuIj6/MPPIE6+p1riWKtProoEl 5XUuTj1eTuMnNnoe60nTOsz/Dq8xyj0q4Wrenh8d+E0c9ab8VekE77Ym6zG3GyOn8+VG fONx6Tn4uDY7rfUVo+d3EW8+id9Qbsfz4k6SdlUeaL4r2mjYVq3QdSFB4ioj1xc1ARZt U6uWRirFXGKLwXkxc926LYP8ixrmsL7OqcJw64yMqxPd4UdwE9e2GrOQkyGEA1zlRqqy x27A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=8/ijGdXUpk/bOx95tYb/G/O+ZlxWtjcaYyWfUGg3pEc=; b=LWCBl06Tkf1u9wdlJvEx+TKcYPGahFxT6EfM1h3DsS020Gkwjlt5F5c5rA5e10jUOs p7SArmiq/yXx4aMeBzDPicAiTQXsx4cSaSYIzbKQztbtUrbqZZtx/6a0dpNk33PplfuG /v6f6/wAAKlRBphNsUdH8dbujxCqGxsiWLO/B8XnKnqbsfimWctbbI44eehCNE4x88fm CS8dC2lNW/HoqavwFkisBe2fj7fzMHsfV0GEZAmzMm9DLlAbOEFwbIJo2p4OWMZ+ZzJc xBw58W8VN9Vhtk1+EAAXUYSdb4FZkdWsbj0xD5QPJnPpXbeq/0psztQmHxQcy6RezAK9 KoNw== X-Gm-Message-State: AO0yUKVjtgCQDfrj/EndoY2b5sxZ/JKJOgRjHpMNsv4UXZUC0hUt5W+z 9dA7jbYmbyz0O0Wv1N4kCZTmpw== X-Received: by 2002:a17:907:1ddc:b0:886:221b:44e5 with SMTP id og28-20020a1709071ddc00b00886221b44e5mr24043584ejc.62.1676290234028; Mon, 13 Feb 2023 04:10:34 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:33 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Johan Hovold , Loic Poulain , Vinod Koul , Douglas Anderson , Neil Armstrong , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/9] drm/msm/dsi: Switch the QCM2290-specific compatible to index autodetection Date: Mon, 13 Feb 2023 13:10:09 +0100 Message-Id: <20230213121012.1768296-7-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757718091027773184?= X-GMAIL-MSGID: =?utf-8?q?1757718091027773184?= Now that the logic can handle multiple sets of registers, move the QCM2290 to the common logic and mark it deprecated. This allows us to remove a couple of structs, saving some memory. Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dsi/dsi.c | 4 +++- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 28 ++-------------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 31fdee2052be..90d43628b22b 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -174,7 +174,9 @@ static int dsi_dev_remove(struct platform_device *pdev) static const struct of_device_id dt_match[] = { { .compatible = "qcom,mdss-dsi-ctrl", .data = NULL /* autodetect cfg */ }, - { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = &qcm2290_dsi_cfg_handler }, + + /* Deprecated, don't use */ + { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = NULL }, {} }; diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 6d4b2ce4b918..29ccd755cc2e 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c @@ -169,7 +169,8 @@ static const struct msm_dsi_config sdm845_dsi_cfg = { .bus_clk_names = dsi_v2_4_clk_names, .num_bus_clks = ARRAY_SIZE(dsi_v2_4_clk_names), .io_start = { - { 0xae94000, 0xae96000 }, /* SDM845 / SDM670 / SC7180 */ + { 0xae94000, 0xae96000 }, /* SDM845 / SDM670 */ + { 0x5e94000 }, /* QCM2290 / SM6115 / SM6125 / SM6375 */ }, }; @@ -203,25 +204,6 @@ static const struct msm_dsi_config sc7280_dsi_cfg = { }, }; -static const char * const dsi_qcm2290_bus_clk_names[] = { - "iface", "bus", -}; - -static const struct regulator_bulk_data qcm2290_dsi_cfg_regulators[] = { - { .supply = "vdda", .init_load_uA = 21800 }, /* 1.2 V */ -}; - -static const struct msm_dsi_config qcm2290_dsi_cfg = { - .io_offset = DSI_6G_REG_SHIFT, - .regulator_data = qcm2290_dsi_cfg_regulators, - .num_regulators = ARRAY_SIZE(qcm2290_dsi_cfg_regulators), - .bus_clk_names = dsi_qcm2290_bus_clk_names, - .num_bus_clks = ARRAY_SIZE(dsi_qcm2290_bus_clk_names), - .io_start = { - { 0x5e94000 }, - }, -}; - static const struct msm_dsi_host_cfg_ops msm_dsi_v2_host_ops = { .link_clk_set_rate = dsi_link_clk_set_rate_v2, .link_clk_enable = dsi_link_clk_enable_v2, @@ -312,9 +294,3 @@ const struct msm_dsi_cfg_handler *msm_dsi_cfg_get(u32 major, u32 minor) return cfg_hnd; } - -/* Non autodetect configs */ -const struct msm_dsi_cfg_handler qcm2290_dsi_cfg_handler = { - .cfg = &qcm2290_dsi_cfg, - .ops = &msm_dsi_6g_v2_host_ops, -}; From patchwork Mon Feb 13 12:10:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 56255 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2309769wrn; Mon, 13 Feb 2023 04:18:05 -0800 (PST) X-Google-Smtp-Source: AK7set/fKUxLiOSaYrBJ6jEGx2WdtUxja/epL8voKruwIiTk1Ix1R1pscJ20L+/l8/L9/OSBRql4 X-Received: by 2002:a17:902:c40e:b0:196:8a80:4d91 with SMTP id k14-20020a170902c40e00b001968a804d91mr28638757plk.35.1676290685558; Mon, 13 Feb 2023 04:18:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676290685; cv=none; d=google.com; s=arc-20160816; b=CGarmoNSHbGoY+EMmCtuf7oSMuZKmxPtwquKAFCHocYcWn6Wa1RNWN0fYCVfgn1k3W g3bchU+yNDGoDEOAbamKpcJhtMHjM/53iSY0ZsginB2iyen2TpFYq/YFee7RmyFo31HJ sMvweWn4cjY8pr9DTsGb99/GoVhqerEA5VZUo53ZrWUr0CoTkQaKbN8Y4YaQr+bcw3pj cqKbGGBsvt9/Onrp/kyJxMbkI+XRYTAdGHKNUVlfLiHLrxWCasmuFiDkY+goI7HvsXEU GOpw96gvFueSVHxc2BJlwlVQhWAk5SecaK4PK5rU0zit/AN/6AjrWx89UDxs432l42f2 AQ1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=W/kPvMZiwgDK+KZq9Kf+lEuw04CYRxX2KFNzK4CB7Pw=; b=uLPyfKGkCjPsX+MIDzVwxWhDlwfoQgTb3Ew27Qe0FzKz+0MQ6zafSh/QazlCsyN0la XbzfSUol9qDgQVYT7O/LnHViwxKAM8583VLgIwsuq9qulqawhC280FhcXaYjujnoryKK z6E8unkgU+R7VvDbyq3x/CWiIzdolGPhre6IiYJYj8+JkZnVbVNzQYMX57+6mu/GRP3J WKzJXBbfx8CsouRGrHLvdxF0fehgAaczc9dz1hZ0qSqUaE69imeVdCHlNjeO975Ets2Q f5BKg/H1VjWOV+6m3YRe53n8bzuXD2mPBc8jg10ePFVkNtl5wSRz6XK+jdQy/DjsudWK A4Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jMzFgbQ0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d5-20020a170903230500b0019911e762c1si13226716plh.212.2023.02.13.04.17.49; Mon, 13 Feb 2023 04:18:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jMzFgbQ0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230248AbjBMML5 (ORCPT + 99 others); Mon, 13 Feb 2023 07:11:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231374AbjBMMLG (ORCPT ); Mon, 13 Feb 2023 07:11:06 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08A23B74B for ; Mon, 13 Feb 2023 04:10:40 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id hx15so31236681ejc.11 for ; Mon, 13 Feb 2023 04:10:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W/kPvMZiwgDK+KZq9Kf+lEuw04CYRxX2KFNzK4CB7Pw=; b=jMzFgbQ0fUe+4erNDvsfQTczPffpIp1t3k7O7tJhiPwIdCtYM+LM5pICdn7e7aqDvJ FhV2wU5125wBpyZqKBPD4oatdrTOkpv78KhcKieVTA31YzenyPoCe04XSFgXbKP8ya4T ZbQ6poWo5m4nl7GtVy4nKWGyJe+UVfT25kLdjxSkVcnfyQ9OPrpmrF/exUckeBgDln2i 9oc5meWaJgngoMFPr3z34EFEjPglCKPMthuBIxto4VNRZrU8GP2BEKtYiLG81m7EOQhE 6PyVlX45x58ss46CYbSKjyqgUho+TI46cNjnW57JnRR9jVBnXWIRN0lqQh8JdxsFJopr PeBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=W/kPvMZiwgDK+KZq9Kf+lEuw04CYRxX2KFNzK4CB7Pw=; b=GgtkdkVj+tL5gAM9KUoEqoPyotpI86uoG3YqkXY69Tjmbb7Mpnd5vEcqOav+fYkJ/z xKfv4CzKlCg79YebnkG0haOAMjTzUUMrALSWQfxXKdjfnQRg/mNSALnRAel4fvlbfQS5 VHHXkVUadukMPI7Og5ybKGHMG1JD1zE37U3BnKO2+mRhL38Stk4wDViH30KWqA23qQ01 dx8IzrS89ybEB5kcKAErBGL5HBOF95cWeJ/KKYBtegwP+rnXORK+KDZNm5gKbjS5sGtu kJbMBTL0Q2pmd8oKVOpfCLg5uiWjYlttQfhlQ8oTvxDPh0sRlkL5TboN5yNd9KjpJbID WpKQ== X-Gm-Message-State: AO0yUKXuVb+TpSVpKCExKnSVXYEKtL025WLF+Cehr4istucnO7FHTRxA ju0GSS7ul7CSUOpm5raYP2uKXA== X-Received: by 2002:a17:907:804:b0:8a9:fa2f:e440 with SMTP id wv4-20020a170907080400b008a9fa2fe440mr28641469ejb.55.1676290237351; Mon, 13 Feb 2023 04:10:37 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:37 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Dmitry Baryshkov , Rob Clark , Abhinav Kumar , Sean Paul , David Airlie , Daniel Vetter , Loic Poulain , Johan Hovold , Vinod Koul , Douglas Anderson , Vladimir Lypak , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/9] drm/msm/dsi: Remove custom DSI config handling Date: Mon, 13 Feb 2023 13:10:10 +0100 Message-Id: <20230213121012.1768296-8-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757718181980306478?= X-GMAIL-MSGID: =?utf-8?q?1757718181980306478?= Now that the only user is handled by common code, remove the option to specify custom handlers through match data. This is effectively a revert of commit: 5ae15e76271 ("drm/msm/dsi: Allow to specify dsi config as pdata") Reviewed-by: Dmitry Baryshkov Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/dsi/dsi.c | 4 ++-- drivers/gpu/drm/msm/dsi/dsi_host.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 90d43628b22b..e0b911af618d 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -173,10 +173,10 @@ static int dsi_dev_remove(struct platform_device *pdev) } static const struct of_device_id dt_match[] = { - { .compatible = "qcom,mdss-dsi-ctrl", .data = NULL /* autodetect cfg */ }, + { .compatible = "qcom,mdss-dsi-ctrl" }, /* Deprecated, don't use */ - { .compatible = "qcom,dsi-ctrl-6g-qcm2290", .data = NULL }, + { .compatible = "qcom,dsi-ctrl-6g-qcm2290" }, {} }; diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 9cfb9e91bfea..961689a255c4 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -214,10 +214,6 @@ static const struct msm_dsi_cfg_handler *dsi_get_config( int ret; u32 major = 0, minor = 0; - cfg_hnd = device_get_match_data(dev); - if (cfg_hnd) - return cfg_hnd; - ahb_clk = msm_clk_get(msm_host->pdev, "iface"); if (IS_ERR(ahb_clk)) { pr_err("%s: cannot get interface clock\n", __func__); From patchwork Mon Feb 13 12:10:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 56254 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2309726wrn; Mon, 13 Feb 2023 04:17:59 -0800 (PST) X-Google-Smtp-Source: AK7set+dZUPPNS8vJRSWxJs1YuIUveRUBtbR5/4DK+lQrM6VEjZ9ACOhDaEPrOymPLN7C06gokqj X-Received: by 2002:aa7:9556:0:b0:5a8:cec9:6ab6 with SMTP id w22-20020aa79556000000b005a8cec96ab6mr320879pfq.31.1676290678830; Mon, 13 Feb 2023 04:17:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676290678; cv=none; d=google.com; s=arc-20160816; b=d8ysRL8T4aRiK5zUJ7384cmL32Zp0jzp9ezKkd4VCCf5OAXqRYjBrQRGhCNBVafOrE aOb1PkgLDR0AgH2RELbPnhx0mvan1kIjqkdQL0oRvcBHZjgVoIaDF6wPjfzX5tibCNRa 0+2c5YwFaRH/WoYSrQK20T2xBxTLbZxBbMLnx/e5Z+oEy+H82VylXIjfTXjB8MOor+4X Yt/lOPJjeudHpXRhK3/KygmSHB3arobSdGi7HJoFo/lSk59lDt/0qjKYfP9xFlZuochf AqQOWPbA1P8vCMqo4Lb1MVnMr+W4scnvv3hNH2X76k31ZlKevDqWVuX3C/0LzlcgYAI5 h4TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ep4dAxNDBfiGXuqBk5NhBpEX23ggwEaT57AExj6qK0E=; b=tsRIm2h7hpJBZizGpRfOKjupzP3OK/6W3OS0huTsYMD9xMntNb4iJDNyD13cs6qZ/F rIYhIBjDshgQo5YhtLDQhRaTPHDVC36pvBYrySTb15FN8PBy6nzyqtXmg/JOEx+oiqRl CsvtgBaZtbYeuXqAe05/+gdEiTG5t3YePdHeUaqvgPVSaoz78tjR/gstfBLdrjc3p67i 7R3O1C+3r5DSgC06le8FCQk4UHYLB8QCcJduqeXvm9ypp4XiG5H9B13/w87zA/eTiZu0 bh5QZdtGlIQlCSo75H4h376KT7PJCz7foWAyehVfVMXFO+9DfrysnbdzdAck8UAjAsHu N9SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eGCWScyn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r17-20020aa79891000000b0058426b3545fsi12125352pfl.113.2023.02.13.04.17.39; Mon, 13 Feb 2023 04:17:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eGCWScyn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230201AbjBMMMC (ORCPT + 99 others); Mon, 13 Feb 2023 07:12:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbjBMMLN (ORCPT ); Mon, 13 Feb 2023 07:11:13 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE909193F4 for ; Mon, 13 Feb 2023 04:10:42 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id hx15so31236911ejc.11 for ; Mon, 13 Feb 2023 04:10:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ep4dAxNDBfiGXuqBk5NhBpEX23ggwEaT57AExj6qK0E=; b=eGCWScynR/KATjl4CR1NQ0awa37mNI8v0bJtA/rygcer1I0LVc7i04Jp43z2vUlwgn a+ODzt8JJtOMHJOwKcCsq7PmgRM4WcbMAMOhQTU4Ci90i6K301aHcKQZccfvxfyaNlVl qdpImCNac1yuuItnpKBJdB6tXjAMeE+rAK9UAEKMKsNuUjIwN5FrnvTlt+JfeE388AzT 1WMdLj1Yy/arp6lE7YgTtFbdACRVTqZNkLGtqBdxfIyyiH5WVbvZ2iqgvpSSuTpYFMK0 Rx7E/iMJySn0UCfGQ882aKjZRwOjoh6lAECPD324X5W2V2SMOjomSR8NJ8OIcKr9EB/k 8PyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=ep4dAxNDBfiGXuqBk5NhBpEX23ggwEaT57AExj6qK0E=; b=w08tlD3ohaek8KfktXkC13VOpVvKTIz5shJAPYOv2wmnnX8SS+vXX4GWTQVlJgrEr5 JSiGPUFRqmOW7DfUETtG7GRXktQ0lU1JIihyjpLaYqlR5IFYqDND1A84vR6d4jSvNx58 Tg0LwtzlktQ5V3UVdbp2043+ZKQR8JHTOh0yUWohZm4jNvd6i2nhuA1rZMJQ/xbn+3VX ybxLUbHIiQpp5ZBFAlfas1HRm/BC/w9KhNa4GZByqI5EpKkomRXtrp07BdAbi8ynjJlP 0kUiM79GDMbJ5QXbYPL85u8Gy7l7AQkj39qIBCmuwR/evt1meIcZoxAxXk1d/DoFSWxP 95lA== X-Gm-Message-State: AO0yUKVmez1ox3sve5j4YUpN7tVVjA93DC18H1a4AqFki/Df1pANwuAP E9It7PuUmjS+OqXwyQsDynVgjg== X-Received: by 2002:a17:906:988b:b0:88c:3a48:715b with SMTP id zc11-20020a170906988b00b0088c3a48715bmr26558712ejb.30.1676290239364; Mon, 13 Feb 2023 04:10:39 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:39 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Krishna Manikandan , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 8/9] dt-bindings: display/msm: dsi-controller-main: Add SM6115 Date: Mon, 13 Feb 2023 13:10:11 +0100 Message-Id: <20230213121012.1768296-9-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757718174806529633?= X-GMAIL-MSGID: =?utf-8?q?1757718174806529633?= Add a compatible for the DSI on SM6115. Signed-off-by: Konrad Dybcio Acked-by: Rob Herring --- .../devicetree/bindings/display/msm/dsi-controller-main.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml index 2494817c1bd6..f195530ae964 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +++ b/Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml @@ -25,6 +25,7 @@ properties: - qcom,sc7280-dsi-ctrl - qcom,sdm660-dsi-ctrl - qcom,sdm845-dsi-ctrl + - qcom,sm6115-dsi-ctrl - qcom,sm8150-dsi-ctrl - qcom,sm8250-dsi-ctrl - qcom,sm8350-dsi-ctrl @@ -351,6 +352,7 @@ allOf: contains: enum: - qcom,sdm845-dsi-ctrl + - qcom,sm6115-dsi-ctrl then: properties: clocks: From patchwork Mon Feb 13 12:10:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 56256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2309857wrn; Mon, 13 Feb 2023 04:18:16 -0800 (PST) X-Google-Smtp-Source: AK7set+fmQZVPvAhtFFYrnZICI4QiDGgDBSwIB+RRx8OpG3KIXH5NniK2+ogC4uT5TVVTRflP9OC X-Received: by 2002:a50:a45b:0:b0:4ab:4011:ff3d with SMTP id v27-20020a50a45b000000b004ab4011ff3dmr11709980edb.0.1676290696260; Mon, 13 Feb 2023 04:18:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676290696; cv=none; d=google.com; s=arc-20160816; b=ZXRk56v1BUnnktzfxtQgYQxNlIWnYtoDBlnYg7Kt0N9KRmQ3u6s9xKFUNjUQ6tLj6s 9i0lSb+W65btHABrhSY+TdsAqmsUAhjNdxCjJFdzzhpgzVwo0MnvaZGlwUMskqlpbS81 NCWGZZi20bdtRLPQMmeevnbo+0RJrRj9umLFQifP6XfhDn52djyxKwWeat64dWltJcuM x2mLhQ3gEYCYc2ClK41YlAe4JbyqBAsu8w/UtvazZWnjEUePeMXzVWh3GWoaWbTF/Db3 aIx7e16F0NQLioNOYLUugagH1foR67uieIuD8M9w9Q7STh8XlQq6jzsj41M8YS9Ge3XG 4eEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7JwitY1QgTn2wW32f2EWY7DiZlNcao6/ffQYXSOSkgM=; b=nAd6WKs4p0ikEtYGEna0McoeJ7231Sk6bBWBQm0jI5zM8xWbvcqosUyzN9o1vVUPub noH5aAMneT+4JT82suThDbHkgRXZCv5MihSFzuehWVAxaNfTlC8oK49LLOnuyRQPk7Ac GN8cNVwjy0flEQ7gYvomoQAv1tNIw1s/2Y4ZmJ4aEYKyIEhGROGxx190PbXlfhRFUHj7 rPccAUY/Knwqr8+Bwq5UjcVItCakiXRCuKkk/i3vDLkKXCoHkj6pGLc02fpLyKO+7/zV d4tAxiDg2K2VJ4jQZgBVFPhmrIhSVs6kjzPs7iJ+7qQcCeLHT+zcoXkYbNjzHTDxnvVa bBfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hGvnAsUO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r23-20020aa7cb97000000b004ab1747b80fsi13687835edt.246.2023.02.13.04.17.49; Mon, 13 Feb 2023 04:18:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hGvnAsUO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231248AbjBMMMF (ORCPT + 99 others); Mon, 13 Feb 2023 07:12:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230361AbjBMMLO (ORCPT ); Mon, 13 Feb 2023 07:11:14 -0500 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FC121A66D for ; Mon, 13 Feb 2023 04:10:43 -0800 (PST) Received: by mail-ej1-x62b.google.com with SMTP id qw12so31328585ejc.2 for ; Mon, 13 Feb 2023 04:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7JwitY1QgTn2wW32f2EWY7DiZlNcao6/ffQYXSOSkgM=; b=hGvnAsUOiAo8e5XcrV48vO8k565QbdVnV75roqlQVSvdFxJxTvTQOQLz7BHO+B50vI RHkrT0HDr85tVr/1L45VwNonktRigwIYL59ygol+VfkoyhnTD3w+yeCZvhD1uJ2e9f8w tysowusaNeRWUdr8mApnOVAULocSOn8iC4/f6Cuam+6iF2e+PzlmhVKBbKgL5UpxGKPT MTS0nHr2WnEN0UYLdk/Z3GYU+gngVviUfGLxq07nCwYVeQvoX4Ud5rZMOHzNxXb6aNkF nfUgNsL/YYHBQL8oRZCWZmPJrliqhgNkZkXvhlouoPRdaNiVvE2Y3so3NEUGqcA/5cBR LrYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=7JwitY1QgTn2wW32f2EWY7DiZlNcao6/ffQYXSOSkgM=; b=7l6cikiZNL47zwCTx39Q7ZZUPiVvYtiRQzl7CcX2U5edvXUxzJ9vjcRiG4k2UY5F8I cy0FtdnUxzA2M2ZV3XmAptYJvaRXyX60M5RfqNDx1q2h61sRH1P3KVsaYAjlD+G+FI/N 9Pqtdr2dXbkZ+9kTPebk5Y7G1Gyklis8CwBqtqBTrbINVkeMgK7Dn8+S5fEt+5rDy6qK e0MpBDwUii1xYWLFUneGRddb3iDmErVdRy0bhE6bgxgKWvRD0IUPfP9OxcgfVJeSTHwa Pva6nSQaRFi1E0lrFuEWZR2WLWmZVG0tKc601RdFv10z+NYvLRLRnxVYicu4Dm3cJEdE z2gg== X-Gm-Message-State: AO0yUKUcVhMztPI5wtzgzhZ+uIq3Y1avdmiFHF6p+7492Q1DYftV9jv/ Jnj+veVkgFsg09sddLFkCoKCbA== X-Received: by 2002:a17:907:9a0d:b0:8af:3fcc:2b05 with SMTP id kr13-20020a1709079a0d00b008af3fcc2b05mr14287763ejc.12.1676290240723; Mon, 13 Feb 2023 04:10:40 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id dt19-20020a170906b79300b0088ed7de4821sm6651586ejb.158.2023.02.13.04.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 04:10:40 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 9/9] arm64: dts: qcom: sm6115: Use the correct DSI compatible Date: Mon, 13 Feb 2023 13:10:12 +0100 Message-Id: <20230213121012.1768296-10-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213121012.1768296-1-konrad.dybcio@linaro.org> References: <20230213121012.1768296-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757718193559969781?= X-GMAIL-MSGID: =?utf-8?q?1757718193559969781?= Use the non-deprecated, SoC-specific DSI compatible. Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index bff067ed2e94..15811be82acc 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -1447,7 +1447,7 @@ opp-384000000 { }; mdss_dsi0: dsi@5e94000 { - compatible = "qcom,dsi-ctrl-6g-qcm2290"; + compatible = "qcom,sm6115-dsi-ctrl", "qcom,mdss-dsi-ctrl"; reg = <0x0 0x05e94000 0x0 0x400>; reg-names = "dsi_ctrl";