| Message ID | 20241014113026.78853-2-cenk.uluisik@googlemail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v4,1/2] arm64: dts: rockchip: Add rk3588-orangepi-5b device tree and refactor | expand |
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml > index 687823e58c22..62bb6587da8f 100644 > --- a/Documentation/devicetree/bindings/arm/rockchip.yaml > +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml > @@ -1051,7 +1051,9 @@ properties: > > - description: Xunlong Orange Pi 5 > items: > - - const: xunlong,orangepi-5 > + - enum: > + - xunlong,orangepi-5 > + - xunlong,orangepi-5b > - const: rockchip,rk3588s As Krzysztof mentioned in v3. The binding commit should come before the devicetree commit. You'll want to reorder your commits. Otherwise, if you git bisect, you can get an error with only the devicetree updates without the changes to the bindings.
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 687823e58c22..62bb6587da8f 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -1051,7 +1051,9 @@ properties: - description: Xunlong Orange Pi 5 items: - - const: xunlong,orangepi-5 + - enum: + - xunlong,orangepi-5 + - xunlong,orangepi-5b - const: rockchip,rk3588s - description: Zkmagic A95X Z2
This extends the Xunlong Orange Pi 5 device tree binding with an enum for the Orange Pi 5b. How does this board differ from the original Orange Pi 5? - the Orange Pi 5 has a M.2 NVMe M-key PCI 2.0x1 slot (hooked to combphy0_ps) whereas the Orange Pi 5b uses combphy0_ps for the WiFi. - The Orange Pi 5 with the M.2 socket has a regulator defined hooked to "GPIO0_C5" (i.e. PCIE_PWREN_H) whereas the Orange Pi 5B has GPIO0_C5 hooked to BT_WAKE_HOST. - builtin eMMC storage - no SPI NOR flash (u-boot, preboot etc. initiates from within the eMMC storage) - ap6275p Wifi module (like the Orange Pi 5 Plus) - builtin BlueTooth module Signed-off-by: Cenk Uluisik <cenk.uluisik@googlemail.com> --- Documentation/devicetree/bindings/arm/rockchip.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)