From patchwork Fri Aug 7 09:48:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11705345 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E4D11618 for ; Fri, 7 Aug 2020 09:50:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 C046620748 for ; Fri, 7 Aug 2020 09:50:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UhIXPjSD"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="RGpxzowG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C046620748 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JBP69q6KAfYA3CiPq0BCZoNJlf+ew4h2RmJd+hdT9Pw=; b=UhIXPjSDWYikyE7g3/RjzaL5G CHu1B1jg8ARFCjMkRAC2J/+4pT+C9dqpecU6CncTUFcIOmVKIakeQx70pCKQR0GhE138Rzmb27g7m 32+AIbJB5O+fuFbRXHk21YLvP131w8KYrHynLUdJXKSMDNsHINcv+fPVhpDKZ9AZaeZ6iJJqAYDgu Fsy65GIYKU1CA9dCqONRmCvd1cENkSK7YaZEaUVgoGXvhDqhUfOX8dhLV5ImcTLBpSqIZ3EPufNhj CBOBdhhR+ENjipRCLe7ccQ3+z8lB5t4aMFC1kv0WMRDu+c5AEZgIWtenXVYlwTI2QbCWQ7eQQa9Ka 0yHpi31DQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3yza-0005yt-Uk; Fri, 07 Aug 2020 09:48:50 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k3yzW-0005wF-Mi for linux-arm-kernel@lists.infradead.org; Fri, 07 Aug 2020 09:48:48 +0000 Received: by mail-pf1-x443.google.com with SMTP id u20so736947pfn.0 for ; Fri, 07 Aug 2020 02:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=02o/duJFuPsa51rahLQuUkgKqOgWknYxohHZSpeLSFM=; b=RGpxzowGLm/VGCRGVp5wBW5ZhuH3Ip5LxyD9aPh4uqdx8ec1ZZ6pdaOFgmgn29Imy+ QL2UE3qUKUuqcdYeFeUsX/wDny/mfbkSsoj98Q6RfZoz5WsrhzImURmBc9r3Rg4XMA2H DapvsItYXeFiMP1dT6Tk8D6/dqUhY2cDbIvEs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=02o/duJFuPsa51rahLQuUkgKqOgWknYxohHZSpeLSFM=; b=gU/80JBgrvGepxHnHxqzSqm3a9ghkoC2VzROAj+h4uezkHFNx1W/zbmIl4ZbSXb+Nz HHNrUbgiUy4h7tl2U8MPOrjxQ6F/5vcRVIZO14NODLPQETQXAS1VQlvvGkSzPSrdwyJH 08fo0Zun2La2uqmbnr1Z5kh4o7nnlvDQ1oEhNi1/zo4QO/p40NaGmsy4w/EmqRw3CWGo Kz/+e70J8BRkhm1OfqTdypk8ZWfLkMsxNB6ZZM6lWCduOlRiCwldxVDoz/65alJBF5ue TAD6EDz13GyNoTs2l6IULdZgvLW2RkiyN9qmOyaZBRTPjSROEvHV+EBeAsBgEyY7ocG1 ImGg== X-Gm-Message-State: AOAM53001pgMnzr0Yy1UUj3EfuO7K9zAUu8P47TuasS6lHmbcZuNnLye UWq5iAdW6zTIzUfFq/tpo/twkA== X-Google-Smtp-Source: ABdhPJxgq2N8SMIizuOiXCoiNNoqPeSr3OpOAYogDH8wSLOQikEaK92KPDRdBvhs7ITb0jkYqSGLbQ== X-Received: by 2002:a62:cfc1:: with SMTP id b184mr11610684pfg.262.1596793724650; Fri, 07 Aug 2020 02:48:44 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:6097:2d32:26bb:64fe]) by smtp.gmail.com with ESMTPSA id d65sm11412112pfc.97.2020.08.07.02.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 02:48:43 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Subject: [PATCH v4 2/4] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts Date: Fri, 7 Aug 2020 15:18:24 +0530 Message-Id: <20200807094826.12019-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200807094826.12019-1-jagan@amarulasolutions.com> References: <20200807094826.12019-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200807_054846_816463_2A892CEF X-CRM114-Status: GOOD ( 16.09 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:443 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jagan Teki , Suniel Mahesh , Michael Trimarchi , linux-amarula , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: Jagan Teki --- Changes for v4, v3: - none Changes for v2: - update commit message - add radxa,rockpi4a arch/arm64/boot/dts/rockchip/Makefile | 2 +- .../{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 3 --- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 13 +++++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) rename arch/arm64/boot/dts/rockchip/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (99%) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index b87b1f773083..42f9e1861461 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -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 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi similarity index 99% rename from arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts rename to arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index 60f98a3e19d8..e163f438f836 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -11,9 +11,6 @@ #include "rk3399-opp.dtsi" / { - model = "Radxa ROCK Pi 4"; - compatible = "radxa,rockpi4", "rockchip,rk3399"; - chosen { stdout-path = "serial2:1500000n8"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts new file mode 100644 index 000000000000..89f2af5e111d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Akash Gajjar + * Copyright (c) 2019 Pragnesh Patel + */ + +/dts-v1/; +#include "rk3399-rock-pi-4.dtsi" + +/ { + model = "Radxa ROCK Pi 4A"; + compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399"; +};