Commit 1a6e7411 authored by Robin Murphy's avatar Robin Murphy Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: Add DT for NanoPi M4 



There are a number of subtle differences between the nanopi4 variants,
and where they disagree, the common DTSI currently follows the details
of NanoPi M4. In order to improve matters even more, let's add a
separate DTS for the M4 to which we can start splitting things out
appropriately. The third variant, NanoPi NEO4, is a lot closer to the M4
than either is to the larger T4, so arguably could get away with just
sharing the M4 DT for now (plus I have neither of the smaller boards to
actually test with).

CC: Rob Herring <robh+dt@kernel.org>
CC: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 1b5715c6

Documentation/devicetree/bindings/arm/rockchip.yaml

+4 −2
Original line number Diff line number Diff line
@@ -87,9 +87,11 @@ properties: 
          - const: firefly,roc-rk3399-pc

          - const: rockchip,rk3399



      - description: FriendlyElec NanoPC-T4

      - description: FriendlyElec NanoPi4 series boards

        items:

          - const: friendlyarm,nanopc-t4

          - enum:

              - friendlyarm,nanopc-t4

              - friendlyarm,nanopi-m4

          - const: rockchip,rk3399



      - description: GeekBuying GeekBox

arch/arm64/boot/dts/rockchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-kevin.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-inx.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-scarlet-kd.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb

arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts

0 → 100644
+18 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * FriendlyElec NanoPi M4 board device tree source

 *

 * Copyright (c) 2018 FriendlyElec Computer Tech. Co., Ltd.

 * (http://www.friendlyarm.com)

 *

 * Copyright (c) 2018 Collabora Ltd.

 * Copyright (c) 2019 Arm Ltd.

 */



/dts-v1/;

#include "rk3399-nanopi4.dtsi"



/ {

	model = "FriendlyElec NanoPi M4";

	compatible = "friendlyarm,nanopi-m4", "rockchip,rk3399";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE