From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6749ACA9EA0 for ; Mon, 4 Nov 2019 12:12:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3ED3D218BA for ; Mon, 4 Nov 2019 12:12:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726441AbfKDMMy (ORCPT ); Mon, 4 Nov 2019 07:12:54 -0500 Received: from gloria.sntech.de ([185.11.138.130]:47048 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728188AbfKDMMy (ORCPT ); Mon, 4 Nov 2019 07:12:54 -0500 Received: from ip5f5a6266.dynamic.kabel-deutschland.de ([95.90.98.102] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iRbDx-0000l0-SX; Mon, 04 Nov 2019 13:12:45 +0100 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: Markus Reichl , Jagan Teki Cc: Rob Herring , Mark Rutland , Jagan Teki , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board. Date: Mon, 04 Nov 2019 13:12:45 +0100 Message-ID: <2226540.xovL9aYQn6@diego> In-Reply-To: <075b3fa6-dab7-5fec-df68-b53f32bf061b@fivetechno.de> References: <075b3fa6-dab7-5fec-df68-b53f32bf061b@fivetechno.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi Markus, Am Freitag, 1. November 2019, 17:54:23 CET schrieb Markus Reichl: > For rk3399-roc-pc is a mezzanine board available that carries M.2 and > POE interfaces. Use it with a separate dts. > > Signed-off-by: Markus Reichl > --- > arch/arm64/boot/dts/rockchip/Makefile | 1 + > .../boot/dts/rockchip/rk3399-roc-pc-mezz.dts | 52 ++ > .../arm64/boot/dts/rockchip/rk3399-roc-pc.dts | 757 +---------------- > .../boot/dts/rockchip/rk3399-roc-pc.dtsi | 767 ++++++++++++++++++ > 4 files changed, 821 insertions(+), 756 deletions(-) > create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezz.dts > create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi > > diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile > index a959434ad46e..80ee9f1fc5f5 100644 > --- a/arch/arm64/boot/dts/rockchip/Makefile > +++ b/arch/arm64/boot/dts/rockchip/Makefile > @@ -28,6 +28,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-mezz.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezz.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezz.dts > new file mode 100644 > index 000000000000..ee77677d2cf2 > --- /dev/null > +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezz.dts > @@ -0,0 +1,52 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2017 T-Chip Intelligent Technology Co., Ltd > + * Copyright (c) 2019 Markus Reichl > + */ > + > +/dts-v1/; > +#include "rk3399-roc-pc.dtsi" > + > +/ { > + model = "Firefly ROC-RK3399-PC Mezzanine Board"; > + compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399"; different board with same compatible isn't possible, so you'll need a new compatible for it and add a new line to the roc-pc entry in Documentation/devicetree/bindings/arm/rockchip.yaml Either you see it as - a board + hat, using dt overlay and same compatible - a completely separate board, which needs a separate compatible as well And as discussed in the previous thread http://lists.infradead.org/pipermail/linux-rockchip/2019-November/027592.html but also in Jagan's response that really is somehow a grey area for something relatively static as the M.2 extension. Heiko