From patchwork Sun May 21 20:23:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 684552 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 EF051C87FDD for ; Sun, 21 May 2023 20:23:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231145AbjEUUXf (ORCPT ); Sun, 21 May 2023 16:23:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231156AbjEUUXc (ORCPT ); Sun, 21 May 2023 16:23:32 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F06DE9 for ; Sun, 21 May 2023 13:23:31 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2af20198f20so37796051fa.0 for ; Sun, 21 May 2023 13:23:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684700609; x=1687292609; 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=hzve2U6INwQH5itjsfr5UFo42bizs7zTnlEHq2fDisw=; b=WZqp+hsuqlrkpVdrpjeaGYCRYP2htvmhaybPaB9Om0s6fHRMQDJ0YoLnnhGVwQkzzW gn02gQRL9YboWTrgaZlrdDzI4mMtCdUxPgm/o8OLfE2QzBZ0EkOXNlUz7/51duYf/0lS UI9ZE45Wpi6FlUvVsW51jYygH7CyizWIhrA+7pAtszxDT55o566wsuNAL8vkFm669BDB jmyP4Yqgdl7elhXbjcGXN3F1VMPUUfQdAW0X4KobPAZd6OnwiMeuQoJtfKt/ECncZwPG TTlg25/qXjeGh5TO+rngkq09iFJdDPL/f3KHZy1nsoPNjII58I6otK6VnvUrYjDOI63T RTJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684700609; x=1687292609; 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=hzve2U6INwQH5itjsfr5UFo42bizs7zTnlEHq2fDisw=; b=eYfC2aYvRO+hfSE+POEseRIF2jQODDEFCVE5cG/4n4/Hi5yFs3zjfnaNq9fU5vH+xC CB7KtUsO+F+JdfpqVTuwuJrdHhQbpZRlOAD+mjRIwfziAt9Lv90GvqwL5xJqXb0edfjW Rqn3R3JcB/9B46iIJ4cbop29p+B4peH/V+dxvoA/7XKCYQKMZ15w0zsHhA7LsbkYQ2VT Sn+hfweW99rslkdV+DvNwxUzwKYArlk3Tbh0okk0up3boHIG5INqb9Q95p/EkvP2KG6u V4Gl1Hg2XSC/G7rKZ6e+77PzGd4fFzrfYM2cNZ7havBCb0YhhnNceR7WKuoHcnkpnnvO vKrg== X-Gm-Message-State: AC+VfDwOzzEoyShmwQOOJtHV3fHuaOh+pc8shVDdjjbQrAiHt/fe9dV1 2vqpnEKgnsh8cbiyY4YZ2VwnEw== X-Google-Smtp-Source: ACHHUZ5PWQoCJcsB/E/8krwGUSZQ0r68R0xfkV7lJmExGtyjUJyh0OrSEW9w5mlcqiKp5VWvhTy9NA== X-Received: by 2002:a2e:740b:0:b0:2ad:1ba2:eff9 with SMTP id p11-20020a2e740b000000b002ad1ba2eff9mr2970708ljc.20.1684700609404; Sun, 21 May 2023 13:23:29 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 13:23:28 -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 09/10] arm64: dts: qcom: sm8150: switch USB+DP QMP PHY to new style of bindings Date: Sun, 21 May 2023 23:23:20 +0300 Message-Id: <20230521202321.19778-10-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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.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 --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 48 ++++++++-------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 1f442e1be63a..e2e210e10475 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -3398,47 +3399,26 @@ usb_2_hsphy: phy@88e3000 { resets = <&gcc GCC_QUSB2PHY_SEC_BCR>; }; - usb_1_qmpphy: phy@88e9000 { + usb_1_qmpphy: phy@88e8000 { compatible = "qcom,sm8150-qmp-usb3-dp-phy"; - reg = <0 0x088e9000 0 0x18c>, - <0 0x088e8000 0 0x38>, - <0 0x088ea000 0 0x40>; - status = "disabled"; - #address-cells = <2>; - #size-cells = <2>; - ranges; + reg = <0 0x088e8000 0 0x3000>; + clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>, - <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_USB3_PRIM_CLKREF_CLK>, - <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>; - clock-names = "aux", "ref_clk_src", "ref", "com_aux"; + <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>, + <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; + clock-names = "aux", + "ref", + "com_aux", + "usb3_pipe"; resets = <&gcc GCC_USB3_DP_PHY_PRIM_BCR>, <&gcc GCC_USB3_PHY_PRIM_BCR>; reset-names = "phy", "common"; - usb_1_ssphy: phy@88e9200 { - reg = <0 0x088e9200 0 0x200>, - <0 0x088e9400 0 0x200>, - <0 0x088e9c00 0 0x218>, - <0 0x088e9600 0 0x200>, - <0 0x088e9800 0 0x200>, - <0 0x088e9a00 0 0x100>; - #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"; - }; + #clock-cells = <1>; + #phy-cells = <1>; - usb_1_dpphy: 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>; - }; + status = "disabled"; }; usb_2_qmpphy: phy@88eb000 { @@ -3575,7 +3555,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x140 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"; }; };