RK3568 PCIe V3 support
Subsystems (3)
v5 cover RK3568 PCIe V3 support
From: Frank Wunderlich <[email protected]>
This series adds Rockchip PCIe V3 support found on rk3568 SOC.
Compared to PCIeV2 which uses the Naneng combphy, PCIe v3 uses a dedicated PCI-phy.
Frank Wunderlich (4):
dt-bindings: phy: rockchip: add PCIe v3 phy
dt-bindings: soc: grf: add pcie30-{phy,pipe}-grf
arm64: dts: rockchip: rk3568: Add PCIe v3 nodes
arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro
Shawn Lin (1):
phy: rockchip: Support PCIe v3
.../bindings/phy/rockchip,pcie3-phy.yaml | 80 +++++ .../devicetree/bindings/soc/rockchip/grf.yaml | 3 + .../boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 117 +++++++ arch/arm64/boot/dts/rockchip/rk3568.dtsi | 122 +++++++ drivers/phy/rockchip/Kconfig | 9 + drivers/phy/rockchip/Makefile | 1 + .../phy/rockchip/phy-rockchip-snps-pcie3.c | 319 ++++++++++++++++++ include/linux/phy/pcie.h | 12 + 8 files changed, 663 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml create mode 100644 drivers/phy/rockchip/phy-rockchip-snps-pcie3.c create mode 100644 include/linux/phy/pcie.h
Signature · 1 line
2.34.1
PATCH v5 1/5 dt-bindings: phy: rockchip: add PCIe v3 phy
From: Frank Wunderlich <[email protected]>
Add a new binding file for Rockchip PCIe v3 phy driver.
---
v4:
- add reviewed-by
- remove minitems for clock-names as i have static list to fix error
- fix reg error by using 32-bit adressing in binding example
- change lane-map to u32 data-lanes
- tried to move data-lanes to phy-provider
https://github.com/frank-w/dt-schema/blob/main/dtschema/schemas/phy/phy-provider.yaml#L17
cloned and installed via pip install -e <local path> verified with pip show, but phy-privider seems not to be applied
v3:
- drop quotes
- drop rk3588
- make clockcount fixed to 3
- full path for binding header file
- drop phy-mode and its header and add lane-map
v2:
dt-bindings: rename yaml for PCIe v3 rockchip-pcie3-phy.yaml => rockchip,pcie3-phy.yaml
changes in pcie3 phy yaml
- change clock names to ordered const list
- extend pcie30-phymode description
- add phy-cells to required properties
- drop unevaluatedProperties
- example with 1 clock each line
- use default property instead of text describing it
- update license
--- .../bindings/phy/rockchip,pcie3-phy.yaml | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml
Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml new file +80 -0
@@ -0,0 +1,80 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/rockchip,pcie3-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip PCIe v3 phy + +maintainers: + - Heiko Stuebner <[email protected]> + +properties: + compatible: + enum: + - rockchip,rk3568-pcie3-phy + + reg: + maxItems: 1 + + clocks: + minItems: 3 + maxItems: 3 + + clock-names: + items: + - const: refclk_m + - const: refclk_n + - const: pclk + + data-lanes: + description: which lanes (by position) should be mapped to which + controller (value). 0 means lane disabled, higher value means used. + (controller-number +1 ) + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 2 + maxItems: 16 + items: + minimum: 0 + maximum: 16 + + "#phy-cells": + const: 0 + + resets: + maxItems: 1 + + reset-names: + const: phy + + rockchip,phy-grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: phandle to the syscon managing the phy "general register files" + + rockchip,pipe-grf: + $ref: /schemas/types.yaml#/definitions/phandle + description: phandle to the syscon managing the pipe "general register files" + +required: + - compatible + - reg + - rockchip,phy-grf + - "#phy-cells" + +additionalProperties: false + +examples: + - | + #include <dt-bindings/clock/rk3568-cru.h> + pcie30phy: phy@fe8c0000 { + compatible = "rockchip,rk3568-pcie3-phy"; + reg = <0xfe8c0000 0x20000>; + #phy-cells = <0>; + clocks = <&pmucru CLK_PCIE30PHY_REF_M>, + <&pmucru CLK_PCIE30PHY_REF_N>, + <&cru PCLK_PCIE30PHY>; + clock-names = "refclk_m", "refclk_n", "pclk"; + resets = <&cru SRST_PCIE30PHY>; + reset-names = "phy"; + rockchip,phy-grf = <&pcie30_phy_grf>; + };
Signature · 1 line
2.34.1
Re: [PATCH v5 1/5] dt-bindings: phy: rockchip: add PCIe v3 phy
Quoted 3 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Add a new binding file for Rockchip PCIe v3 phy driver.
Applied, thanks
Signature · 1 line
~Vinod
Rob Herring
maintainerRe: [PATCH v5 1/5] dt-bindings: phy: rockchip: add PCIe v3 phy
In reply to Frank WunderlichQuoted 52 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Add a new binding file for Rockchip PCIe v3 phy driver.
Signed-off-by Frank Wunderlich <[email protected]>Reviewed-by Krzysztof Kozlowski <[email protected]>---
v4:
- add reviewed-by
- remove minitems for clock-names as i have static list to fix error
- fix reg error by using 32-bit adressing in binding example
- change lane-map to u32 data-lanes
- tried to move data-lanes to phy-provider
https://github.com/frank-w/dt-schema/blob/main/dtschema/schemas/phy/phy-provider.yaml#L17
cloned and installed via pip install -e <local path> verified with pip show, but phy-privider seems not to be appliedv3:
- drop quotes
- drop rk3588
- make clockcount fixed to 3
- full path for binding header file
- drop phy-mode and its header and add lane-mapv2:
dt-bindings: rename yaml for PCIe v3rockchip-pcie3-phy.yaml=> rockchip,pcie3-phy.yamlchanges in pcie3 phy yaml
- change clock names to ordered const list
- extend pcie30-phymode description
- add phy-cells to required properties
- drop unevaluatedProperties
- example with 1 clock each line
- use default property instead of text describing it
- update license--- .../bindings/phy/rockchip,pcie3-phy.yaml | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yamlDocumentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml new file +5
-0@@ -0,0 +1,80 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/phy/rockchip,pcie3-phy.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml#
Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml line 15
Quoted 10 lines
Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml new file +10
-0+ +title: Rockchip PCIe v3 phy + +maintainers: + - Heiko Stuebner <[email protected]> + +properties: + compatible: + enum: + - rockchip,rk3568-pcie3-phy
The driver also has 'rockchip,rk3588-pcie3-phy'. Please send a fix adding it here or removing from the driver. Are they not compatible with each other?
Rob
Re: [PATCH v5 1/5] dt-bindings: phy: rockchip: add PCIe v3 phy
Am 4. Oktober 2022 17:09:29 MESZ schrieb Rob Herring <[email protected]>:
Quoted 11 lines · Frank Wunderlich
Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml line 15
Quoted 6 lines
From: Frank Wunderlich <[email protected]>
Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml new file +4
-0+properties: + compatible: + enum: + - rockchip,rk3568-pcie3-phyThe driver also has 'rockchip,rk3588-pcie3-phy'. Please send a fix adding it here or removing from the driver. Are they not compatible with each other?
Hi,
Right,
original driver has rk3588 support,but we can't test it. Initialization and lane-mapping (bifurcation) was bit different. So we wanted to upstream rk3568 first (but have not removed this part from driver).
I see that someone added rk3588 basic support and if he can test rk3588 i can send compatible for it.
regards Frank
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v5 1/5] dt-bindings: phy: rockchip: add PCIe v3 phy
Hi,
Quoted 13 lines · Frank Wunderlich
Am 4. Oktober 2022 17:09:29 MESZ schrieb Rob Herring <[email protected]>:
Quoted 11 lines · Frank Wunderlich
Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml line 15
Quoted 6 lines
From: Frank Wunderlich <[email protected]>
Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml new file +4
-0+properties: + compatible: + enum: + - rockchip,rk3568-pcie3-phyThe driver also has 'rockchip,rk3588-pcie3-phy'. Please send a fix adding it here or removing from the driver. Are they not compatible with each other?
Quoted 7 lines
Right, original driver has rk3588 support,but we can't test it. Initialization and lane-mapping (bifurcation) was bit different. So we wanted to upstream rk3568 first (but have not removed this part from driver).
I see that someone added rk3588 basic support and if he can test rk3588 i can send compatible for it.
Basic rk3588 support is still WIP. At the moment patches for the CRU are still pending as well as base DT. I hope to land them for v6.2 (so next merge window). At the same time I don't think PCIe support is realistic before v6.3.
-- Sebastian
Andrew Powers-Holmes
Tested-byRe: [PATCH v5 1/5] dt-bindings: phy: rockchip: add PCIe v3 phy
Quoted 21 lines · Sebastian Reichel
Hi,
Quoted 18 lines · Frank Wunderlich
Am 4. Oktober 2022 17:09:29 MESZ schrieb Rob Herring <[email protected]>:
Quoted 11 lines · Frank Wunderlich
Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml line 15
Quoted 6 lines
From: Frank Wunderlich <[email protected]>
Documentation/devicetree/bindings/phy/rockchip,pcie3-phy.yaml new file +4
-0+properties: + compatible: + enum: + - rockchip,rk3568-pcie3-phyThe driver also has 'rockchip,rk3588-pcie3-phy'. Please send a fix adding it here or removing from the driver. Are they not compatible with each other?
Right, original driver has rk3588 support,but we can't test it. Initialization and lane-mapping (bifurcation) was bit different. So we wanted to upstream rk3568 first (but have not removed this part from driver).
Quoted 7 lines
Quoted 2 lines
I see that someone added rk3588 basic support and if he can test rk3588 i can send compatible for it.
Basic rk3588 support is still WIP. At the moment patches for the CRU are still pending as well as base DT. I hope to land them for v6.2 (so next merge window). At the same time I don't think PCIe support is realistic before v6.3.
Hi all,
I can confirm this patchset successfully brings up the PCIe 3.0 controller/PHY on an RK3588 - I'm using a Pine64 QuartzPro64, which is very similar to the Rockchip RK3588-EVB1 board. Runs fine at x1, x2, x4 lane widths and full 8GT/s lane throughput.
The PCIe 2.0 lanes (which use the same PCIe controller driver) need some changes to the rockchip-naneng-combphy driver that I've not quite gotten to a working state, but that's unrelated to this series.
I have a (very messy) tree based on v6.0 (on GitHub at [0]) with Sebastian's other RK3588 support patches dropped in, along with this series and a few other tweaks. Works quite well :)
So insofar as RK3588 support is concerned,
[0] https://github.com/neggles/linux-quartz64/tree/qp64-pcie
Cheers,
A
PATCH v5 2/5 dt-bindings: soc: grf: add pcie30-{phy,pipe}-grf
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add compatibles for PCIe v3 General Register Files.
---
v4:
- rebase on 5.19-rc1
- add acked-by
v3:
- fix order of grf-bindings
v2:
- add soc-part to pcie3-phy-grf
--- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +3 -0
@@ -16,9 +16,12 @@ properties: - enum: - rockchip,rk3288-sgrf - rockchip,rk3566-pipe-grf + - rockchip,rk3568-pcie3-phy-grf - rockchip,rk3568-pipe-grf - rockchip,rk3568-pipe-phy-grf - rockchip,rk3568-usb2phy-grf + - rockchip,rk3588-pcie3-phy-grf + - rockchip,rk3588-pcie3-pipe-grf - rockchip,rv1108-usbgrf - const: syscon - items:
Signature · 1 line
2.34.1
PATCH v5 3/5 phy: rockchip: Support PCIe v3
In reply to Frank WunderlichFrom: Shawn Lin <[email protected]>
RK3568 supports PCIe v3 using not Combphy like PCIe v2 on rk3566. It use a dedicated PCIe-phy. Add support for this.
Initial support by Shawn Lin, modifications by Peter Geis and Frank Wunderlich.
Add data-lanes property for splitting pcie-lanes across controllers.
The data-lanes is an array where x=0 means lane is disabled and x > 0 means controller x is assigned to phy lane.
---
v5:
- change pr_* to dev_*, update copyright-years
- add naming of magic constants
v4:
- change u8 lane-map to u32 data-lanes
v3:
- change dt-binding include
- change reset to devm_reset_control_get_optional_exclusive exit on error and lower severity of message if unset
- fix from peter: disable reg-write for phy-mode in rockchip_p3phy_probe
- move bifurcation/lane-map support from PCIe to phy driver
v2:
- move dt-bindings header into separate patch
- use BIT-macro
- make constants better readable
- use dev_err instead of pr_*
- change dt-binding include due to renaming (phy-snps-pcie3.h => phy-rockchip-pcie3.h)
- use exclusive variant of devm_reset_control_get{,_exclusive}
- fix semicolon.cocci warnings reported by kernel test robot <[email protected]>
---
driver was taken from linux 5.10 based on in
https://github.com/JeffyCN/mirrors
which now has disappeared
Update phy-rockchip-snps-pcie3.c
Fix messages for data-lanes
Update phy-rockchip-snps-pcie3.c
Fix comment for data-lanes
--- drivers/phy/rockchip/Kconfig | 9 + drivers/phy/rockchip/Makefile | 1 + .../phy/rockchip/phy-rockchip-snps-pcie3.c | 319 ++++++++++++++++++ include/linux/phy/pcie.h | 12 + 4 files changed, 341 insertions(+) create mode 100644 drivers/phy/rockchip/phy-rockchip-snps-pcie3.c create mode 100644 include/linux/phy/pcie.h
drivers/phy/rockchip/Kconfig +9 -0
@@ -83,6 +83,15 @@ config PHY_ROCKCHIP_PCIE help Enable this to support the Rockchip PCIe PHY. +config PHY_ROCKCHIP_SNPS_PCIE3 + tristate "Rockchip Snps PCIe3 PHY Driver" + depends on (ARCH_ROCKCHIP && OF) || COMPILE_TEST + depends on HAS_IOMEM + select GENERIC_PHY + select MFD_SYSCON + help + Enable this to support the Rockchip snps PCIe3 PHY. + config PHY_ROCKCHIP_TYPEC tristate "Rockchip TYPEC PHY Driver" depends on OF && (ARCH_ROCKCHIP || COMPILE_TEST)
drivers/phy/rockchip/Makefile +1 -0
@@ -8,5 +8,6 @@ obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) += phy-rockchip-inno-hdmi.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o obj-$(CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY) += phy-rockchip-naneng-combphy.o obj-$(CONFIG_PHY_ROCKCHIP_PCIE) += phy-rockchip-pcie.o +obj-$(CONFIG_PHY_ROCKCHIP_SNPS_PCIE3) += phy-rockchip-snps-pcie3.o obj-$(CONFIG_PHY_ROCKCHIP_TYPEC) += phy-rockchip-typec.o obj-$(CONFIG_PHY_ROCKCHIP_USB) += phy-rockchip-usb.o
drivers/phy/rockchip/phy-rockchip-snps-pcie3.c new file +319 -0
319 lines not on this page · raw message
include/linux/phy/pcie.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2022 Rockchip Electronics Co., Ltd. +*/ +#ifndef __PHY_PCIE_H +#define __PHY_PCIE_H + +#define PHY_MODE_PCIE_RC 20 +#define PHY_MODE_PCIE_EP 21 +#define PHY_MODE_PCIE_BIFURCATION 22 + +#endif
Signature · 1 line
2.34.1
Re: [PATCH v5 3/5] phy: rockchip: Support PCIe v3
Quoted 5 lines · Frank Wunderlich
From: Shawn Lin <[email protected]>
RK3568 supports PCIe v3 using not Combphy like PCIe v2 on rk3566. It use a dedicated PCIe-phy. Add support for this.
Quoted 7 lines
Initial support by Shawn Lin, modifications by Peter Geis and Frank Wunderlich.
Add data-lanes property for splitting pcie-lanes across controllers.
The data-lanes is an array where x=0 means lane is disabled and x > 0 means controller x is assigned to phy lane.
Applied, thanks
Signature · 1 line
~Vinod
PATCH v5 4/5 arm64: dts: rockchip: rk3568: Add PCIe v3 nodes
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add nodes to rk356x devicetree to support PCIe v3.
---
v4:
- update pcie3 reg/ranges
v3:
- fix from Peter: change bus-range and msi-map, msi-map needs to start from 0x0
v2:
- change to compatible with soc-part
- change rockchip,bifurcation to vendor unspecific bifurcation
--- arch/arm64/boot/dts/rockchip/rk3568.dtsi | 122 +++++++++++++++++++++++ 1 file changed, 122 insertions(+)
arch/arm64/boot/dts/rockchip/rk3568.dtsi +122 -0
@@ -42,6 +42,128 @@ qos_sata0: qos@fe190200 { reg = <0x0 0xfe190200 0x0 0x20>; }; + pcie30_phy_grf: syscon@fdcb8000 { + compatible = "rockchip,rk3568-pcie3-phy-grf", "syscon"; + reg = <0x0 0xfdcb8000 0x0 0x10000>; + }; + + pcie30phy: phy@fe8c0000 { + compatible = "rockchip,rk3568-pcie3-phy"; + reg = <0x0 0xfe8c0000 0x0 0x20000>; + #phy-cells = <0>; + clocks = <&pmucru CLK_PCIE30PHY_REF_M>, <&pmucru CLK_PCIE30PHY_REF_N>, + <&cru PCLK_PCIE30PHY>; + clock-names = "refclk_m", "refclk_n", "pclk"; + resets = <&cru SRST_PCIE30PHY>; + reset-names = "phy"; + rockchip,phy-grf = <&pcie30_phy_grf>; + status = "disabled"; + }; + + pcie3x1: pcie@fe270000 { + compatible = "rockchip,rk3568-pcie"; + #address-cells = <3>; + #size-cells = <2>; + bus-range = <0x0 0xf>; + clocks = <&cru ACLK_PCIE30X1_MST>, <&cru ACLK_PCIE30X1_SLV>, + <&cru ACLK_PCIE30X1_DBI>, <&cru PCLK_PCIE30X1>, + <&cru CLK_PCIE30X1_AUX_NDFT>; + clock-names = "aclk_mst", "aclk_slv", + "aclk_dbi", "pclk", "aux"; + device_type = "pci"; + interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "sys", "pmc", "msg", "legacy", "err"; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie3x1_intc 0>, + <0 0 0 2 &pcie3x1_intc 1>, + <0 0 0 3 &pcie3x1_intc 2>, + <0 0 0 4 &pcie3x1_intc 3>; + linux,pci-domain = <1>; + num-ib-windows = <6>; + num-ob-windows = <2>; + max-link-speed = <3>; + msi-map = <0x0 &gic 0x1000 0x1000>; + num-lanes = <1>; + phys = <&pcie30phy>; + phy-names = "pcie-phy"; + power-domains = <&power RK3568_PD_PIPE>; + reg = <0x3 0xc0400000 0x0 0x00400000>, + <0x0 0xfe270000 0x0 0x00010000>, + <0x3 0x7f000000 0x0 0x01000000>; + ranges = <0x01000000 0x0 0x3ef00000 0x3 0x7ef00000 0x0 0x00100000>, + <0x02000000 0x0 0x00000000 0x3 0x40000000 0x0 0x3ef00000>; + reg-names = "dbi", "apb", "config"; + resets = <&cru SRST_PCIE30X1_POWERUP>; + reset-names = "pipe"; + /* bifurcation; lane1 when using 1+1 */ + status = "disabled"; + + pcie3x1_intc: legacy-interrupt-controller { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <1>; + interrupt-parent = <&gic>; + interrupts = <GIC_SPI 157 IRQ_TYPE_EDGE_RISING>; + }; + }; + + pcie3x2: pcie@fe280000 { + compatible = "rockchip,rk3568-pcie"; + #address-cells = <3>; + #size-cells = <2>; + bus-range = <0x0 0xf>; + clocks = <&cru ACLK_PCIE30X2_MST>, <&cru ACLK_PCIE30X2_SLV>, + <&cru ACLK_PCIE30X2_DBI>, <&cru PCLK_PCIE30X2>, + <&cru CLK_PCIE30X2_AUX_NDFT>; + clock-names = "aclk_mst", "aclk_slv", + "aclk_dbi", "pclk", "aux"; + device_type = "pci"; + interrupts = <GIC_SPI 165 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "sys", "pmc", "msg", "legacy", "err"; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie3x2_intc 0>, + <0 0 0 2 &pcie3x2_intc 1>, + <0 0 0 3 &pcie3x2_intc 2>, + <0 0 0 4 &pcie3x2_intc 3>; + linux,pci-domain = <2>; + num-ib-windows = <6>; + num-ob-windows = <2>; + max-link-speed = <3>; + msi-map = <0x0 &gic 0x2000 0x1000>; + num-lanes = <2>; + phys = <&pcie30phy>; + phy-names = "pcie-phy"; + power-domains = <&power RK3568_PD_PIPE>; + reg = <0x3 0xc0800000 0x0 0x00400000>, + <0x0 0xfe280000 0x0 0x00010000>, + <0x3 0xbf000000 0x0 0x01000000>; + ranges = <0x01000000 0x0 0x3ef00000 0x3 0xbef00000 0x0 0x00100000>, + <0x02000000 0x0 0x00000000 0x3 0x80000000 0x0 0x3ef00000>; + reg-names = "dbi", "apb", "config"; + resets = <&cru SRST_PCIE30X2_POWERUP>; + reset-names = "pipe"; + /* bifurcation; lane0 when using 1+1 */ + status = "disabled"; + + pcie3x2_intc: legacy-interrupt-controller { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <1>; + interrupt-parent = <&gic>; + interrupts = <GIC_SPI 162 IRQ_TYPE_EDGE_RISING>; + }; + }; + gmac0: ethernet@fe2a0000 { compatible = "rockchip,rk3568-gmac", "snps,dwmac-4.20a"; reg = <0x0 0xfe2a0000 0x0 0x10000>;
Signature · 1 line
2.34.1
PATCH v5 5/5 arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add Nodes to Bananapi-R2-Pro board to support PCIe v3 and set PCIe related regulators to always on.
---
v5:
- rebase on 6.0-rc1
- add pinctrl for pcie
- fix ngff pwr_en_h gpio for hw ref 1.1
v4:
- change u8 lane-map to u32 data-lanes
v3:
- squash lane-map over bifurcation property
- add comment which slot is M2 and which one if mPCIe
- fixes from Peter:
- drop regulator-always-on/regulator-boot-on from regulators
- increase startup-delay-us for regulators
- set phy-mode on PCIe3-phy
- add num-lanes to PCIe overrides
- add usb node for to PCIe/m2
- move lane-map from PCIe controller to PCIe-phy
v2:
- underscores in nodenames
- rockchip,bifurcation to vendor unspecific bifurcation
- fix trailing space
--- .../boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+)
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +117 -0
@@ -86,6 +86,66 @@ vcc5v0_sys: vcc5v0-sys { vin-supply = <&dc_12v>; }; + pcie30_avdd0v9: pcie30-avdd0v9 { + compatible = "regulator-fixed"; + regulator-name = "pcie30_avdd0v9"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + vin-supply = <&vcc3v3_sys>; + }; + + pcie30_avdd1v8: pcie30-avdd1v8 { + compatible = "regulator-fixed"; + regulator-name = "pcie30_avdd1v8"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc3v3_sys>; + }; + + /* pi6c pcie clock generator feeds both ports */ + vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_pcie"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; + startup-delay-us = <200000>; + vin-supply = <&vcc5v0_sys>; + }; + + /* actually fed by vcc3v3_sys, dependent on pi6c clock generator */ + vcc3v3_minipcie: vcc3v3-minipcie-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_minipcie"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&minipcie_enable_h>; + startup-delay-us = <50000>; + vin-supply = <&vcc3v3_pi6c_05>; + }; + + /* actually fed by vcc3v3_sys, dependent on pi6c clock generator */ + vcc3v3_ngff: vcc3v3-ngff-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_ngff"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&ngffpcie_enable_h>; + startup-delay-us = <50000>; + vin-supply = <&vcc3v3_pi6c_05>; + }; + vcc5v0_usb: vcc5v0_usb { compatible = "regulator-fixed"; regulator-name = "vcc5v0_usb";
@@ -513,6 +573,32 @@ rgmii_phy1: ethernet-phy@0 { }; }; +&pcie30phy { + data-lanes = <1 2>; + phy-supply = <&vcc3v3_pi6c_05>; + status = "okay"; +}; + +&pcie3x1 { + /* M.2 slot */ + num-lanes = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&ngffpcie_reset_h>; + reset-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_ngff>; + status = "okay"; +}; + +&pcie3x2 { + /* mPCIe slot */ + num-lanes = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&minipcie_reset_h>; + reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_minipcie>; + status = "okay"; +}; + &pinctrl { leds { blue_led_pin: blue-led-pin {
@@ -529,6 +615,24 @@ hym8563_int: hym8563-int { }; }; + pcie { + minipcie_enable_h: minipcie-enable-h { + rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none_drv_level_5>; + }; + + ngffpcie_enable_h: ngffpcie-enable-h { + rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none_drv_level_5>; + }; + + minipcie_reset_h: minipcie-reset-h { + rockchip,pins = <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none_drv_level_5>; + }; + + ngffpcie_reset_h: ngffpcie-reset-h { + rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none_drv_level_5>; + }; + }; + pmic { pmic_int: pmic_int { rockchip,pins =
@@ -708,6 +812,19 @@ &usb2phy0_otg { status = "okay"; }; +&usb2phy1 { + /* USB for PCIe/M2 */ + status = "okay"; +}; + +&usb2phy1_host { + status = "okay"; +}; + +&usb2phy1_otg { + status = "okay"; +}; + &vop { assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
Signature · 1 line
2.34.1
Re: [PATCH v5 5/5] arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro
Quoted 40 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Add Nodes to Bananapi-R2-Pro board to support PCIe v3 and set PCIe related regulators to always on.
Suggested-by Peter Geis <[email protected]>Signed-off-by Frank Wunderlich <[email protected]>---
v5:
- rebase on 6.0-rc1
- add pinctrl for pcie
- fix ngffpwr_en_hgpio for hw ref 1.1v4:
- change u8 lane-map to u32 data-lanesv3:
- squash lane-map over bifurcation property
- add comment which slot is M2 and which one if mPCIe
- fixes from Peter:
- drop regulator-always-on/regulator-boot-on from regulators
- increase startup-delay-us for regulators
- set phy-mode on PCIe3-phy
- add num-lanes to PCIe overrides
- add usb node for to PCIe/m2
- move lane-map from PCIe controller to PCIe-phyv2:
- underscores in nodenames
- rockchip,bifurcation to vendor unspecific bifurcation
- fix trailing space--- .../boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+)arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +0
-0
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 89
Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +1
-0@@ -86,6 +86,66 @@ vcc5v0_sys: vcc5v0-sys { vin-supply = <&dc_12v>; }; + pcie30_avdd0v9: pcie30-avdd0v9 {
Use consistent naming, so if other nodes have "regulator" suffix, use it here as well.
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 99
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +10
-0+ compatible = "regulator-fixed"; + regulator-name = "pcie30_avdd0v9"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + vin-supply = <&vcc3v3_sys>; + }; + + pcie30_avdd1v8: pcie30-avdd1v8 {
Ditto.
Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +11
-0+ compatible = "regulator-fixed"; + regulator-name = "pcie30_avdd1v8"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc3v3_sys>; + }; + + /* pi6c pcie clock generator feeds both ports */ + vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulator {
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 120
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +10
-0+ compatible = "regulator-fixed"; + regulator-name = "vcc3v3_pcie"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; + startup-delay-us = <200000>; + vin-supply = <&vcc5v0_sys>; + }; +
Best regards,
Krzysztof
Aw: Re: [PATCH v5 5/5] arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro
Hi
Quoted 13 lines
Gesendet: Freitag, 26. August 2022 um 08:50 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>Quoted 10 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +0
-0@@ -86,6 +86,66 @@ vcc5v0_sys: vcc5v0-sys { vin-supply = <&dc_12v>; };
Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 89
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +1
-0+ pcie30_avdd0v9: pcie30-avdd0v9 {Use consistent naming, so if other nodes have "regulator" suffix, use it here as well.
only these 3 new have the suffix:
vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulatorvcc3v3_minipcie: vcc3v3-minipcie-regulatorvcc3v3_ngff: vcc3v3-ngff-regulator
so i would drop it there...
so i end up with (including existing ones to compare):
vcc3v3_sys: vcc3v3-sysvcc5v0_sys: vcc5v0-syspcie30_avdd0v9: pcie30-avdd0v9pcie30_avdd1v8: pcie30-avdd1v8vcc3v3_pi6c_05: vcc3v3-pi6c-05vcc3v3_minipcie: vcc3v3-minipcievcc3v3_ngff: vcc3v3-ngffvcc5v0_usb: vcc5v0_usbvcc5v0_usb_host: vcc5v0-usb-hostvcc5v0_usb_otg: vcc5v0-usb-otg
is this ok?
maybe swap avdd* and pcie30 part to have voltage in front of function.
Quoted 39 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 99
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +10
-0+ compatible = "regulator-fixed"; + regulator-name = "pcie30_avdd0v9"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <900000>; + vin-supply = <&vcc3v3_sys>; + }; + + pcie30_avdd1v8: pcie30-avdd1v8 {Ditto.
Quoted 11 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +11
-0+ compatible = "regulator-fixed"; + regulator-name = "pcie30_avdd1v8"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc3v3_sys>; + }; + + /* pi6c pcie clock generator feeds both ports */ + vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulator {arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 120
Quoted 10 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +10
-0+ compatible = "regulator-fixed"; + regulator-name = "vcc3v3_pcie"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; + startup-delay-us = <200000>; + vin-supply = <&vcc5v0_sys>; + }; +Best regards,
Krzysztof
Re: Aw: Re: [PATCH v5 5/5] arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro
Quoted 41 lines · Frank Wunderlich
Hi
Quoted 13 lines
Gesendet: Freitag, 26. August 2022 um 08:50 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>Quoted 10 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +0
-0@@ -86,6 +86,66 @@ vcc5v0_sys: vcc5v0-sys { vin-supply = <&dc_12v>; };Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 89
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +1
-0+ pcie30_avdd0v9: pcie30-avdd0v9 {Use consistent naming, so if other nodes have "regulator" suffix, use it here as well.
only these 3 new have the suffix:
vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulatorvcc3v3_minipcie: vcc3v3-minipcie-regulatorvcc3v3_ngff: vcc3v3-ngff-regulatorso i would drop it there...
so i end up with (including existing ones to compare):
vcc3v3_sys: vcc3v3-sysvcc5v0_sys: vcc5v0-syspcie30_avdd0v9: pcie30-avdd0v9pcie30_avdd1v8: pcie30-avdd1v8vcc3v3_pi6c_05: vcc3v3-pi6c-05vcc3v3_minipcie: vcc3v3-minipcievcc3v3_ngff: vcc3v3-ngffvcc5v0_usb:vcc5v0_usbvcc5v0_usb_host: vcc5v0-usb-hostvcc5v0_usb_otg: vcc5v0-usb-otg
Quoted 4 lines
is this ok?
maybe swap avdd* and pcie30 part to have voltage in front of function.
I prefer all of them have regulator suffix. I think reasonable is also to rename the old ones and then add new ones with suffix.
Best regards,
Krzysztof
Aw: Re: Re: [PATCH v5 5/5] arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro
Quoted 45 lines
Gesendet: Samstag, 27. August 2022 um 10:56 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>Quoted 41 lines · Frank Wunderlich
Hi
Quoted 13 lines
Gesendet: Freitag, 26. August 2022 um 08:50 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>Quoted 10 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +0
-0@@ -86,6 +86,66 @@ vcc5v0_sys: vcc5v0-sys { vin-supply = <&dc_12v>; };Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 89
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +1
-0+ pcie30_avdd0v9: pcie30-avdd0v9 {Use consistent naming, so if other nodes have "regulator" suffix, use it here as well.
only these 3 new have the suffix:
vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulatorvcc3v3_minipcie: vcc3v3-minipcie-regulatorvcc3v3_ngff: vcc3v3-ngff-regulatorso i would drop it there...
so i end up with (including existing ones to compare):
vcc3v3_sys: vcc3v3-sysvcc5v0_sys: vcc5v0-syspcie30_avdd0v9: pcie30-avdd0v9pcie30_avdd1v8: pcie30-avdd1v8vcc3v3_pi6c_05: vcc3v3-pi6c-05vcc3v3_minipcie: vcc3v3-minipcievcc3v3_ngff: vcc3v3-ngffvcc5v0_usb:vcc5v0_usbvcc5v0_usb_host: vcc5v0-usb-hostvcc5v0_usb_otg: vcc5v0-usb-otg
Quoted 7 lines
Quoted 4 lines
is this ok?
maybe swap avdd* and pcie30 part to have voltage in front of function.
I prefer all of them have regulator suffix. I think reasonable is also to rename the old ones and then add new ones with suffix.
ok, will change these to add -regulator in name (not label). and then rename the others in separate Patch outside of the series.
so basicly here
- pcie30_avdd0v9: pcie30-avdd0v9 {
+ pcie30_avdd0v9: pcie30-avdd0v9-regulator {
- pcie30_avdd1v8: pcie30-avdd1v8 {
+ pcie30_avdd1v8: pcie30-avdd1v8-regulator {how about the swapping of pcie30 and the avddXvY? In Schematic they are named PCIE30_AVDD_0V9 / PCIE30_AVDD_1V8, so better leave this?
avdd0v9-pcie30 will be more similar to the other regulators, but inconsistent with Schematic.
regards Frank
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: Aw: Re: Re: [PATCH v5 5/5] arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro
Quoted 61 lines · Frank Wunderlich
Quoted 45 lines
Gesendet: Samstag, 27. August 2022 um 10:56 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>Quoted 41 lines · Frank Wunderlich
Hi
Quoted 13 lines
Gesendet: Freitag, 26. August 2022 um 08:50 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>Quoted 10 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +0
-0@@ -86,6 +86,66 @@ vcc5v0_sys: vcc5v0-sys { vin-supply = <&dc_12v>; };Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 89
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +1
-0+ pcie30_avdd0v9: pcie30-avdd0v9 {Use consistent naming, so if other nodes have "regulator" suffix, use it here as well.
only these 3 new have the suffix:
vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulatorvcc3v3_minipcie: vcc3v3-minipcie-regulatorvcc3v3_ngff: vcc3v3-ngff-regulatorso i would drop it there...
so i end up with (including existing ones to compare):
vcc3v3_sys: vcc3v3-sysvcc5v0_sys: vcc5v0-syspcie30_avdd0v9: pcie30-avdd0v9pcie30_avdd1v8: pcie30-avdd1v8vcc3v3_pi6c_05: vcc3v3-pi6c-05vcc3v3_minipcie: vcc3v3-minipcievcc3v3_ngff: vcc3v3-ngffvcc5v0_usb:vcc5v0_usbvcc5v0_usb_host: vcc5v0-usb-hostvcc5v0_usb_otg: vcc5v0-usb-otgQuoted 7 lines
Quoted 4 lines
is this ok?
maybe swap avdd* and pcie30 part to have voltage in front of function.
I prefer all of them have regulator suffix. I think reasonable is also to rename the old ones and then add new ones with suffix.
ok, will change these to add -regulator in name (not label). and then rename the others in separate Patch outside of the series.
so basicly here
(quoted diff) +2
-2- pcie30_avdd0v9: pcie30-avdd0v9 { + pcie30_avdd0v9: pcie30-avdd0v9-regulator { - pcie30_avdd1v8: pcie30-avdd1v8 { + pcie30_avdd1v8: pcie30-avdd1v8-regulator {
Quoted 3 lines
how about the swapping of pcie30 and the avddXvY? In Schematic they are named
PCIE30_AVDD_0V9/PCIE30_AVDD_1V8, so better leave this?avdd0v9-pcie30 will be more similar to the other regulators, but inconsistent with Schematic.
Does not matter to me - it is still a specific prefix, so whatever you put there it's for you, not for me. Keeping something aligned to schematic - even if not consistently named - makes sense to me.
Best regards,
Krzysztof
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Heiko Stübner
maintainerRe: Aw: Re: Re: [PATCH v5 5/5] arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro
In reply to Frank WunderlichHi,
Am Samstag, 27. August 2022, 11:14:28 CEST schrieb Frank Wunderlich:
Quoted 61 lines
Quoted 45 lines
Gesendet: Samstag, 27. August 2022 um 10:56 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>Quoted 41 lines · Frank Wunderlich
Hi
Quoted 13 lines
Gesendet: Freitag, 26. August 2022 um 08:50 Uhr
Von: "Krzysztof Kozlowski" <[email protected]>Quoted 10 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +0
-0@@ -86,6 +86,66 @@ vcc5v0_sys: vcc5v0-sys { vin-supply = <&dc_12v>; };Quoted 4 lines
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts vcc5v0_sys: vcc5v0-sys { · line 89
Quoted 1 line
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +1
-0+ pcie30_avdd0v9: pcie30-avdd0v9 {Use consistent naming, so if other nodes have "regulator" suffix, use it here as well.
only these 3 new have the suffix:
vcc3v3_pi6c_05: vcc3v3-pi6c-05-regulatorvcc3v3_minipcie: vcc3v3-minipcie-regulatorvcc3v3_ngff: vcc3v3-ngff-regulatorso i would drop it there...
so i end up with (including existing ones to compare):
vcc3v3_sys: vcc3v3-sysvcc5v0_sys: vcc5v0-syspcie30_avdd0v9: pcie30-avdd0v9pcie30_avdd1v8: pcie30-avdd1v8vcc3v3_pi6c_05: vcc3v3-pi6c-05vcc3v3_minipcie: vcc3v3-minipcievcc3v3_ngff: vcc3v3-ngffvcc5v0_usb:vcc5v0_usbvcc5v0_usb_host: vcc5v0-usb-hostvcc5v0_usb_otg: vcc5v0-usb-otgQuoted 7 lines
Quoted 4 lines
is this ok?
maybe swap avdd* and pcie30 part to have voltage in front of function.
I prefer all of them have regulator suffix. I think reasonable is also to rename the old ones and then add new ones with suffix.
ok, will change these to add -regulator in name (not label). and then rename the others in separate Patch outside of the series.
so basicly here
(quoted diff) +2
-2- pcie30_avdd0v9: pcie30-avdd0v9 { + pcie30_avdd0v9: pcie30-avdd0v9-regulator { - pcie30_avdd1v8: pcie30-avdd1v8 { + pcie30_avdd1v8: pcie30-avdd1v8-regulator {
Quoted 3 lines
how about the swapping of pcie30 and the avddXvY? In Schematic they are named
PCIE30_AVDD_0V9/PCIE30_AVDD_1V8, so better leave this?avdd0v9-pcie30 will be more similar to the other regulators, but inconsistent with Schematic.
now that the phy-driver changes got applied I'll just pick up the remaining patches and do the node-name conversion while applying, so no need to send another revision for it.
But of course feel free so send patches for converting the other regulator names.
And I'm definitly preferring keeping close to schematic names :-)
Heiko
Re: (subset) [PATCH v5 0/5] RK3568 PCIe V3 support
In reply to Frank WunderlichQuoted 5 lines · Frank Wunderlich
This series adds Rockchip PCIe V3 support found on rk3568 SOC.
Compared to PCIeV2 which uses the Naneng combphy, PCIe v3 uses a dedicated PCI-phy.
Quoted 7 lines
Frank Wunderlich (4):
dt-bindings: phy: rockchip: add PCIe v3 phy
dt-bindings: soc: grf: add pcie30-{phy,pipe}-grf
arm64: dts: rockchip: rk3568: Add PCIe v3 nodes
arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro[...]
Applied, thanks!
[2/5] dt-bindings: soc: grf: add pcie30-{phy,pipe}-grf
commit: 4e441643b32249b4dac89be063255957f3d2938c
[4/5] arm64: dts: rockchip: rk3568: Add PCIe v3 nodes
commit: faedfa5b40f095d09040c3a040e2f8dee4a36b4b
[5/5] arm64: dts: rockchip: Add PCIe v3 nodes to BPI-R2-Pro
commit: 86973ae0355bc302d5e4c10fa382f6801feb4b90As stated in the separate mail, I've added the -regulator suffixes to the regulator node names.
Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>