From patchwork Thu Jun 17 04:49:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 12326513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21EC6C49361 for ; Thu, 17 Jun 2021 04:50:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E687C6100A for ; Thu, 17 Jun 2021 04:50:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229671AbhFQEwJ (ORCPT ); Thu, 17 Jun 2021 00:52:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229515AbhFQEwJ (ORCPT ); Thu, 17 Jun 2021 00:52:09 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1887AC061574; Wed, 16 Jun 2021 21:50:02 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id e22so1496971wrc.1; Wed, 16 Jun 2021 21:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G8xBS3pgbjn1u0NzXrJPbnHQ5MKIiawbeczldYN/4uY=; b=gRZDlpwJC98qkdPgrOJkADH6IP23iv9SrTRmpkw2AkJwJ+KoAtVQFY5MmhSCAgzXAP CQz3L5elU7d+jI1qjhW5wSKAeqqhaKHpG5zGPQYTJsPxU+uyYo8xdEWOD3FyBVrz6U4T t9kdWVXw9nJkuoavkjqU2+EaWpZ15IsQXvOuIGJAjqyXo3CIA+iBOegeI61ukmYECbBA VUW32LtiG9zLQrTt3ks8Fa4r3tiOjyYN9J63rQSGwNvTPLBf3nLnPijM1+6SkPYs3BVv vw1c8ANYTHxRNeSFxUpKblCz+MmmUnte44HQ4js1hQ8cAY7Qu9JEN0KWpf2qg60dvjy4 vMDg== 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=G8xBS3pgbjn1u0NzXrJPbnHQ5MKIiawbeczldYN/4uY=; b=K2GEvE5ukp11trGPmK8CjDvCvWLiFGm/JvJF7CFIbYZ01cXDSBKfbUgLK2hZkc8jCO XmpJXCE4f7bkdOC+0ki0qHm6fimnw3MT0/VIQTj4G2G+iifcmOAHa18S5+2HERlY0I3+ HSRlgy1S7xTLt+c81/ioSgBydgxy6Tptcn54jxIeb3sZ+8+x6jdYaNtYzM+BEktpwVmN KryTJy40zTTp/Cwa2SFcRqr71ACB0PeQBJwfT6WkfYgUPq1ac49tX/aaFUge5f4L5YRL Hqr89wZbz0xc4EPsySzByW/9pKq085PcfKVkGNKMHxsN8UKXo2f7njJU6rO1CP5LDCUF GqWQ== X-Gm-Message-State: AOAM533MtpfQBlZ7WvDwJssoWew4KrKbEzuTDRMXj7twYpMMvJQdk6pM 8nPpFf04qN2bT6wtC+YBew== X-Google-Smtp-Source: ABdhPJx88fGa0319NJTKdbmepy1yUaY/3BNtC2Mjf2cyEjMmkgRDpZVAMMnOMoXSvFjVc38WHmCZMQ== X-Received: by 2002:adf:facf:: with SMTP id a15mr3278608wrs.308.1623905400757; Wed, 16 Jun 2021 21:50:00 -0700 (PDT) Received: from localhost.localdomain (ip5b434b8b.dynamic.kabel-deutschland.de. [91.67.75.139]) by smtp.googlemail.com with ESMTPSA id n13sm4587460wrg.75.2021.06.16.21.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 21:50:00 -0700 (PDT) From: Alex Bee To: Heiko Stuebner Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, Alex Bee Subject: [PATCH 1/3] arm64: dts: rockchip: add ES8316 codec for Rock Pi4 Date: Thu, 17 Jun 2021 06:49:53 +0200 Message-Id: <20210617044955.598994-1-knaerzche@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Rock Pi4 boards have the codec connected to i2s0 and it is accessible via i2c1 address 0x11. Add an audio-graph-card it. Signed-off-by: Alex Bee --- .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) 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 7d0a7c697703..e5c1083174ff 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -36,6 +36,12 @@ sdio_pwrseq: sdio-pwrseq { reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; }; + sound { + compatible = "audio-graph-card"; + label = "rockchip,rk3399"; + dais = <&i2s0_p0>; + }; + vcc12v_dcin: dc-12v { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; @@ -422,6 +428,20 @@ &i2c1 { i2c-scl-rising-time-ns = <300>; i2c-scl-falling-time-ns = <15>; status = "okay"; + + es8316: codec@11 { + compatible = "everest,es8316"; + reg = <0x11>; + clocks = <&cru SCLK_I2S_8CH_OUT>; + clock-names = "mclk"; + #sound-dai-cells = <0>; + + port { + es8316_p0_0: endpoint { + remote-endpoint = <&i2s0_p0_0>; + }; + }; + }; }; &i2c3 { @@ -441,6 +461,14 @@ &i2s0 { rockchip,capture-channels = <2>; rockchip,playback-channels = <2>; status = "okay"; + + i2s0_p0: port { + i2s0_p0_0: endpoint { + dai-format = "i2s"; + mclk-fs = <256>; + remote-endpoint = <&es8316_p0_0>; + }; + }; }; &i2s1 { From patchwork Thu Jun 17 04:49:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 12326515 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 072C0C49EA2 for ; Thu, 17 Jun 2021 04:50:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D0057613CE for ; Thu, 17 Jun 2021 04:50:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229805AbhFQEwM (ORCPT ); Thu, 17 Jun 2021 00:52:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229677AbhFQEwK (ORCPT ); Thu, 17 Jun 2021 00:52:10 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6AF9C061574; Wed, 16 Jun 2021 21:50:02 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id i94so5088796wri.4; Wed, 16 Jun 2021 21:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1H0pRK+p9SqfiPEkg/fuHEcESDP6rKm5XaeGluOXB44=; b=rpQs4ZXeo+Yv7RZBLrTk8MPAbfNG6uJkL0o0C/VYsmaGbu+xJYA42CPhNls34kCK5a V1t6TKoFIaN9XXPfgonRV5RH+OuJX8Lh/j/uUCgWdfJ3vKu6cXaAiXZNZhXzHBrekgbX ZgxsoQAjfgwQ9htKXLkCYLpALrLFyXczcowzPREIfZo4so33dWFjQpyfOSH0roTcdvS/ 0WByXlgJUcQUjaDVEf7AajWtPkkEN/UjI2FX8Lo8qU6JVmJf49VGdnIeSAVs/hRvlK0/ Id+Q/mbDe+KD9amsbH/VpFyzd/S8UZDkEaAJ9duhq138GCEqeREvyyFwiGJaGZTQ9Oxo GTkw== 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=1H0pRK+p9SqfiPEkg/fuHEcESDP6rKm5XaeGluOXB44=; b=D/KrRQQ01zSkDOUQCaj0EjfyGmGb1UfQkBUnVBjROVbNZ8zaTKjwA3EZoOx+jNMvAb k/sV1P9iTgRImOud11PsQ7SC71SiNi52TxmQZyafHHZHmYyRny+V2mASLz6Qbt6sR3wF YqWeboHeFOvmllzRDnKeUcpgMYVi0ihiaRSDrEplZUyU8SulCgbuMD67zCnyURvlg3lx OmPYNW0LikfsLlGgyQv3x81XvHkQkm757iEt4h58JtLbC0ThwJvpwfos9i3YUpaGldob JQppU81CEHQLBcMqDSYzjZTih5PkjLRej5wZLdRAJKJdlWajaE6GPyBGAKgwRzzcbtIS r/lw== X-Gm-Message-State: AOAM532wqziJ6B/hYrVCctXStZkpBiHC6BpSNszT97QuRq9ixLaWqOLc rlIqxK/Blgo71VXrCPSA/A== X-Google-Smtp-Source: ABdhPJyK5VW6f5WGABPtt+CT0g9pGSVIMgGRmmCBlmt4nt0PrKA7657C9oY+PUkydL3HprmgUjJ1eQ== X-Received: by 2002:a5d:4689:: with SMTP id u9mr3155825wrq.31.1623905401488; Wed, 16 Jun 2021 21:50:01 -0700 (PDT) Received: from localhost.localdomain (ip5b434b8b.dynamic.kabel-deutschland.de. [91.67.75.139]) by smtp.googlemail.com with ESMTPSA id n13sm4587460wrg.75.2021.06.16.21.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 21:50:01 -0700 (PDT) From: Alex Bee To: Heiko Stuebner Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, Alex Bee Subject: [PATCH 2/3] arm64: dts: rockchip: Add RK3399 Rock Pi 4a plus board Date: Thu, 17 Jun 2021 06:49:54 +0200 Message-Id: <20210617044955.598994-2-knaerzche@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210617044955.598994-1-knaerzche@gmail.com> References: <20210617044955.598994-1-knaerzche@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Rock Pi 4a plus board is the successor of Rock Pi 4a board. Differences to the original version are - has RK3399 OP1 SoC revision - has eMMC (16 or 32 GB) soldered on board (no changes required, since it is enabled in rk3399-rock-pi-4.dtsi) - dev boards have SPI flash soldered, but as per manufacturer response, this won't be the case for mass production boards I didn't add yet another compatible, since the small set of differences are captured by the device tree. Signed-off-by: Alex Bee --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index c3e00c0e2db7..dbd7d37950f1 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -43,6 +43,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-4a-plus.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 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts new file mode 100644 index 000000000000..2deaab7f9307 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts @@ -0,0 +1,14 @@ +// 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" +#include "rk3399-op1-opp.dtsi" + +/ { + model = "Radxa ROCK Pi 4A plus"; + compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399"; +}; From patchwork Thu Jun 17 04:49:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 12326517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 409EEC49EA2 for ; Thu, 17 Jun 2021 04:50:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2535C6023D for ; Thu, 17 Jun 2021 04:50:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229842AbhFQEwO (ORCPT ); Thu, 17 Jun 2021 00:52:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229784AbhFQEwM (ORCPT ); Thu, 17 Jun 2021 00:52:12 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9130EC06175F; Wed, 16 Jun 2021 21:50:03 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso4181155wmc.1; Wed, 16 Jun 2021 21:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ASVo2MLoqVP1mLF6Nd3xdMslTrtZKM7Mb5C6XqAN9Os=; b=FHM8WTkrJ5sOVzzApmHO1kODYwLZheKZiN+Dv7007BCbcYQYVmxGSFAy+1wHvpZT8N p/bJu+/TqfBIGRtpgsEPdqKOvltEjWjCmENWI3Uao9PnBs2UY/qhPgW0NLrFMQ3rCa93 I8Kia0V5WTLKTH4kUUQX7L/uQx7Zeh0q0wsp373RsupINBdP3zJ9DwflL7wG7NCoA7GI TMtSErfAzbe3QZ5wet/jwyYhcm3KWSHYeifs/qVr9EXW9uaVhY1BgRsRAw+ikR7PIgoi IoKltUU6dO0Ux/0r3fOj4ZeLfCD014ipoARQVFGvY8vRFyk1ZbCBmtV/l5VeU7x+xmKd VhEg== 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=ASVo2MLoqVP1mLF6Nd3xdMslTrtZKM7Mb5C6XqAN9Os=; b=Nqc4jC8Be43Vb0W6IpdGZL8VVPWwpF7rI6FibsSog8VZzPD2FpSniibDsasY7t8z+i KRo/ckG/7Y66vUREl1qz4JYrOKALEMR7jqzgazk6Vi4xSZZZI36wUkBvScmBoOPtft14 jnm1G/5PMrGVCB+sCkbQPVdA69mYkbtWomM9TD5xxcLkbtcusNu1tfJ2Xfo2YXC+ZtGO /47ECSD0bA29ST1DZe52VLRubr5Fnfl9W7U04Yy+GYJeLFsEZMIbKVvW1rl9aoAsLvCH Z4HQ3a+PenVp/IgrUVJOUNJA18umHv1xmBkePd6Oz9AE+jTaMZn5PWqd7dov7rslRqmr gcjQ== X-Gm-Message-State: AOAM531GA6waQI+1sL4nwCmAneTHQBVWwqqtTzK0613EaTnnb+byybDq K+kWOLXhhIESLiJ2zYRu1w== X-Google-Smtp-Source: ABdhPJykCMd2j7kccm6Lk69DK/jMdpK2aAoJdzlwIytRotmEuFmHTkvf2l6vWkoFn0SfSipgLCeULw== X-Received: by 2002:a05:600c:3ba2:: with SMTP id n34mr2705531wms.120.1623905402247; Wed, 16 Jun 2021 21:50:02 -0700 (PDT) Received: from localhost.localdomain (ip5b434b8b.dynamic.kabel-deutschland.de. [91.67.75.139]) by smtp.googlemail.com with ESMTPSA id n13sm4587460wrg.75.2021.06.16.21.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 21:50:01 -0700 (PDT) From: Alex Bee To: Heiko Stuebner Cc: devicetree@vger.kernel.org, balbi@kernel.org, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, Alex Bee Subject: [PATCH 3/3] arm64: dts: rockchip: Add RK3399 Rock Pi 4b plus board Date: Thu, 17 Jun 2021 06:49:55 +0200 Message-Id: <20210617044955.598994-3-knaerzche@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210617044955.598994-1-knaerzche@gmail.com> References: <20210617044955.598994-1-knaerzche@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Rock Pi 4b plus board is the successor of Rock Pi 4b board. Differences to the original version are - has RK3399 OP1 SoC revision - has eMMC (16 or 32 GB) soldered on board (no changes required, since it is enabled in rk3399-rock-pi-4.dtsi) - dev boards have SPI flash soldered, but as per manufacturer response, this won't be the case for mass production boards I didn't add yet another compatible, since the small set of differences are captured by the device tree. Signed-off-by: Alex Bee --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../dts/rockchip/rk3399-rock-pi-4b-plus.dts | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index dbd7d37950f1..e867e5889d44 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -45,6 +45,7 @@ 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-4a-plus.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b-plus.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 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts new file mode 100644 index 000000000000..ea68b8c9d9ba --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts @@ -0,0 +1,47 @@ +// 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" +#include "rk3399-op1-opp.dtsi" + +/ { + model = "Radxa ROCK Pi 4B plus"; + compatible = "radxa,rockpi4b", "radxa,rockpi4", "rockchip,rk3399"; + + aliases { + mmc2 = &sdio0; + }; +}; + +&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>; + }; +};