Skip to contentSkip to conversation

arm64: dts: qcom: sm8250: change ufs node name to ufshc

PATCH In review Jonathan Marek 2 participants 2 messages May 23, 2020 – May 29, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: qcom: sm8250: change ufs node name to ufshc

The ufs-qcom driver checks that the name matches the androidboot.bootdevice parameter provided by the bootloader, which uses the name ufshc. Without this change UFS fails to probe.

I think this is broken behavior from the ufs-qcom driver, but using the name ufshc is consistent with dts for sdm845/sm8150/etc.

---
 arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8250.dtsi +1 -1
index e0344d3ba159..3bdce658c08a 100644
@@ -309,7 +309,7 @@ uart2: serial@a90000 {
 			};
 		};
 
-		ufs_mem_hc: ufs@1d84000 {
+		ufs_mem_hc: ufshc@1d84000 {
 			compatible = "qcom,sm8250-ufshc", "qcom,ufshc",
 				     "jedec,ufs-2.0";
 			reg = <0 0x01d84000 0 0x3000>;
Signature · 1 line
2.26.1
#1 lore raw
Quoted 4 lines · Jonathan Marek

The ufs-qcom driver checks that the name matches the androidboot.bootdevice parameter provided by the bootloader, which uses the name ufshc. Without this change UFS fails to probe.

Seems I only tested with UFS built as module, thanks for spotting this.

Quoted 3 lines

I think this is broken behavior from the ufs-qcom driver, but using the name ufshc is consistent with dts for sdm845/sm8150/etc.

I agree. Patch applied...

Thanks,
Bjorn

Quoted 21 lines
---
 arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8250.dtsi +1 -1
index e0344d3ba159..3bdce658c08a 100644
@@ -309,7 +309,7 @@ uart2: serial@a90000 {
 			};
 		};
 
-		ufs_mem_hc: ufs@1d84000 {
+		ufs_mem_hc: ufshc@1d84000 {
 			compatible = "qcom,sm8250-ufshc", "qcom,ufshc",
 				     "jedec,ufs-2.0";
 			reg = <0 0x01d84000 0 0x3000>;
Signature · 1 line
2.26.1