From patchwork Thu Jul 23 09:02:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1565 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E14C941487 for ; Thu, 23 Jul 2020 11:02:29 +0200 (CEST) Received: by mail-pl1-f199.google.com with SMTP id y24sf3084117plp.18 for ; Thu, 23 Jul 2020 02:02:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1595494948; cv=pass; d=google.com; s=arc-20160816; b=EzFioVZAbmH4j18SjLCJNBWnZQSdD4BlN3JSCAtAI62SOgBzyl9bEkHHJKLjl5nbi8 MxOHapQGFdQU3wXfE39BXL6jADV5uPOuheQN/Q+aLYLzCRHo+LfXIznivBgTfC7+l1aZ ZI1b/NJ1O2rxoRpOpHVhG9FT1tQh2vXS/yon67oQigvmAE6iqQpNDxtyu6sx+JwmLsaI xelZ5+xnKZ8EDqLDEy7W8tIALrPrH54T6GBAHpCfpO6jkR2s91WRE5SLxpwQV9tBKoC/ HzocNKKaOvfeVoD1qsHUVc0DCXQOOtq6f2ud2TfM7ckhANxGJYRXpeqXkPO1H3ygx9aM TebQ== 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=Ba+YVJEnA6zqehcDqt8kCLHXYzfCu8fUv08YI81S+JA=; b=ytAzGchQjtJd4wpHTzINcqnq3lWmSy94wnY4QEiCUjbKccyOqycg5fSF1kzYA/8OKC yagdV7Il9TZYOyYdUjY/MG4j2yqw+aa8/d6AsPLCsqo4jS1bGaSjd/dlwzOR6KKTZ61k XCmKYY6tb92cQoepuAx0dfc5sHzyE+SO7upIblasB11gT2w3pxMFxgSJTfo+fa2mC+Da Qxgx/wEwBh6gWzAPqLPjg3hmuU4VNsALrVORDZZ/PUF4ccAbFT2r2P+9OZ1UI7in0myS Eb54jj80qUFKR5rCdoWj4TedisyXhCTddCORODTyIBa87EJF/rZtwhBK+BxtG0VG1WHv eoEA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HU0nk8lz; 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=Ba+YVJEnA6zqehcDqt8kCLHXYzfCu8fUv08YI81S+JA=; b=AAmaW5iDBwnonqM8nVrh11xH1A+nQY5gEFLE5aGd3o/dEU/kqnf5LAoq3UgqRV7USt Lwli9gMZw/Gy6VwBJI7OtkU49wX9p1ntirNUsuGIw8T55t3C+LKa8B0w8XCBulpmRsTN znk0pZ5/7k2pLQNmDKr5vHZiMdcZNSlSI5/4U= 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=Ba+YVJEnA6zqehcDqt8kCLHXYzfCu8fUv08YI81S+JA=; b=Rsy7S6qgDA0P6mr8/m6KGTuUlvsM9ZA5q4k/Bj8yksXhacqNNlikWuwvBA5dZT1zhY tdL+jh51nbz2/cZZdkBDPf6ZvlOaj3PZtgK1gLxty3HieNTcL4mvsYXo5Tzw7uXtPJN2 lWwAdeYLwDtK1WN2g0QNSXASscqgzVYRqv1CCCPPKq1adJ0VG4kLL9eCg+/Nnr+Eq/sG v9D4ZyNX65ihlzfj76ibnesG6skR0aHT865pGNvkDEDr8AiTiLUnlA9TGuHUfdYDGP36 m3WrLdGBDDnpL1382EeY+oSBC8bqjbq8XphwSooDY9842bwhLsTutFPQ6XeeNFiIZcQw md9g== X-Gm-Message-State: AOAM533B9KHCN5SuwF/ZUgLFdFwgQMpHGVSJGOeDIwK6Hm3LBdvKBZkD vITP9zz0mIdOy4Imk8mIr+PJq9ur X-Google-Smtp-Source: ABdhPJyY4d2tK99m6K32yzNceLXTu5EHXyP8utZuh+x/jTfWrqTuJgl5jsndRS4nK78vWdHWjFvNYg== X-Received: by 2002:a05:6a00:1514:: with SMTP id q20mr3297798pfu.243.1595494948625; Thu, 23 Jul 2020 02:02:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:be15:: with SMTP id r21ls2026599pls.11.gmail; Thu, 23 Jul 2020 02:02:28 -0700 (PDT) X-Received: by 2002:a17:90a:24ed:: with SMTP id i100mr205038pje.22.1595494948113; Thu, 23 Jul 2020 02:02:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595494948; cv=none; d=google.com; s=arc-20160816; b=eZyVcZkbhpBJjB1ToTdbvdxOv8IRaUI0exQOtCvt34FJyHh/PhAH+oj6SsF+bZ7VRa nky2CjKDMpfQbfZJABuIXJzrKkJp/DzRi4xmllFp195wm8klPxidtIrSvdexjw7hdzp4 +eeuQvghyIs2uMUOx6pa4YOG/a+jJ8SualdG9CH51QBfnsprEu435g+6MWsWTjf2jERI BQoATYLW/inQIOYYxabRJMAitUFVT6dc1ei3qYXhbwUHacCfKFVbRxmM9bZ4YWp98ioa 6Gs1M2EJ37iwpL2+aRud51BlsQI3/WU7mi8yuFpNcY3vvgv/HWULDfBcC7MR5Jfy6bWB BQSg== 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=DJCSwxnGk2Ssl9aVpet8CDGQoGguzrl/jiXKGzvc19M=; b=BysQ5SLTxyfDboSazQodMKtqmVaINFDsUW8c3jsqP+lIqT8fdkkPnvGjcwloIZRoIK RuZ3OyMX4BGH9KMqZzGIFmJr9Xbo+/cU7bTeEEbaLj8seGOsHLuwgS00sCzIgQTzc5J4 0899jnPSbqmfTYsamkfIXihUFo0eig9ZGaKlTajh1KpqeRltC6Bu/pP9lMDMwzzE6PMN fNt8WSODcfpl1ldb7YQ4g62GKNPImM84QwG9QVFFhTluh13JwgKeh2qLeMrKUwh6wQnh tr8SMaYjpSv01mvsZ5yLzOyF7ZDZhZPgN/jOHLeBYxb08TfrGevM86w08hphVBwqIynX EpZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HU0nk8lz; 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 d9sor2575446pjz.25.2020.07.23.02.02.28 for (Google Transport Security); Thu, 23 Jul 2020 02:02:28 -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:784b:: with SMTP id y11mr161257pjl.51.1595494947770; Thu, 23 Jul 2020 02:02:27 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:cbf:ea0:8a30:a3af]) by smtp.gmail.com with ESMTPSA id k23sm2319383pgb.92.2020.07.23.02.02.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 02:02:26 -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 v3 2/4] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts Date: Thu, 23 Jul 2020 14:32:08 +0530 Message-Id: <20200723090210.41201-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200723090210.41201-1-jagan@amarulasolutions.com> References: <20200723090210.41201-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=HU0nk8lz; 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 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"; +};