From patchwork Thu Mar 16 08:51:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 70676 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp365682wrt; Thu, 16 Mar 2023 02:00:48 -0700 (PDT) X-Google-Smtp-Source: AK7set857OvvZMfSs5lcKH5NcS5CpHemqr6jwb95S6dBkbvLfWukGiuBdsU6WbtyoT8H2if23I2A X-Received: by 2002:a17:902:c791:b0:1a0:5671:42a6 with SMTP id w17-20020a170902c79100b001a0567142a6mr1890557pla.31.1678957248451; Thu, 16 Mar 2023 02:00:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678957248; cv=none; d=google.com; s=arc-20160816; b=E5q60bJLeiG4VPJRzXeGWPmWcILY2X4s4Qq2JKCuv1uFwz5Ejmled8+hU4ICw9++Ll lhVFTCtwKQdhuNp2anamTeYJ/b3aEZlpgICoZ3822BqeCUO9VdD9GCND7QuQZBqjTgff gEgEpEzAl8wNYuXEfNfio4LqddrZwSQGKBfUr7IsTULqO89hB1nMhDdVQ1HHc+Vrvth2 1rR8GYIq1zW6jKKdVIeNs7UmeLPbV8qZjcdYPuqk+2eI5xptaNg2uVKXn+wY6uOtN/du cS1U/hiZjsuZhdqN9REhKYp8Y3rZ34nxZpRmWcPVCempfsqPLtiXBF4O+RYIQgJ+ZCrg OjiQ== 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=Vhpul7Rh3cRj+K0GuudZQvoFoP/xfXO3CkdZI/yylms=; b=VM/p1RN+dMG6TmJWSRZgs3UA45jyGfX86imem4IYm+cJmAHvOH4dEXh3OHM3u2ErDz uEqaJeOwUNpPfUCeKSbrNE6gVkd1x2/2sa2mjNHpCuU0dXieqQKPw793neps2P/3Ew8V r+uCbwlDbRNOMHSiWN2y+Z/yZiO6/Cd/4OECxNO6jf4xK5HzK5XX9VL7UyTvnRhTficn UAGtb9HUjnZNPo8jRFNmA9k/oaj3Gm5oVNkvfWq4w+a19xN2g4uHbYMflP1BJeY9YSS+ SIuyHOrzsCIVsgcg2Y1p7Jv2D2/tAAnCAHuv8XRLbREtd/O9OSUtxwvvKnNCYuCcYHbu q1Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WGZZcM6W; 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 p15-20020a170902ebcf00b0019cb53969a5si7109463plg.398.2023.03.16.02.00.35; Thu, 16 Mar 2023 02:00:48 -0700 (PDT) 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=WGZZcM6W; 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 S231307AbjCPIxO (ORCPT + 99 others); Thu, 16 Mar 2023 04:53:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231127AbjCPIw1 (ORCPT ); Thu, 16 Mar 2023 04:52:27 -0400 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA40FB7181 for ; Thu, 16 Mar 2023 01:51:27 -0700 (PDT) Received: by mail-lf1-x12f.google.com with SMTP id x17so1366374lfu.5 for ; Thu, 16 Mar 2023 01:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678956682; 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=Vhpul7Rh3cRj+K0GuudZQvoFoP/xfXO3CkdZI/yylms=; b=WGZZcM6WcKH5wJ1+O0BxrYdydlbnmi9n3vrDnUzyoEKCuj1f5n+zMKOcvadpSek/hA vGL63abAMSP5iVzvDL26UfoC6spiGrsmj4uybj2x0vMaUWZ/I+xvRhYjlShoy/fzsEPr ExY5DeTOQUtgCCQieW7i3WDOwt3BDmtkbhEew5FUNqd6JHTRKaBuxqVXBqHRshHtnPFE LWIRg42QHEd8i3PwNRacAkcOWKDzWiYTPUXm1Mf+12UOmEcrUcdvU92UbyAKvwvRSsld PEbfiR7VVopFzPxwdkxlCg0xm/gyQbUKM+5wUfTZOPqv9U/uvWt0I6AWAcDlv/PlftJ/ ABlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678956682; 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=Vhpul7Rh3cRj+K0GuudZQvoFoP/xfXO3CkdZI/yylms=; b=a2ecautGcaOwFxDA9mpue3U58GbA+yXI7l9eIuE2HFR7v9c0CfEdZKJLB4iHlpkUD4 5dbGnnbupMLy4HXYwPTyyWnXUoORDtJICBb0Q9FyIaGXuepNRjMjeth01DcDCOSmw9FT KRbockNZj8b5c7J3Vn/1FqWMYkbvakYa3iWrIHXSQ2NKJfn0dt7Q+BvW/DZ6KvcHMoxb 3INYj+laOVQN+FAuYVdoxMQmX8bnjAjb594jmlMDQtgpABeFjOOOWZIZHLz4rxJfY+zw E+GjhimwTdgyzY1eeDxTvsZcqZ3SUdfYJQT8zB+eEj73UrxX3vjot+DjCIdHHQM+SHsS +gjw== X-Gm-Message-State: AO0yUKWUNfZ5uaRxLMobkE3rKjczEljRVs3l23jzU6wQU84YLRw3OYJ4 4Hbcd73bpB5tHfMbyJOswhLm9g== X-Received: by 2002:a05:6512:2804:b0:4d8:86c1:4771 with SMTP id cf4-20020a056512280400b004d886c14771mr2570389lfb.6.1678956681755; Thu, 16 Mar 2023 01:51:21 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id o11-20020a2e730b000000b002991baef49bsm251566ljc.12.2023.03.16.01.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 01:51:21 -0700 (PDT) From: Konrad Dybcio Date: Thu, 16 Mar 2023 09:51:13 +0100 Subject: [PATCH v5 07/10] drm/msm/dsi: Remove custom DSI config handling MIME-Version: 1.0 Message-Id: <20230307-topic-dsi_qcm-v5-7-9d4235b77f4f@linaro.org> References: <20230307-topic-dsi_qcm-v5-0-9d4235b77f4f@linaro.org> In-Reply-To: <20230307-topic-dsi_qcm-v5-0-9d4235b77f4f@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, Marijn Suijten , Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1678956668; l=1730; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=F4fPirOHyMQPj35ost0pdi8esBWoDrjWNUljpExX+4U=; b=FL/r6rvLYNSYDNfxE3wvGBoxEwQ/m3wkv470pmFuq27VtanvQIIOf7xBKwiqIZyhM9Ok3ofPqSOM qwkknPNnDy8cfZ9kpkusgCrzafDZeyJpNEQ/i7+w1iFvb6rc6Td0 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 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?1760514275495086903?= X-GMAIL-MSGID: =?utf-8?q?1760514275495086903?= 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 Reviewed-by: Marijn Suijten 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 f761973e4cba..baab79ab6e74 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -172,10 +172,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__);