From patchwork Wed Dec 14 20:31:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 634573 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 A1904C001B2 for ; Wed, 14 Dec 2022 20:36:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229883AbiLNUgE (ORCPT ); Wed, 14 Dec 2022 15:36:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229895AbiLNUfn (ORCPT ); Wed, 14 Dec 2022 15:35:43 -0500 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 816413137D for ; Wed, 14 Dec 2022 12:31:49 -0800 (PST) Received: by mail-pj1-x1034.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso518159pjt.0 for ; Wed, 14 Dec 2022 12:31:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=xfisaX1yRNC7eLaChTG8lYX6QtvwXvGxy+CVBHfkvYY=; b=iXwjzWxm8czKkuv24mdSFWh1miR+KRa+tM7sG71WvNRjMJsKUYbqluXDfKVle+Yra5 alPu5buTji1JguvriqfWjHTI7PE2qaYG5MK1py017BGe7E4lg4y9Jcuk91iVj1rLCzDJ xQune/lj6T2xB3yQ1GI6aoXukCBiVmohQuu7DHtU/ArKIFxlxNJve/EOfzSMNJHRyUK9 F1cfn/y4P6+g/96uaNZHDD0k3NlcUqt7zAgc76DZ2ttFTVbW2xvTa2YWx298HJz4MHTd +WllCDUW2O/HWSfNWp1WJLCKzYChvSOAqYZ16mLdan8LgrOA1vb0wlkQ1raKqC2pgNRN xiAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=xfisaX1yRNC7eLaChTG8lYX6QtvwXvGxy+CVBHfkvYY=; b=Hu7JVLS2IQZUTEOvSN+Sb9ABTYX/ks9KKciVhf5SRBcVswEWwhqMi0AYALVhNQQi7l Ski/Czgs0t9/j7J2mRtI2D1svx9sEcekVSyXaWshU5bJomzMEgvbVX8b60AasDCUz1Y5 ZphDnqja6iFxclyYhwFtZU0scgi/T9KojbOtFTyyAz8uFGBvmmWKVo9wann7Qljk64VV SoWFPiAXGolwNGBpyuHeXbwJimGrXlghgKHhosnFYELfYNkmFFfpWRrrnMieDZ6j00Rz +n4Y4H7nZsqk1hb/ucDRIm+gp7AVMaASdiXgfYuXf/4GsxO6bf1bPeHYTqrj5y/2q7q0 Q+5w== X-Gm-Message-State: ANoB5pmSto9ZwEZnXSkxsU0wL3Ph4L05ttH/DtMcfpPS3PoyZY1cq9iZ CoUv9xJFIiX04YRZ3RW8MfmiaeS24n+X7VjLoAk= X-Google-Smtp-Source: AA0mqf4IoGccZZP7169MteNGpn2PFmUOvL3DOXR55Lib2aZ7FjigSY7EK8yOhRrrZpc//QLEPCNBAg== X-Received: by 2002:a17:90a:710b:b0:21f:e5c:9852 with SMTP id h11-20020a17090a710b00b0021f0e5c9852mr21559709pjk.1.1671049908588; Wed, 14 Dec 2022 12:31:48 -0800 (PST) Received: from localhost.localdomain ([2401:4900:1c60:4bad:5c3:ab51:3d81:6264]) by smtp.gmail.com with ESMTPSA id gx13-20020a17090b124d00b00219e38b42f5sm1812238pjb.26.2022.12.14.12.31.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 12:31:48 -0800 (PST) From: Bhupesh Sharma To: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Cc: agross@kernel.org, bhupesh.sharma@linaro.org, bhupesh.linux@gmail.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, krzysztof.kozlowski@linaro.org, konrad.dybcio@linaro.org, andersson@kernel.org Subject: [PATCH v2 1/3] arm64: dts: qcom: sm6115: Cleanup USB node's label Date: Thu, 15 Dec 2022 02:01:22 +0530 Message-Id: <20221214203124.564537-2-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214203124.564537-1-bhupesh.sharma@linaro.org> References: <20221214203124.564537-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 ++++---- 2 files changed, 6 insertions(+), 6 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 572bf04adf906..b5f7480c2e713 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -565,7 +565,7 @@ gcc: clock-controller@1400000 { #power-domain-cells = <1>; }; - usb_1_hsphy: phy@1613000 { + usb_hsphy: phy@1613000 { compatible = "qcom,sm6115-qusb2-phy"; reg = <0x01613000 0x180>; #phy-cells = <0>; @@ -991,7 +991,7 @@ spi5: spi@4a94000 { }; }; - usb_1: usb@4ef8800 { + usb: usb@4ef8800 { compatible = "qcom,sm6115-dwc3", "qcom,dwc3"; reg = <0x04ef8800 0x400>; #address-cells = <1>; @@ -1019,11 +1019,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 = <0x04e00000 0xcd00>; interrupts = ; - phys = <&usb_1_hsphy>; + phys = <&usb_hsphy>; phy-names = "usb2-phy"; iommus = <&apps_smmu 0x120 0x0>; snps,dis_u2_susphy_quirk;