From patchwork Tue Mar 7 13:01:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 65456 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2421560wrd; Tue, 7 Mar 2023 05:14:39 -0800 (PST) X-Google-Smtp-Source: AK7set+K8tzJY+ZqoOY6CmMWH49jqBdTRqWc6RxQ8KENZJ+vSyACdjL0NjvazsOKmF1iCf0znRxb X-Received: by 2002:a17:906:a1c5:b0:906:3373:cfe9 with SMTP id bx5-20020a170906a1c500b009063373cfe9mr13821803ejb.10.1678194879243; Tue, 07 Mar 2023 05:14:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678194879; cv=none; d=google.com; s=arc-20160816; b=vtiss8/l2lx0nA43sxbcGOKOSbJYn/7d71L2IinbXiNFtcdJAYuremcMwuNxwcMk+W hcbr9EACqRvZLZ9gKXomY4dNsD/PSLjuCASwFKu1+OCJ+2aWy9g8txXPozuSqNRgBa3q w2HaWE+0lNsHlg0lqfqAfbmXu4G6x/VtZQi/DzbIAgKNCoyaUtABMBCLb6hdvDJ/1/by u3zU9WfJrsxqUNUeS6niUWa7WF8R2fVZcounE1LLiUQDGQkmwWKBa+fvE4JXvOYGgQGU xx9bc3CFKVixfTZWYOGr96bGjmnAG1RsDyruzOUuAkm8qynTiqtGlUEGFhwYRM0c2nhK vCkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=7PaidmNsI4X4+HjLVSO/Mw/Vgb1gA+84W9VJP5fzGmw=; b=bE3ITH95n3NpUiMcoDRLpXGYF4T53AX/xQ9HY8yrNad3a2HURzcsgBQg6Ql0Z1mWKg 41Q91SPV/An4Lt+2LwOtVtKtYWWECiOANAxsRriEf86FdNXl6bWAdb4fwt3nr+oA8YH+ iu+N0aoqnZS89ZmgUuyO7Sdy0QIOZU8sdE6yjU2v0kzv8RLdN/8bZPOU2azH16bVwOvw 7IBqPhJ6VY2Vs2O5QlJ7CI0qGJlzJtI/je1fGDRerG7257cWmJOx1tsZIdBv9RPJVvzX qhI6KElptg8NVMC27ooOauR8Vdef++/fpKltyTeE6Obb9ebe2v0KXRfzZaAvJmfiCb/d HoSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ybDeVf3o; 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 r5-20020a170906280500b008dbc41587a7si243091ejc.121.2023.03.07.05.14.16; Tue, 07 Mar 2023 05:14:39 -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=ybDeVf3o; 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 S230092AbjCGNC1 (ORCPT + 99 others); Tue, 7 Mar 2023 08:02:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbjCGNB4 (ORCPT ); Tue, 7 Mar 2023 08:01:56 -0500 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25ED73756E for ; Tue, 7 Mar 2023 05:01:54 -0800 (PST) Received: by mail-lf1-x129.google.com with SMTP id j11so16890179lfg.13 for ; Tue, 07 Mar 2023 05:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678194112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7PaidmNsI4X4+HjLVSO/Mw/Vgb1gA+84W9VJP5fzGmw=; b=ybDeVf3o3AYMMPETLq2Rdp9UGraYIOlwXEM3om7QZZEOw1tG4ydNiM9rck7drBz1h0 jWEFVmcl/EKs/NL/y1jVMDZ49zWO7OBk4um0M0rK9XpMSU7r8RZG17JZIxmgQ6hmXKA1 /jDMG8WfHpNXWlGxHtJrAP/YQeCgxwGS/Tw5baoUbjUo8glTUO0xB5AUpDZ92/0kwt7+ Sh99yfvUMkuPgHA+uCbGtpApsCwT9j1U0kUGYA6nyFASz+kT6rT0TzFm3NfXubj+9+7H P1kJMStI5ESo46W0i1Za41E43Fqd2IOOTtWplXoKOocoX7tGl1tnkvilQleSmdrFDGIy 495A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678194112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7PaidmNsI4X4+HjLVSO/Mw/Vgb1gA+84W9VJP5fzGmw=; b=Eu1UQRcJv2UuLRfrKNSR0AU8OZ+f8FH45SO1nQcE+Aqc8Bnwo7ajgcwLjS2n1SIOId U2RT8//GraEo6OplpSTbCYlHNqKLlCNVOBCP8K+cSKl0eh/H7DyNibxr5uG9MPVxt6ke bKm2mGOUtlovrh6r5DtlXjwMaCvnQbzyFhMXxfPdDCgS0qtbKyX0hByMpnPnYv1STVh1 K4vBKsbFGqPAKvhlrj82zoj2zjMtbrRCWrjZJpvPMzU3toJt+9g0I8MnaGsE9FTAJGoY sFqYwmTtDNzFI2Z/DqO6p+V3jpy+BGBUgNqQLOKTGm5/JMkZsY62mHDMNqEkLcdtyiqN R1nA== X-Gm-Message-State: AO0yUKVr85DdT+KlkScfRwkbqjvHni4sHZCX7x8VptnIxRutZFj37s3w bpE9MvWCd0B2EmYLk5gbbU5pJw== X-Received: by 2002:ac2:5dfb:0:b0:4d5:8f3e:7852 with SMTP id z27-20020ac25dfb000000b004d58f3e7852mr4051427lfq.49.1678194112386; Tue, 07 Mar 2023 05:01:52 -0800 (PST) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id u2-20020ac248a2000000b004cc5e97d356sm2048265lfg.148.2023.03.07.05.01.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 05:01:51 -0800 (PST) From: Konrad Dybcio Date: Tue, 07 Mar 2023 14:01:45 +0100 Subject: [PATCH v3 07/10] drm/msm/dsi: Remove custom DSI config handling MIME-Version: 1.0 Message-Id: <20230307-topic-dsi_qcm-v3-7-8bd7e1add38a@linaro.org> References: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v3-0-8bd7e1add38a@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Krishna Manikandan , Bryan O'Donoghue , Andy Gross , Bjorn Andersson Cc: Rob Herring , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678194100; l=1669; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=x9eSVOGZMp5LDI1BiTB/gmaSF0y+os8hsi63E66yEQw=; b=SE4rbaWLt+hWaIAtC7Qt02TIAq4KXSrCYpl8fpJ4Mi/B1KvuDGHtJetP3PvPm2tCvYDkNx2j6kcR POEjl9jlCTiSdZQTrezBPqu+t3WWg1iGpvdUwufC2NSGmldNRviD X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-0.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_HTTP,RCVD_IN_SORBS_SOCKS,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no 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?1759714873803273295?= X-GMAIL-MSGID: =?utf-8?q?1759714873803273295?= 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 Reviewed-by: Marijn Suijten --- 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__);