From patchwork Thu Mar 23 14:47:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 666258 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 05725C6FD1C for ; Thu, 23 Mar 2023 14:47:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230495AbjCWOrb (ORCPT ); Thu, 23 Mar 2023 10:47:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbjCWOra (ORCPT ); Thu, 23 Mar 2023 10:47:30 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50472265BD for ; Thu, 23 Mar 2023 07:47:29 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id g17so28101233lfv.4 for ; Thu, 23 Mar 2023 07:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679582847; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dkVzE0c1IRA8Gk0//5W10K4Vfb8zGz9NSISS6mug9tQ=; b=JxXoi2ksQza7GwzgtyPBSN6/cyfLoUIk/3czMiTIcV/TVr73dVJFmfAA1oSuyHh3q5 x+0XQ+X0cuCKH46NKThXjHIU3/n1Hrn5rVGwMRnVDZdKhQDXPUt6tNIssh00gPQaXa+L 8E637Kpz/JgUwSr1XYsKE9rCbHja4aRWPp/G+clqntpIo14P5VuM4ER6/U7BpxDcBw8x oF1aBtxKhiQ7G7KV1Neh30UoxPuUvMq6vU7Ev3Kwn06qXFJLQR16hVb2hzIzxYmxH5RH nHN+YNjGeJD+GQNGuZ/6j5+Xh9A8W9o68fGx2n4/FouTAiXX2aq0W7fpdkw+iUr4flCd Z/mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679582847; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dkVzE0c1IRA8Gk0//5W10K4Vfb8zGz9NSISS6mug9tQ=; b=6lKYtqxNkv/IwibSlrK9ERTKz7keE/SK02CFCOBRBTq/m3giIxsMTGCw7PW1JFRCHb anoc3oF7auyYr0iHfzdQDcyefr06cuABHNHrvtEWsrj2tmajBgdC5vMy0T0BEpZbxXrQ molvzJP0peMG6kKGjwrFEnJocfm6A4Hi2WrKm4cRLzy/NTIzsYGg5qW6VnH+P7WOmFiE tXqOoL0QGXaxRLk7oBRxuZBETKJy74xhq/OmQpxdKlL+ljIXKTFFEoJqwajfIhKF/W0j EiEnMAGVWVhM0OOmO7YpWIO5CY4jmRZheQ2reapL+8gPjH0rvda5zj2RHWbvfK3yY2ON aqzQ== X-Gm-Message-State: AO0yUKV65IhEck8sP2R5hRDbak2nQkNhSYVzi9vK9M/5+0XC4ER3k99Q YsS7KLmmMDsNK7C9FORRgEXDzz7eM0CqMCK3ve8= X-Google-Smtp-Source: AK7set+Qn4rMzzUH7pQNtNX4kjI/1cPBc5aaBV58CJkUWNDEvtiDTDvCRLX54C3PTtTXvIgx4gB0mw== X-Received: by 2002:a19:5210:0:b0:4ea:d6c7:c897 with SMTP id m16-20020a195210000000b004ead6c7c897mr3134613lfb.31.1679582847509; Thu, 23 Mar 2023 07:47:27 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id z15-20020ac24f8f000000b004e83fc5f627sm2922033lfs.188.2023.03.23.07.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Mar 2023 07:47:27 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I Cc: linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, Neil Armstrong Subject: [PATCH 1/2] phy: qcom-qmp-combo: fix v3 offsets table Date: Thu, 23 Mar 2023 17:47:25 +0300 Message-Id: <20230323144726.1614344-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org SM8350 and SM8450 use qmp_combo_offsets_v3 table, which doesn't have PCS_USB offset. Add the usb3_pcs_usb entry to program correct registers while setting up sm8350 and sm8450 USB+DP combo PHYs. Fixes: 05bd18348b88 ("phy: qcom-qmp-combo: Add config for SM6350") Cc: Neil Armstrong Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index c1483e157af4..3b488d12c933 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -1396,6 +1396,7 @@ static const struct qmp_combo_offsets qmp_combo_offsets_v3 = { .usb3_serdes = 0x1000, .usb3_pcs_misc = 0x1a00, .usb3_pcs = 0x1c00, + .usb3_pcs_usb = 0x1f00, .dp_serdes = 0x2000, .dp_txa = 0x2200, .dp_txb = 0x2600, From patchwork Thu Mar 23 14:47:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 666653 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 100C7C6FD1D for ; Thu, 23 Mar 2023 14:47:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229548AbjCWOrb (ORCPT ); Thu, 23 Mar 2023 10:47:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230435AbjCWOrb (ORCPT ); Thu, 23 Mar 2023 10:47:31 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E16A726590 for ; Thu, 23 Mar 2023 07:47:29 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id y20so28104015lfj.2 for ; Thu, 23 Mar 2023 07:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679582848; 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=7FnaHvkF/EeUZFXtYAGWVdOTWkg/zMiRbhBKZ4hSqrA=; b=K8hQz8uz6sDTC4RwHRVPoE7V1oYrLzk/9kyOh2PrHn0B50om43st3+8UiBs4scpFze 7SMi1tW/2k70JsGXVnW5JjaoUCdTxNtIKvK1XBtLI5139dIvqXgXsGR7PqTBU4g/QPqY U16nBl+GxTIRAvmbNeFQN/fH/m2kN+yyio79+rveLgOZkehlgzMynOZhpLAQUb2hsSOp 66bpDv71DR8u2RhgDd4ykLpDuLoUrLqboulR7cTrVV3jvB2lMBsLQrnkYfHufV4CaIzA KAwGTQYWGNbYoAtH9914HV/AxRdy7vPcVO9LYHCYCD/r/drKZD+/19xWbcPiI9kxjNiV 8eSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679582848; 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=7FnaHvkF/EeUZFXtYAGWVdOTWkg/zMiRbhBKZ4hSqrA=; b=lkyvgPZ2dRF2lpZ8Dck9ONkJUlC929UV1YKKSrNh69u2EJg9Z5PD80xJ476pAN6IsF WRY1enWRlN0USJrH5h1Hs+b6OkrVr1ea5T0hcRtnTqHnq5Ozz9zJzYhO4pAL54cbJ8cR Si8hy24hD3KErSU34vOZDzRHdk0ZCBgM7vc5jVj60Ke6V9zelYakcIVdnm8cWSXuYMBs i3CuY5u8kOnXUc8mYcstiI2pWfjpqoTsDLeto+k++oRi8XWLgdhzbLWPHaZzkM4U85zs NOpas11kckUPGrXNbc1tLeOryayEu4H2yc4bn+3fHkaLIgjpe2jlShQQrAOVABNe2uso U3LA== X-Gm-Message-State: AO0yUKUrRdCUTf0eB7jHRvt3iSwHq3ZNfYn1EMie6l1FkjjR7jBxgLsC lLiJfX2PmQ3CWxjtJ4F2ApgijA== X-Google-Smtp-Source: AK7set8g5D2AaDWEp61cURfkGfT32ewkiNOn9Lfx/3jzOjCBt4S0jUTaGPcOfbyKpiBkVYvluUxLnQ== X-Received: by 2002:a05:6512:15b:b0:4b5:8507:9ae6 with SMTP id m27-20020a056512015b00b004b585079ae6mr3297539lfo.2.1679582848198; Thu, 23 Mar 2023 07:47:28 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id z15-20020ac24f8f000000b004e83fc5f627sm2922033lfs.188.2023.03.23.07.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Mar 2023 07:47:27 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I Cc: linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org Subject: [PATCH 2/2] phy: qcom-qmp-combo: use qmp_combo_offsets_v3 instead of _v6 Date: Thu, 23 Mar 2023 17:47:26 +0300 Message-Id: <20230323144726.1614344-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230323144726.1614344-1-dmitry.baryshkov@linaro.org> References: <20230323144726.1614344-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The qmp_combo_offsets_v3 table is already used for v3 and v4 PHYs. Reuse it for v6 too, dropping the separate qmp_combo_offsets_v6. Signed-off-by: Dmitry Baryshkov --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 3b488d12c933..6850e04c329b 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -1417,22 +1417,6 @@ static const struct qmp_combo_offsets qmp_combo_offsets_v5 = { .dp_dp_phy = 0x2200, }; -static const struct qmp_combo_offsets qmp_combo_offsets_v6 = { - .com = 0x0000, - .txa = 0x1200, - .rxa = 0x1400, - .txb = 0x1600, - .rxb = 0x1800, - .usb3_serdes = 0x1000, - .usb3_pcs_misc = 0x1a00, - .usb3_pcs = 0x1c00, - .usb3_pcs_usb = 0x1f00, - .dp_serdes = 0x2000, - .dp_txa = 0x2200, - .dp_txb = 0x2600, - .dp_dp_phy = 0x2a00, -}; - static const struct qmp_phy_cfg sc7180_usb3dpphy_cfg = { .serdes_tbl = qmp_v3_usb3_serdes_tbl, .serdes_tbl_num = ARRAY_SIZE(qmp_v3_usb3_serdes_tbl), @@ -1759,7 +1743,7 @@ static const struct qmp_phy_cfg sm8350_usb3dpphy_cfg = { }; static const struct qmp_phy_cfg sm8550_usb3dpphy_cfg = { - .offsets = &qmp_combo_offsets_v6, + .offsets = &qmp_combo_offsets_v3, .serdes_tbl = sm8550_usb3_serdes_tbl, .serdes_tbl_num = ARRAY_SIZE(sm8550_usb3_serdes_tbl),