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"; +}; From patchwork Mon Jul 20 10:55:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1510 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 C2B8D3F080 for ; Mon, 20 Jul 2020 12:56:13 +0200 (CEST) Received: by mail-pj1-f71.google.com with SMTP id k7sf13329935pjw.2 for ; Mon, 20 Jul 2020 03:56:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1595242572; cv=pass; d=google.com; s=arc-20160816; b=HFqz85dgK7k89aJG+YY5cjTkmxwhN8BHxWIJGYN2I+n8OscLvZxk9WID+b7j0qyX7g Fz4sY0YCaYffViVj0ckB063F8ZPFBbcNUUpQr3wM2G+M41o+fkvS6bxDmv7ykSTpg2Em jOb6LjzFdwiRdd3/HcYjtT5OlZZNTiumupczckZSllWGSUjMkqXtxTL+PQED0qKE48Ij ICo3ep6F2mpRrzhiuSWm2d4E1eP84vkP6TskcWA8pVeB2NomIfwqP5pSUk+b6lIcHqCw Efod695lKeX4vVpeK7gaKwsURez/FJfa8SdLtvh8T969T9uLy9jsyFluMgjAnkb9PkXx E0YQ== 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=/CceSkjO/3vpjoaxdCqdbmb+1YrXpzuAWpx61KBgT+M=; b=0i4tR1/5deb5Iev8hT2V8Lr/a+INSmBO02tv5E7btZWhLjgrCpBBzZUZC5xSUx+z4E mLjCp/6SJq3iYYuvTDXLeSN/PqN2BGlVx9792SdCTda3H3XTB73Qp0gLpdxJv09yGAhk wOk981j/M6jAsXZMfYohumY1inP8XpmziPu/Rol1EkYOnRmndfRTgVdoCDRWfKDlCmCW ywa0LAZZhvp2Ci0G8LJvZbl8n3FA80fCWw0FYYpJeaatROIYZCB4ErNp0RNCgglBk5Nk 6DUNKMOb0KQyap/cYLoLn9p5QheYXXUVY/hSlK9OHijgZAvedECYSf8DaZsvlk0X9FGL 2V/Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=RtUNFEDV; 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=/CceSkjO/3vpjoaxdCqdbmb+1YrXpzuAWpx61KBgT+M=; b=TNizWRMSHIaqt7ViJdOKh7Jaz/jISEphrEzIhgpN22Paa4J2NZuQwyOxqrGh+JsYob wBOz71YVQKiBScsHxjxlctZ1886jEIqWFmPxBVhVb2zgh89fCYypG6PaaFDEMjnLymnp nE4Vo/LYaYidEIiMMsr0Vu+7BppkdD+A32M/o= 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=/CceSkjO/3vpjoaxdCqdbmb+1YrXpzuAWpx61KBgT+M=; b=iqzkLQ1MzIaOmlzSNR7u+yCQ1e7JhvpO2YWpUKW5tD5pJABFxd9jq+XDtBQ6XwY+/A WYX8AlNVkB7uIh3VVwnV053rQvkLMDZ+w7Ve4vsHW8ZyilS0CxXYkPlttthUHvBtR1FC E0EUhlhWkLk3mq0SmaGhlCb5B07bzWMeq5CrJvSBHFzuqGn1nCjuUWji4usTTji7Qouj WvCGu94zO7rUgGJzyOeX4XkthpmZk/gW35bC0s/cAZOkdsf4TtzOZCrMPosgs+nMJQZN RITzcXnDFpbvURjQj3plEVbY/sclHuNMXPBDiWT9UzRpdaw+vLONc4fcuB+YZzV+rXIt iewQ== X-Gm-Message-State: AOAM530zZSBrL7ra6JefnW9v0ToGYifXVqC+qZ3+mX5kydGDesUvI25Y 1UBz1WaTJ5XEJj6VlWcqa489Mtnk X-Google-Smtp-Source: ABdhPJwG52kd3xMN+5a9GNqU/j702TelgZOMMV0iQBPx6BR/N6PaB/FCIUBrjjJUNwLuFxNCdVwdrg== X-Received: by 2002:a62:88d4:: with SMTP id l203mr18467017pfd.205.1595242572539; Mon, 20 Jul 2020 03:56:12 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:bb8f:: with SMTP id m15ls2627488pls.5.gmail; Mon, 20 Jul 2020 03:56:12 -0700 (PDT) X-Received: by 2002:a17:902:b78b:: with SMTP id e11mr17056353pls.204.1595242572070; Mon, 20 Jul 2020 03:56:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595242572; cv=none; d=google.com; s=arc-20160816; b=ylmc4MQGS45DxMaUBtOlD7V49tyPtwLQb2HLQ7AvSMnKTisNFOluWiOP0sVqzpiwgU KyzzXzd01iXeFNbYbXNKFsD3d6jssJ7eOuWc4yWLJ5Be1P+91g5b3UryWryu6c/uZGoy opNmhlRBKfY1m8H4Y0fmkPQdSVXCqmE/TCyBoQUI0uxhf6WJrCRZMHCwFDPwa3SOACqR T5FS86OtceYdlUcVEsxCG4G861kPOV7KxWEK7noOiv9eHnRx6RHIRqrIu+ulXTEtxdHF VQ4WeFX/jTgztNR8geIH6MZePMCOTdNJu5s8OCDxaKCWHEwxAix3sTuNVUBj41q1KzQ3 Pm8g== 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=7jsB7/zG2Zw1ViCb1957FBxqdpipMGGh3/SxIaRSDfI=; b=u72SQVRb3MPu1ItqEPDKy74pSpFOclXojo6b4nGXKwlBYFFBTlcVbLVq8v2+etyG24 X3gU8V0Qu2MpM2EySkxVlmLQWxW32+tnUwm5CM/wZcmUS1v2eLKsmh/5zqosq3rZW2IN I65YHgIjo8EqxbtjHMcWwH8eMPmDr2Cfd0lRypM0Eph/xb//YL/K0VXhsdpDMKDc00z9 Of2iu6T5t9vj0EuNYcCgDgVsQyHhIKNhLu7HjB8I5TDLhTPR5/pIdgWz1yqprT6NAnGh 7BffrKckIF1su0IA3oD31VecCLSBD69Cx7HuB2jwmJBVBKTGYhNVGAVnz/ofTjPYbqqf 2nvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=RtUNFEDV; 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 ng6sor14091982pjb.4.2020.07.20.03.56.12 for (Google Transport Security); Mon, 20 Jul 2020 03:56:12 -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:a106:: with SMTP id s6mr22863520pjp.53.1595242571727; Mon, 20 Jul 2020 03:56:11 -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.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 03:56:10 -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 2/3] arm64: dts: rockchip: Add Radxa ROCK Pi 4B support Date: Mon, 20 Jul 2020 16:25:30 +0530 Message-Id: <20200720105531.367671-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720105531.367671-1-jagan@amarulasolutions.com> References: <20200720105531.367671-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=RtUNFEDV; 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 4B has AP6256 Wifi/BT, so enable them in 4B dts instead of enable in common dtsi. Signed-off-by: Jagan Teki --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 23 ---------- .../boot/dts/rockchip/rk3399-rock-pi-4b.dts | 42 +++++++++++++++++++ 3 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 42f9e1861461..8832d05c2571 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -34,6 +34,7 @@ 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-4a.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.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.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index c39334b139cc..1c55a4645b59 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -584,17 +584,6 @@ &sdio0 { pinctrl-names = "default"; pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; sd-uhs-sdr104; - status = "okay"; - - brcmf: wifi@1 { - compatible = "brcm,bcm4329-fmac"; - reg = <1>; - interrupt-parent = <&gpio0>; - interrupts = ; - interrupt-names = "host-wake"; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_host_wake_l>; - }; }; &sdmmc { @@ -663,18 +652,6 @@ u2phy1_host: host-port { &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; - status = "okay"; - - bluetooth { - compatible = "brcm,bcm43438-bt"; - clocks = <&rk808 1>; - clock-names = "ext_clock"; - device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; - host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>; - }; }; &uart2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts new file mode 100644 index 000000000000..4ca970acacd3 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts @@ -0,0 +1,42 @@ +// 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 4B"; + compatible = "radxa,rockpi4", "rockchip,rk3399"; +}; + +&sdio0 { + status = "okay"; + + brcmf: wifi@1 { + compatible = "brcm,bcm4329-fmac"; + reg = <1>; + interrupt-parent = <&gpio0>; + interrupts = ; + interrupt-names = "host-wake"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_host_wake_l>; + }; +}; + +&uart0 { + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rk808 1>; + clock-names = "ext_clock"; + device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>; + }; +}; From patchwork Mon Jul 20 10:55:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1511 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id DAC143F080 for ; Mon, 20 Jul 2020 12:56:27 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id o5sf12441433pfg.10 for ; Mon, 20 Jul 2020 03:56:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1595242586; cv=pass; d=google.com; s=arc-20160816; b=KeT1niHF9jikKIzPcdnKzPC+36Etf0XG3VuNcauOT2mwaWe1l06HLCnZ9SxODFR+V/ 55ld4UpkieP52lsepdOlsvJKW/Sni8npBz+nursX7jOYPXzft/vJi2QXxCR31R9UOwd2 1ov3uLpDH+3SVG495gYjlCSuCTzHySnroUx+p2Ei4dQ2KH9mqnr9tKGQW6Pi4aLDbSqh /oVECYdayd064UQC5CHBYVFC0uOBClB++qAVhzEJ2nrdQhiBh57FJq07nvKxlgvdUzAw Yoys4Qg7udlOTqhDbKb7+lWv/c6mExsVX3KpNQ0rEGcwqOmnvpAzVQLUOmyuCA3lVDkm LYpA== 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=42OMjtJz+B1AKu3kFmGS9pM7v/dbdFl/YDFL6Sfpmmg=; b=ORwxhara//tBYVFtFqvdnC5ckSWGacvthy48BaPJ61+A5Jfe9twJd8nf19epkX+Sxj OJFc8nCAZQIpemHBi+Lm830RYZaYkKxrKAff/vX0xsrs5AgKuG7ztyidfvo9LrNga2s1 3h3FIG5I/XDWjPZZhnVvrkuBs82d9QROYsIGgBHReDQu6Lx7e1YM0bBA/3O6PG7Rq2jx UPqBdGFs4+/AN2gTjKKm+0KiWta4B2BHHMioGgfveMampogYKJKrvBH1tTv7gzjMEaGM tJ88ySXnFWFEt2vVN6KWnJl/G/CEPKWgFmBIP9dtoRJ0sX/Mvz3ekvoYIAmE48HfpaAW Aumw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Ly3MetxY; 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=42OMjtJz+B1AKu3kFmGS9pM7v/dbdFl/YDFL6Sfpmmg=; b=CJ+5yZyfRZEo5HgsyH9ZjL5GIRq/9EOWLpFGYEceQelIz52/xCrwji6mrcnYFU/cld antIYGfahlMRswKC4znYmWSH28bjOwjskZGC6noK20YdIo0oE7cWfmmaSwvXgUYV5maD S6pBO94SJ0zlpjYOEzAqqap7aN2OKWcbtPItY= 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=42OMjtJz+B1AKu3kFmGS9pM7v/dbdFl/YDFL6Sfpmmg=; b=PLci/eqx5aK0fEu7h12ebY12r7ws8UyHsGJ5FDmulQdaVcnZ1QWiXPEjl1jtuWx1yp HNV8Tm3xSfuMykIb5r+EylH4J1akYo3JO6d9jVZ4tdD1hind2yhRUDi3BbjhzA308f4G PwIWUuxmrHjCaZVXsuxCp2vxBZA2PpM3mvZt5SKgws2pwb8cgLK6s5EthdHRyV7AQ7xz nwIjvZdVx6PFgpwgldJ3ZBgd8CAdmh1MhIaAGqtWuO2ZxWe5Imu9r3CV52TUHLwmb3lJ Etr6mX7NNOA2UQprXunDEQSqsAmChHat2gKjYrbNyDKyv1xLNCsWUkTa682X43LK9GLP L8Wg== X-Gm-Message-State: AOAM530EgZH7vJHkdLBbXYcbI4N8iRF4r5xFU5tV5xM9GUNlUBEjkZ+u e7CPA3JZ+vTmdyhoLm4fMDdZzHOT X-Google-Smtp-Source: ABdhPJy+8w8H2v2Hr0aYgxPkmo1Nwi9D/1oEquYIrS6QHaAugbwoY8fOxKdS0nI5EJVz+HQwF3XTdA== X-Received: by 2002:a62:1c13:: with SMTP id c19mr18256616pfc.52.1595242586211; Mon, 20 Jul 2020 03:56:26 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:7757:: with SMTP id s84ls4543868pfc.9.gmail; Mon, 20 Jul 2020 03:56:25 -0700 (PDT) X-Received: by 2002:a62:82ce:: with SMTP id w197mr19212547pfd.322.1595242585714; Mon, 20 Jul 2020 03:56:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595242585; cv=none; d=google.com; s=arc-20160816; b=I7TbssQo8cnw04tH38qNjyrNhcqVrBHvAvqDN7pzmi9TYTk8jbJsCEJR1x3Hmjdfir QwOuJ9p7Q5MFNlcAwXjon8XACNZorlUIKIDf1YvWWq2UjpvBtcKgFxzPLRTmGYVo0fQ6 kZnLS9DKJqyz0ZIEXHSAbQJIlTIhaWmja+Sb2giUyLch3v9xylzEb7Pld1IBFmksza8v lPOFADOwNlGfqSAtNLR7Z4KrYy17ltpNpZKtzASqD6PoZj4xCj0/KmBMdYQ1MWqnAdXh jyWmPiH3oAbNqxlIVuwZ3CIEGMiEjD+SEod8oAO88cuil94+Uicazv8MKDd/yiHWNKaT 41wA== 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=nSOMoYdoeN3ixxkr9HyJ0ziUQqzOG9TSyjql14cVs8g=; b=W+euOH50+HUh/XKC6zXhRcCaGuUUfPsOUNlYE448suBP49KD57B3K6EH+AYLoBSvpT lfEu8UE2YFSYQ/ZTk/GsAc9wA5hyOVjCZ1ccpieouAY4w9DXSXtqZsMsVvYqfTu6EOJe UPT7KbKfWxgczVo8+W4q1SDJRmPRoU40gw+f57GaK8qGP0QbPLF12TrjXxNSeEobyKVm xNzTRTu2nGgA7gJWmJdCj6Zf4HiZDM0wCWU1sXfbBwmnQhB/kCLcWDHEJIHli8WGugjP +d26TTfGV1DWPkWnB7P4eZEaS6ryfNGsT3DccCbbpKQym/qNerwr8NVvK6BzSbQ5dxY5 tGKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Ly3MetxY; 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 em21sor13714174pjb.14.2020.07.20.03.56.25 for (Google Transport Security); Mon, 20 Jul 2020 03:56:25 -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:90b:2350:: with SMTP id ms16mr14056450pjb.127.1595242585402; Mon, 20 Jul 2020 03:56:25 -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.56.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 03:56:24 -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 3/3] arm64: dts: rockchip: Add Radxa ROCK Pi 4C support Date: Mon, 20 Jul 2020 16:25:31 +0530 Message-Id: <20200720105531.367671-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720105531.367671-1-jagan@amarulasolutions.com> References: <20200720105531.367671-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=Ly3MetxY; 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 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4C. So, add or enable difference nodes/properties in 4C dts by including common dtsi. Signed-off-by: Jagan Teki --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4c.dts | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 8832d05c2571..02cdb3c4a6c1 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -35,6 +35,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-4a.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.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-4c.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts new file mode 100644 index 000000000000..9d07ebd1ec82 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd + * Copyright (c) 2019 Radxa Limited + * Copyright (c) 2019 Amarula Solutions(India) + */ + +/dts-v1/; +#include "rk3399-rock-pi-4.dtsi" + +/ { + model = "Radxa ROCK Pi 4C"; + compatible = "radxa,rockpi4", "rockchip,rk3399"; +}; + +&sdio0 { + status = "okay"; + + brcmf: wifi@1 { + compatible = "brcm,bcm4329-fmac"; + reg = <1>; + interrupt-parent = <&gpio0>; + interrupts = ; + interrupt-names = "host-wake"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_host_wake_l>; + }; +}; + +&uart0 { + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rk808 1>; + clock-names = "ext_clock"; + device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>; + }; +}; + +&vcc5v0_host { + gpio = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>; +}; + +&vcc5v0_host_en { + rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>; +};