From patchwork Mon Jul 20 10:55:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1509 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3507A3F080 for ; Mon, 20 Jul 2020 12:56:04 +0200 (CEST) Received: by mail-pj1-f71.google.com with SMTP id bf1sf13316857pjb.6 for ; Mon, 20 Jul 2020 03:56:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1595242562; cv=pass; d=google.com; s=arc-20160816; b=cNazZ+H42zxYsX6sAz183l6qWqctk2lKpSqphBgMfj+Ti3wAPEn9ZgrlRrrnTCb9sA CYfcxegQulcX2hG8+FJFrHPfqTSCRgZodAOV7yqu+pxgLion96G1ZGt/LZSm78k7WxEM YpXmhCPf/P6svZQ0ih8fWvL8OPQt8j+c2JPjRhND0JFyNS6QuVcb0+ixCNOub3P1Uyjh zPL2p8v0qmR5NdgAwmyNr+bmZiK74mOaYdOj4Zq1+K75MEtkju3lz7xHX00Tl2rex0Pd WeDoC4r/kRUUhs7rc5FPkFNMr17sYLA2A2OVCxSyLyllhVlqYzT0k/yWwDST3FmnZMK9 81ng== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=eRPc2ujsJtMNx6agkh6MqrEEyDKfEGbC38+jGfGoTUI=; b=FksvduFV0LRe4FBXNIpo2AIH0xTI3q6H7AHvI/UR12y03KJXnsiUv3tAQWNaH3vU11 6ktV04ePzyxPsGz1ZbYU8Um1/48X2DqHivALYiSKoFXK5KFTEBZaTfEVY6Mgge/MMfmm wsogY0//kY/Zin0VxR3JuJWz8fLO/FK+6I0zOALFuPaTsSQP2VN8Oijbsu82rTVbyMS9 jt9CvLZXKuM3vxy6JPA8/4+8ba5KHYdrmCDRg1PYnV5EmcqOu7vXbNRKN6tumLemd8nb TzEMNWNeuM5tUzfK0o5t3CWgH/Yrc8/T7bhHKKfk7Pi00ZyImWA8+DeOzpY/B7R9aMPQ wsJw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MM+l6kte; 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:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=eRPc2ujsJtMNx6agkh6MqrEEyDKfEGbC38+jGfGoTUI=; b=M3CTvmwhDzaN3ncI1WQcnTb8mOK4UwVsHC0RD/zUao9qyhkHhU/CcSL76YKg+kr6Vo BE7WiWwntXpY4eh7kUTwvKh7WTv89OaH6bKejSOoXi5jjV5l9dBhKvP9u5WkbmvRLFjp VlEGKM2tZVyLD8ao6HTxDwFexRzX2N/QacnCk= 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: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=eRPc2ujsJtMNx6agkh6MqrEEyDKfEGbC38+jGfGoTUI=; b=ojXW4IZ7Ka9J5iX7jWloD9cVj4LihWCs5Ad89jXldD888VlysuBoogTMawnPjZUQI1 ps5xfRllsUYiKduVqM4/SS766ffUfg+++iTRK92kD+ejm+RxK/aO6BQjzDAYlI6gXnye eY8OtlSNTjDK4XL//2feEK81C/UUu4iYaDXpdlBEYFOT+z0B4yy6xCp4TRiysGUeBl/p 26+ym1Fvjfobv2pIwgfxTmD+uM1M8GNr6XpztCoJ/oA65mcnTJy7MA7vnpOKPag2dIat jY7ijI27xUab6FBJFu9PH2j5+wIuIb0ZLfjdmoQfLioYoAhkfMmyAI5CfgZpRTSoDXnM xFDQ== X-Gm-Message-State: AOAM533Th/mKv6eoIrP7CJ3AfFI1yi9UPFDpjcm7eBOu+lsolU/q4Yvw uF8JQQ2Q8yFcNWnkrvwN3IQsVZw1 X-Google-Smtp-Source: ABdhPJwYsh8AJ9fQKh/eApq8eIzIQ+RxWjVDaasoOY3ISBiXAzQxGQSvlyKr3SAWa+HYXPkS/XW4AA== X-Received: by 2002:a62:6142:: with SMTP id v63mr19685158pfb.179.1595242561558; Mon, 20 Jul 2020 03:56:01 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6a00:134a:: with SMTP id k10ls4535631pfu.11.gmail; Mon, 20 Jul 2020 03:56:01 -0700 (PDT) X-Received: by 2002:a63:4b4e:: with SMTP id k14mr17772462pgl.75.1595242561040; Mon, 20 Jul 2020 03:56:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595242561; cv=none; d=google.com; s=arc-20160816; b=YyFcE+AoZ0awC71fXTnAvZSWlfdlNYnJSAu+iNf0sivw2a2puZ0WqxxGrNnM8cf1yI GN/kLlSWrD5IH8HVqWRViQ6zR1YSKdVczLCgk1E/QBROycNgaZFSSSl5S8PxR//+mq5V Yhfmh5ELaByeGGDdojmlvKtHXArfESa2EXVmVti4h0EZO7r7fDoHmk6NZo287Y4zdrYb bDF9dsonxEQCcLNT81rAUTn7sc6U8JWh8wr8BQn8rs/A5OcMrpKXzEUCPWcQXHpyI3Va PJGzb6I24lwl0qF3EHO6Qtc+7g5KDa3fS3Re1Ypw/4PF8V7lxJkzQlZDkkOdI5dywsoN Q71Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=87hFulUMTLYcYtfb5/q1HiR84qe1kMeDg6xrZ7BQkqI=; b=GFGVt+3YyzgEx6hPOoF2auElftG8xNKw25xW7Rj2D/8b6W0SFaxfIsj8C3vA7sVp3i EABAfwGfJgPQeD9qrFGFe3CqrZjPR0oiBL+7SGyfI17IaP935VwOgyGEaAlARCZbnPku LB3dk1noc8GU5Sx4YQC+Dxiq+79lMTAfdQrA2q7AuIYKSK45tGfifkNC43Id3ZXowzzk o3qdCDo5fUFjQzAUij+UuvsjKf2JAJC+LrEA/6PanlhXfq3qwjgu0JmixvJdsyIfXjWT wJFXoS/Qsc0v4z30Gf8HbgXqyKEhYfE8NTu2IeqM72bO6fzl98H77tSkpktD+PjvIooq aRVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MM+l6kte; 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 gp9sor14088762pjb.19.2020.07.20.03.56.00 for (Google Transport Security); Mon, 20 Jul 2020 03:56:00 -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:90a:a0a:: with SMTP id o10mr22464206pjo.12.1595242560305; Mon, 20 Jul 2020 03:56:00 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:8c21:db7b:4558:fba3]) by smtp.gmail.com with ESMTPSA id j5sm13984721pgi.42.2020.07.20.03.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 03:55:59 -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 1/3] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts Date: Mon, 20 Jul 2020 16:25:29 +0530 Message-Id: <20200720105531.367671-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 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=MM+l6kte; 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: , Rock PI 4 has 3 variants of hardware platforms called RockPI 4A, 4B, and 4C. - Rock PI 4A has no Wif/BT. - Rock PI 4B has AP6256 Wifi/BT, PoE. - Rock PI 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enable 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 --- 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 3923ec01ef66..c39334b139cc 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..d96dd3ebd3e0 --- /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,rockpi4", "rockchip,rk3399"; +};