From patchwork Sat Feb 11 11:51: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: 55798 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1455805wrn; Sat, 11 Feb 2023 03:56:17 -0800 (PST) X-Google-Smtp-Source: AK7set8jg7qv+OKbV4jPPZYxy2VwkOpt/k6KxEoC9jW3YJ7KmZzcHqiunHitd5Jj/M10E2drzsnK X-Received: by 2002:a50:8711:0:b0:4ac:b937:3976 with SMTP id i17-20020a508711000000b004acb9373976mr1325540edb.4.1676116577324; Sat, 11 Feb 2023 03:56:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676116577; cv=none; d=google.com; s=arc-20160816; b=rq8l1hZR0NdHtOqR2TeQPe4wQ+6hmR4Ny4X3P9BaxDD2Qw0k5Q6Uy1V6sQq1onD7LW biELKHGAmSrqh1zewCmTNjU3iBfdzzd3XmpOHQOWVgltlrGkSHED6w7uPclnX2LSEdzZ nCGiK5hMV75I/d2wBg+gucYhXReXaxCkjcr1uhERLSykHHIEmeoMxmJ2z3cNZ5/shvyq e/84zhb+m/M1HFggc4+EZggDMom9VvWynlD8+vLlDexwfeCaWNty5qflgyNRJK4aAA6X csTxpHCaX4sTuIfoQigOQAD7RQey0pCtPnR3bhhITu/p0o3ilemonmK9dV5hMYtFsBMm KvmA== 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=rmt6VW0qzHeVmfsiW1rh5EIINQ5Xr+hUNmJsEmBTOOs=; b=ChxcIe27EzI1/sC41xrz4XOWpesO3VMKrW06FZ7NiOp4fVFW3ypihs8H/GW1U864U0 3YFPPajLHg0UzblCxkwqR2KUN8H9be3TvkUG/ydn3yeJ/tmLpitkr+q4Y0wsco/XC7FL GnPJskmcR7+h2S4GgdHi1vzwivEkozqLM309V4PZ0u+wAVAyRhSQoNQ2KgEH1HHz369/ 3urRhqhGq7VhbMR1bqe7Tu9gYbKs6uUnKE0gYuRvWiqElHEGXxcOU1ZECZdiVV0ol0u3 Xf4mAoVqF/iTKcI1QDLh8JFvnPB1oAf7V804OFqoe4iYlvc/LE0RkBT1VVyNTc8L50YK AKjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EzfpwYOs; 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 g3-20020a056402180300b004acb6f9299bsi1737536edy.554.2023.02.11.03.55.54; Sat, 11 Feb 2023 03:56:17 -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=EzfpwYOs; 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 S230184AbjBKLwt (ORCPT + 99 others); Sat, 11 Feb 2023 06:52:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230050AbjBKLw0 (ORCPT ); Sat, 11 Feb 2023 06:52:26 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4722BEB6E for ; Sat, 11 Feb 2023 03:52:10 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id fj20so7352207edb.1 for ; Sat, 11 Feb 2023 03:52:10 -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=rmt6VW0qzHeVmfsiW1rh5EIINQ5Xr+hUNmJsEmBTOOs=; b=EzfpwYOsuX2EE/VJNfqpGd6gfX3N3ZS3aObHcIi4JhKxtgNap2qsxZJ7nI/hBQWeO8 SaB0NLjyYdJw9m3w4lxsp8VagGW1QSx16dWoz60m/gCm08jWxlBvsdo13QydlmhNAKED V8N80WYqq1DHALFRoU4/NahRAShWnQ+ibT3LGKmgiYPjJhV2iRjKkAk/ognNtVPo5KaJ zSlzgTN2nW+Dhwy6jO0N3Q9YYoDKhKWF38o7D24o1aF7w8XMyvu1707u4mtu1VlTuWH9 sIW+5wx6/WfOWHqW0Ia1q73M2+U1kkeF372RfGS5n3NcJXtPelFkc91fSs2Nrb6KXiSQ imDg== 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=rmt6VW0qzHeVmfsiW1rh5EIINQ5Xr+hUNmJsEmBTOOs=; b=cm3IBSODfMGgmlbow+Ua+bc2EgKro1q9Lz0P4IIzA17GYf0qwf7pggyh8vHKGHcDZT bxcgAjGqMrhnIVCXIdPiUUx6NV16KmgEAsaPmg2IQPkA10D6Ggn30T1ZdmDKpkvQ4yLn RjPT0gTwmqkBS+I9uQYf87zBYjhmp8emo+akFCiNKEQbEY2D+mtHrOjyEY0+O8bSQH7X Nahketqh7+NtWvdWCeVHX3lBR8t2I4fqNGTJKBxC0Ze+aF188Y1fjyrmOeeFQJrLceuO d7mEluC2TWv9Zm+QP2jRr0oOIWK1mTQGB8yhUYJk3WB0JtuTt+nQqG0Xnc9YwZ7RQE65 ZMlg== X-Gm-Message-State: AO0yUKXZpP2xT3c7v3vlBHFZNnedzgDrIK9x1FCkC4UnB7mKq+5ukQ54 C7YUFiTfLcgYIpYoE5HrszhgRA== X-Received: by 2002:a50:935a:0:b0:4ac:b4b1:53fe with SMTP id n26-20020a50935a000000b004acb4b153femr3345338eda.20.1676116329827; Sat, 11 Feb 2023 03:52:09 -0800 (PST) Received: from localhost.localdomain (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id r10-20020a50d68a000000b004aabb714230sm3636070edi.35.2023.02.11.03.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 03:52:09 -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 , Kuogee Hsieh , Vinod Koul , Douglas Anderson , Vladimir Lypak , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] drm/msm/dsi: Remove custom DSI config handling Date: Sat, 11 Feb 2023 12:51:08 +0100 Message-Id: <20230211115110.1462920-9-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230211115110.1462920-1-konrad.dybcio@linaro.org> References: <20230211115110.1462920-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?1757535616362154185?= X-GMAIL-MSGID: =?utf-8?q?1757535616362154185?= 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") Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- 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 8dfa69bcff77..79c33d066348 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__);