From patchwork Tue Jul 25 08:46:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 125445 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2343803vqg; Tue, 25 Jul 2023 02:25:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlFWC9SQWtIu+W8srGZES1gqNqITQaSvBr6iisPfHVoG+jbgi3s1r2dCH3UTwL9VjC8ckBne X-Received: by 2002:a05:6402:42c6:b0:51e:5206:d69e with SMTP id i6-20020a05640242c600b0051e5206d69emr2010638edc.10.1690277129967; Tue, 25 Jul 2023 02:25:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690277129; cv=none; d=google.com; s=arc-20160816; b=GTcGKWN0dFz+ni+LoUKOTVS81kZ9MQV7C+MEXCrL7EYCBlAc2Fm52jLYLksDGIBPQT ABeIo4UZ8W2VvyrDd4hk2tcxSIGskcl415+G4Av1hvSoXQoyy85g9RgB7Gc/Zrtm3W0P vv2EL7oN2mEvk5A9QP5KY9w982BvrT2Pne/1pRqswaL3s8kvIbKvoG10xuFal1thEU3P 1EzajMRU5S42OhtzFdsztqVggN76nkyYptPAsydS/614B9F2mlPusemeEE6tRU09H0VG cX2ECjeUo6aSMhwo8bvqK1whLVyGLc6+rVKOZkXTOjMfluZtW6QfQX/qqV6t3U1JnlZZ WboQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=HlbuF9GW/UUiryYl6cWoqRYe+aX6OM3eYgKK9vJEYOw=; fh=xe1QSgRgyzWN/dHYNjgPsu3XAShvk6pi+Q46arn53dk=; b=uGQcdT6AjlG75+1ugAufvkmnXTFNUb8gW71SWYGeA3CblAUCim+3GiZ/86McDXwsFS of9/63Qmgdbi6wzlRzeB7rc1Z5b4epA17XYPQWiWl53g2YUslUYmaW2TBHRPfSqLyGCL zCvM/OCXMCAZNGA+yDEfIHmj2PtuQKsvQglS0In9GR8zHgsi4ofulqF+7O3ZRDrePmvM cCzJveWAfZaQuC354CbQLOvzem7upOFQnSTpZ1845d3zgxWI8ljsh2YmPqWf9BAD6WPk bLF8eo/azddiyVH6P5W1HtPsf1jwJmqLghxYJvTmPGpc3I68ZIcwk4JnbitG+jj0FVdH HMVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M3iBy29p; 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 k20-20020aa7c394000000b0051e168e63dasi7902002edq.450.2023.07.25.02.25.06; Tue, 25 Jul 2023 02:25:29 -0700 (PDT) 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=M3iBy29p; 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 S231809AbjGYIta (ORCPT + 99 others); Tue, 25 Jul 2023 04:49:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232939AbjGYIsW (ORCPT ); Tue, 25 Jul 2023 04:48:22 -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 F0B9826A3 for ; Tue, 25 Jul 2023 01:46:43 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-51a52a7d859so13143784a12.0 for ; Tue, 25 Jul 2023 01:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690274798; x=1690879598; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=HlbuF9GW/UUiryYl6cWoqRYe+aX6OM3eYgKK9vJEYOw=; b=M3iBy29puoxXZ6rM8EV9glS1Zn1pRGPsaw6LOOahZUz959whS8lkcXeS2+NK1aqPq0 5f+cFOtECynFkB7aX4pb9L4TMfZpad4918vlV3F792Cyr/cCrSTPKmcEKhlqogRaGqJl y6+m8dfYviHqGh4JMY6DIchB4Z31U7xFt/uAiqkX0HB2MOC9CI6P7WoX0yHvNzu8PJyw hKS4bonZKIkj0FHMWSBYviNBRxRO1UYcitJVHm9ItgKoKEH3cI6dpA0/S33S4iwpTQ/H uxuFOTLFUNtkHalKNhrQsrI+FHsnf7Gj06S7T1rCsUaP1LTzyBQ/iNSOEf22WTdwvGBd 5AMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690274798; x=1690879598; 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=HlbuF9GW/UUiryYl6cWoqRYe+aX6OM3eYgKK9vJEYOw=; b=A3Z7pD+ubiy0V4Wlvla7z/EOGMm1vihsF1B+yttfQT8oWIlJTrXnqMzCsb6BiUsdR5 kYh0D6PQaVWE5CJ00YupyiVNOtqpccO149kNHz1lFZI8UfUqBzUZsb++zkr4RfdOwwLJ NBA5qdpPfUjOUHRV1BU+t5IlEIuv7QWnhPm5RdpyQo0kfFKLNFyegh2nlrZBTKDjf7yV LDPL1TIrvugAF46cb9qXKp2mH7fTNdHScQHmqsJQgncCj8/ozSiYz47S3l6CY7j9EUPy RFCQ+Zbf/1yVjlREcyBFXcf01Yie6Yfr0jgtEhYccAawUc5i1zpG5c3NhOxULE6E+XAd 2NOg== X-Gm-Message-State: ABy/qLY+YuZxo2o4nuWvP6vMuZlzCX3ZbNnNty6awdWe6w0Irp7xtc8U sgvOdU3qt2PdCtNtp7Q3jQF5qw== X-Received: by 2002:a05:6402:4412:b0:51e:48e7:72ca with SMTP id y18-20020a056402441200b0051e48e772camr1910946eda.13.1690274797759; Tue, 25 Jul 2023 01:46:37 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id w22-20020a056402071600b005221b918e33sm4472526edx.22.2023.07.25.01.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 01:46:36 -0700 (PDT) From: Krzysztof Kozlowski To: cros-qcom-dts-watchers@chromium.org, Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bhupesh Sharma , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH RFT] arm64: dts: qcom: sc7280: drop incorrect EUD port on SoC side Date: Tue, 25 Jul 2023 10:46:33 +0200 Message-Id: <20230725084633.67179-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1772384032097359960 X-GMAIL-MSGID: 1772384032097359960 Qualcomm Embedded USB Debugger (EUD) second port should point to Type-C USB connector. Such connector was defined directly in root node of sc7280.dtsi which is clearly wrong. SC7280 is a chip, so physically it does not have USB Type-C port. The connector is usually accessible through some USB switch or controller. Correct the EUD/USB connector topology by removing the top-level fake USB connector and adding appropriate ports in boards having actual USB Type-C connector defined (Herobrine, IDP). All other boards will have this EUD port missing. This fixes also dtbs_check warnings: sc7280-herobrine-crd.dtb: connector: ports:port@0: 'reg' is a required property Fixes: 9ee402ccfeb1 ("arm64: dts: qcom: sc7280: Fix EUD dt node syntax") Cc: Bhupesh Sharma Signed-off-by: Krzysztof Kozlowski --- Not tested on hardware. --- .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 15 +++++++++++++ .../arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 15 +++++++++++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 21 +------------------ 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi index 9ea6636125ad..2a4f239c5632 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi @@ -573,6 +573,12 @@ usb_c0: connector@0 { power-role = "dual"; data-role = "host"; try-power-role = "source"; + + port { + usb_c0_ep: endpoint { + remote-endpoint = <&eud_con>; + }; + }; }; usb_c1: connector@1 { @@ -590,6 +596,15 @@ usb_c1: connector@1 { #include #include +&eud_ports { + port@1 { + reg = <1>; + eud_con: endpoint { + remote-endpoint = <&usb_c0_ep>; + }; + }; +}; + &keyboard_controller { function-row-physmap = < MATRIX_KEY(0x00, 0x02, 0) /* T1 */ diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi index ebae545c587c..ffc469431340 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi @@ -44,6 +44,12 @@ usb_c0: connector@0 { power-role = "dual"; data-role = "host"; try-power-role = "source"; + + port { + usb_c0_ep: endpoint { + remote-endpoint = <&eud_con>; + }; + }; }; usb_c1: connector@1 { @@ -78,6 +84,15 @@ cr50: tpm@0 { }; }; +&eud_ports { + port@1 { + reg = <1>; + eud_con: endpoint { + remote-endpoint = <&usb_c0_ep>; + }; + }; +}; + &tlmm { ap_ec_int_l: ap-ec-int-l-state { pins = "gpio18"; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 925428a5f6ae..af9bb2ebcaa1 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -649,18 +649,6 @@ cpu7_opp_3014mhz: opp-3014400000 { }; }; - eud_typec: connector { - compatible = "usb-c-connector"; - - ports { - port@0 { - con_eud: endpoint { - remote-endpoint = <&eud_con>; - }; - }; - }; - }; - memory@80000000 { device_type = "memory"; /* We expect the bootloader to fill in the size */ @@ -3624,7 +3612,7 @@ eud: eud@88e0000 { <0 0x88e2000 0 0x1000>; interrupts-extended = <&pdc 11 IRQ_TYPE_LEVEL_HIGH>; - ports { + eud_ports: ports { #address-cells = <1>; #size-cells = <0>; @@ -3634,13 +3622,6 @@ eud_ep: endpoint { remote-endpoint = <&usb2_role_switch>; }; }; - - port@1 { - reg = <1>; - eud_con: endpoint { - remote-endpoint = <&con_eud>; - }; - }; }; };