From patchwork Tue Mar 14 08:36:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 13173911 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 9F0D0C6FD1F for ; Tue, 14 Mar 2023 08:37:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229842AbjCNIhY (ORCPT ); Tue, 14 Mar 2023 04:37:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbjCNIhW (ORCPT ); Tue, 14 Mar 2023 04:37:22 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 400196B5CB for ; Tue, 14 Mar 2023 01:36:53 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id e15-20020a17090ac20f00b0023d1b009f52so4285029pjt.2 for ; Tue, 14 Mar 2023 01:36:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678783012; 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=6q+qyPGDLJ/AP4PFWDiCUsP/deylgofbigsoyAE3L1c=; b=e7G1aMvXtF1I8c2ZAyXFFVdLVf7S3x2cpF0pIqPbfCHSll/tn4b76cqEZRUyp0SBcc eWGYiNTKkXa3DB0jbogKkDQ1QTEZM/Q77pN2h82J/n1fOxLSSTXwNL1klE3Ib4FTREDF n1czqx5MaKBo9ZuWQf85of6l0+wC6fUZoWut5OUnQEmemmKcj3Mwqwvfo6pbF7arZTyP IXEraUeNCymbNY6ZFtLoybS1+M4LC0LGf7ZYjmXVsJuaQedS69eLVgXZHo+5s9zjRoHX e410uGTIeCf5ElCDUTQq2jEE6jzL5V5JpQjKCAEPTypKM08cFUpLe8ITIKM9nzQiUTin +zfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678783012; 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=6q+qyPGDLJ/AP4PFWDiCUsP/deylgofbigsoyAE3L1c=; b=BYaiqW4UVPEmhPQuDaDtxUlFOBQTQKgvclDPOBmjnuHmPfPZB/spbliivyvRk25duE hPAbj0/MRPi1bHptFaaVbwdiGKSDCbVFiTyCt++BXyWCgQpHtf+WDbEdynKTKYbyptTG fQJ1grnvIRFEtopaLKQEfO31/W1DqCriWA8RUmUn5vi/YgtMrB9NcQ8QkYRwrouI/99Y jXnMrHSGkQXsKeDoEHAhlvdO0rU2t+E7rG0rSON7Wx75KQvZDlSkc2R6Hri/iBhaYZu+ 5Wwf2Ozj9I0XRBoTEdsFRmpznpeWN9a1QvFGEbyr7yasHMmWxta4Vulx6Ncd97PP2vxr ExaQ== X-Gm-Message-State: AO0yUKV9Y4zdXhgY/LzJ1Y2OzXI78ustvvSYd5OSOrJxnYB0tzAlweNF UE+sDUL7lQcZ2qWz5OpvB3da25X/P8sIS4bw1O0= X-Google-Smtp-Source: AK7set+wPYAmDyw8cz9rtFC4/S9pcL0c0ADM/sO5yemGTJyo5TevbbMsUKWv9+A0wNFC8RfHzharMQ== X-Received: by 2002:a05:6a20:c11c:b0:d3:c02a:1777 with SMTP id bh28-20020a056a20c11c00b000d3c02a1777mr8211352pzb.4.1678783012361; Tue, 14 Mar 2023 01:36:52 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:1c5e:4a3e:15d0:d540:3861:ef0e]) by smtp.gmail.com with ESMTPSA id g3-20020a631103000000b00502ecb91940sm1020980pgl.55.2023.03.14.01.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 01:36:52 -0700 (PDT) From: Bhupesh Sharma To: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Cc: agross@kernel.org, andersson@kernel.org, konrad.dybcio@linaro.org, linux-kernel@vger.kernel.org, bhupesh.linux@gmail.com, bhupesh.sharma@linaro.org, robh+dt@kernel.org, krzysztof.kozlowski@linaro.org Subject: [PATCH v4 1/2] arm64: dts: qcom: sm6115: Cleanup USB node's label Date: Tue, 14 Mar 2023 14:06:32 +0530 Message-Id: <20230314083633.1882214-2-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230314083633.1882214-1-bhupesh.sharma@linaro.org> References: <20230314083633.1882214-1-bhupesh.sharma@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org There is only one USB controller present on SM6115 / SM4250 Qualcomm SoC, so drop the numbering used with USB node's label names in the dtsi and the related sm4250-oneplus-billie2.dts. Reviewed-by: Konrad Dybcio Signed-off-by: Bhupesh Sharma --- arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 4 ++-- arch/arm64/boot/dts/qcom/sm6115.dtsi | 8 ++++---- arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts index a3f1c7c41fd73..fa57f4bf58256 100644 --- a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts +++ b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts @@ -225,11 +225,11 @@ &ufs_mem_phy { status = "okay"; }; -&usb_1 { +&usb { status = "okay"; }; -&usb_1_hsphy { +&usb_hsphy { vdd-supply = <&vreg_l4a>; vdda-pll-supply = <&vreg_l12a>; vdda-phy-dpdm-supply = <&vreg_l15a>; diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index fbd67d2c8d781..f477c7f5ad761 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -642,7 +642,7 @@ gcc: clock-controller@1400000 { #power-domain-cells = <1>; }; - usb_1_hsphy: phy@1613000 { + usb_hsphy: phy@1613000 { compatible = "qcom,sm6115-qusb2-phy"; reg = <0x0 0x01613000 0x0 0x180>; #phy-cells = <0>; @@ -1082,7 +1082,7 @@ spi5: spi@4a94000 { }; }; - usb_1: usb@4ef8800 { + usb: usb@4ef8800 { compatible = "qcom,sm6115-dwc3", "qcom,dwc3"; reg = <0x0 0x04ef8800 0x0 0x400>; #address-cells = <2>; @@ -1110,11 +1110,11 @@ usb_1: usb@4ef8800 { qcom,select-utmi-as-pipe-clk; status = "disabled"; - usb_1_dwc3: usb@4e00000 { + usb_dwc3: usb@4e00000 { compatible = "snps,dwc3"; reg = <0x0 0x04e00000 0x0 0xcd00>; interrupts = ; - phys = <&usb_1_hsphy>; + phys = <&usb_hsphy>; phy-names = "usb2-phy"; iommus = <&apps_smmu 0x120 0x0>; snps,dis_u2_susphy_quirk; diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts index 4ce2d905d70e1..4a7194acb44a6 100644 --- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts +++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts @@ -273,11 +273,11 @@ &ufs_mem_phy { status = "okay"; }; -&usb_1 { +&usb { status = "okay"; }; -&usb_1_hsphy { +&usb_hsphy { vdd-supply = <&pm6125_l4>; vdda-pll-supply = <&pm6125_l12>; vdda-phy-dpdm-supply = <&pm6125_l15>;