From patchwork Wed Jul 22 19:09:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1559 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id D606A3F03F for ; Wed, 22 Jul 2020 21:10:07 +0200 (CEST) Received: by mail-pj1-f72.google.com with SMTP id jx16sf2350275pjb.6 for ; Wed, 22 Jul 2020 12:10:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1595445006; cv=pass; d=google.com; s=arc-20160816; b=ayqhE8zE84MEm+u1+KRd7kB4PMq7QnNMtEh6Tcr76cW1YYMpVS9gNG0OqQhzv7gRvY QCqzz/ZqoF1sTTGHHk402My2XHmGWHbcNHN5ab6FgdzFpKMujSQgvnrMgtzYmNXXj9BO s6Lsf4tNOXxpl6sMrh6AwUJ/PrQC4Z+d0elt+Wv5LKIuQAYcq9j3Bvd10KekHQxtqk3o sz2T/Itr9QUMflTJYPqEs1LeqE+7W5lSKGZZA9i2ITS5b2CyWV1t/5g1J5COMqa6XS50 R43lxlKlq7+Ryik+bkL8cZcFEVddm59CXNnEL3brqdrunG2942DjTNcbYah4JtmDg1ob 1NLg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=TRdK1E4RBqFFANpRHL96Z1VidechCNhOj8kyhBgBqPo=; b=ttxOBZarS8Pg82Gnest1hKfBrLl6x83+b2ytpniJ1yOFK2m1nD3M0SxmVXMMRUi0nJ TP5lyLLn3QTfxa3Sdm57BonUfzqowRGqo5MJOTYntA+aa36R1OyeLZuHzOZvNANFpBgH zqDSVqVUVEnL+EncNIi7pArtJ7l4aDs1dWVwTCse31RubGeuH5mQsXGn/CYXkd3ZEIGN JiH1DrNi6RAnOV0nlI5QTR547K5JBnV8gXMtYhj7OP/AnQWFGHkpgWs5hoO3eKNJqA1v iUVdNziItGOR47byRREL0SKeXHEJtq0gD6AG6lTNtcmB1buJYiiOUm0AJa3hpX6859uT gEZQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hsLEdP4d; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=TRdK1E4RBqFFANpRHL96Z1VidechCNhOj8kyhBgBqPo=; b=j9dd8tFhTGT3UtRpKuMBl5YPWvxIZLuS8xc8uFUuAwN6mVTKGBmi/C2GUNiJUA+0oy BuseOHmUfOCqWUA3qfRUiqcjdQUP3GE9BhvpnyssDmzDNKk2jXjFunsJuvwxSrQcVpnR 3ay8mS4G2SGeLnbh1JrDoYkVVbDyjENYBgLbM= 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=TRdK1E4RBqFFANpRHL96Z1VidechCNhOj8kyhBgBqPo=; b=CkKC62+qEvpWKIkd/s/qSoOGcjnrOFHvs2MRT5aPfDrXaW1jNVHV3BYCZF6Axcpp7U 8jf08GzGQ6WSXaTBfptNaSA4vqN0Dk/YUlqCUKIswt7UGyVTnhqqhbn/UEvRpOvYJiUM SylklHW0+iEPG3c1a3opLgGtcE8m352VgJukmY/oS72Jc66ssYg6ce2GmfltmAPp/NHz ZygkR/ZfJsB5JoG0h4JinZkDZnT7OkKjkTfMNuJNy8pi2sTZFGiHn6PS0R52ehqAOuLV uaJpMAeDcEfrPamwhpjVU5tLzi/pk0xtzPWk96wA2FgbugLLY69BdHXaRJUmH6/TlI00 E8vg== X-Gm-Message-State: AOAM532MGmTbGM6qMKst1NJyMf4aAZuMXoWNMusMwmZ3gYgpeUBx/R9p KA4TCKHT7jzyI+9mjJcuwaKKAhSn X-Google-Smtp-Source: ABdhPJxaQAX4El4GcVUwjYZCrTNv9M6/NQbUmYv9NxXVRPssG0RiRz/yMqh0a9FtKolmK9+4UBNmGw== X-Received: by 2002:a17:902:904c:: with SMTP id w12mr788444plz.147.1595445005885; Wed, 22 Jul 2020 12:10:05 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:38d:: with SMTP id 135ls925395pgd.0.gmail; Wed, 22 Jul 2020 12:10:05 -0700 (PDT) X-Received: by 2002:a63:6486:: with SMTP id y128mr1084423pgb.82.1595445005390; Wed, 22 Jul 2020 12:10:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595445005; cv=none; d=google.com; s=arc-20160816; b=hK4XZDlOt/8ZdvXviOOC7WIaEQOlObn2fUQVkHqLFEzyJQb7puc1C+6loO8k9Fy3/X RBY30DQxGhlp2Dw6fB+3Q/v0qC1fAzT3JO3hW5Tv3gPzwv76C38DSrFluFCcpPnbq8+H 5dWa8mpxLyhD6/hV0bjzEo6t4cFMXNBpsvQizQ0wPxgnGFORBBsRBwZw7g+IwmsykzVa /NZKlIIydKt1F+XNq8pxuci0fZn3EO0v6jeHfsVmadfEAlj7XXqTgXdVomykk5V+s3cQ cXDF2gdUaOWq3If8Hbqrt8YzE7xcKCytJg31dYHdLN0XllIcjudPUQN16ox8HVHG9Jcq oRKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=hfiWO0Ph160Ftuv8im+r8mR8zkoGr6zHq96rgtWc2ok=; b=VBS0/01fYkIv/5o/MR+/7mI2sLYnWdY0xhBpqtAOY117AQlcPpdf76VJR5ktjMdooT NGwb0zQa7CW8/QW1NJaV98r25frv5EE1jGDcsit2L00OPg5K7GCcrxhM8pUIodYo0+o2 6lEmh8ojJTgb5F+yQ+R+2SvjwZ1Xoj7AN1xF/g+2L18uU/Gud4FtHZnAwXQWKXPaGMpM O4jCoC8BQiZCcXxj5/w6WgktNIZ6bB/3/cdTtNHfqvajtsSy1KEx8icp6P3+e3VnZhLf 1vA9fq7xTwBVSREzPEFYEsRTCxD7TC0ulHAMA7mYOqE4TloV2NjBN+JzWaUulI1r7eJ2 5lsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hsLEdP4d; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f5sor507698plo.36.2020.07.22.12.10.05 for (Google Transport Security); Wed, 22 Jul 2020 12:10:05 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:902:b113:: with SMTP id q19mr789986plr.170.1595445005086; Wed, 22 Jul 2020 12:10:05 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:fda7:aaf8:9d1a:6749]) by smtp.gmail.com with ESMTPSA id n137sm342398pfd.194.2020.07.22.12.10.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 12:10:04 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Cc: Suniel Mahesh , Michael Trimarchi , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amarula , Jagan Teki Subject: [PATCH v2 2/6] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts Date: Thu, 23 Jul 2020 00:39:45 +0530 Message-Id: <20200722190949.215656-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200722190949.215656-1-jagan@amarulasolutions.com> References: <20200722190949.215656-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hsLEdP4d; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 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 2ab77206699b..1250c62205a4 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -35,7 +35,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"; +};