riscv: dts: spacemit: Add PMIC regulators usb pcie
Subsystems (3)
v3 cover riscv: dts: spacemit: Add PMIC regulators usb pcie
Changes in v3:
- Merge patch 2 into 3
- Fix
Rename regulator-name from USB30_HUB to USB_HUB_EN
Drop regulator-usb3-vbus-5v
Drop reset-gpios from usb hub nodes
Fix reg_dc_in regulator-name from "dc_in_12v" to "dc_in_5v"
- Link to v2: https://lore.kernel.org/linux-riscv/[email protected]/
Han Gao (3):
riscv: dts: spacemit: Enable i2c8 adapter for OrangePi RV2
riscv: dts: spacemit: Define the P1 PMIC regulators for OrangePi RV2
riscv: dts: spacemit: Enable USB3.0/PCIe on OrangePi RV2
.../boot/dts/spacemit/k1-orangepi-rv2.dts | 222 ++++++++++++++++++ 1 file changed, 222 insertions(+)
base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f
prerequisite-patch-id: ef6e9c7b5854d0c08066b72f9a7868db8c2140eb
prerequisite-patch-id: cfe3800f8c791ec4c63e070af9628e88e0fc31b9
prerequisite-patch-id: b76493e625ae257c8adcd67874178458420e4d47
prerequisite-patch-id: 88e01dc92c83bd88ddeb78891d3088209fed8d6b
prerequisite-patch-id: 60336d10ab8322c70596d0f046b6b5c54bb24b54
prerequisite-patch-id: 68c4d869548687dc115dd91e2ffb8f4c11482d86
prerequisite-patch-id: fdadcf964c2cb3406160edb579d99a8d5695f8e6
prerequisite-patch-id: 73b9e745338b0499b849fa4f7f9508987ab39a59
prerequisite-patch-id: cd26770c2160c3c31a406bd8a6b01ab666180ae0
prerequisite-patch-id: e5dfddc32cefae195692da8b80e19adf086e4ad7
prerequisite-patch-id: 7fd53cbe4977598f26148a4bb1cf692bbdb79a09
prerequisite-patch-id: 96ebac57bb29619b97fe95422206a685825618e9
prerequisite-patch-id: 00fac16b52f60383db3140e2885f3f7f8d14dd1a
prerequisite-patch-id: 3b7a60047b922c48e93599f621cb738856f42354
prerequisite-patch-id: 275c030b963be05dd1041451f539a130ce614277
prerequisite-patch-id: 93963424b0871e64276af0e0b2199b52e29b4603
prerequisite-patch-id: 8383188b1c01ed6280629faaa29c37d699ade241
prerequisite-patch-id: 5f8126b912b924d63d4a1e0c5eb42d212eb0d369
Signature · 1 line
2.47.3
PATCH v3 1/3 riscv: dts: spacemit: Enable i2c8 adapter for OrangePi RV2
The adapter is used to access the SpacemiT P1 PMIC present in this board.
--- arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts +6 -0
@@ -87,6 +87,12 @@ &pdma { status = "okay"; }; +&i2c8 { + pinctrl-0 = <&i2c8_cfg>; + pinctrl-names = "default"; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_2_cfg>;
Signature · 1 line
2.47.3
PATCH v3 2/3 riscv: dts: spacemit: Define the P1 PMIC regulators for OrangePi RV2
In reply to Han GaoDefine the DC power input and the 4v power as fixed regulator supplies.
Define the SpacemiT P1 PMIC voltage regulators and their constraints.
The power management hardware design on the OrangePi RV2 is identical to the Banana Pi BPI-F3, so the DT Nodes were taken from k1-bananapi-f3.dts.
--- .../boot/dts/spacemit/k1-orangepi-rv2.dts | 137 ++++++++++++++++++ 1 file changed, 137 insertions(+)
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts +137 -0
@@ -23,6 +23,25 @@ chosen { stdout-path = "serial0"; }; + reg_dc_in: regulator-vcc-in-5v { + compatible = "regulator-fixed"; + regulator-name = "dc_in_5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + }; + + reg_vcc_4v: regulator-vcc-4v { + compatible = "regulator-fixed"; + regulator-name = "vcc_4v"; + regulator-min-microvolt = <4000000>; + regulator-max-microvolt = <4000000>; + regulator-boot-on; + regulator-always-on; + vin-supply = <®_dc_in>; + }; + leds { compatible = "gpio-leds";
@@ -91,6 +110,124 @@ &i2c8 { pinctrl-0 = <&i2c8_cfg>; pinctrl-names = "default"; status = "okay"; + + pmic@41 { + compatible = "spacemit,p1"; + reg = <0x41>; + interrupts = <64>; + vin1-supply = <®_vcc_4v>; + vin2-supply = <®_vcc_4v>; + vin3-supply = <®_vcc_4v>; + vin4-supply = <®_vcc_4v>; + vin5-supply = <®_vcc_4v>; + vin6-supply = <®_vcc_4v>; + aldoin-supply = <®_vcc_4v>; + dldoin1-supply = <&buck5>; + dldoin2-supply = <&buck5>; + + regulators { + buck1 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck3_1v8: buck3 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1800000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck4 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3300000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck5: buck5 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + buck6 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3450000>; + regulator-ramp-delay = <5000>; + regulator-always-on; + }; + + aldo1 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + }; + + aldo2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + aldo3 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + aldo4 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo1 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-boot-on; + }; + + dldo2 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo3 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo4 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-always-on; + }; + + dldo5 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + + dldo6 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + regulator-always-on; + }; + + dldo7 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <3400000>; + }; + }; + }; }; &uart0 {
Signature · 1 line
2.47.3
Yixun Lan
maintainerRe: [PATCH v3 2/3] riscv: dts: spacemit: Define the P1 PMIC regulators for OrangePi RV2
Hi Han,
Quoted 4 lines · Han Gao
Define the DC power input and the 4v power as fixed regulator supplies.
Define the SpacemiT P1 PMIC voltage regulators and their constraints.
..
Quoted 2 lines
The power management hardware design on the OrangePi RV2 is identical to the Banana Pi BPI-F3, so the DT Nodes were taken from
k1-bananapi-f3.dts.
I'd suggest to drop above comment, it's vague and even not a direct reason..
Quoted 14 lines
Signed-off-by Han Gao <[email protected]>--- .../boot/dts/spacemit/k1-orangepi-rv2.dts | 137 ++++++++++++++++++ 1 file changed, 137 insertions(+)arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts +0
-0@@ -23,6 +23,25 @@ chosen { stdout-path = "serial0"; };
..
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts chosen { · line 33
Quoted 8 lines
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts +8
-0+ reg_dc_in: regulator-vcc-in-5v { + compatible = "regulator-fixed"; + regulator-name = "dc_in_5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + regulator-always-on; + };
This regulator can be dropped, it's not used by *device*, take a look at Krzysztof's comment
https://lore.kernel.org/all/[email protected]
Signature · 1 line
Yixun Lan (dlan)
Re: [PATCH v3 2/3] riscv: dts: spacemit: Define the P1 PMIC regulators for OrangePi RV2
In reply to Han GaoHi,
Quoted 2 lines
The power management hardware design on the OrangePi RV2 is identical to the Banana Pi BPI-F3, so the DT Nodes were taken from
k1-bananapi-f3.dts.
Why? If you've looked at the schematics, you'll find there are differences. e.g. The regulator name and the PMIC have several pins left floating:
aldo2, aldo3, aldo4, dldo2, dldo3, dldo7.
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts chosen { · line 28
Quoted 3 lines
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts +3
-0+ reg_dc_in: regulator-vcc-in-5v { + compatible = "regulator-fixed"; + regulator-name = "dc_in_5v";
vcc_5v0
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts chosen { · line 37
Quoted 3 lines
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts +3
-0+ reg_vcc_4v: regulator-vcc-4v { + compatible = "regulator-fixed"; + regulator-name = "vcc_4v";
vcc4v0
Thanks,
Chukun
PATCH v3 3/3 riscv: dts: spacemit: Enable USB3.0/PCIe on OrangePi RV2
In reply to Han GaoEnable the DWC3 USB 3.0 controller and its associated usbphy2 on the OrangePi RV2 board.
The board utilizes a Genesys Logic GL3523 hub, which requires one separate power supplies for hub itself.
Define a 3.3v fixed voltage regulator to be used by PCIe on OPi RV2.
Define PCIe and PHY-related Device Tree nodes for the OPi RV2.
--- .../boot/dts/spacemit/k1-orangepi-rv2.dts | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+)
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts +79 -0
@@ -23,6 +23,15 @@ chosen { stdout-path = "serial0"; }; + pcie_vcc_3v3: regulator-pcie-vcc3v3 { + compatible = "regulator-fixed"; + regulator-name = "PCIE_VCC3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio K1_GPIO(116) GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + reg_dc_in: regulator-vcc-in-5v { compatible = "regulator-fixed"; regulator-name = "dc_in_5v";
@@ -42,6 +51,15 @@ reg_vcc_4v: regulator-vcc-4v { vin-supply = <®_dc_in>; }; + usb3_hub_5v: regulator-usb3-hub-5v { + compatible = "regulator-fixed"; + regulator-name = "USB_HUB_EN"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio K1_GPIO(123) GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + leds { compatible = "gpio-leds";
@@ -54,6 +72,10 @@ led1 { }; }; +&combo_phy { + status = "okay"; +}; + ð0 { phy-handle = <&rgmii0>; phy-mode = "rgmii-id";
@@ -230,8 +252,65 @@ dldo7 { }; }; +&pcie1_phy { + pinctrl-names = "default"; + pinctrl-0 = <&pcie1_3_cfg>; + status = "okay"; +}; + +&pcie1_port { + phys = <&pcie1_phy>; + vpcie3v3-supply = <&pcie_vcc_3v3>; +}; + +&pcie1 { + vpcie3v3-supply = <&pcie_vcc_3v3>; + status = "okay"; +}; + +&pcie2_phy { + pinctrl-names = "default"; + pinctrl-0 = <&pcie2_4_cfg>; + status = "okay"; +}; + +&pcie2_port { + phys = <&pcie2_phy>; + vpcie3v3-supply = <&pcie_vcc_3v3>; +}; + +&pcie2 { + vpcie3v3-supply = <&pcie_vcc_3v3>; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_2_cfg>; status = "okay"; }; + +&usbphy2 { + status = "okay"; +}; + +&usb_dwc3 { + dr_mode = "host"; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + hub_2_0: hub@1 { + compatible = "usb5e3,610"; + reg = <0x1>; + vdd-supply = <&usb3_hub_5v>; + peer-hub = <&hub_3_0>; + }; + + hub_3_0: hub@2 { + compatible = "usb5e3,620"; + reg = <0x2>; + vdd-supply = <&usb3_hub_5v>; + peer-hub = <&hub_2_0>; + }; +};
Signature · 1 line
2.47.3
Re: [PATCH v3 3/3] riscv: dts: spacemit: Enable USB3.0/PCIe on OrangePi RV2
Hi,
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts reg_vcc_4v: regulator-vcc-4v { · line 56
Quoted 3 lines
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts +3
-0+ usb3_hub_5v: regulator-usb3-hub-5v { + compatible = "regulator-fixed"; + regulator-name = "USB_HUB_EN";
regulator-name = "vcc5v0_usb30";
"USB_HUB_EN" is the pin name.
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts dldo7 { · line 306
Quoted 10 lines
+&usb_dwc3 {
arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts +9
-0+ dr_mode = "host"; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + hub_2_0: hub@1 { + compatible = "usb5e3,610"; + reg = <0x1>; + vdd-supply = <&usb3_hub_5v>;
This is incorrect...
The hub is powered by VCC_5V0.VCC5V0_USB30 provides USB VBUS.
Thanks,
Chukun