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: 11673469 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 2FFC560D for ; Mon, 20 Jul 2020 10:56:11 +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 09F632068F for ; Mon, 20 Jul 2020 10:56:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="az+A5Yyt"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="MM+l6kte" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09F632068F 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-rockchip-bounces+patchwork-linux-rockchip=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: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:In-Reply-To:References:List-Owner; bh=ZbqhKLF8hgaY5Xq4+TccPGna4Guzmvm7ehX7/M6QAFk=; b=az+A5Yytzm7/biG15zVTFFvsVU 7Qz8XMc2k58OmZPhtjFQsGrXx1oSMn1vUMWhATFnx9dOCSCtIrHzvgdr+RiNRnw9QsNMR6eHpuIaC S+kC6NPEcn0r+UhXBXh9agE89zv1ORby4/mI4BVgit2/JyinKJntQza+6f4fIsYbel0AWPouuEJf/ lpsHoWSTX+3mWM9vxOeM6nzUZvBQOcSuqd4fATMZfDx3N2TFjcUDE8e9gTsz9/kTMybFClKb+9GTP 4MkwpA5YZ1hye8EZ/Ub3y2LEUwEVs9deBxgeIxVFyt1m26UnVZ7DReL2soiLEYkO3IIfySeI9U+pB dws36k1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTSm-0004eK-QP; Mon, 20 Jul 2020 10:56:04 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTSk-0004cm-NY for linux-rockchip@lists.infradead.org; Mon, 20 Jul 2020 10:56:03 +0000 Received: by mail-pj1-x1044.google.com with SMTP id a9so4403602pjd.3 for ; Mon, 20 Jul 2020 03:56:02 -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:mime-version :content-transfer-encoding; bh=87hFulUMTLYcYtfb5/q1HiR84qe1kMeDg6xrZ7BQkqI=; b=MM+l6kteqQzEpnQ/ywvSjIFlpM9azD+mxwXxGGlCUwlkklIaJBa9+GDaW7Htux8/Ze N6XiO0NF+0Rt5PgioLbTBsUPJWJT7tSKInjVLe88qAYGJsoTaJ0xKY5i5+7lLVFUhPGq 6ZfRVWeLAL/lW1q+B4w9Ofv9plQJdHNYspXjk= 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 :content-transfer-encoding; bh=87hFulUMTLYcYtfb5/q1HiR84qe1kMeDg6xrZ7BQkqI=; b=fSlBP1cS9v6JQviwaR31LqtXvoE4cuvIGSTn/+ttMcJaysnl8saG5ULQir2+mzJwth wm/GBYYT31hzX702XBOvLdmNJZtdtzStFlVikUsTmPxnaCdrZoXwZKx5g7JwP08YbTQf T9mz4yTsFD5GQLAVAW8yEjG2DQfuy9hddFAt1qxuBNlZQLeSngdcO0Yeax6ESRkgj1AO ILs2aV1bJEQxaBVm24NzL4j5/BYQtaX/ufkbe0U+lzvqrT4+WtvemVgiavbJTG7UjdWF eFyMvw7kTykF6t/15Q64mqZ1nOAoPAOPvy8ooAwhx9njET1HR1cgynU8Ej6wvcu2OUe7 /wXQ== X-Gm-Message-State: AOAM531KBtAPave0VCkRqi0jQm6MaYXA10sVW0XCWUG7uGURWw/Pfs7v 2POaxkhfcu9Rq8YFwzkrJXUGYA9uFuAqmw== X-Google-Smtp-Source: ABdhPJzjoQNKzZ+yDhrVCkGBwPkfdrqM2z3JHRSN3Qbebmu8oZ0F7c5A9NPns6yP/9LViF/8Ba/LMA== 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200720_065603_036351_CBD14991 X-CRM114-Status: GOOD ( 12.93 ) 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:1044 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms 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-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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: 11673471 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 0517A60D for ; Mon, 20 Jul 2020 10:56:21 +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 CA8A02068F for ; Mon, 20 Jul 2020 10:56:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dTNZUrpq"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="RtUNFEDV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA8A02068F 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-rockchip-bounces+patchwork-linux-rockchip=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=i7sMgpKe5ahH279v2SUKLljTFdmxgBOUHTdSwh2xPLk=; b=dTNZUrpqHVX8isDjtO46VKtON 0NiP9TlGvranVXNyfQfsLcGY/qnK1/PZmGpqH+1Qs0rUn/UY8JI82Kp2Sy9SXgBe039H35PV+okRR b4xXHwt+0EsI0sjL77bkRzagPtZPo/SNSkOTBzpJBv1hQPOcKmE4/GthVRggbvkt2xzfKvTTLO510 vWjAqKnCcHWLC2NAZJZhq8h6kXUA1+TeWjp0aZmMQ1YiWpiNGEmGp35WgP+aLfV5mDpStJiXOPM89 DDMF4Ra1gu8Y5TMyMAlctF7RpTzqGhJ/GRtO/Io5g6HaiLRPtpe0XBEssUeSfb4vSOd4ByHau/zdM jCNVgencQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTSx-0004ih-SV; Mon, 20 Jul 2020 10:56:15 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTSv-0004h1-Ih for linux-rockchip@lists.infradead.org; Mon, 20 Jul 2020 10:56:14 +0000 Received: by mail-pj1-x1041.google.com with SMTP id a9so4403837pjd.3 for ; Mon, 20 Jul 2020 03:56:13 -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=7jsB7/zG2Zw1ViCb1957FBxqdpipMGGh3/SxIaRSDfI=; b=RtUNFEDVjRgv0TzEz/tvJ49cF/RkIU07clngL4wNDeLuPPmOwXha4YC3a7IPZj9Gnd GoEUOq9NRykz8x57FMUAZwVaS8GXFK1Jx8F8RZnaKv/57O4RnL96bYD2sTMSuaZBIgZL xBT8Tdjk57G7V/DoFWneQMLDLm2x9lVW7kTVY= 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=7jsB7/zG2Zw1ViCb1957FBxqdpipMGGh3/SxIaRSDfI=; b=Wkd1IzMpxbSNLSTfatNxpg542OhDI9RBoRIH4GtoM7pgFZrkSqVdQ5PXFTc1e5Zo1Z T1kUoNGQqAEcmjrIiN4LjhiIHkKHHPhT+ZLsIuEy/8+LMFCj61JMO5yQGy1YfIO89Q9d LrcTAqm67SQ9xUJ6ygkFQHq0pKwpID+x8N1VpAKPSvmFhxyFcz7Lgijs1gcQMLoz7Yja 2VuSYKDD6evmKQ3HUb+mC6+geNbXbHIQphgpw6Rz8KtypJhPWR6VF0oge3NAz6bxXRZI jJEVgZT5n58shgT8aHkPa3izKUY+/tN76V7y+33Gs3sB8T7okoYPkmDRouvx+c1rIHWg sdLw== X-Gm-Message-State: AOAM530JoaEOvYbNbHAZ0vzMDDZYm2KUr19GcCJ61DOxv8tA/xw0jh53 RQSKpt5tRfTjnoyd2zj3qpA9Lg== X-Google-Smtp-Source: ABdhPJx0qGJ0CZAGE3I7RRc8YyKyBoidf1YIOIZAM2kwFQPhOwxiTs+T4p23lvnOobnqT+ThT0d7Sg== 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200720_065613_684051_182725D7 X-CRM114-Status: GOOD ( 13.55 ) 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:1041 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms 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-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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: 11673473 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 D117313B1 for ; Mon, 20 Jul 2020 10:56:39 +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 AACB92068F for ; Mon, 20 Jul 2020 10:56:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Xr8DmY8+"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="Ly3MetxY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AACB92068F 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-rockchip-bounces+patchwork-linux-rockchip=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=rvEvNBVOLFt0WnQ4neQQB3+3SWK8KXXUg1Sf9dmuLag=; b=Xr8DmY8+SH0ocwSN+uNVu81tR v/sL4kVjZ0rvWBq2RP8td18/LzDMn67aTreDvubXGwQaPqjD0WQ8wtbDzQa3kxcvmrF7eu2HwPFQn 91QiPIKK7xbowW6yvcN4AqMpLe5n8admp/Mm7eo+YIK5VWve3Nyc7uyK7TMFMiWT8YhP7gyC8wwEN /FvqEogKTKtVngVjGcIXvO1JOZKAsiVdYXD0htyRbOxGlFvR/S6lbODkc//XKjVyYXOiarcnCfTtI iClbDg3HiC1g+dO6EvwBeN7z2BKMOGBZ9oBGj+nMFoZCfG0Yc+PHrp+8PgJhevkNrFKNIorWpA/zv cxBZjpWGg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTTH-0004rB-8U; Mon, 20 Jul 2020 10:56:35 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxTT9-0004nE-Kn for linux-rockchip@lists.infradead.org; Mon, 20 Jul 2020 10:56:28 +0000 Received: by mail-pl1-x641.google.com with SMTP id w17so8508915ply.11 for ; Mon, 20 Jul 2020 03:56:27 -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=nSOMoYdoeN3ixxkr9HyJ0ziUQqzOG9TSyjql14cVs8g=; b=Ly3MetxYtUoLy7ynvT0emxlziJSTT/D0jOHRm5pDALE3DZJaM8QzJ2qCR3ODASwLZY u67HLCCTU4JjwUIKlm7QI6xbux4D0bYILmWDp7keoxSrJ5TEwIQzu4n5reDvv8ehElJn 0VCESqXe1wWf+PEz5fnyZhjm3g3ze4X0aMeb0= 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=nSOMoYdoeN3ixxkr9HyJ0ziUQqzOG9TSyjql14cVs8g=; b=hwK8DCnjcrWjwA3fKwDu5yLeshZFKxGOtO4cC/KqXw9eU8SenRQj+BYITYxnWT3tPf kC6y2kQyXT0+7erJff5GnxJ5UGFrzBMBHh39d7JcYBanxjhtpZebIXz9BYvsSPKyr44I SCQaRN5NmMa3dCqopVw0+uPwpMcUsRdwrrxUF8OArGi3zT5KqofI/UIIqEpkpt4Gh+Re lJdzqrR8sqCw+/3ot8b4HS8gkUXXfc8g3O3OzycgnpW6nHAPNlklBHa5Kmtfv4QIgNVD zQ3ZApi0l+uXMTvbssKHVrXAIX4ZLZXt+88Vffpvv6EdvJVgDUrtfAcyzA21GR6h2U82 YBHg== X-Gm-Message-State: AOAM5327LoG7uqG3dV5GRES9PUHYWl+KIOBNpnD06BFrIFpdYYaYbXyy 7IPmuYu1yYCF2+E/E3IlRx0WcrTsRCsehg== X-Google-Smtp-Source: ABdhPJxtpGiGl5nfJ/WlbO97twEDAKENawlViepi1t92UU+FBph92dN8QPL/JfxxH5UeJmFl+YUKrg== 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200720_065627_728661_AFFEB473 X-CRM114-Status: GOOD ( 13.24 ) 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:641 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms 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-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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>; +};