Skip to contentSkip to conversation

arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.

PATCH In review Markus Reichl 2 participants 2 messages Nov 8, 2019

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

PATCH v4 1/1 arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.

For rk3399-roc-pc is a mezzanine board available that carries M.2 and POE interfaces. Use it with a separate dts.

---
v4: Rebased on [0]
[0] https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/log/?h=v5.5-armsoc/dts64
v3: Use full name in compatible string and file name.
v2: Add new compatible string for roc-pc with mezzanine board.
---

---
 .../devicetree/bindings/arm/rockchip.yaml     |   4 +-
 arch/arm64/boot/dts/rockchip/Makefile         |   1 +
 .../dts/rockchip/rk3399-roc-pc-mezzanine.dts  |  72 ++
 .../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 757 +----------------
 .../boot/dts/rockchip/rk3399-roc-pc.dtsi      | 767 ++++++++++++++++++
 5 files changed, 844 insertions(+), 757 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
Documentation/devicetree/bindings/arm/rockchip.yaml +3 -1
index 45a87c6e0a88..3fbc4615c1a3 100644
@@ -94,7 +94,9 @@ properties:
 
       - description: Firefly ROC-RK3399-PC
         items:
-          - const: firefly,roc-rk3399-pc
+          - enum:
+              - firefly,roc-rk3399-pc
+              - firefly,roc-rk3399-pc-mezzanine
           - const: rockchip,rk3399
 
       - description: FriendlyElec NanoPi4 series boards
arch/arm64/boot/dts/rockchip/Makefile +1 -0
index cf69b0f33ecb..8494c6839d7e 100644
@@ -29,6 +29,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts new file +72 -0

72 lines not on this page · raw message

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts +1 -756

765 lines not on this page · raw message

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi new file +767 -0

767 lines not on this page · raw message

Signature · 1 line
2.20.1