From patchwork Sun May 21 20:23:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13249521 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B26EAC87FDC for ; Sun, 21 May 2023 20:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CTPQm0OslH46pe2z+VcEr+pggIoB71oSxKiUD1TqV9k=; b=UEyW23yop5fiqX xFkroKd0VCKYBTowDTOmJ2XtkIOfvT1Tu5Im/tew3xjRn1fK6JXxvBGwVik/d12kdsQFNs9eDPGil 9EJfGYamty79E7tiGvq5+BeGVXzX5ciXf/qqadXs2ArRTGDvu3O7I8d0LbD2w6tp6IRzF0DZ1v4SJ BP5nONB1Knyr4RGFfiFHOrUax2z6visFHIBODvRNwYL1U/MhWV1pzcx45pPA1SQ75Sbg9zutH0rHI Twzv1R//kCLtictcjHXy6BRXLt2TQqQUEFMA5nZxmiWnu7nPE94g6FyOQGwlIFHLapZemkCwYdrhZ 8ySEv1x9/cFNDNhXeqZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q0paa-004bDH-0w; Sun, 21 May 2023 20:23:36 +0000 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q0paV-004b8O-1e for linux-phy@lists.infradead.org; Sun, 21 May 2023 20:23:33 +0000 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2af2ef0d0daso15664551fa.2 for ; Sun, 21 May 2023 13:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684700606; x=1687292606; 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=3CtfNgD8Z7wk1bdlKEuLIZKzZsZsbSU36yXhqQA2Lg8=; b=IL6lcK+OpB29F3wFeJVIsNdzPsO6XNH3b0kkQdq0aandodICulMjyhw3hvLS/Dabk4 02Ie4C2rWhMxK7wZpX8O5NjOr9/PIbhfoIPyO29Kr9OjSug6Y9f7hoDVR01D+gjgn5oI CAW1vXxJWlnEnmoptJmL4Xh7o7EzLdT6iPDZ4n1p+SieEeIp6UnoOwLgSf941zUYUiC8 MxJyb8p9RZWZiuOBAGIfNG37GSxVCrIA498/HIZ0Laqi3GWPyHJJKwrBq5Vu59v14gcq VJAjFlAyAKJ9IVOyYylL32yTRBsTVQDSgLX89fYTkVYMaB/X5MDWpjbSWAoTS78bjzxx tW5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684700606; x=1687292606; 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=3CtfNgD8Z7wk1bdlKEuLIZKzZsZsbSU36yXhqQA2Lg8=; b=N4GiS/WK05ePBJVfp2zntPNSesue4WYYOQxZaN6eJpFucK2uNoZcvAvquqPL2O+h3I K08vqWQJN4/fNc8u6MyO9auHUvtQSAduQB7czXnepS92wHeJ0IdGw+xK1Fkm7eAaEmSw woC14K5ppSB5zfpZEwk1JuSK6KOwi0q3VzwG7RKfcE1QK9L3OMy2Mq1oyKZCqayrSFsQ 0CtAOmbtD9BpQ3XYpofDa0EVD6IWqFXS9wYa6An/lmfPbS94zO1aduapW/p+jqLlZy9U mpq3dCORAo0DhsHt/M5jNRTknalUTyOHy/x+O/eMIi07/Zg9lxSImIPgOkiBoV47R4S8 bqMw== X-Gm-Message-State: AC+VfDzMqXKsN1W1TCnRVFf6PL6H1kMvK7/S9pCiGLRCqRyUZTnsfp7R vBJvvO1Omo3ALPvxb5JrnsgC8g== X-Google-Smtp-Source: ACHHUZ5i89Igm+XsCJPrdPN4Ok57cwHDVHoZehHZTi+iN7husNv6rqII7hCFAESXQoED406lZNSerQ== X-Received: by 2002:a2e:96cd:0:b0:2af:22a0:81ec with SMTP id d13-20020a2e96cd000000b002af22a081ecmr3317668ljj.27.1684700606277; Sun, 21 May 2023 13:23:26 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u23-20020a2e91d7000000b002adb566dc10sm835589ljg.129.2023.05.21.13.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 13:23:25 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Philipp Zabel , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Neil Armstrong Subject: [PATCH v3 05/10] arm64: dts: qcom: sc7180: switch USB+DP QMP PHY to new style of bindings Date: Sun, 21 May 2023 23:23:16 +0300 Message-Id: <20230521202321.19778-6-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521202321.19778-1-dmitry.baryshkov@linaro.org> References: <20230521202321.19778-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230521_132331_551218_A5EAEC50 X-CRM114-Status: GOOD ( 10.13 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Change the USB QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 57 ++++++++++------------------ 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index ea1ffade1aa1..b07a49e6829a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -2718,49 +2719,28 @@ usb_1_hsphy: phy@88e3000 { nvmem-cells = <&qusb2p_hstx_trim>; }; - usb_1_qmpphy: phy-wrapper@88e9000 { + usb_1_qmpphy: phy@88e8000 { compatible = "qcom,sc7180-qmp-usb3-dp-phy"; - reg = <0 0x088e9000 0 0x18c>, - <0 0x088e8000 0 0x3c>, - <0 0x088ea000 0 0x18c>; + reg = <0 0x088e8000 0 0x3000>; status = "disabled"; - #address-cells = <2>; - #size-cells = <2>; - ranges; clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>, - <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, <&gcc GCC_USB3_PRIM_CLKREF_CLK>, - <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>; - clock-names = "aux", "cfg_ahb", "ref", "com_aux"; + <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>, + <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>, + <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>; + clock-names = "aux", + "ref", + "com_aux", + "usb3_pipe", + "cfg_ahb"; resets = <&gcc GCC_USB3_PHY_PRIM_BCR>, <&gcc GCC_USB3_DP_PHY_PRIM_BCR>; reset-names = "phy", "common"; - usb_1_ssphy: usb3-phy@88e9200 { - reg = <0 0x088e9200 0 0x128>, - <0 0x088e9400 0 0x200>, - <0 0x088e9c00 0 0x218>, - <0 0x088e9600 0 0x128>, - <0 0x088e9800 0 0x200>, - <0 0x088e9a00 0 0x18>; - #clock-cells = <0>; - #phy-cells = <0>; - clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; - clock-names = "pipe0"; - clock-output-names = "usb3_phy_pipe_clk_src"; - }; - - dp_phy: dp-phy@88ea200 { - reg = <0 0x088ea200 0 0x200>, - <0 0x088ea400 0 0x200>, - <0 0x088eaa00 0 0x200>, - <0 0x088ea600 0 0x200>, - <0 0x088ea800 0 0x200>; - #clock-cells = <1>; - #phy-cells = <0>; - }; + #clock-cells = <1>; + #phy-cells = <1>; }; dc_noc: interconnect@9160000 { @@ -2840,7 +2820,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x540 0>; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; - phys = <&usb_1_hsphy>, <&usb_1_ssphy>; + phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; maximum-speed = "super-speed"; }; @@ -3148,8 +3128,9 @@ mdss_dp: displayport-controller@ae90000 { "ctrl_link_iface", "stream_pixel"; assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK_CLK_SRC>, <&dispcc DISP_CC_MDSS_DP_PIXEL_CLK_SRC>; - assigned-clock-parents = <&dp_phy 0>, <&dp_phy 1>; - phys = <&dp_phy>; + assigned-clock-parents = <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; + phys = <&usb_1_qmpphy QMP_USB43DP_DP_PHY>; phy-names = "dp"; operating-points-v2 = <&dp_opp_table>; @@ -3206,8 +3187,8 @@ dispcc: clock-controller@af00000 { <&gcc GCC_DISP_GPLL0_CLK_SRC>, <&dsi_phy 0>, <&dsi_phy 1>, - <&dp_phy 0>, - <&dp_phy 1>; + <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; clock-names = "bi_tcxo", "gcc_disp_gpll0_clk_src", "dsi0_phy_pll_out_byteclk",