From patchwork Fri Jun 18 18:12:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 463222 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 A9EBBC48BDF for ; Fri, 18 Jun 2021 18:13:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8DAE8613ED for ; Fri, 18 Jun 2021 18:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229816AbhFRSPU (ORCPT ); Fri, 18 Jun 2021 14:15:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235063AbhFRSPT (ORCPT ); Fri, 18 Jun 2021 14:15:19 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 176F1C06175F; Fri, 18 Jun 2021 11:13:09 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id f2so11659179wri.11; Fri, 18 Jun 2021 11:13:09 -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=htjXApkhNdnP2TPogXqT3DcJXBVLwZ/N/O4uwhluccE=; b=P94bMjEVAhghS3e8W5TNzb5y1EnmV4DRB8X6rO4hSox87ZbVbQe8DH8tfDUeeh9Si6 SgP02Y/+cLTYVJoFUAXvj9rkIMMeLq4Cm8ajMrRwVLi9ZX5xFxOIUfyW+ALpFzpUXnlF Rg8uxa0VeNtO4M3DqbOeJkJ6OF2D+CSEdh04mbsjBpJP6d0xjHVueqHKkujC0LlHXhVV lKdLiS9l0WVdfS9aa/qKqDN1447W5KzbGAjOd+igh9YZElxtQ31BiHGdWbrSgaVTdaQ4 bqzcUsOiciLxvNUue4Zxzc4EEYD8OPSQGEaTt/5gAs5gbmB6uhtBZsU1P24U7/S0hmRI mjQQ== 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=htjXApkhNdnP2TPogXqT3DcJXBVLwZ/N/O4uwhluccE=; b=YRdibE3L/7huVcedm0IHukUQfJn/z32sVYPePk8kKiGubtbtw1Xqa5FSQworwRTL/v TIMtKF/1V/J+v9QWQj/+znVFF4AJa/qKWShcuFAwgowtLmMCGHef/Fzxc2YnOuVKpnA6 O3/ZRZeCL30CpMBMZGVbENBp5jbcjS8Xd2UXIj5aD4/Z9VlpGRO+VhoELKpPqlulbzbk FFWBhvSaq1a0GHMKB/QbaVKwg4Sup+097k56miEZg9bceD2YMHQopixWPZMvWfpzChBU y8m87C/QpQhDHtvwmAcHNZn4vrwZr1kn8CVBzc4SkjuLGEpeg8rNEpfyc3lq3q9ukoQs iJZA== X-Gm-Message-State: AOAM530Z9lHM45FXvqDB0OBrOa1qWOQHVUUWN22kGvFgOcw0pIK02Cn7 xpEW1Y7ZLF3NqaWlu37q/A== X-Google-Smtp-Source: ABdhPJwhb8/oWvEHsp+eeJJ3vSb744SlgxAnekBNoPjdu6MG4ouNSzdrlSrWY2hLX/GtKYAMb+swTg== X-Received: by 2002:a5d:6acc:: with SMTP id u12mr14032258wrw.414.1624039987716; Fri, 18 Jun 2021 11:13:07 -0700 (PDT) Received: from localhost.localdomain (ip5b434b8b.dynamic.kabel-deutschland.de. [91.67.75.139]) by smtp.googlemail.com with ESMTPSA id l10sm9306782wrv.82.2021.06.18.11.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jun 2021 11:13:07 -0700 (PDT) From: Alex Bee To: Heiko Stuebner , Rob Herring Cc: Johan Jonker , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH v2 1/5] dt-bindings: Add doc for ROCK Pi 4 A+ and B+ Date: Fri, 18 Jun 2021 20:12:52 +0200 Message-Id: <20210618181256.27992-2-knaerzche@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210618181256.27992-1-knaerzche@gmail.com> References: <20210618181256.27992-1-knaerzche@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org ROCK Pi 4 got 2 more variants called A+ and B+. Add the dt-bindings documentation for it. Signed-off-by: Alex Bee Acked-by: Rob Herring --- Documentation/devicetree/bindings/arm/rockchip.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml index 4a6f772c1043..e5049550bdbf 100644 --- a/Documentation/devicetree/bindings/arm/rockchip.yaml +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml @@ -460,11 +460,13 @@ properties: - const: radxa,rock - const: rockchip,rk3188 - - description: Radxa ROCK Pi 4A/B/C + - description: Radxa ROCK Pi 4A/A+/B/B+/C items: - enum: - radxa,rockpi4a + - radxa,rockpi4a-plus - radxa,rockpi4b + - radxa,rockpi4b-plus - radxa,rockpi4c - const: radxa,rockpi4 - const: rockchip,rk3399 From patchwork Fri Jun 18 18:12: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: 463997 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.7 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, URIBL_BLOCKED, 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 1638CC48BDF for ; Fri, 18 Jun 2021 18:13:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0016B613EE for ; Fri, 18 Jun 2021 18:13:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235063AbhFRSP1 (ORCPT ); Fri, 18 Jun 2021 14:15:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236202AbhFRSP1 (ORCPT ); Fri, 18 Jun 2021 14:15:27 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1E1BC061574; Fri, 18 Jun 2021 11:13:16 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso6954231wmc.1; Fri, 18 Jun 2021 11:13:16 -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=rv4VKDRBcNrskkvEnd89Jswu3eRnd7ncejFN962fJIc=; b=MliDCA4h82Qv6GO6z0JtwJO5+8tXwdfODNzdyQKaMkLkFWiFf8n4HuqoMCeTeEW+YE B0UMnx53hRwiXJbZGkfdTK1zdrpS4b1m+rCz1hTKBPi2UW7itn2L8elTxo3sg5Du8k6C BQ8K/X6GuIwXrpaXqljV5OBiURiZpdgYo8f2ExCjzGAdKTvcsI5EWiNkecEmB7wBug71 kmiMWKt4JzgM1FIODJd2Or8o0mhttgwr/vHyBc7s7eUnbwZjvYc+1s9p73wlzatQKK59 5jQ82e/GTIVpSI0YolaPFIKxpIcofiQMUo3EqRrWCBpC3bdUv+GLti9jhHb0jNgZR+my O0lw== 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=rv4VKDRBcNrskkvEnd89Jswu3eRnd7ncejFN962fJIc=; b=fbg+Am32Zm+VXDNz5OSftGpZlzBjACkwm7YZvaHjngQR9LBOOBp8bU8tkvdFGxE+P5 M6fiW1Bgvt0Miv9E1cWVNSUBjPowypMpfKOvqCGMFdpM949WmyRFqXS6zC+HxZ7/dqAg yFFUEqINkngr7ahsQ+ZGZ1aZSCdMIC7Ki8sY9k2zpCUaH4KrlNy3oDauomMFlMUmDRAN cd0Gb6qYokulNBJZOEJcXMs/O74oiHYChZ00VbfCDceOXrlUCAxiOIY8lWEi+nxk0B/V nKVwhwCoLl11bOn40O9synkGaYBGnB6GtShqnalLf9mrS2DiLnCTbZdZg6pXtp6rg1oH /paA== X-Gm-Message-State: AOAM531rY7FbFFFUPVxgJO8mYUPlkBrw/1EnOF3jSV0fLy/YcxIAan/h NorVbZAl1YckiUWUzjJSqw== X-Google-Smtp-Source: ABdhPJw61tE1SgD3KZkdhjmX83akHP4VSX6zBLhC8lhARwMxkLIsxlU5wpu1/jpGew1IKacMRmYctA== X-Received: by 2002:a05:600c:21d0:: with SMTP id x16mr2771318wmj.78.1624039995461; Fri, 18 Jun 2021 11:13:15 -0700 (PDT) Received: from localhost.localdomain (ip5b434b8b.dynamic.kabel-deutschland.de. [91.67.75.139]) by smtp.googlemail.com with ESMTPSA id l10sm9306782wrv.82.2021.06.18.11.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jun 2021 11:13:15 -0700 (PDT) From: Alex Bee To: Heiko Stuebner , Rob Herring Cc: Johan Jonker , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH v2 2/5] arm64: dts: rockchip: Add RK3399 ROCK Pi 4A+ board Date: Fri, 18 Jun 2021 20:12:53 +0200 Message-Id: <20210618181256.27992-3-knaerzche@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210618181256.27992-1-knaerzche@gmail.com> References: <20210618181256.27992-1-knaerzche@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org ROCK Pi 4A+ 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 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..281a04b2f5e9 --- /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+"; + compatible = "radxa,rockpi4a-plus", "radxa,rockpi4", "rockchip,rk3399"; +}; From patchwork Fri Jun 18 18:12: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: 463221 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.7 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, URIBL_BLOCKED, 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 3661CC48BDF for ; Fri, 18 Jun 2021 18:13:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 22E52613F8 for ; Fri, 18 Jun 2021 18:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235110AbhFRSPg (ORCPT ); Fri, 18 Jun 2021 14:15:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235139AbhFRSPd (ORCPT ); Fri, 18 Jun 2021 14:15:33 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0029AC06175F; Fri, 18 Jun 2021 11:13:22 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id n7so11709833wri.3; Fri, 18 Jun 2021 11:13:22 -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=kn98Ll5NtpVpipbgUQvn4hSMRQNojtQUAei8tOm3g58=; b=NIX0oLDftDi6biHsi+LL0gntF8jwaNG+amkxSzoGyPBQI7xlAmcR3NfrZ54USdFQP4 q1QegsItPIubfkqLRpRe+0HpO9mszszJ9Br7N+0RkFmDUCcgKnGiRMrq/QfCHZlMIAzj AAWcjADKNmqy6kcwwvqI2Km/yTMcdaRIkrxiBw+VwKZe9Sf7Q7D87H7ddAr195ElfWQH k3OgTjecka+toNHRxZXYD5NQ+re7SluV3OXE6xGbKKRkktxz8qRoaYIXLVXMxAYYcpcd +LrCFT8+nLsvOdnXT3gSrACevK8+AbHb13URNoQaCmz8sf0VHBeR6gnUPWS0YiY36qmH 8qNg== 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=kn98Ll5NtpVpipbgUQvn4hSMRQNojtQUAei8tOm3g58=; b=lkUOnerx+0uCVjhF4p5GxIRkjxS9gfg95H51yDqu1jFOYNjNBYqp8Jk+nIr63gB1qF WfyPekjij3PRvTbA9VLUE3i7sH1Sho1qXo+JX8+iAi5bTzYLrrihkT6igWjCWkgkZJcw lnTVk34dEnhA15qGBvEtFH9okHObPiR3vVGk3gJ0NH3QKUZKgL4HL1m8fsY7ZVUTR1Tj pMqqKqUtT+Dc7MJiEb4KmVpkirW+WaJkChGXrNwcP+NozlUEV8aeQpaxrYrZ3G8ZTMbJ fwnxIkfB/RYl0PFiG5IALuvhda8elAo0jrgvEYrKFlYRasUxUcM/ilv4ftilIuKfjSUl 2xUA== X-Gm-Message-State: AOAM531AphLPKyDortO3bKLRYYmCoAYDrC+0nkX8Ukp23S89ZMW1VLqo Ze8YUsaaotYuePJeCbPHGw== X-Google-Smtp-Source: ABdhPJz8Y2F3LWyjxmZDk8cpgSz9/LhbtqqL7qNCHFkVV4MLCnbXc5uPbiQj0rJ2h/sY6FuHztbgYA== X-Received: by 2002:adf:e502:: with SMTP id j2mr7001313wrm.275.1624040001599; Fri, 18 Jun 2021 11:13:21 -0700 (PDT) Received: from localhost.localdomain (ip5b434b8b.dynamic.kabel-deutschland.de. [91.67.75.139]) by smtp.googlemail.com with ESMTPSA id l10sm9306782wrv.82.2021.06.18.11.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jun 2021 11:13:21 -0700 (PDT) From: Alex Bee To: Heiko Stuebner , Rob Herring Cc: Johan Jonker , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH v2 3/5] arm64: dts: rockchip: Add RK3399 ROCK Pi 4B+ board Date: Fri, 18 Jun 2021 20:12:54 +0200 Message-Id: <20210618181256.27992-4-knaerzche@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210618181256.27992-1-knaerzche@gmail.com> References: <20210618181256.27992-1-knaerzche@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org ROCK Pi 4B+ 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 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..dfad13d2ab24 --- /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+"; + compatible = "radxa,rockpi4b-plus", "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>; + }; +}; From patchwork Fri Jun 18 18:12: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: 463996 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 4A507C48BDF for ; Fri, 18 Jun 2021 18:13:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 33B0D613ED for ; Fri, 18 Jun 2021 18:13:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236227AbhFRSPl (ORCPT ); Fri, 18 Jun 2021 14:15:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236221AbhFRSPj (ORCPT ); Fri, 18 Jun 2021 14:15:39 -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 71571C061574; Fri, 18 Jun 2021 11:13:28 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id n35-20020a05600c3ba3b02901cdecb6bda8so9232828wms.5; Fri, 18 Jun 2021 11:13:28 -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=UG1JOqqWkVJ7vxd2JTkW+ImSRr+NkC9K3MMi/AjrjDU=; b=Xkzn6Ksrnwia97J/BpCY2xkdPjNlvHd3y9vejcoRWCqvmOR5xUiorCQaI4mZHvnynm ndNXHy78Pt50Vj0fpMqY0cKIjesMEhZqGdSCPdM1C33Zrr58lXAs8I1oS3u6d9DnTbdi JynaoBGH76QpwwnaPxxjR4OF2Q410iJvw//1dOKAldVJkG8H9hUREd9FvIRu0MVLG3ui kHKvmqYumEQR0pk/igFV/JJbUO1msDEZmobaIE68/X4FZOFtoZ5bfYzXXwnP4E1S05PS xOiIHCgJ447PcpCF2Ev3DPAD38SX/Q7BQolquiS6nQwo79jFVq916zxilq558Laiwfzo B0fQ== 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=UG1JOqqWkVJ7vxd2JTkW+ImSRr+NkC9K3MMi/AjrjDU=; b=Nd+12RJMZnqHD0tQEQkVQGvUIwCjWEI665FUTw5XsHRWulffz+wcUQXDGOt3Pw5qvx xExccaX25vrRG+9Uge4Zkz/E4001X+Pkros09SGKFNOpzMPPye2gGnzB0O6M7UbmaUEE aGsuQ2Tjq5rkTFiUQ+GH/p3b3JWYkfRBMWXoGUo2Kh8fOFkyB659OvHwkT6mdAAwlA+b tyJQ+kP0uPh8oZJWYTPwdW9403RQTiPYisfAEZg7KzJ0h+qitqRfziHu7qvAGxJ9WAzR /6qMjP2FJ/p8DD2aGXdANWtZfBp4pjdDDzobET7ecODKguRiYLQlOyNMTHezSEVLPNtb ySMg== X-Gm-Message-State: AOAM533+2nhL0BAzd7UEu6/5kJaUqtHRgLOxi2jXn0NFfqND1V5jKlPk tyf1EBHkc8rvj/0aRh1k9Q== X-Google-Smtp-Source: ABdhPJx+u7DyeUluCInilWHRKBpThJKW9LLFAGMQfBOa+7iNfIt8TIajVsZ3oq20Lw7RsABn3ZHwhA== X-Received: by 2002:a05:600c:4f09:: with SMTP id l9mr13253406wmq.114.1624040007086; Fri, 18 Jun 2021 11:13:27 -0700 (PDT) Received: from localhost.localdomain (ip5b434b8b.dynamic.kabel-deutschland.de. [91.67.75.139]) by smtp.googlemail.com with ESMTPSA id l10sm9306782wrv.82.2021.06.18.11.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jun 2021 11:13:26 -0700 (PDT) From: Alex Bee To: Heiko Stuebner , Rob Herring Cc: Johan Jonker , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH v2 4/5] arm64: dts: rockchip: add ES8316 codec for ROCK Pi 4 Date: Fri, 18 Jun 2021 20:12:55 +0200 Message-Id: <20210618181256.27992-5-knaerzche@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210618181256.27992-1-knaerzche@gmail.com> References: <20210618181256.27992-1-knaerzche@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org ROCK Pi 4 boards have the codec connected to i2s0 and it is accessible via i2c1 address 0x11. Add an audio-graph-card for 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..80925a58e470 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 = "Analog"; + 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 Fri Jun 18 18:12:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 463220 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 C8B67C48BDF for ; Fri, 18 Jun 2021 18:13:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF8E0613F2 for ; Fri, 18 Jun 2021 18:13:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236235AbhFRSPn (ORCPT ); Fri, 18 Jun 2021 14:15:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235139AbhFRSPk (ORCPT ); Fri, 18 Jun 2021 14:15:40 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D1F5C06175F; Fri, 18 Jun 2021 11:13:29 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id y7so11641680wrh.7; Fri, 18 Jun 2021 11:13:29 -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=FRadAAJthazKXCs3EEyrRLqIIy1SFHZ81iHPWgmnJRI=; b=ny3LB6aXzm8w8C3+A9jf74tf+BJ986neHs79X76TCRusy5yLSp0LO3EWdBMg0srLNh KIeluN/0svlz2LiKKVdBMwWQ2tyMAriywQiW9cqmW/LaGjqjtfbb5d9ECq2MWH2UpXmA mE6DQTzTQIrkOc82FAufn5lZ0UHmzBzzD1yoHZVQcKa45Wx/8lkFLyAy0o/QBW0MQVj0 myGns/y4E4h/zzLtvcglLgvzg/Hz2drPsNPJpYYhgYi86j3gEAvx12/a7cnDoZUI+2bT n013PLal7MkOMd3BP6gE7OervN1873OvazXnpI1urafITd3UmANw62uMjEBfKxdlGmwt jWSQ== 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=FRadAAJthazKXCs3EEyrRLqIIy1SFHZ81iHPWgmnJRI=; b=I0gg4u+OrJkXftvpua79qkrNud/zEy75k5H5/H+YgH1C9Kun11Ra0OgCOaJok8EuQa 1UlzA1ywR1r4WfI8+qauAeWfLvQfOdhQiZF3QlYeX9aiDjDEwkGlM7geu2kk20dTD6Zr fZfrgoZEbEbQSV8qAqrJp9aKw6PTCPBMKMs+c9mxx7Hxq61us72rqlERftok1cDgefEs cXZED29NNs9RnmdFiLMIIthYn5gHD1+Q0I7LaxdShNzuIVr+AvkxxwV2Kgws8e/B3XZ2 wLvSoQZKAlre8SVxKLhWzf38r4+WniDxmxmvac+mYzFxzxJPqPw5jyeRkNstXSoF7H05 T0Cw== X-Gm-Message-State: AOAM533HlWtET3mE5LsljYWpGJAnWVNoYwP6oYZw+5piCkIltGN35XMz ROk8O5x4t4MHzsvD7YybmA== X-Google-Smtp-Source: ABdhPJxwYQRQMqECTGWplAPGQubZuPc+DAoMbIBgAWiqVlg7kAw1Gi3FbNatZS9UZrU2FM6mBdz28w== X-Received: by 2002:adf:d4cc:: with SMTP id w12mr13871170wrk.216.1624040007816; Fri, 18 Jun 2021 11:13:27 -0700 (PDT) Received: from localhost.localdomain (ip5b434b8b.dynamic.kabel-deutschland.de. [91.67.75.139]) by smtp.googlemail.com with ESMTPSA id l10sm9306782wrv.82.2021.06.18.11.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Jun 2021 11:13:27 -0700 (PDT) From: Alex Bee To: Heiko Stuebner , Rob Herring Cc: Johan Jonker , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH v2 5/5] arm64: dts: rockchip: add SPDIF node for ROCK Pi 4 Date: Fri, 18 Jun 2021 20:12:56 +0200 Message-Id: <20210618181256.27992-6-knaerzche@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210618181256.27992-1-knaerzche@gmail.com> References: <20210618181256.27992-1-knaerzche@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add a SPDIF audio-graph-card to ROCK Pi 4 device tree. It's not enabled by default since all dma channels are used by the (already) enabled i2s0/1/2 and the pin is muxed with GPIO4_C5 which might be in use already. If enabled SPDIF_TX will be available at pin #15. Signed-off-by: Alex Bee --- .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 26 +++++++++++++++++++ 1 file changed, 26 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 80925a58e470..b5b8a79116fd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -42,6 +42,23 @@ sound { dais = <&i2s0_p0>; }; + sound-dit { + compatible = "audio-graph-card"; + label = "SPDIF"; + dais = <&spdif_p0>; + }; + + spdif-dit { + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + + port { + dit_p0_0: endpoint { + remote-endpoint = <&spdif_p0_0>; + }; + }; + }; + vcc12v_dcin: dc-12v { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; @@ -632,6 +649,15 @@ &sdhci { status = "okay"; }; +&spdif { + + spdif_p0: port { + spdif_p0_0: endpoint { + remote-endpoint = <&dit_p0_0>; + }; + }; +}; + &tcphy0 { status = "okay"; };