From patchwork Thu Dec 15 09:45:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 33562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp250671wrn; Thu, 15 Dec 2022 01:48:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf4RJhlk4PzxIp3PlbbUuSeRh7tB8mL+9mkM9Xs1c00z3c64je6BSIxSKxwHQtlp4iVHKMAK X-Received: by 2002:a17:906:f843:b0:7ae:8194:7e06 with SMTP id ks3-20020a170906f84300b007ae81947e06mr23267494ejb.56.1671097721577; Thu, 15 Dec 2022 01:48:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671097721; cv=none; d=google.com; s=arc-20160816; b=tLhLsvLOQ4NM1QCyG1ziJ5uPar0cDi4abHG3tZD8Z1YqcjfQjl5qVSLNQ2aPPLD88y Kipfiv0mtgW5U6OCTtM66hG+dDxuhe/slhduinth2N6OtLdIJS1linTx1tCyJ4qM7QlB qP7Wch3Fx86pfv+N7tU34/JKIwxS89Qq0Kx+smX0yK7fOJfXueoGfURCIgI0Os+ogVnc TODzy5mGaPIM1OhvUduRUout42s1vtogadpLAi5IOHGbvb+NycbQDp68StZ5L4AzU+1V cUBilH9oGbrbmP38wzLCRwtCK/KNbUQf8Vsd81CZUPqitwivDeR0KTH5j9da72/LHquf mhZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xfisaX1yRNC7eLaChTG8lYX6QtvwXvGxy+CVBHfkvYY=; b=eLTHg2u/lc+QfDNNnT7pcuKnYbNt5uNibovuHtcVVJCxBe+ybesPQLggXzXinoizip 6MNcfC0mCLPxThLwR5aIXHp9NltiOGipCqvGtR1puxwOebrVJTVhTim4pT292iWJkdD5 HoCDXrQWNeH+nBMNCMkWiqZMtXpDGq2EqFBb/k0MwuP5xCEoL/kRPMT6kV7jl1maQmwY 9b1WR6obGq/kXv9iEbXQIWv+p8dx9shidQ3AdUKDdbJAybMZlBBqp01RzDx2ZS/TeNgP fJRtZk1MiErtRZy7pSJ+SLUnHFw1fmb0xYhsiUz5otViyt4VZz5kUcAM8nmiumyZfBcx Ealg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EEqLm2S7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m13-20020a056402430d00b0046a7ad0bb17si16756421edc.586.2022.12.15.01.48.17; Thu, 15 Dec 2022 01:48:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EEqLm2S7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230144AbiLOJqB (ORCPT + 99 others); Thu, 15 Dec 2022 04:46:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230133AbiLOJpx (ORCPT ); Thu, 15 Dec 2022 04:45:53 -0500 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3378A2634 for ; Thu, 15 Dec 2022 01:45:52 -0800 (PST) Received: by mail-pj1-x1033.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so2141658pjo.3 for ; Thu, 15 Dec 2022 01:45:52 -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=EEqLm2S7EqL3///kF/8ooxf8kcKH6HQg+q06nqDxz18j62Hl2358QbO6sMZqZVwJ4/ G7UM9JUmlSyr7cYFB7lLPAzQjbg9Se8ykqWYoChXMXp5eHcpiEU/ou/HdsnB/R7pbYYL nxo3hBgLJrw5VeixPoJrpZGGw12Q5hL7t/OVUWdD3YlR3g1C7exuo7dOFkDgZ3XgDH6l I/EmDFIj1oJBbrd+05ySpglLn5j0vACZRzSAkAxKK8jRiEPsCc5UDKLiNr0P8wLAfW+9 C8mWCpqAdLUwOLvtAkBg6jWNdadWDHXpU9CO5u81RKI0RyBBlUIr+g7ncUDbixip+6nd dYBA== 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=xcEs8wSg5X5ABDDeupluH3Qix8nCTwAM/ngMilu9mUyqJS4NxKZSuPjoB4xRnY1dFx M8oUZBDm0W0mFPmxs+NbC72/LRW+UmmPsu96yx0GO6RepFq19QJh1EhoirYFaO2u2zNK T0MpTyvG4Se6TlCmBJB7pqd2cjve4/x8e5DByaCOQhJZQxOIWBfHioe0hJkkrlwkBKuR g0NzNp4QNO6noohJntOGucn/OCU5+LBExwF6AoQANPrLZ3x52Pyl/e9Q9YsI2sEarHtA teivSg9uG6iPNGaK6UDBZLr81+5L/yZW2S8OLynF4P0KcPlV5PIfvyOkpvWXf5JAcfkc 4BNg== X-Gm-Message-State: ANoB5pmVvjfyfpErGohSUuBgkjXNPd5fHx3AD52fX0Rd5desJq3qEHBA OTtY3zZpwSe3g5s6BaWBmE0k+A== X-Received: by 2002:a17:902:6b46:b0:18f:a820:1811 with SMTP id g6-20020a1709026b4600b0018fa8201811mr13125455plt.31.1671097551597; Thu, 15 Dec 2022 01:45:51 -0800 (PST) Received: from localhost.localdomain ([2401:4900:1c5f:4e45:ae49:8018:6d22:e5b4]) by smtp.gmail.com with ESMTPSA id b5-20020a170902650500b0018971fba556sm3342646plk.139.2022.12.15.01.45.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 01:45:51 -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 v3 1/3] arm64: dts: qcom: sm6115: Cleanup USB node's label Date: Thu, 15 Dec 2022 15:15:30 +0530 Message-Id: <20221215094532.589291-2-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221215094532.589291-1-bhupesh.sharma@linaro.org> References: <20221215094532.589291-1-bhupesh.sharma@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752272964375884216?= X-GMAIL-MSGID: =?utf-8?q?1752272964375884216?= 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;