From patchwork Tue May 14 13:08:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 13664112 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 713C0140E37 for ; Tue, 14 May 2024 13:08:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715692131; cv=none; b=olq/piCGa/aCoOAEKVmvc062HVj1F30ZOYhOlT16BSNRLzw2xOU6Hbajc7Whk9CNlRtCrGvmtz+mI0PkGCmGfmV7ZjXbI19HWyPBvpVhQacuVwqDsKeTi6GhNXC7/lgelTTdxRP8NRZSuIKvcMXPVFjmrpnS8ls6s6IFpUPPMrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715692131; c=relaxed/simple; bh=lJ4M28ShGbipfUlXRuryczQZJv4W7HNw0NKMqTL9vm0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NFmLJRdpQfk6KWe9+HYTnRMY3aq1FrqxwObUKy7JTZuS7c+2C5SMnizwOSD9QYdLpisdjItW6oD20U9VnON1Py0/t4qukqQtT0Bp7E09kCIK/GQrGTWh2i0T11sK3rTjojVlDgsn/qx/NN53+MdTEzkyT6N8miQ4zrR3DvIVw1c= 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=iwcHZivL; arc=none smtp.client-ip=209.85.208.48 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="iwcHZivL" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-571be483ccaso95512a12.2 for ; Tue, 14 May 2024 06:08:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715692128; x=1716296928; 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=L7YTa9xv3vHa0uYpcB9xiMfmcwkDWM/7SRo5P1u8PZg=; b=iwcHZivL7mqNKcRjOHhQyETHzoZi6px1ZUFlTnmW93JbSNfGIUmCPxT+mxaxTd66Il 2q6HLWXKyMfbLQalYqMsERAEtVH8KqXUMMp9EehSzvCHOOKXsNwAFclViw8C4Guiij9X lN+BwOKZtWknXtr3mAs0O6EwYz8xjZEh6eYGzKPXgFbLKwnsalCTtxHU1qD99MNmOawX Trk3GEYV/7v20hHDDN3uo9ZrcgverceF+iuRwlepJPcuYnNYdpOX0b2UH18TFCed/Pnt dvNMCEjkT59Q28csMMOPS0gJ+E7Y1XFgCoIbdAx6N5M5R+BLptRvdSFBAvaLzuXVOAgz C01w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715692128; x=1716296928; 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=L7YTa9xv3vHa0uYpcB9xiMfmcwkDWM/7SRo5P1u8PZg=; b=SU2uq3Rzo9vQ7IK50Yk9ej+6hhC28zU0s80aqeqKvU5/EeDouaioM3/djv+W9P8deY I7K83BF2FsIfVdTrPIFXlWi6a/6beJ/1ORxOtI1melDL5c512CA/4Q7RTkOfurEGWnpS MgUjyfkUUpsI8FN45bcAy+h6IMdkcW5NS+fcC7o/P12UnWcfmCii1tFM8iWCnYb30O3j NGTxMWUV+pflO+zVnYCwkA0njytyC2GA3Xv5xRE/Re9IBZdJVWfm2QOkdNn/pyqYA735 3uvzooJH37y4iugjmqRbJqe79gGNrm9PnkccVOe4KY9RNIineQHyr81m4/jmJ+u0f2qx LfGQ== X-Forwarded-Encrypted: i=1; AJvYcCW87zr4r6lmhuVkNkhBsem0PBAAqarxR3Szfql/aoxnZYIDmGwr5+nqeIzM8wOe2vI3O967N6uXxIBWiIdQ92b4fzAbQdglH378Ow== X-Gm-Message-State: AOJu0YzuUzbH7gvG9zhfTgYt0kD+L9dtur4cyD+Euiqz8TT5nnn+LZQF KWMooGJrIVSVPXNBf9lf6fc3hgMNuh4qOWGGT1MlzH5b0Oz8qq330U8i4IlESQ== X-Google-Smtp-Source: AGHT+IEu0s0hnS1XYl6UiC9Z+DGGQBL3NhlIQ4iFpvrPafqjZmv+iQEAeWTewWvrOR5RUBuRVMY6ZA== X-Received: by 2002:a17:907:1b28:b0:a5a:5f31:7663 with SMTP id a640c23a62f3a-a5a5f31777bmr549608366b.56.1715692127703; Tue, 14 May 2024 06:08:47 -0700 (PDT) Received: from [127.0.1.1] ([149.14.240.163]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a1781cf91sm719572466b.1.2024.05.14.06.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 06:08:47 -0700 (PDT) From: Manivannan Sadhasivam Date: Tue, 14 May 2024 15:08:40 +0200 Subject: [PATCH 1/2] dt-bindings: ufs: qcom: Use 'ufshc' as the node name for UFS controller nodes Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240514-ufs-nodename-fix-v1-1-4c55483ac401@linaro.org> References: <20240514-ufs-nodename-fix-v1-0-4c55483ac401@linaro.org> In-Reply-To: <20240514-ufs-nodename-fix-v1-0-4c55483ac401@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Gross , cros-qcom-dts-watchers@chromium.org Cc: linux-arm-msm@vger.kernel.org, linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Manivannan Sadhasivam X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=926; i=manivannan.sadhasivam@linaro.org; h=from:subject:message-id; bh=lJ4M28ShGbipfUlXRuryczQZJv4W7HNw0NKMqTL9vm0=; b=owGbwMvMwMUYOl/w2b+J574ynlZLYkhzTor5ZqQpXy/+Q/wqj3ncyaCYBuWC2MqHYUnzWXrPN J+KC9vZyWjMwsDIxSArpsiSvtRZq9Hj9I0lEerTYQaxMoFMYeDiFICJJC9k/8mYybitWIO9tDBy UvthqzbedQcbJNse7M0Rinvu3Fq0v9N13SebGXEix/bvSN99cu0BqTblxlmu95Var9mpRJ2/80T KwKQ/VNTg/e8Q8bqpabs0P39gNrlTYth29Mm+Tfz17ltX9R4V743br514Zp3m6TNGhhtD+t5Fvn 5a398ia/zgUqDh2U/6Ubs4Zuv47or05TUIc9W93Fa8x6qds+/0bc6HHtduTIvwORp6x6P/rVp8l VNOkC5v9+FpBWuC5raFvVDZWMfTu+bNFpHb0UtTWxfNXL2oYePv5Dlyb+uNuPj3RiYa9KnoLzH+ u4H/98MzzMHVP/Ok63XMf+/WdfkwRep9WWzscp/cmJlaAA== X-Developer-Key: i=manivannan.sadhasivam@linaro.org; a=openpgp; fpr=C668AEC3C3188E4C611465E7488550E901166008 Devicetree binding has documented the node name for UFS controllers as 'ufshc'. So let's use it instead of 'ufs' which is for the UFS devices. Signed-off-by: Manivannan Sadhasivam Reviewed-by: Stephen Boyd --- Documentation/devicetree/bindings/ufs/qcom,ufs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml b/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml index 10c146424baa..37112e17e474 100644 --- a/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml +++ b/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml @@ -273,7 +273,7 @@ examples: #address-cells = <2>; #size-cells = <2>; - ufs@1d84000 { + ufshc@1d84000 { compatible = "qcom,sm8450-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0 0x01d84000 0 0x3000>; From patchwork Tue May 14 13:08:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 13664113 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 0A8EF1411EE for ; Tue, 14 May 2024 13:08:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715692133; cv=none; b=qHTRYVrkLKsnrwIkJYSw3YLEF4A2E7ZIEQDwgPZflZA3MHFdG2Gy1ALOa5RH14Mh/EDrnMteM2idfMsdBoHaKBnC2dZaMLNq5Y5gm2mBiKEMy8Uq715os4QiufrLxUPITgx6xnMObV0s0aEyatNU2+CanW6coyA8FEuq4icA0Qc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715692133; c=relaxed/simple; bh=79N957sFT+botkrfIwoMhZsYTKAk7xgpP8euBkNNACI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Uqic/ptN59sNE8+b17rw8aKWOeV/z9D/SKukXDxxETeNoYW6B4S2kv2+qdrsm1ETCGtHx/TUQ5Nh4X82Uft8eevgMlnUSWgJgAFbP2xMUS9A1LXeNlte5y4Rjrh39u2ExlZq6bDPwYAYmeuOIGhOtGSk1dZve48PwF06TwlHl44= 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=B2OklwyD; arc=none smtp.client-ip=209.85.218.43 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="B2OklwyD" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a59a934ad50so31673566b.1 for ; Tue, 14 May 2024 06:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715692129; x=1716296929; 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=7VuwYtf2gX32SkqHPv74weor+XeWeSTj0M9fYMirYNI=; b=B2OklwyDlI6p+o71LKU3862hoJPBAMgmxACRxcOWd9w2QbdAF9KnSw6DWYcO7TOXJe /YL9h9H2pWdPmZB13OTOMXAvS7ba1sITmjabIQvBvCYFK3K0ZLuqjAhVvHxn1tfI+/pJ gYy3p1x9F6Y7HSFtO5CqLGbFhkAC3fBZ7rcPVorkM2C3HgSRjAvMeR7R4BjQ0TceoLWP kiBjvvq1kZ+KWqSvnrWjn61LLu79ddvZ9WmkaF/rsscEHLiVNzpi/jk2LJ4iisfBGMbd 970F/dvPn4vm+0vRMamHlDC9z/Pciod7Nimy5va6wu6Ie4vEq4mMafKEjGi/8gWtu8Mm l1Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715692129; x=1716296929; 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=7VuwYtf2gX32SkqHPv74weor+XeWeSTj0M9fYMirYNI=; b=OYRX127QQZzPxtqx88+6eT5906Xp4TY318j5th2ukhbBWz2ekf6hU+KoTLX0RgiRMa u7CYOgydtR0qibALAFJpPw7+AupLEImKH4kkL0pBpT0VdVVhY9qwfEoD6iVEKHv1bUoU 8GylJQ7HVDe34mvssz0dMIS3zp83838JCuKsNgaJ/lo1fNhOVZhr/zL3mV+L4g8ffSlX YBJaTG9sY+IK62MEpilS+mwx/r2GZaGOPlcHN9mAWhSte/e/KjBQboJXW+rciMSUhMoC eISa7KeIuOH2R+W0baIKctWr4NEo+trBNxkaBwAvRT7cjQSiGfaG/gNEm08Ry/mZYpUZ SU5w== X-Forwarded-Encrypted: i=1; AJvYcCUZHj/tPzl8cRIiEVvMUvbGda7tM/duJHTgdHK5Bv/nvp8QyU/xdDbBErcmkWDkAd4muamsU48IumejSqnUcizieEKNphQehiB3kA== X-Gm-Message-State: AOJu0Yyud7hiWexor8wsPYXWCO0Ns4h2W4BaelLWr5MiszSyr5Yvpm/P Wr0A+03X9/O3wwhTipIQH2aD/6/0XsewKKpuybZV54njHScmT7yihfaAwLwNuw== X-Google-Smtp-Source: AGHT+IGNpGJlmgPOxPVJvvSuUoh2Ab97ent0Dok78SJQyBenyIoReygTEJ87C8Nx8095CWPY0R7wOA== X-Received: by 2002:a17:906:4443:b0:a59:c728:5420 with SMTP id a640c23a62f3a-a5a2d6786damr842245266b.66.1715692129290; Tue, 14 May 2024 06:08:49 -0700 (PDT) Received: from [127.0.1.1] ([149.14.240.163]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a1781cf91sm719572466b.1.2024.05.14.06.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 06:08:48 -0700 (PDT) From: Manivannan Sadhasivam Date: Tue, 14 May 2024 15:08:41 +0200 Subject: [PATCH 2/2] arm64: dts: qcom: Use 'ufshc' as the node name for UFS controller nodes Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240514-ufs-nodename-fix-v1-2-4c55483ac401@linaro.org> References: <20240514-ufs-nodename-fix-v1-0-4c55483ac401@linaro.org> In-Reply-To: <20240514-ufs-nodename-fix-v1-0-4c55483ac401@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Alim Akhtar , Avri Altman , Bart Van Assche , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Andy Gross , cros-qcom-dts-watchers@chromium.org Cc: linux-arm-msm@vger.kernel.org, linux-scsi@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Manivannan Sadhasivam X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=4956; i=manivannan.sadhasivam@linaro.org; h=from:subject:message-id; bh=79N957sFT+botkrfIwoMhZsYTKAk7xgpP8euBkNNACI=; b=owEBbQGS/pANAwAKAVWfEeb+kc71AcsmYgBmQ2JcCiqQHXYXc/pSk57uMz9J0WsiC91fwyJS8 xlpoaLIiB+JATMEAAEKAB0WIQRnpUMqgUjL2KRYJ5dVnxHm/pHO9QUCZkNiXAAKCRBVnxHm/pHO 9QTmCACOCnfMGexb8BFI5GPfGZQ5LToQiDo/gsJ1usTirkHSeyxIWn1gyL3jxQ3kFuc9eygDYta 0nAIdP2pRmsZQQhasFIVv1lIuHHiaDEx/cYWx0F/WNIuS/xZyCuMJouY5v99ljdHkhWiIzbWJ91 AXgcx9753HE6xY0Zldn2NdmCPEG4DEkefb76hpqz1n5IWM3DP42cIwP/wtZZR7ZaVOzJxcyGubR L5FSRcrO/7+rdON2JMt+/38u4NjfLHQIu5Fb2g52zD97po6wCVryPSCZlNcr7ob17eXn8e7/tof qPPxmgAnQQnUitrBzGy2LMGVwq4y9PfYK40xnIaUZNBPwbwM X-Developer-Key: i=manivannan.sadhasivam@linaro.org; a=openpgp; fpr=C668AEC3C3188E4C611465E7488550E901166008 Devicetree binding has documented the node name for UFS controllers as 'ufshc'. So let's use it instead of 'ufs' which is for the UFS devices. Signed-off-by: Manivannan Sadhasivam Reviewed-by: Stephen Boyd --- arch/arm64/boot/dts/qcom/sa8775p.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm6125.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm6350.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8650.dtsi | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sa8775p.dtsi b/arch/arm64/boot/dts/qcom/sa8775p.dtsi index 231cea1f0fa8..3f65494259aa 100644 --- a/arch/arm64/boot/dts/qcom/sa8775p.dtsi +++ b/arch/arm64/boot/dts/qcom/sa8775p.dtsi @@ -1577,7 +1577,7 @@ rng: rng@10d2000 { reg = <0 0x010d2000 0 0x1000>; }; - ufs_mem_hc: ufs@1d84000 { + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sa8775p-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0x0 0x01d84000 0x0 0x3000>; interrupts = ; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 7e7f0f0fb41b..da63e9435130 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2303,7 +2303,7 @@ pcie1_phy: phy@1c0e000 { status = "disabled"; }; - ufs_mem_hc: ufs@1d84000 { + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sc7280-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0x0 0x01d84000 0x0 0x3000>; diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index a5b194813079..9c5437c2540a 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -2208,7 +2208,7 @@ pcie2a_phy: phy@1c24000 { status = "disabled"; }; - ufs_mem_hc: ufs@1d84000 { + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sc8280xp-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0 0x01d84000 0 0x3000>; @@ -2274,7 +2274,7 @@ ufs_mem_phy: phy@1d87000 { status = "disabled"; }; - ufs_card_hc: ufs@1da4000 { + ufs_card_hc: ufshc@1da4000 { compatible = "qcom,sc8280xp-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0 0x01da4000 0 0x3000>; diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index aca0a87092e4..974e4b6e27a4 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -1175,7 +1175,7 @@ opp-202000000 { }; }; - ufs_mem_hc: ufs@4804000 { + ufs_mem_hc: ufshc@4804000 { compatible = "qcom,sm6115-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0x0 0x04804000 0x0 0x3000>, <0x0 0x04810000 0x0 0x8000>; reg-names = "std", "ice"; diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi index 98ab08356088..20527b254f6b 100644 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi @@ -763,7 +763,7 @@ sdhc_2: mmc@4784000 { status = "disabled"; }; - ufs_mem_hc: ufs@4804000 { + ufs_mem_hc: ufshc@4804000 { compatible = "qcom,sm6125-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0x04804000 0x3000>, <0x04810000 0x8000>; reg-names = "std", "ice"; diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi index 24bcec3366ef..66e5ebbbbada 100644 --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi @@ -1136,7 +1136,7 @@ mmss_noc: interconnect@1740000 { qcom,bcm-voters = <&apps_bcm_voter>; }; - ufs_mem_hc: ufs@1d84000 { + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm6350-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0 0x01d84000 0 0x3000>, diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index 3904348075f6..94eea47c24d3 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -1957,7 +1957,7 @@ ufs_mem_phy: phy@1d80000 { status = "disabled"; }; - ufs_mem_hc: ufs@1d84000 { + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm8550-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0x0 0x01d84000 0x0 0x3000>; diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi index ba72d8f38420..7c6d2150a1e0 100644 --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi @@ -2509,7 +2509,7 @@ ufs_mem_phy: phy@1d80000 { status = "disabled"; }; - ufs_mem_hc: ufs@1d84000 { + ufs_mem_hc: ufshc@1d84000 { compatible = "qcom,sm8650-ufshc", "qcom,ufshc", "jedec,ufs-2.0"; reg = <0 0x01d84000 0 0x3000>;