101 lines
3.1 KiB
Diff
101 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Yixun Lan <dlan@kernel.org>
|
|
Date: Thu, 26 Feb 2026 09:35:00 +0000
|
|
Subject: [PATCH] riscv: dts: spacemit: adapt regulator node name to
|
|
preferred form
|
|
|
|
The preferred node name for fixed-regulators has changed to pattern [1]:
|
|
'^regulator(-[0-9]+v[0-9]+|-[0-9a-z-]+)?$'
|
|
|
|
Adjust all SpacemiT DT regulator node names to fix this.
|
|
|
|
Link: https://lore.kernel.org/r/20240426215147.3138211-1-robh@kernel.org [1]
|
|
Signed-off-by: Yixun Lan <dlan@kernel.org>
|
|
---
|
|
In Review of adding DTS for OrangePi, Chukun mentioned fixed-regulator
|
|
has preferred node names [1], so let's change it now.
|
|
|
|
This isn't strictly a bug, so I've not added the Fixes tag.
|
|
|
|
Link: https://lore.kernel.org/r/20260123145015.1926865-1-amadeus@jmu.edu.cn [1]
|
|
---
|
|
arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 10 +++++-----
|
|
arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts | 4 ++--
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts b/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
|
|
index 5971605754b3..d55f3e148ed2 100644
|
|
--- a/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
|
|
+++ b/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
|
|
@@ -33,7 +33,7 @@ led1 {
|
|
};
|
|
};
|
|
|
|
- pcie_vcc_3v3: pcie-vcc3v3 {
|
|
+ pcie_vcc_3v3: regulator-pcie-vcc3v3 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "PCIE_VCC3V3";
|
|
regulator-min-microvolt = <3300000>;
|
|
@@ -41,7 +41,7 @@ pcie_vcc_3v3: pcie-vcc3v3 {
|
|
regulator-always-on;
|
|
};
|
|
|
|
- reg_dc_in: dc-in-12v {
|
|
+ reg_dc_in: regulator-dc-in-12v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "dc_in_12v";
|
|
regulator-min-microvolt = <12000000>;
|
|
@@ -50,7 +50,7 @@ reg_dc_in: dc-in-12v {
|
|
regulator-always-on;
|
|
};
|
|
|
|
- reg_vcc_4v: vcc-4v {
|
|
+ reg_vcc_4v: regulator-vcc-4v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "vcc_4v";
|
|
regulator-min-microvolt = <4000000>;
|
|
@@ -60,7 +60,7 @@ reg_vcc_4v: vcc-4v {
|
|
vin-supply = <®_dc_in>;
|
|
};
|
|
|
|
- usb3-vbus-5v {
|
|
+ regulator-usb3-vbus-5v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "USB30_VBUS";
|
|
regulator-min-microvolt = <5000000>;
|
|
@@ -70,7 +70,7 @@ usb3-vbus-5v {
|
|
enable-active-high;
|
|
};
|
|
|
|
- usb3_hub_5v: usb3-hub-5v {
|
|
+ usb3_hub_5v: regulator-usb3-hub-5v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "USB30_HUB";
|
|
regulator-min-microvolt = <5000000>;
|
|
diff --git a/arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts b/arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts
|
|
index 800a112d5d70..931887aee8e0 100644
|
|
--- a/arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts
|
|
+++ b/arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts
|
|
@@ -21,7 +21,7 @@ chosen {
|
|
stdout-path = "serial0";
|
|
};
|
|
|
|
- reg_dc_in: dc-in-12v {
|
|
+ reg_dc_in: regulator-dc-in-12v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "dc_in_12v";
|
|
regulator-min-microvolt = <12000000>;
|
|
@@ -30,7 +30,7 @@ reg_dc_in: dc-in-12v {
|
|
regulator-always-on;
|
|
};
|
|
|
|
- reg_vcc_4v: vcc-4v {
|
|
+ reg_vcc_4v: regulator-vcc-4v {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "vcc_4v";
|
|
regulator-min-microvolt = <4000000>;
|
|
|
|
--
|
|
2.43.0
|
|
|