Commit b5edb046 authored by Jagan Teki's avatar Jagan Teki Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts 



ROCKPi 4 has 3 variants of hardware platforms called
RockPI 4A, 4B, and 4C.

- ROCKPi 4A has no Wif/BT.
- ROCKPi 4B has AP6256 Wifi/BT, PoE.
- ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled
  GPIO pin change compared to 4B, 4C

So move common nodes, properties into dtsi file and include
on respective variant dts files.

Signed-off-by: default avatarJagan Teki <jagan@amarulasolutions.com>
Link: https://lore.kernel.org/r/20200807094826.12019-2-jagan@amarulasolutions.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 75a0a65a

arch/arm64/boot/dts/rockchip/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.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-rock-pi-4a.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts→arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ 
#include "rk3399-opp.dtsi"



/ {

	model = "Radxa ROCK Pi 4";

	compatible = "radxa,rockpi4", "rockchip,rk3399";



	chosen {

		stdout-path = "serial2:1500000n8";

	};

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts

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

/*

 * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>

 * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>

 */



/dts-v1/;

#include "rk3399-rock-pi-4.dtsi"



/ {

	model = "Radxa ROCK Pi 4A";

	compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE