From patchwork Tue Dec 13 12:38:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupesh Sharma X-Patchwork-Id: 32799 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp94305wrn; Tue, 13 Dec 2022 04:43:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf7c6gev9TK0pMgr5yIqD395Co00P0kI8PG2SiG80/1CQMHJGD9y77kQxsHLCYtXcxjpKKbf X-Received: by 2002:a05:6a20:9296:b0:a7:882e:3a2f with SMTP id q22-20020a056a20929600b000a7882e3a2fmr18127710pzg.28.1670935408490; Tue, 13 Dec 2022 04:43:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670935408; cv=none; d=google.com; s=arc-20160816; b=j7xUMjw7V0WqR42JKa3gP84wZvfLMTP7gxvbOqsmR3Ig4fdNMzbOrgW7pNZWS0g7Ij yAAcqje7JFWSjnk2oMpTsYfQTU1YHIwXgnt4wT4B8wcCE1qW1y6XXdGo5tppSIRERLGp b9yfFAKCmKT4P/L7c3bMH8bUpq6iLUl1vg571LqiFeQA6gVwQ6STM6ftt4rLYA6zPbR3 OiP3we8Xt8dvAO6LeR7X2mYKiLpzRk8SSMpRZXtDdeYluNQ7BS2VCe0OtmQhuM5eNJgi B+CyKCJOAOyhUZi6pjuv8/KoFD/SgLHb19uDxJ6rc/BD/T51mx1NYtrR9H9B5odNpaF/ 3ifg== 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=wKPVsv2TqsP8zux8ohBTaLzqLXnKFjC2mxPTp1lrDzo=; b=Ieyz31i2UrKUjN0WKYItYsefUDmAe5+d/zPkaso4rGHhURFwQAHfqT6gfJX95izn7H W/hH72MHHs3/QJqO+kl0QZte2LrZ9azmCS2jzLSgXcFw8+Rf9IT9go8WSisjxrmKsz1C lRTYDtrt9tbjNzrpczjPjoglXLXmJ+VqWDIYoXJ08TZkLnrGbrzAsV6RznMgVQ7yFU37 g2sinqUH/1tENuqJxKQmIRW3AvhsTFW2NJVsU99nScs1XU/baf4bkHuGLDbf9BNBMh4k WwHUIJ0zz631mZgsnQPu0PbPNNbE9WFoK5MuAwxJ5S1G1DRUtLWTyZCQM1LChFPTjOKr PEfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pRkn7CER; 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 f18-20020a635552000000b00478ab063103si12143856pgm.821.2022.12.13.04.43.15; Tue, 13 Dec 2022 04:43:28 -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=pRkn7CER; 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 S235025AbiLMMlL (ORCPT + 99 others); Tue, 13 Dec 2022 07:41:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235030AbiLMMkT (ORCPT ); Tue, 13 Dec 2022 07:40:19 -0500 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1C401FCCD for ; Tue, 13 Dec 2022 04:38:37 -0800 (PST) Received: by mail-pl1-x629.google.com with SMTP id 4so9504704plj.3 for ; Tue, 13 Dec 2022 04:38:37 -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=wKPVsv2TqsP8zux8ohBTaLzqLXnKFjC2mxPTp1lrDzo=; b=pRkn7CERucvFWodZldKONF9Sc3CWZ5+E2aWS2cNNcv38w0mNCRE0sMmaG2VaE/Kwvf viS3cXILhSRSGiOMd9Sxi9s+40tXTMfqfK3ZI+GeJ2rgsmxNmJvmcOS5gGc8t8xzUTeF p7q5bOYgnA0rv93Yalk1qWGktpGkJxSo2R/9Gtg14Njk7pqo3d3HHnxeQitdNfPLXBMn vsb+41wvux/AFaQm5vFVuX68M0pdEP12N9FkRzbpGw0UuZOMlIZNGUdgb2kWhjuvWzHD ZRhJvCpMmPykClY3mctXRQWyAJPvTyR7oDvR7iA09AzG97XIlFLuB+gXhP3/hqoLnl4y Fjiw== 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=wKPVsv2TqsP8zux8ohBTaLzqLXnKFjC2mxPTp1lrDzo=; b=F7tvd+rNzAIQmX9cL8OE2/xv7zZV6Da7a8Wz6Ds+hZaaQ2/Snvyd67uZn3WaJx6ztT QRBu/+lU0X5LAr7V+dDDYKhJtKPYF1zH14wyT9LF+vvUlTIc/EMu6Dnq9D4rU0VULS+S vWo3coaFD53JcjifQ971oXmOYoUvcyx6YTzQstB09+rcT5Y8QVDO/71kD9NOGdgCuZZm 0t07zR7QWNEoiVKyEIXWbE/Mr7uJ/tEhS8M/WiLGRccZukegaMxWbTykp8FkpF3pRWSE wcej4wd5TbPpjgyv2Bjm+HfXmC6K2P1ytzqQtKsgb0xDJpw3G/2+neTK0hVEDdK+GI7c s+Xg== X-Gm-Message-State: ANoB5pmJjml3Oagd9oisqpdLBtsT4sc/H7oslj/qoxTxICm4RIZRX16Q ITfRTnRF/8ovoKAZLVLLRVHPgA== X-Received: by 2002:a17:902:d412:b0:18f:37ec:9675 with SMTP id b18-20020a170902d41200b0018f37ec9675mr9524687ple.21.1670935117264; Tue, 13 Dec 2022 04:38:37 -0800 (PST) Received: from localhost.localdomain ([2401:4900:1c60:4bad:5c3:ab51:3d81:6264]) by smtp.gmail.com with ESMTPSA id m12-20020a170902c44c00b001889e58d520sm8297011plm.184.2022.12.13.04.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Dec 2022 04:38:36 -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 1/3] arm64: dts: qcom: sm6115: Cleanup USB node names Date: Tue, 13 Dec 2022 18:08:21 +0530 Message-Id: <20221213123823.455731-2-bhupesh.sharma@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221213123823.455731-1-bhupesh.sharma@linaro.org> References: <20221213123823.455731-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=unavailable 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?1752102766912063501?= X-GMAIL-MSGID: =?utf-8?q?1752102766912063501?= There is only one USB controller present on SM6115 / SM4250 Qualcomm SoC, so drop the numbering used with USB nodes in the dtsi and the related sm4250-oneplus-billie2.dts. Signed-off-by: Bhupesh Sharma Reviewed-by: Konrad Dybcio --- 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;