From nobody Sun Oct 5 21:59:57 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 503EA28727C for ; Tue, 29 Jul 2025 14:58:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801105; cv=none; b=oqqCwHSN/15gmj+wGbeJINUef3oYGXqaHr4NCPSUowBvJ/WDxLNIWJFOei7rGJ2pWhS/mo7KzQFYsNpYIK1JjSUydXKBMFo3uKPfH4sBeDNq/RAxgEF6uAqbarddtsklCa+iAR/QDlXrdkQCdkkQvpYMOaBT1HY2qJxYBlS1YhM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801105; c=relaxed/simple; bh=a76w9P/W1dZKqTU1YXIkU5GRvE3+uA+XoVFIJPcGYJE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fUxIbtdWbIHNyx/jJDACDSv9tatIO2z3JdQ2CDkwIYbtL3JUzklgPHlcZeKLs9L6zGNHIOo6cLl/30nB4pWVUzcxA5MkA34a5p+Mcn32QapdEl0wr/PPOKVys7ZUHkf0gJvr1h5ShtibALno+eLJiEcyG3dzmGncBtkKluiITiE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=N8rHcL7Y; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="N8rHcL7Y" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-451d41e1ad1so34787375e9.1 for ; Tue, 29 Jul 2025 07:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753801101; x=1754405901; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=p05nlOvQfzxXoS5wCNf98NUfm77DuBDoigr1C8/LCF4=; b=N8rHcL7YQTTtYg1B172V++BDLw1XoQvHjp73m5O+awhEuLClHZlNmIpZ89s+REfr7j QAExCcLdLoDy7HSI37NoxLmNnwo48CXuIuvwRx/AItTMnRXqJyLhDAPb3CHvrXOXA4jd XNuoYL/VGYZEYFTY3ZyEmvhUckTCNYusPRMG63f94g0aDWqYhIM8E/TpHOCP+vbTSsiB diHjBxgeGFoWnevdKQj1shfOKArtFkP9TYUNa5rv6eY//zeJX4tGR4wZUb37p04kU27L Uw097H5sCbRR5kkV08SFxKd7r+5Ox5mXuXMGKaw7UdrplDXEBRkzNpMkuXk7yROdVNTe fPLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753801101; x=1754405901; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p05nlOvQfzxXoS5wCNf98NUfm77DuBDoigr1C8/LCF4=; b=bfxFxB0Va1kDLF3FoA9Mq31mBzvOm1JAiUCmPwhldKBNkhBa7DU+LNzF426f/mKHKs 0AY09Ke844yzUXkU5+xkaJZTcCZhrLQs3+CZeFKIU0DC9FkweMh3oIVGfpFV+xaX4w+p jidkArav+K9u7ApNggluaBLUiL+M2srCYXDgGyVi5NEhQwtkLTvbgcxdxsAqNQm+oA6Q LTTQxp4UUPLbHMAChCeCXa2GI3JxLVPl5ab2n917dP8Z/kbRS2bHQE8oKNePBCqTXH8E Mr983JuF1jZ9+AdkLPSx8So3U+PDl8eQh9YYZEACBbmNe2uiFkjrY98U4MUIOP3QsgKK qDcw== X-Forwarded-Encrypted: i=1; AJvYcCXR996JBYhLVjZYIg9mkmJJRx8DpGBumSdBhJdiy06twl5hFb0txgj+ly+X4yQXVP5f+qYkMQC3Ttii+2Q=@vger.kernel.org X-Gm-Message-State: AOJu0YyT+SHr0CyqRhJGfqRiu0S3xkCCebcZKjTi+7xwE4Q3iY0xDyM2 vCr0SqD9z+HHq6vDTovtqamRnDzZsrquF5YHLjnW+DnT9v8b3U+HNdG1b9SJPyQMhOQ= X-Gm-Gg: ASbGncu5afaj9iGggEw1THWPlevy38imc6mJu6uLoPHKMbLq68MLkQfbwJYt5Q5DAzC MKsM2ViTcTdhrSvHvqfiwpSDk0eYpm2JD/ObEccKa2S/l84DcGX/lzukHNA0ait/jXgWZC0/wvM TYz7hovnt8LV73MSNEY8z2KALeWrYyXrjU4VcclxXLja1rh2yTk9Ix0kckbUsTOAZg5YupMALPt GtA2LC2n1pI8Cgf9zzdixmUKtBjtHKWbGVEqZBaZvAv1tlGkxsOLS1lKT6AOIq0gkWqVCfMazyS YQ0Rl7M5QnNGWyNpwMujQLi355V3YTC/6bdng9qj/92Ap66p2pRnUy7kcl9gPbBCzPY+i/5xt8y D24dxOPnWMkjW9A/naVmfW+7eT/B9Za5Ja6Pc6s2ObrI= X-Google-Smtp-Source: AGHT+IHLn5likhDOow361J0wljLn5gSP87I+9EMtbVP1wjtdnS4tSC4JDlAEbb9BZ77EmfkO1Yh4vQ== X-Received: by 2002:a05:600c:458d:b0:453:84a:8cf1 with SMTP id 5b1f17b1804b1-45892bdff3amr782595e9.33.1753801101455; Tue, 29 Jul 2025 07:58:21 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:3d9:2080:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458705bcbb7sm210294075e9.18.2025.07.29.07.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 07:58:21 -0700 (PDT) From: Neil Armstrong Date: Tue, 29 Jul 2025 16:58:17 +0200 Subject: [PATCH 1/2] arm64: dts: qcom: sm8550: Flatten the USB nodes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250729-topic-sm8x50-usb-flatten-v1-1-4be74a629136@linaro.org> References: <20250729-topic-sm8x50-usb-flatten-v1-0-4be74a629136@linaro.org> In-Reply-To: <20250729-topic-sm8x50-usb-flatten-v1-0-4be74a629136@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4132; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=a76w9P/W1dZKqTU1YXIkU5GRvE3+uA+XoVFIJPcGYJE=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBoiOGLHlvpHvQOv93BMXnI0Iihyvqjt15v7LA4d0Ew gOj67kmJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCaIjhiwAKCRB33NvayMhJ0VbSD/ 4xgNLkzwXMTH2FRWlC7I2ZwthBc7j32LyZ4lfsSwdPFyXl8yPEute388anz++CqWA6rsQ0U2mytdzD jju2GYu0bJDK/2hYMhmU2UVmjcizQquicG6e82FfSLt/IwQreyaI616JSqPgRWCbFSwTdKbmxoDutY lsKkUKLxSp66160lt7JxPFMQRl5KDDqKmIzOYsHiN3Wajda4Gi5VP1Cn+EGjWzSO1QCgKOmKtTauwY VY86a60MCCxrFksDJzzbuGWSG4PtSB+7+DYD8CeGw+kzFZopy9yLkJ52JHS083F/7x9hMFiimUgyd9 NE0IH+lzzG8QvuSgvk1++jrsYaWUrSr95cMP1NHGnGiGv0LR6omiywXrEF+4Mpmoa3gCnIOZTugtfN c0TwIqkgDUlMc4d1W4AqkJwI6rlGZ0je2DIN4pD1XYR+lFqm45MAqQPX9+BvfbJeSnfK/SqrloyY8g 4tMMhlq32JYfrV1h9VanWeTOg98iB/rSAHf2VQjxh3I/2N24NYNxWA46+Oc/PmhvbMh/eypxC0UdIX PGYTwnBQAWEI/qyswcYSL8wEvXRNPwfjJNxsooZCrNCLqO2RV8zeyGct80n99IBoql+E0KBZiRIQuA Y8TO92yIn9KU8mwavEkYWA7HpuJbkXuZ90OQUElD3t8zRy5E5tfchdS9DYhA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Transition the USB controllers found in the SM8550 SoC to the newly introduced, flattened representation of the Qualcomm USB block, i.e. qcom,snps-dwc3, to show the end result. The reg and interrupts properties from the usb child node are merged with their counterpart in the outer node, remaining properties and child nodes are simply moved. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550.dtsi | 84 ++++++++++++++++++--------------= ---- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qco= m/sm8550.dtsi index 45713d46f3c52487d2638b7ab194c111f58679ce..1e67b1cbdbfd1ac5478af23bf45= ba45bb756ef29 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -4084,12 +4084,11 @@ usb_dp_qmpphy_dp_in: endpoint { }; }; =20 - usb_1: usb@a6f8800 { - compatible =3D "qcom,sm8550-dwc3", "qcom,dwc3"; - reg =3D <0x0 0x0a6f8800 0x0 0x400>; - #address-cells =3D <2>; - #size-cells =3D <2>; - ranges; + usb_1: usb@a600000 { + compatible =3D "qcom,sm8550-dwc3", "qcom,snps-dwc3"; + reg =3D <0x0 0x0a600000 0x0 0x10000>; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 clocks =3D <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>, <&gcc GCC_USB30_PRIM_MASTER_CLK>, @@ -4108,12 +4107,14 @@ usb_1: usb@a6f8800 { <&gcc GCC_USB30_PRIM_MASTER_CLK>; assigned-clock-rates =3D <19200000>, <200000000>; =20 - interrupts-extended =3D <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>, + interrupts-extended =3D <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>, + <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>, <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, <&pdc 14 IRQ_TYPE_EDGE_BOTH>, <&pdc 15 IRQ_TYPE_EDGE_BOTH>, <&pdc 17 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names =3D "pwr_event", + interrupt-names =3D "dwc_usb3", + "pwr_event", "hs_phy_irq", "dp_hs_phy_irq", "dm_hs_phy_irq", @@ -4130,47 +4131,46 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, &config_noc SLAVE_USB3_0 QCOM_ICC_TAG_ACTIVE_ONLY>; interconnect-names =3D "usb-ddr", "apps-usb"; =20 - status =3D "disabled"; + iommus =3D <&apps_smmu 0x40 0x0>; =20 - usb_1_dwc3: usb@a600000 { - compatible =3D "snps,dwc3"; - reg =3D <0x0 0x0a600000 0x0 0xcd00>; - interrupts =3D ; - iommus =3D <&apps_smmu 0x40 0x0>; - phys =3D <&usb_1_hsphy>, - <&usb_dp_qmpphy QMP_USB43DP_USB3_PHY>; - phy-names =3D "usb2-phy", "usb3-phy"; - snps,hird-threshold =3D /bits/ 8 <0x0>; - snps,usb2-gadget-lpm-disable; - snps,dis_u2_susphy_quirk; - snps,dis_enblslpm_quirk; - snps,dis-u1-entry-quirk; - snps,dis-u2-entry-quirk; - snps,is-utmi-l1-suspend; - snps,usb3_lpm_capable; - snps,usb2-lpm-disable; - snps,has-lpm-erratum; - tx-fifo-resize; - dma-coherent; - usb-role-switch; + phys =3D <&usb_1_hsphy>, + <&usb_dp_qmpphy QMP_USB43DP_USB3_PHY>; + phy-names =3D "usb2-phy", "usb3-phy"; =20 - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; + snps,hird-threshold =3D /bits/ 8 <0x0>; + snps,usb2-gadget-lpm-disable; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; + snps,dis-u1-entry-quirk; + snps,dis-u2-entry-quirk; + snps,is-utmi-l1-suspend; + snps,usb3_lpm_capable; + snps,usb2-lpm-disable; + snps,has-lpm-erratum; + tx-fifo-resize; =20 - port@0 { - reg =3D <0>; + dma-coherent; =20 - usb_1_dwc3_hs: endpoint { - }; + usb-role-switch; + + status =3D "disabled"; + + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; + + port@0 { + reg =3D <0>; + + usb_1_dwc3_hs: endpoint { }; + }; =20 - port@1 { - reg =3D <1>; + port@1 { + reg =3D <1>; =20 - usb_1_dwc3_ss: endpoint { - remote-endpoint =3D <&usb_dp_qmpphy_usb_ss_in>; - }; + usb_1_dwc3_ss: endpoint { + remote-endpoint =3D <&usb_dp_qmpphy_usb_ss_in>; }; }; }; --=20 2.34.1 From nobody Sun Oct 5 21:59:57 2025 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9F972874F0 for ; Tue, 29 Jul 2025 14:58:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801106; cv=none; b=ZmMe9u/HXREh05ptx0CZcf5YjEhzg0rN5ivUpV1vC1iUgq9rPIZRqE0+RdkqBV5c1os4+na8ODHvUnwvgzUI+L4Q3L2GdSYWco++stRd+xAb0NYTzKIchXFU9RWTKSjt5RjpdK1SZ7dE7VWCPMefFEQ94j403R0zDDshs1IzumU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753801106; c=relaxed/simple; bh=G1mNuBpA7HbauYoTqR/3ft2D5iQv7PrC1A9qoCeBmnI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GyyRAZ6dHH1D6x4SPxKbssRdtg59xyUvJkvpNLNqwNFSDo83MjutL93BOsL10PzBBvoP5GAqjWxe/g8KRmau5znu9KAw8EOGQZBq9YmVYswbauXDEL21gE/sCLj5ZbrmOTP2lF1Yn9WJfLpX5HRvJi40w2wewDsuW4OioWh5/lU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ywFvilFI; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ywFvilFI" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4538bc52a8dso42173845e9.2 for ; Tue, 29 Jul 2025 07:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753801102; x=1754405902; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=iHsvigqSpw00u1mtcnaLxdNNr9s9Oed6sd1X0ydEhkE=; b=ywFvilFI/YG5ftYG3pfPsO2xcaCDGyDiB3bCKIEmjGtC5VEwH5TRkZqUZQO03IuNpK 5trW82yeBtVTs1EGVRhZETCYKPmjXXizS0AoSVdA0wVOGG3QqR1AWVFip2MFSjMX0Jo0 g2CoE+H/h0cVBqS2F+9B1IYb6QP/OAZlvtVrJ2c/vL4iZVBWcHd+OqbDAkNcQiRKXmb0 rBDb+W/mj1UWsreikHX1m57bu0KOsscFHQtIsormQAEFL4lLJNxp15OJmzT6+vdAmT6L MNMNNyRZLdmbSFPTNw5GRCGNMTiTNKDGAmUmVkwHxNdB1EJfB+aWF330j1ILA3SpRK6P tkwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753801102; x=1754405902; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iHsvigqSpw00u1mtcnaLxdNNr9s9Oed6sd1X0ydEhkE=; b=JEYA5ckkACBjh4880zbp9aHcIDBMmTmh8YbNhvMvlhfEYt0epdG7Drn4TS3EjY4642 HgYu7g8nbc7wTleBYg0hIMrxi3mHXXneuVjS7uGMJaF4iwuXhg3nfg2aqCMdAoK8nIjb kgeJy7BW6caUcqU5x7SQFyGffK+kNI01+vHO/m74N6J9jyKEm4wVHynooH7jrmDzU0xP lkHSAEug3U7IF5RSVAxQp/316d69bPbMjmZa22IBiDHhhIMwzC67XnaCrJj74i0iRHxa yrsBEuyQQvt5No0Py1lVZ15sKNfoAUiV67lC697V8433m7vakJZu7Tv2aSVhsmlNN7hf uc+A== X-Forwarded-Encrypted: i=1; AJvYcCW27HzfUeZsUcn+oWpfU2oibklRxnbiT6k5dpxnGCoRUKaMOXomHnCtcXRRnwSIXcH/vDXPVU0LswjITAU=@vger.kernel.org X-Gm-Message-State: AOJu0YyBfK3cyLMM2UpVfEoJk6yMuJPvCbUlAp2AadwaeZz1waZ/1fYk ClTwuPTOCxRhlwrMRENcWS01D+FU8oAwh8S0701PHeuNeGBSpwobAN2qhzPvr9TuHIo= X-Gm-Gg: ASbGncv1WSapKeVNb9pKUHDiyjeDXBRx2IkeUUDkIWMqWOepUQn0/dgezIP7WsYGVKS W6R2vm/MqbUW2GdAy7G63A9gJnmMtCHEuyONbwWyaVY6khF1gGR3Lp5pD9T/xUzupIHBmG99qhZ yqUCsUo1CGwzFbFeyrCz6yEm2CYyIEuBeaor651sYy/jRG2hOhCBLWyl+XXuREfyxVH95/DnTO3 zLMuxqTEsBBwzEZTFNKJ5e03D5OdUUYk7S0hiFFw2aS1xWP2J47LdqQlBMuI/eM1krGcLGtSNHw Hw85/bRTrXhJrOdCNSqZBLLC6NfG78OJXLJuwCQmYzpr2eawm27Ngyt5dmZVsz6BmHtjvkQ58V5 FH+F+x4DDYiAkuRgNHvaC/ZIPzBYsSYTtImQeNzxoVE0= X-Google-Smtp-Source: AGHT+IErc4AESaBFczNyM97DPfV/SppVmdg8l4MS3ZHOXD1p0g7Pk6+WmXwiG6iRAAUfgH2rgywKGQ== X-Received: by 2002:a05:600c:19c6:b0:456:2020:165d with SMTP id 5b1f17b1804b1-45892bdf4femr728825e9.31.1753801102129; Tue, 29 Jul 2025 07:58:22 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:3d9:2080:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458705bcbb7sm210294075e9.18.2025.07.29.07.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jul 2025 07:58:21 -0700 (PDT) From: Neil Armstrong Date: Tue, 29 Jul 2025 16:58:18 +0200 Subject: [PATCH 2/2] arm64: dts: qcom: sm8650: Flatten the USB nodes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250729-topic-sm8x50-usb-flatten-v1-2-4be74a629136@linaro.org> References: <20250729-topic-sm8x50-usb-flatten-v1-0-4be74a629136@linaro.org> In-Reply-To: <20250729-topic-sm8x50-usb-flatten-v1-0-4be74a629136@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5785; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=G1mNuBpA7HbauYoTqR/3ft2D5iQv7PrC1A9qoCeBmnI=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBoiOGL5vRSKPAoLrk3+YfDrsEa5OpAg8IuYfVUKDrF 7pcZDcKJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCaIjhiwAKCRB33NvayMhJ0QV1EA CcKSE+dBtILpL00HPJDYm5W8ZzLGTaAi1Tqd5pztY6nMAAPn/oZ43QPDRjWg1sQoyMnNIVMm2VdKDl XiYRp6NJ4CRiOqfGFVYEvxWfvbv7VQ/+fAbb2zwet9Q5ktM8HDYRsyYG2mkkoIrke3+yUA3OAdtEdy wXSdJNlLS0ltVGN0nL6FDSbEnWG8ptZpncrJb2LdXJ30tAKo5nksY2ueWigYPO9wMoM/aeLGGEI0TZ Cvq9LfyWVxy9fsrEECouowYyp1sk9Z+em2b6zFaA1CBdMCv6NWD7YnQsk6RfNKvImwQt+XtQyJhcsL hR0dllrRlTtThycBntW+j+Wocqv+dahNbj7zyOz45tdyJB0pcw4xPG8ut79nE0Xwwv2QExS9jDIaqQ 7N7L9CcAGHAJfcz56KCsjD/lkD4mJJBAGzFBN5vL603FmnZf/rl4ZtRz5H/GBwzp6Yk/MsYgxFUbHV c3JN+3MrQDZQUzLRtaHBtzvswqMMe3hxm3OczbH8mbhr4buaT3x36UM2ClTBbGgLckaqlo/Gwi/y8Z EXDUz+roxS4B3uJ1Iv+2U7edp1Mx5uGN9ErB8qfom//A/nXokQGoRuvdDiBdVdLOmpxEf5XiEqi/dx w6/wAHYPJsM0MHQ3oBRgKRIYvyqM1B/zj1VeWd3ow/uFmywpHi/v6J8ttrHA== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE Transition the USB controllers found in the SM8650 SoC to the newly introduced, flattened representation of the Qualcomm USB block, i.e. qcom,snps-dwc3, to show the end result. The reg and interrupts properties from the usb child node are merged with their counterpart in the outer node, remaining properties and child nodes are simply moved. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 6 +-- arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 6 +-- arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 6 +-- arch/arm64/boot/dts/qcom/sm8650.dtsi | 86 +++++++++++++++--------------= ---- 4 files changed, 46 insertions(+), 58 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/= qcom/sm8650-hdk.dts index 259649d7dcd768ecf93c9473adc1738e7d715b6c..a00da76a60620b998973cab189f= 12eeaa0a448fa 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts @@ -1310,12 +1310,10 @@ &ufs_mem_phy { */ =20 &usb_1 { - status =3D "okay"; -}; - -&usb_1_dwc3 { dr_mode =3D "otg"; usb-role-switch; + + status =3D "okay"; }; =20 &usb_1_dwc3_hs { diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/boot/dts/= qcom/sm8650-mtp.dts index 8a957adbfb383411153506e46d4c9acfb02e3114..c67bbace27439ad67cfb247a88a= ec633f93f5a6d 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts @@ -857,12 +857,10 @@ &ufs_mem_phy { */ =20 &usb_1 { - status =3D "okay"; -}; - -&usb_1_dwc3 { dr_mode =3D "otg"; usb-role-switch; + + status =3D "okay"; }; =20 &usb_1_dwc3_hs { diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/= qcom/sm8650-qrd.dts index 7552d5d3fb4020e61d47242b447c9ecbec5f8d55..081b7e40f5742120a611cbfa57a= 59dfb1dc19b9f 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts @@ -1293,12 +1293,10 @@ &ufs_mem_phy { */ =20 &usb_1 { - status =3D "okay"; -}; - -&usb_1_dwc3 { dr_mode =3D "otg"; usb-role-switch; + + status =3D "okay"; }; =20 &usb_1_dwc3_hs { diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qco= m/sm8650.dtsi index e14d3d778b71bbbd0c8fcc851eebc9df9ac09c31..0120b9c7432a945a204ed76a461= a6d0f13875537 100644 --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi @@ -5651,16 +5651,18 @@ usb_dp_qmpphy_dp_in: endpoint { }; }; =20 - usb_1: usb@a6f8800 { - compatible =3D "qcom,sm8650-dwc3", "qcom,dwc3"; - reg =3D <0 0x0a6f8800 0 0x400>; + usb_1: usb@a600000 { + compatible =3D "qcom,sm8650-dwc3", "qcom,snps-dwc3"; + reg =3D <0 0x0a600000 0 0x10000>; =20 - interrupts-extended =3D <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH 0>, + interrupts-extended =3D <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH 0>, + <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH 0>, <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>, <&pdc 14 IRQ_TYPE_EDGE_RISING>, <&pdc 15 IRQ_TYPE_EDGE_RISING>, <&pdc 17 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names =3D "pwr_event", + interrupt-names =3D "dwc_usb3", + "pwr_event", "hs_phy_irq", "dp_hs_phy_irq", "dm_hs_phy_irq", @@ -5685,6 +5687,11 @@ usb_1: usb@a6f8800 { =20 resets =3D <&gcc GCC_USB30_PRIM_BCR>; =20 + phys =3D <&usb_1_hsphy>, + <&usb_dp_qmpphy QMP_USB43DP_USB3_PHY>; + phy-names =3D "usb2-phy", + "usb3-phy"; + interconnects =3D <&aggre1_noc MASTER_USB3_0 QCOM_ICC_TAG_ALWAYS &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY @@ -5692,59 +5699,46 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, interconnect-names =3D "usb-ddr", "apps-usb"; =20 + iommus =3D <&apps_smmu 0x40 0>; + power-domains =3D <&gcc USB30_PRIM_GDSC>; required-opps =3D <&rpmhpd_opp_nom>; =20 - #address-cells =3D <2>; - #size-cells =3D <2>; - ranges; - - status =3D "disabled"; - - usb_1_dwc3: usb@a600000 { - compatible =3D "snps,dwc3"; - reg =3D <0 0x0a600000 0 0xcd00>; + snps,hird-threshold =3D /bits/ 8 <0x0>; + snps,usb2-gadget-lpm-disable; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; + snps,dis-u1-entry-quirk; + snps,dis-u2-entry-quirk; + snps,is-utmi-l1-suspend; + snps,usb3_lpm_capable; + snps,usb2-lpm-disable; + snps,has-lpm-erratum; + tx-fifo-resize; =20 - interrupts =3D ; - - iommus =3D <&apps_smmu 0x40 0>; - - phys =3D <&usb_1_hsphy>, - <&usb_dp_qmpphy QMP_USB43DP_USB3_PHY>; - phy-names =3D "usb2-phy", - "usb3-phy"; + dma-coherent; =20 - snps,hird-threshold =3D /bits/ 8 <0x0>; - snps,usb2-gadget-lpm-disable; - snps,dis_u2_susphy_quirk; - snps,dis_enblslpm_quirk; - snps,dis-u1-entry-quirk; - snps,dis-u2-entry-quirk; - snps,is-utmi-l1-suspend; - snps,usb3_lpm_capable; - snps,usb2-lpm-disable; - snps,has-lpm-erratum; - tx-fifo-resize; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - dma-coherent; + status =3D "disabled"; =20 - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; + ports { + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - port@0 { - reg =3D <0>; + port@0 { + reg =3D <0>; =20 - usb_1_dwc3_hs: endpoint { - }; + usb_1_dwc3_hs: endpoint { }; + }; =20 - port@1 { - reg =3D <1>; + port@1 { + reg =3D <1>; =20 - usb_1_dwc3_ss: endpoint { - remote-endpoint =3D <&usb_dp_qmpphy_usb_ss_in>; - }; + usb_1_dwc3_ss: endpoint { + remote-endpoint =3D <&usb_dp_qmpphy_usb_ss_in>; }; }; }; --=20 2.34.1