Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp4969173ybc; Tue, 26 Nov 2019 18:27:16 -0800 (PST) X-Google-Smtp-Source: APXvYqwLbH5w+p5HRr8scFNRDSnBm2fWwhCqx5iZT3YBuIVi+yHDTUBqFblMw+UUT6ShDFLvyxs0 X-Received: by 2002:a17:906:b856:: with SMTP id ga22mr27805526ejb.199.1574821636184; Tue, 26 Nov 2019 18:27:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574821636; cv=none; d=google.com; s=arc-20160816; b=MQavPXPSqNqjenDYyF5z07/3kbtXcPknhhh+Qo6Zaeor+YIC8siM1/XlVdWZb6Smcu /oAWcaU/6X7GzWickaBMi1N9+m4c7eO48j4uhL1cuTZypeakZFRe4FnQk5DIso9fgjRe 0glMjTPuPOUcQhuq/DhlaWPeS68uu8/giWS9LlrNwfS9qy45Siw5Jh+SFHGKa/B6V+mc VbSwbBpJsl10pWcC/M7CIT5X/nT9lwIfJOdIsruPL83QD/4j5YJtBvK3Ymm1vQctkDSp ETzkek4AhAderK2c2d+24wGPS9UaenBX2CJgsQisFpQjv06Knw2ATD8iEGqTUI1jtcE4 QJ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=xC9RVEUN60MRiDoiCowOLH+Vqpm85ZffCJiku49WmOU=; b=ub//PJckjqISDf2gXoanXXgQ/nHhbvUkGSkyL85ZoN6PUoMe9p0FL9bN6tcmC4uITB YQswTlpQtGa5E5HTgGcqdIRpmXN9ZYPESkgRgGma0sGcEkcjIBJvC2jSs/qTFbOLo24d C0Mv14WV85dmLuiGAGPhnN1aIctdtsTM+e4/r/zcLlsaraWE1kkACBy02SzljWiJQpbm QiWTaozqQOnpnF+V2tKeBeuvJTR9Zyw0IsG3G31ZfaaAkJqhLnxJFcb1VMUz8JiNMAm8 OqpUA7Jm7aeZLbzW3QskdfSRncb1YQaX5I+jJa5la3R2CrJn1qG4OgvTNg5hFpItzUPW M4xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=aTlCJq9k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id df27si10275014edb.110.2019.11.26.18.26.52; Tue, 26 Nov 2019 18:27:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=aTlCJq9k; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726634AbfK0CZC (ORCPT + 99 others); Tue, 26 Nov 2019 21:25:02 -0500 Received: from mail-oi1-f195.google.com ([209.85.167.195]:35208 "EHLO mail-oi1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726118AbfK0CZC (ORCPT ); Tue, 26 Nov 2019 21:25:02 -0500 Received: by mail-oi1-f195.google.com with SMTP id k196so2308428oib.2 for ; Tue, 26 Nov 2019 18:25:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xC9RVEUN60MRiDoiCowOLH+Vqpm85ZffCJiku49WmOU=; b=aTlCJq9kHNPfUA7x56iC66yzyHWWV01ste/kdv/OU2wt7kxCa03HxNWVB7oANK+hTY t7vx2q+uAWO5GJan2gg4AWeDnW9t+P8g2GQKcF1C8Oh3KOuqdUk1WXSZhirPEqIVdbps kODPMv0tSl6uM81EmJ2k2nwyzt0GfAVkjYARBaBdde9X1f0sp0jovhLMiDY2Afk4MRaY 2kiGtrlWAk5ZHmTJqqBQnSXsRwHQgDUCVBKRfy/MhtsSA6qA44gLINLvuGNwniwJklHc gypbhCS7uSZU4p4z2W6mcX4pM/NUlaHgVNNBqhcHILj3XLsKB9nE7peWPCBnphPHS4s/ 63Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xC9RVEUN60MRiDoiCowOLH+Vqpm85ZffCJiku49WmOU=; b=ii9vYoGr9C5OajXp0i+K0EZ7pereMSN7qNMq7e6v/QwLBNKqfDCcsgTZG/f6eE+DHM ezl+bq8OHAY+KWaQLkARGulcvbQjW2W6QaUDfUum2OltsEXG5AGcJZWUhm1tLsDIANgs Fa/7JVj07mUgB4JoLZW6Z+WDOO7qiCOAzfvTkQyfUQvf8NpRJsI4s3RwOcN0Afc1gNRU v7rAAzlx0mll6pPE/vapAe5kxG8ACX19ZYZXZh+OQY7P4LB8+MaZmpNRTnGT4k+jW1e2 luf8qBsA6N6MiQ+q488pENK8dwOehMulC3UMNnKNNjsLXSa3A784Fzv6D//js6XiJQFc WRxQ== X-Gm-Message-State: APjAAAVWfq1BVaJyT9Ko3V8YeHHh32Xr58aKDKFsf2fq0jSeYK+bKxDS YajEmfwv/dZS/xkX1MgnjHtyk2s6F5ikOW3UKps= X-Received: by 2002:aca:330a:: with SMTP id z10mr1993629oiz.98.1574821501100; Tue, 26 Nov 2019 18:25:01 -0800 (PST) MIME-Version: 1.0 References: <20191126165529.30703-1-katsuhiro@katsuster.net> In-Reply-To: <20191126165529.30703-1-katsuhiro@katsuster.net> From: Vasily Khoruzhick Date: Tue, 26 Nov 2019 18:24:35 -0800 Message-ID: Subject: Re: [PATCH] arm64: dts: rockchip: split rk3399-rockpro64 for v2 and v2.1 boards To: Katsuhiro Suzuki Cc: Heiko Stuebner , linux-rockchip@lists.infradead.org, arm-linux , linux-kernel , Hugh Cole-Baker Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 26, 2019 at 8:55 AM Katsuhiro Suzuki wrote: Hi Katsuhiro, > This patch splits rk3399-rockpro64 dts file to 2 files for v2 and > v2.1 boards. Thanks for the patch! > Both v2 and v2.1 boards can use almost same settings but we find a > difference in I2C address of audio CODEC ES8136. I'd prefer to avoid moving and renaming dts files since it can cause a mess if you don't upgrade your bootloader. Can we use existing rk3399-rockpro64.dts for v2.1 (and change model name accordingly) and introduce new dts for v2.0? Regards, Vasily > Reported-by: Vasily Khoruzhick > Signed-off-by: Katsuhiro Suzuki > --- > arch/arm64/boot/dts/rockchip/Makefile | 3 +- > .../dts/rockchip/rk3399-rockpro64-v2.1.dts | 30 +++++++++++++++++++ > .../boot/dts/rockchip/rk3399-rockpro64-v2.dts | 30 +++++++++++++++++++ > ...99-rockpro64.dts => rk3399-rockpro64.dtsi} | 18 ----------- > 4 files changed, 62 insertions(+), 19 deletions(-) > create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.1.dts > create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.dts > rename arch/arm64/boot/dts/rockchip/{rk3399-rockpro64.dts => rk3399-rockpro64.dtsi} (97%) > > diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile > index 48fb631d5451..3debaeb517fd 100644 > --- a/arch/arm64/boot/dts/rockchip/Makefile > +++ b/arch/arm64/boot/dts/rockchip/Makefile > @@ -33,6 +33,7 @@ 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 > +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb > +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.1.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb > dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.1.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.1.dts > new file mode 100644 > index 000000000000..9450207bedad > --- /dev/null > +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.1.dts > @@ -0,0 +1,30 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. > + * Copyright (c) 2018 Akash Gajjar > + * Copyright (c) 2019 Katsuhiro Suzuki > + */ > + > +/dts-v1/; > +#include "rk3399-rockpro64.dtsi" > + > +/ { > + model = "Pine64 RockPro64 v2.1"; > + compatible = "pine64,rockpro64", "rockchip,rk3399"; > +}; > + > +&i2c1 { > + es8316: codec@11 { > + compatible = "everest,es8316"; > + reg = <0x11>; > + clocks = <&cru SCLK_I2S_8CH_OUT>; > + clock-names = "mclk"; > + #sound-dai-cells = <0>; > + > + port { > + es8316_p0_0: endpoint { > + remote-endpoint = <&i2s1_p0_0>; > + }; > + }; > + }; > +}; > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.dts > new file mode 100644 > index 000000000000..7bd37eaa1d57 > --- /dev/null > +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64-v2.dts > @@ -0,0 +1,30 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. > + * Copyright (c) 2018 Akash Gajjar > + * Copyright (c) 2019 Katsuhiro Suzuki > + */ > + > +/dts-v1/; > +#include "rk3399-rockpro64.dtsi" > + > +/ { > + model = "Pine64 RockPro64 v2"; > + compatible = "pine64,rockpro64", "rockchip,rk3399"; > +}; > + > +&i2c1 { > + es8316: codec@10 { > + compatible = "everest,es8316"; > + reg = <0x10>; > + clocks = <&cru SCLK_I2S_8CH_OUT>; > + clock-names = "mclk"; > + #sound-dai-cells = <0>; > + > + port { > + es8316_p0_0: endpoint { > + remote-endpoint = <&i2s1_p0_0>; > + }; > + }; > + }; > +}; > diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi > similarity index 97% > rename from arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts > rename to arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi > index 7f4b2eba31d4..183eda4ffb9c 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi > @@ -4,16 +4,12 @@ > * Copyright (c) 2018 Akash Gajjar > */ > > -/dts-v1/; > #include > #include > #include "rk3399.dtsi" > #include "rk3399-opp.dtsi" > > / { > - model = "Pine64 RockPro64"; > - compatible = "pine64,rockpro64", "rockchip,rk3399"; > - > chosen { > stdout-path = "serial2:1500000n8"; > }; > @@ -476,20 +472,6 @@ &i2c1 { > i2c-scl-rising-time-ns = <300>; > i2c-scl-falling-time-ns = <15>; > status = "okay"; > - > - es8316: codec@11 { > - compatible = "everest,es8316"; > - reg = <0x11>; > - clocks = <&cru SCLK_I2S_8CH_OUT>; > - clock-names = "mclk"; > - #sound-dai-cells = <0>; > - > - port { > - es8316_p0_0: endpoint { > - remote-endpoint = <&i2s1_p0_0>; > - }; > - }; > - }; > }; > > &i2c3 { > -- > 2.24.0 >