From patchwork Mon Jun 19 17:01:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 694216 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 56F5EEB64D9 for ; Mon, 19 Jun 2023 17:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230505AbjFSRCD (ORCPT ); Mon, 19 Jun 2023 13:02:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231330AbjFSRCA (ORCPT ); Mon, 19 Jun 2023 13:02:00 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEB7210CE for ; Mon, 19 Jun 2023 10:01:55 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-519f6e1a16cso4372586a12.2 for ; Mon, 19 Jun 2023 10:01:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687194114; x=1689786114; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kFsNpkHLcFM//BtPKCIX3dn76ZP7phYzCOeBMJR7VSc=; b=l18FBLSB4Q5LH5BXVHfMra8c5WR+f/ZgyKART/bEbY7FXxQvgSMDzMoNpPqvkK1Rr8 AkUFTAoN0CffSdQ0Tp353Rl3xlEr1Gw1tQ71tRxXLJUTntWchUei6qH7jMtqYuO2v1Zo p/VQaTMneYGur6erh0ZgTt9HI9gDGraytZxZNGMjmru4M7p2Wb0aMDcXTLSythH4hT+Z KpBKK4oP68GKS4rm+/pH9W7TxcUogVByGyXgXW3BhjIydpUJI0iUIYMrzV15+tDamWxt 4ih/xNV1dbUTyrmK4istPCWfe+B4NbI1faxnHGHn21+jzEq7r7u/aBdtkJaV5+hdyjlU NAyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687194114; x=1689786114; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kFsNpkHLcFM//BtPKCIX3dn76ZP7phYzCOeBMJR7VSc=; b=kZLKEnkmF8CVBrcQo8ZAMxp/5545W8BoxVb8CPzypTtsy5myA4RYlM0zTx4QnOHJxj 0OidnfN0GMLFkLtkbhdoCqHN7hy/qCUp7EHRztd0rpFcsTNxMPeTJVSkAZBQvDrk3HS1 kFxhPjZEGfkb7jxIHoB3SjMY2nWCXXdthFQ3XO45jBZI+/Cgb5WA5u78kBQPa8RuWKdR /zjZDHZOZ121Rgi3hZmsYtWSRmPIWMEgClpQ+jy1LpP+WhY13MpRreiYN7/i2oXIhTge dT7vj13pHNbcWxV4A9rOwYKzaso07hHTm78FeKgjB2+cDwp146g3s19WFeIhia/3YMfr LEGg== X-Gm-Message-State: AC+VfDxik3JJeMDfIEG+Ogt8kL9IG6lfbhoiFPvgttOWStbVld8fGNpE 2WIIdfkebYwDYrj63k4USOP1mA== X-Google-Smtp-Source: ACHHUZ5BqxYFvcnq4ViebCsKF9n5slzSqaktTwqLLXRJEWPyUJxvmeid3ugx34q2Djn9iAH8ZljoDg== X-Received: by 2002:aa7:cc87:0:b0:514:98c8:9d7c with SMTP id p7-20020aa7cc87000000b0051498c89d7cmr6303931edt.4.1687194114254; Mon, 19 Jun 2023 10:01:54 -0700 (PDT) Received: from krzk-bin.. ([178.197.219.26]) by smtp.gmail.com with ESMTPSA id p9-20020aa7cc89000000b005166663b8dcsm13136672edt.16.2023.06.19.10.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 10:01:53 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/4] ARM: dts: qcom: ipq4019: use generic node names for USB Date: Mon, 19 Jun 2023 19:01:48 +0200 Message-Id: <20230619170151.65505-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Device node names should be generic which is also expected by USB bindings: qcom-ipq4018-jalapeno.dtb: dwc3@6000000: $nodename:0: 'dwc3@6000000' does not match '^usb(@.*)?' Override also the DWC3 node in qcom-ipq4018-ap120c-ac.dtsi by label/phandle, not via node path, because it is less error-prone and makes the overriding node-name independent. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi | 7 ++++--- arch/arm/boot/dts/qcom-ipq4019.dtsi | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi b/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi index d90b4f4c63af..da67d55fa557 100644 --- a/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi @@ -262,10 +262,11 @@ &usb3_hs_phy { &usb3 { status = "okay"; - dwc3@8a00000 { - phys = <&usb3_hs_phy>; - phy-names = "usb2-phy"; }; + +&usb3_dwc { + phys = <&usb3_hs_phy>; + phy-names = "usb2-phy"; }; &usb2_hs_phy { diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi index f0ef86fadc9d..13388e5c1b4b 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi @@ -621,7 +621,7 @@ ethphy4: ethernet-phy@4 { }; }; - usb3_ss_phy: ssphy@9a000 { + usb3_ss_phy: usb-phy@9a000 { compatible = "qcom,usb-ss-ipq4019-phy"; #phy-cells = <0>; reg = <0x9a000 0x800>; @@ -631,7 +631,7 @@ usb3_ss_phy: ssphy@9a000 { status = "disabled"; }; - usb3_hs_phy: hsphy@a6000 { + usb3_hs_phy: usb-phy@a6000 { compatible = "qcom,usb-hs-ipq4019-phy"; #phy-cells = <0>; reg = <0xa6000 0x40>; @@ -641,7 +641,7 @@ usb3_hs_phy: hsphy@a6000 { status = "disabled"; }; - usb3: usb3@8af8800 { + usb3: usb@8af8800 { compatible = "qcom,ipq4019-dwc3", "qcom,dwc3"; reg = <0x8af8800 0x100>; #address-cells = <1>; @@ -653,7 +653,7 @@ usb3: usb3@8af8800 { ranges; status = "disabled"; - dwc3@8a00000 { + usb3_dwc: usb@8a00000 { compatible = "snps,dwc3"; reg = <0x8a00000 0xf8000>; interrupts = ; @@ -663,7 +663,7 @@ dwc3@8a00000 { }; }; - usb2_hs_phy: hsphy@a8000 { + usb2_hs_phy: usb-phy@a8000 { compatible = "qcom,usb-hs-ipq4019-phy"; #phy-cells = <0>; reg = <0xa8000 0x40>; @@ -673,7 +673,7 @@ usb2_hs_phy: hsphy@a8000 { status = "disabled"; }; - usb2: usb2@60f8800 { + usb2: usb@60f8800 { compatible = "qcom,ipq4019-dwc3", "qcom,dwc3"; reg = <0x60f8800 0x100>; #address-cells = <1>; @@ -685,7 +685,7 @@ usb2: usb2@60f8800 { ranges; status = "disabled"; - dwc3@6000000 { + usb@6000000 { compatible = "snps,dwc3"; reg = <0x6000000 0xf8000>; interrupts = ;