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: 634258 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 D32A9C46467 for ; Thu, 15 Dec 2022 09:46:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbiLOJqD (ORCPT ); Thu, 15 Dec 2022 04:46:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230117AbiLOJpz (ORCPT ); Thu, 15 Dec 2022 04:45:55 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B999638E for ; Thu, 15 Dec 2022 01:45:52 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id x2so4957397plb.13 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=KPG5Jq3+IPUVbs5MEcQuXB88m6wKpe+uCnBNvF8FSQfoMGsHU8xGMi5bUukJWOsUaJ x6RWaHwBxPaWTi9OXrms7L8TZ4EhatLiO1kjyY1QsXErmy4x9M6eV9cNkr/osMEMqAKz hIhDE29Nnoa0FOxsEL5AmKXOc/rPPli6AikRKPDQyza6B7Ohqzs7ObJXKvlEgL92mqt+ 7FpbAyfDLFIBTsy/LGe/Si3hrsTbcHHcBwKHqH/mAPpeOsiMYk/tPIDj2Bn3/RqliKmo pMzZMSfeeP7uRsyNHX1sD8PM9YHUXI5yOEcysW/FSRMHOq4Jyzsm3ITRTFUhW3kT+JD6 NlsA== X-Gm-Message-State: ANoB5pnfXV+HW8A1lf3vGm+8f82fccnKhvZnlCTeqCZhp70Psbw8uZ3C zHL42kUtHJFR4Q6mLTE5AgzqGc/OCQ5udS3AUjI= X-Google-Smtp-Source: AA0mqf5JiNySvW4848edZMJBnhFMzPqYBdD+JpHuO1YoIcrg/5JutiGXLQvrNB0l7xxjWMNoW8GORQ== 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 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;