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.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 3BE68C432C0 for ; Wed, 27 Nov 2019 02:25:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EA4732071E for ; Wed, 27 Nov 2019 02:25:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Nv8IYfPC"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aTlCJq9k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EA4732071E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pJN0CY+SPlbqWrwL468rjAeWadV7TuSvONeSVezP5h8=; b=Nv8IYfPCXVGdfD I/dOArQ1rnbQo+XO9Tukfe8q6zVZ+1wZa7gYz2D4CEtJ648Sd/6eKDGI0lI2doBzWWf9PTMh5pc2R zZnHHjOuny6wenveqZXvw9KOq+0+66BUWdSh7AGR3WRg7F45Xgtf+KuFh+k1AhbaxycBgVIplnkHI o2gBPo3yvDo9ECRGjEsbDlDZAmHfkbxXZMiwDsS+XO6+hmniengJx/NeET2CkikWx5JNTbuqSFVvk qxttMfM2lHr6aICkYHbfIr8iDojaoK+0dPUjX04ejOE+KPsAhiTDwxpE1IBhhYeyb6A407EwvFuau a6BE05sXwQRaknLFtPJw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iZn0u-0001cv-L5; Wed, 27 Nov 2019 02:25:08 +0000 Received: from mail-oi1-x241.google.com ([2607:f8b0:4864:20::241]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iZn0o-0000rr-Pp; Wed, 27 Nov 2019 02:25:04 +0000 Received: by mail-oi1-x241.google.com with SMTP id e9so18683964oif.8; 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=hdmbRkWXmIJIr2jE0QCM/j38yV1phS6Q3b8pN2Brk3xXMDS+qhBQgFc7HGsEPpA/kA MpuTLqXUIS/qYOwMBrPIqVcjsJGOCwBuzFQoHPHKbwMNMSCd9kURdzNKPA7xeBQHrwQ5 T7vf1G6c7ZRQFa6I3OlD4Vt3hf36Ik/vFVahFIqY27225ST6N+PNSni1HCrZX+Vlw3/9 Vr6UaU232qX+xo62Z5ulBKHk0jCHQtCcJS/mHP/AEA4zErPWdM6YXVEVH5Mz5x1YdLkM ViRnKuAiyzCyvGvYY6Olw8JuTJh5XOuS/CWbVFmfT52lEdHEsi68EQzorJ4u0neSsttd xkwA== X-Gm-Message-State: APjAAAWiCRy+kQ3zTFdI9jBgY/VFd1L7G9NbFPb7+zZ9B96TpEyRJBlN Vk7QnYy3QSNep1LjloQVcykcb1Ak/sRFxMqNC8I= X-Google-Smtp-Source: APXvYqyQ+qoWokmJpwljroZqf+blVEyS0Tls/wjXa9zQycM+neHHQ0Zehnyeq+CXDZzKQyCm/g4iTieXckglPDt3ux4= 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191126_182502_869873_ACAC75A2 X-CRM114-Status: GOOD ( 18.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, Hugh Cole-Baker , Heiko Stuebner , arm-linux , linux-kernel Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel