From patchwork Tue Jun 7 18:58:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 579523 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BB17CCA483 for ; Tue, 7 Jun 2022 21:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346415AbiFGVV2 (ORCPT ); Tue, 7 Jun 2022 17:21:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380984AbiFGVRM (ORCPT ); Tue, 7 Jun 2022 17:17:12 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4424132A1B for ; Tue, 7 Jun 2022 11:58:11 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id i29so12971280lfp.3 for ; Tue, 07 Jun 2022 11:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aGzqYEGQn+If9ubvMiuRbk2B+EdJKY+QHOiiUFFUgLA=; b=Sj2qVill9L+8Omi1aXH+ITfabJemTKGx5YdS65gfo5MKRt51SxHahuPZdrVhAwkqWi 6GKL8CY71YignAnsb7FS5qEuahe4EHe2lDKvSxCklkwaVDn54B0+wwMWOWzCWr5ehS8g wQGVjfEIc1i2TdNEZUwLSaLPDCiWtcZvnKr+urn/LGuirb3I4yYJPQSCq/lcaeGOJ5NK e8IbYxw2bZ7pzXXFGmnBOdaxAvL5YHPS+QM8Fx3iWbkDbaeXuagC9CQ4i5vSQ1GWaY0b O8yGgBqnp5VzG7pMTLEZh0E9dU1V+Iq3LNEYIq6hWRP3kuLZB8Dnc6Zf0B3H2V6fkfiD Wqow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aGzqYEGQn+If9ubvMiuRbk2B+EdJKY+QHOiiUFFUgLA=; b=6fsSj8tEJHwLQDFP1iVyzDy3MwsSdnnbnegorw+y2Mj7ihukrfG+Y2hutRx7ZIG3JM lFtmo8jb3/Eh2aJ86eKcVmVpIUvZ+LdjygSzTbbOQJ0W23sD3cIJ9jwhD0ZFRcGM6O0A NvVw8mtFoLap6l1axLpfvjqYEE8x1GIOL6jpjaPVdq6/nK4VMHXR3tjXWM46OsHaCBFh qI2+LAGMfeUW6KNltega7+UUfnP8xO9Zp1T+kf4uUw4iqqNvNv9gkr9GIQ1UYI00Jo3X +nu3BvyaewJNzLNz0AUb7taLixmIaCyXFF5CDeIsZ86adf9Uk4o7JXP3+iGYBXfbOWfL 0/yw== X-Gm-Message-State: AOAM5310wCAlscyHvTUxcOd+gNW5jVEJz99PcOeIOYUEWsOu8C7iPZpl lvvES4Lx2J+uO8gKlUPrgL0AwA== X-Google-Smtp-Source: ABdhPJzEpQjDU9eJCieoZIm+7e2VEurWFXSje1/LOnq676gG9dGxHWnm+QON/hUbK3UpJK4BXh8MKA== X-Received: by 2002:a05:6512:22c1:b0:479:54b6:8281 with SMTP id g1-20020a05651222c100b0047954b68281mr5727582lfu.291.1654628289821; Tue, 07 Jun 2022 11:58:09 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id d19-20020a2eb053000000b0025587b872cesm1611668ljl.70.2022.06.07.11.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 11:58:08 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar , Rob Herring , Krzysztof Kozlowski Cc: Stephen Boyd , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, David Heidelberg Subject: [PATCH v1 2/7] dt-bindings: display/msm: hdmi: mark old GPIO properties as deprecated Date: Tue, 7 Jun 2022 21:58:01 +0300 Message-Id: <20220607185806.2771739-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607185806.2771739-1-dmitry.baryshkov@linaro.org> References: <20220607185806.2771739-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Mark obsolete GPIO properties as deprecated. They are not used by existing device trees. While we are at it, also drop them from the schema example. Signed-off-by: Dmitry Baryshkov --- .../devicetree/bindings/display/msm/qcom,hdmi.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml index 2f485b5d1c5d..2b1cac0851ce 100644 --- a/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml +++ b/Documentation/devicetree/bindings/display/msm/qcom,hdmi.yaml @@ -59,22 +59,27 @@ properties: qcom,hdmi-tx-ddc-clk-gpios: maxItems: 1 + deprecated: true description: HDMI DDC clock qcom,hdmi-tx-ddc-data-gpios: maxItems: 1 + deprecated: true description: HDMI DDC data qcom,hdmi-tx-mux-en-gpios: maxItems: 1 + deprecated: true description: HDMI mux enable pin qcom,hdmi-tx-mux-sel-gpios: maxItems: 1 + deprecated: true description: HDMI mux select pin qcom,hdmi-tx-mux-lpm-gpios: maxItems: 1 + deprecated: true description: HDMI mux lpm pin '#sound-dai-cells': @@ -171,8 +176,6 @@ examples: <&clk 61>, <&clk 72>, <&clk 98>; - qcom,hdmi-tx-ddc-clk-gpios = <&msmgpio 70 0>; - qcom,hdmi-tx-ddc-data-gpios = <&msmgpio 71 0>; hpd-gpios = <&msmgpio 72 0>; core-vdda-supply = <&pm8921_hdmi_mvs>; hdmi-mux-supply = <&ext_3p3v>; From patchwork Tue Jun 7 18:58:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 579525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65BD9CCA483 for ; Tue, 7 Jun 2022 21:18:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377554AbiFGVSj (ORCPT ); Tue, 7 Jun 2022 17:18:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381040AbiFGVRP (ORCPT ); Tue, 7 Jun 2022 17:17:15 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8963C131F12 for ; Tue, 7 Jun 2022 11:58:15 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id w20so8079684lfa.11 for ; Tue, 07 Jun 2022 11:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fIR2tgZYRWBLnmVAd7m2XmX6eAHJSTYm0LMHENEbRWE=; b=Z9BNMiMWD8ai815uoPih/wJvYyzn8lNCz/NcNp/njpUTlCMhxuWY9AczbOdSGN2aET JdHaDCq29y99l4I4k0nFsgiZcDfJ0LJoIXHnzQ+innSecoOrJGy3ZXTcq2iHue0KdZOX IWWshIKaJzw5HM54uW72ChqJfg+E3Jjw5o2eQAXtQGG6qiOJiMTKtcKMnX25/OebaKA7 0vip1wJhXDEqFhPQ5gKJk8+wTZWro850lV3bg0Rs/gyKgjjF275lP+iWQaBYEOFQxP5v dIDlLBY08Lxt2qk793Sz739pxUbriQV2bVj+NYXz8W/kS/Jxba/xCv+yMdst320AU4m3 dE5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fIR2tgZYRWBLnmVAd7m2XmX6eAHJSTYm0LMHENEbRWE=; b=LeO53Fuo/uBWTkLBqokESuQIk2jVvqv7wzZjmfLHXINf+O5K/nmshrAKjW8Xt5upnO wFZLGDgW3wJ9AxSl3qvkftnYvduq9FormLWV/VVqde1Uf6cF5CY9wLjXMs7zebc3ehG6 +aAD4d98ZlyK60uESA4xt4FIIj9iNcvSEp+96sEsVEpMNjAC+1ESGU24aUyzoKaC8M1Q S2t30AWOC1ANlWHCmvnGq0Hc7shkkO7rvNd00M/MqSxVyuwfCB5UlMj7bDnKsMrq0TwB h/CPXmLu7K7UgtqSSxVPPHErrg/B6fWnmgsspBM91Q+T/Pe/ObKGjuo2gcsKoJQugozl qDog== X-Gm-Message-State: AOAM531CiGPhyu2t2K7TqEGaPCuWk1ZxACh2CwgaewlIHGayTXYQU8PO vyqi9xyfBcK26gHJvUvDn6P87w== X-Google-Smtp-Source: ABdhPJwu0bgwWIs2JvK72GIJagzrhqPdQjv0dGrZtc353kYRQPaEmFzS2q1TS6FRQpFMGlAYnMdMqg== X-Received: by 2002:a05:6512:3401:b0:479:4000:fbe1 with SMTP id i1-20020a056512340100b004794000fbe1mr8543546lfr.228.1654628293281; Tue, 07 Jun 2022 11:58:13 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id d19-20020a2eb053000000b0025587b872cesm1611668ljl.70.2022.06.07.11.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 11:58:12 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar , Rob Herring , Krzysztof Kozlowski Cc: Stephen Boyd , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, David Heidelberg Subject: [PATCH v1 5/7] drm/msm/hdmi: drop empty 'none' regulator lists Date: Tue, 7 Jun 2022 21:58:04 +0300 Message-Id: <20220607185806.2771739-6-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607185806.2771739-1-dmitry.baryshkov@linaro.org> References: <20220607185806.2771739-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Several platform configs use empty 'none' regulator arrays. They are not necessary, as the code will use corresponding _cnt field and skip the array completely. Drop them now. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 125712c3fca2..c87a0386647f 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -353,9 +353,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, .item ## _names = item ##_names_ ## entry, \ .item ## _cnt = ARRAY_SIZE(item ## _names_ ## entry) -static const char *pwr_reg_names_none[] = {}; -static const char *hpd_reg_names_none[] = {}; - static struct hdmi_platform_config hdmi_tx_8660_config; static const char *hpd_reg_names_8960[] = {"core-vdda", "hdmi-mux"}; @@ -392,7 +389,6 @@ static struct hdmi_platform_config hdmi_tx_8084_config = { static struct hdmi_platform_config hdmi_tx_8994_config = { HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), HDMI_CFG(pwr_clk, 8x74), HDMI_CFG(hpd_clk, 8x74), .hpd_freq = hpd_clk_freq_8x74, @@ -400,7 +396,6 @@ static struct hdmi_platform_config hdmi_tx_8994_config = { static struct hdmi_platform_config hdmi_tx_8996_config = { HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(hpd_reg, none), HDMI_CFG(pwr_clk, 8x74), HDMI_CFG(hpd_clk, 8x74), .hpd_freq = hpd_clk_freq_8x74, From patchwork Tue Jun 7 18:58:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 579526 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6355CCA47C for ; Tue, 7 Jun 2022 21:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376316AbiFGVSd (ORCPT ); Tue, 7 Jun 2022 17:18:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381041AbiFGVRP (ORCPT ); Tue, 7 Jun 2022 17:17:15 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AC4CC5DB3 for ; Tue, 7 Jun 2022 11:58:15 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id y32so29728855lfa.6 for ; Tue, 07 Jun 2022 11:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yBKwPOiE2yNJ0h72czELiOyk+g2uWrk6+KM2TvTz5JU=; b=Yks/q3su0YHCpP1GZiev8M6GFNTj/3QTyI/Ndrs53Y55o0csQ1hVU4LwAIIwQ1IUA8 +c8piT29CypwfC4legDBxZZwLyPxAueBvOI0cTL5z0ciBVniJGYgb5TnNRKbyMGfkFef XGmf76jAhEZHLHskC+nHi6zFOlIsr0+cUZ+SpDHRQYp5FIJSJ3wmAjATYAnfnzc9bqDX vWgAtgUYsKGJiCZg31C+DxRgkODuIMf5EC3TfuPT0UrLuxdnGO3oPuZb6oReRe0Yaw50 mvCNAEHspgbqg1KrOwxjqEXNCUI4/HaVIl0z0fPopLAIINbFd/2k15Q0nTo2443jmeyb IMog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yBKwPOiE2yNJ0h72czELiOyk+g2uWrk6+KM2TvTz5JU=; b=rXFarAEYQV4/4L+UkdSeUSK9fDlFFXL5x+7oR4opu3K8pr9bC6sczdGQi/+vTebhnL tJRDE1IC4mv0qGr6csVcoTuKkqfeT/YzX4cbQqWER1zBA765Bm0Pwasl9ck31hAvjPXv Qy0zVZSHlVK+Jp64RR5QVWESzuWHWWBnW7INp2v+N8ufVe/WPZ3yraJsI3Z3D03wBw4o QBIcB4cmsxvaY8wLRF0pZrayb8jcibAitxZyAREPz1FEB+b9M8gPsXWlS1e0rtR6EiHh wQE6PaYgzDCE0Wx7k0rIp7A3XsK/xQ81gip6GfjCnazlK2MzUVPgBicJlTHROWsqFMb4 2VSA== X-Gm-Message-State: AOAM531kdQXyRUJfGAHJIjmLoTeOqII6yVikjghXYuzE3sJPC4p8SsjB hOuYVvrK4V0Us7ROSYjUK4lHCw== X-Google-Smtp-Source: ABdhPJy9e5t8nWUlQ5axbawTm+yy688KCIdLqxL6iY8tn6zylCOr28nbh97saNaGf6LTXBhAevBKLw== X-Received: by 2002:a19:4918:0:b0:478:7e82:86f1 with SMTP id w24-20020a194918000000b004787e8286f1mr54777219lfa.353.1654628295453; Tue, 07 Jun 2022 11:58:15 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id d19-20020a2eb053000000b0025587b872cesm1611668ljl.70.2022.06.07.11.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 11:58:15 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Rob Clark , Sean Paul , Abhinav Kumar , Rob Herring , Krzysztof Kozlowski Cc: Stephen Boyd , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, David Heidelberg Subject: [PATCH v1 7/7] drm/msm/hdmi: merge platform config for 8974/8084/8994/8996 Date: Tue, 7 Jun 2022 21:58:06 +0300 Message-Id: <20220607185806.2771739-8-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607185806.2771739-1-dmitry.baryshkov@linaro.org> References: <20220607185806.2771739-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Since there is no more difference between the HDMI platform data between MSM8974/APQ8084/MSM8994/MSM8996, merge these configs into a single entry. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/hdmi/hdmi.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 03d8f97b0cd8..8ae60e97cc94 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -375,27 +375,6 @@ static struct hdmi_platform_config hdmi_tx_8974_config = { .hpd_freq = hpd_clk_freq_8x74, }; -static struct hdmi_platform_config hdmi_tx_8084_config = { - HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), - .hpd_freq = hpd_clk_freq_8x74, -}; - -static struct hdmi_platform_config hdmi_tx_8994_config = { - HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), - .hpd_freq = hpd_clk_freq_8x74, -}; - -static struct hdmi_platform_config hdmi_tx_8996_config = { - HDMI_CFG(pwr_reg, 8x74), - HDMI_CFG(pwr_clk, 8x74), - HDMI_CFG(hpd_clk, 8x74), - .hpd_freq = hpd_clk_freq_8x74, -}; - /* * HDMI audio codec callbacks */ @@ -577,9 +556,9 @@ static int msm_hdmi_dev_remove(struct platform_device *pdev) } static const struct of_device_id msm_hdmi_dt_match[] = { - { .compatible = "qcom,hdmi-tx-8996", .data = &hdmi_tx_8996_config }, - { .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8994_config }, - { .compatible = "qcom,hdmi-tx-8084", .data = &hdmi_tx_8084_config }, + { .compatible = "qcom,hdmi-tx-8996", .data = &hdmi_tx_8974_config }, + { .compatible = "qcom,hdmi-tx-8994", .data = &hdmi_tx_8974_config }, + { .compatible = "qcom,hdmi-tx-8084", .data = &hdmi_tx_8974_config }, { .compatible = "qcom,hdmi-tx-8974", .data = &hdmi_tx_8974_config }, { .compatible = "qcom,hdmi-tx-8960", .data = &hdmi_tx_8960_config }, { .compatible = "qcom,hdmi-tx-8660", .data = &hdmi_tx_8660_config },