From patchwork Sun Jun 13 21:52:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12317897 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 CCC49C48BDF for ; Sun, 13 Jun 2021 21:54:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 966F46108E for ; Sun, 13 Jun 2021 21:54:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 966F46108E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=DW0HtxlH6l9t/LbXqssodmA6FZorVxCj5H4Q9xgakFM=; b=kCb8EQ3qubnIlA KKwLKGM5pKICOxcjTqEhxpFU2kAfD+dzKRmhQCtC3cz5XrbtNHv3rxvLOw0tUYOD/SLc5kj+09oXE BoQKBvx+bFaIH39+rUt+wK4ohZ32GLvJGxyNp/vmf2KFHbCWYBgtsDOZDyCvIszKEm9bUuTTrOGVV C+mf+4AvN+B97wRPyBJeMFUlSg1E6WC4PZJ1k2OgFhTapelU9gq8CYz1AgLO0Hn2XW/u0i5beAVYs mKvnArEjTP6mhw0MwyvLe7SUZP/J+RbMunFlPi6+8uQnBDOh5ffYhTcOKp5iMKmBnih+AkCPSax4U aTTI86c31bVlFgilxieA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsY3M-00BPTI-MD; Sun, 13 Jun 2021 21:54:00 +0000 Received: from mail-wr1-f42.google.com ([209.85.221.42]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsY34-00BPNc-HH; Sun, 13 Jun 2021 21:53:43 +0000 Received: by mail-wr1-f42.google.com with SMTP id a20so12297142wrc.0; Sun, 13 Jun 2021 14:53:42 -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=gHDz6AWLLq/gx7oIS4AjvcfZvVUiCFUsfxFsQ80+UI4=; b=J8VQvTzq9/EnMAC9zaIGEQNXJeaCxsUKx3dUJCl6aIkalCSuas8cdGL0N1hjP0fif+ mPx9mkYRmNBSAxzELOk7srg4vGYRFsGoSi8p4Hp59mknsdeLTxY1rGld4gXbKBdjYrnA 22NeIkx3SdEUeOQ3RqjUd3bO5EsZEcOK8luE1rTJN/OXGTTGYj2k+EOJ0H/Q12kKqEwg jNLupfmSbq80DqZ2A75Q7tZHa/KSrWmNHkMMLcBSkVOS3mm1BnIaaRs24TZCzA0EZAUe iSWuMpd5v7ZCXQKWHAoKEYrvQLHZyFv35d/R6PcT283nVt1p8I0x6Kcy1waKdrZXeFGL 9UcA== 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=gHDz6AWLLq/gx7oIS4AjvcfZvVUiCFUsfxFsQ80+UI4=; b=Kv+beuGpbaQHftHrz32y9ryj5DJmCuagsMgMLl+Tk4q2z9aER6QkqaSQtLQ+e+tLWb 7qBzIxE3cFnC3fM7H9YicqwE/gYrPz/bGh66xZAYP24/WBiHSlB31molWxtecvjHyXu7 jvSMLWSzcHXYyT8C1lQpymbdascAV7ZhmqtVtCxCgmi4oCFEyTpjxq8x/PKjTAJ0uDRN wk3r9tyZv0KYWlFFMP3FN4DPVra42ZYFARzG+5ApzyvMjhdia7rxuMt4RCLObda6UrDq gDKwmSLSCs4oUKqsh0N+l2txIYmAnLL1SpnssqhuKhIWNEJ+EADVO6kp6AHaKQ2PFLyP Ah9Q== X-Gm-Message-State: AOAM531nOYjrAhIHofDZms5xu/YnlXXmWVipjhUvF6o+Y6fklWa0H9aK vEuNQaHSyjyT+dnI/U19VKZPoZDmrOM= X-Google-Smtp-Source: ABdhPJy8CWHU+bI/YsjifrDwAnvK7OMTVzvpXB0qMWhZy+z10TkGfTfnh0O68Y27j4BpwtTslxv49A== X-Received: by 2002:a5d:5243:: with SMTP id k3mr15403285wrc.19.1623621161095; Sun, 13 Jun 2021 14:52:41 -0700 (PDT) Received: from morpheus.home.roving-it.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id a10sm12803883wrr.48.2021.06.13.14.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Jun 2021 14:52:40 -0700 (PDT) From: Peter Robinson To: Heiko Stuebner , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Cc: Peter Robinson Subject: [PATCH 1/4] arm64: dts: rockchip: add SPDIF node for rk3399-firefly Date: Sun, 13 Jun 2021 22:52:34 +0100 Message-Id: <20210613215237.830160-1-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_145342_599702_765819CF X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org This patch adds the SPDIF sound node and related settings for rk3399-firefly. Signed-off-by: Peter Robinson --- .../boot/dts/rockchip/rk3399-firefly.dts | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts index 45254be1350d..6bbf79a370df 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts @@ -151,6 +151,23 @@ sdio_pwrseq: sdio-pwrseq { reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; }; + 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>; + }; + }; + }; + /* switched by pmic_sleep */ vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 { compatible = "regulator-fixed"; @@ -710,6 +727,17 @@ &sdhci { status = "okay"; }; +&spdif { + pinctrl-0 = <&spdif_bus_1>; + status = "okay"; + + spdif_p0: port { + spdif_p0_0: endpoint { + remote-endpoint = <&dit_p0_0>; + }; + }; +}; + &tcphy0 { status = "okay"; }; From patchwork Sun Jun 13 21:52:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12317899 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 36714C48BDF for ; Sun, 13 Jun 2021 21:54:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 DA18A6135A for ; Sun, 13 Jun 2021 21:54:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA18A6135A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GsYqy+PBxIyBigCq3lXK/1sHHGbxrhPpnjGrFjL1KiE=; b=MY1HhUGbM9uhjR pkS/eLQZ7/zBxBev6wNt9qoI/Zhex1nmqlC0De+eCDQffcNJn9sv88kwnx9XMYG2qob227nKzVkZt gaHVQUq/1e05soD+JuDQIPmmZpDREgvkWTJkKLTaqJ3DtmxZXBlPtRvo0Rudo68Lwriy3s0R1DUco VuOrXp68HB7tRoQ2qZISW1CoRPellHIoGoKNelMIQyxDhRIyZYL4q75321eO4E8Frq3roNiuX7KLd w3mnlJQFn5l+8w61CS1px235CVYkBZDv+Qv8nOJ3SyymkBhLPtMAorwujjP4MmcadoEay3ZTow/yL bVDsFTM6U4uVznz1oE1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsY3c-00BPZ2-Ja; Sun, 13 Jun 2021 21:54:16 +0000 Received: from mail-wm1-f43.google.com ([209.85.128.43]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsY35-00BPNh-1y; Sun, 13 Jun 2021 21:53:44 +0000 Received: by mail-wm1-f43.google.com with SMTP id m41-20020a05600c3b29b02901b9e5d74f02so8530057wms.3; Sun, 13 Jun 2021 14:53:42 -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=i5S6HBJI1NA4kr13aXVvm8gK+0olV+tnXt3Z26Z5yts=; b=YG7aA+06E5VxcMn1zvWTYg2g8N6/GrHYVHe9J5aBy7F4lWxHgUmDdxz9i4CLz+Y+zB f6Ic9k581eYfujXw6xB5HLiqq13iijpGjrFFJZAs3K4sqQxne7AxxNBykSm2Zxt82ehM sXD1Ysc/YZkFyYlWg9xIX3gBjpjqNEfYeip7/PVeZNetifKlXcpLBOR0uoPWqD9LKb+b 4y4WvxeorDxLnvlX66UXpIxNoWRKFQW0xh8oSpEyiISfnhY1aJlc34Hbz4hLOWkmiWj4 5JoXjkxL4hhZ2N2GFSq2yabIIPpjQIO0bFB2mhnVyyflzLw6DszJKf6n7k56DCZH/KDF 1i5A== 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=i5S6HBJI1NA4kr13aXVvm8gK+0olV+tnXt3Z26Z5yts=; b=uJtVRLGFtZCHln/hL8H3iJU+AMgj/coQvw+geiF82iFP8qrm1lhYc48C+31ebepVrG HB3CjnvR0IwNwbP7wj2Gar8F/3VCmatru3MT5jrVY+xhpnWhRRINU31JoHJs9oiDqUCO Z9ztwJmkBLa51C63uoFAQ2uwshpHj3crhQeaNq0cGlZjf6L5YdhYICQ9RQTXdOXS4OWB E4SFYKlyS13WsueNIigL9hP1ucP5guwwUf7vKaq9n0m68xcsxnNUlJgi2dG2CRwneIro 0q0SCgxxqkrDYmRxuHJVeGQOyz6t3653JCENYW6xGDy9Isg97AFBeQ0Ayi6+1kOmQePj 94zw== X-Gm-Message-State: AOAM532XaaK8ZnIxchbVo7dv4/BE/XFP19Ponesjo6yAVznolXNSqLD1 t6fkqXG7mgPOpJdfRjNYfPs= X-Google-Smtp-Source: ABdhPJyBsIi/e5cxzS+NbyCpvosWStkqYpDAbycH7Z6YSMMmPSuyLFpxYZ+87wqPTN1ojXKqAbI4Gw== X-Received: by 2002:a7b:c24e:: with SMTP id b14mr13426162wmj.6.1623621161585; Sun, 13 Jun 2021 14:52:41 -0700 (PDT) Received: from morpheus.home.roving-it.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id a10sm12803883wrr.48.2021.06.13.14.52.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Jun 2021 14:52:41 -0700 (PDT) From: Peter Robinson To: Heiko Stuebner , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Cc: Peter Robinson Subject: [PATCH 2/4] arm64: dts: rockchip: add infrared receiver node to RK3399 Firefly Date: Sun, 13 Jun 2021 22:52:35 +0100 Message-Id: <20210613215237.830160-2-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210613215237.830160-1-pbrobinson@gmail.com> References: <20210613215237.830160-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_145343_134697_31429E45 X-CRM114-Status: GOOD ( 11.18 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org This adds the RK3399 Firefly’s infrared receiver to its dts. Signed-off-by: Peter Robinson --- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts index 6bbf79a370df..a5c2cdaa7798 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts @@ -94,6 +94,13 @@ power { }; }; + ir-receiver { + compatible = "gpio-ir-receiver"; + gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>; + pinctrl-0 = <&ir_int>; + pinctrl-names = "default"; + }; + leds { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -595,6 +602,12 @@ pwrbtn: pwrbtn { }; }; + ir { + ir_int: ir-int { + rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + lcd-panel { lcd_panel_reset: lcd-panel-reset { rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>; From patchwork Sun Jun 13 21:52:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12317895 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 3E87DC48BDF for ; Sun, 13 Jun 2021 21:53:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E25556108E for ; Sun, 13 Jun 2021 21:53:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E25556108E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8Kkm/rJDAceS6t1BnfIZjrMgBGYnieJCQ4ZUg+rV6cw=; b=iPZEH7lO9SYWoz Rrwzmfii5XOty8mglRJNmeXeTdQklX3yATBZEcsE+VyGFMlEA2KvmloIcpsfZoOtZIQLRmswHxOmE Gpah0yfVk+m1v/rrdVyS322aWc7iyChPzkR+n9UQUDkZ9P0KZtJ4aS9608CowgbpyjiR7RHyT0+0h FV+LM20EiJxDupMI8P0zWI1ygjEi3JN0vT902z7H/RBCTpeyGPw5MzpQl/ypRPPZC5SW4d3jksVby iBGmibLLhjtZytoiuJ7eK5FuvoTUoo6caca8dlftxXkOv4UuIHnkQgi609Hbi2HC4wlLIngCL2wU/ 1PhPL7G7FBApz4MLTDTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsY2L-00BPEC-Q8; Sun, 13 Jun 2021 21:52:57 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsY28-00BPBU-3R; Sun, 13 Jun 2021 21:52:45 +0000 Received: by mail-wr1-x429.google.com with SMTP id c9so12254836wrt.5; Sun, 13 Jun 2021 14:52:43 -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=UBkdM2OngSfyRErR557cvoLFdJ2FoWtLX9r2vvB2bOU=; b=C55XHFZP+/4+fX1KvFAfo1nGQJJwSJ5f252+tdwRKPFVpRG6ygRcctbg8Zmxa9/rBv Iqjc1fJ3NKHw/tqcwz10wIidERKrXxiwlVue0L4SZ2wVF4CS3MPvq8n51hcIP4M4agLc JmovJ3Oue1gm6F27bzUe46s5YUkYi0QDfUsD/BlnHEcRNye+F6rGr4MdX0l2gmn2SsA7 n+sFR0OI/fOLfP0vosGAazmJ/Lu3QLd3sO6X2dst2wtt8dAgPqNF59DxsfiWIN0P77au Q6IQAx+SbZcvaY5xD1kRJzXLVgxzMpKRpcsOjDq0dIWsNjAbxtSFYlPPZVrh4LHlfLkE pS5g== 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=UBkdM2OngSfyRErR557cvoLFdJ2FoWtLX9r2vvB2bOU=; b=fDIw3B1zYoPa8VpQD6aKcbip5N/n0HuCYc3Dt+Ua6f1R9LKM+k4NZHbYvqomLKYZQH EVtJpGj7MekI5o4Wh5w6t4jM9ZrxNBtkNWQMBBN/RNHMcB6rNxDJJFXHmMrBRkoKo8dv EQasmGAZnN8RGlw9FBpkjbBLykjIwH8UCqmA0sLSu86MhV7NRmfQTqdH0DnJoKu10oTa Tx8372Ug1X3Q+EFy673W7qgGhgfL/7f1C47bQB7On+pKAxQEcQVyRakwkXFQ5/3hON5a qCVOFOjYR8LUZvyGgPYj5zHevALKVDWhsw8fDrk4gj40wI4516YFQ76PF9Saa/grxa4Q FdiA== X-Gm-Message-State: AOAM531MFVMVCCogIZ5kudFQmPhKsuu2Co6WqADcVtbp1nRdnIqM5FDf ra9WnvHSxbb6q5wVdH/QoWU= X-Google-Smtp-Source: ABdhPJzxZhdPFU999eR5+I01B1oMlLIttLdMlt3XWz1Jb5txVruHwEH8buAQH/vdMNAHyZE1B15RkA== X-Received: by 2002:a5d:6d8c:: with SMTP id l12mr15858317wrs.189.1623621162512; Sun, 13 Jun 2021 14:52:42 -0700 (PDT) Received: from morpheus.home.roving-it.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id a10sm12803883wrr.48.2021.06.13.14.52.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Jun 2021 14:52:42 -0700 (PDT) From: Peter Robinson To: Heiko Stuebner , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Cc: Peter Robinson Subject: [PATCH 3/4] arm64: dts: rockchip: Sort rk3399 firefly pinmux entries Date: Sun, 13 Jun 2021 22:52:36 +0100 Message-Id: <20210613215237.830160-3-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210613215237.830160-1-pbrobinson@gmail.com> References: <20210613215237.830160-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_145244_166343_B32DD7A4 X-CRM114-Status: GOOD ( 10.70 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Sort the rk3399 firefly pinmux entries in alphabetical order and de-dupe the pmic entries. Signed-off-by: Peter Robinson --- .../boot/dts/rockchip/rk3399-firefly.dts | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts index a5c2cdaa7798..e56d47040868 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts @@ -614,6 +614,16 @@ lcd_panel_reset: lcd-panel-reset { }; }; + leds { + work_led_pin: work-led-pin { + rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + diy_led_pin: diy-led-pin { + rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + pcie { pcie_pwr_en: pcie-pwr-en { rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; @@ -625,6 +635,10 @@ pcie_3g_drv: pcie-3g-drv { }; pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + }; + vsel1_pin: vsel1-pin { rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>; }; @@ -634,21 +648,15 @@ vsel2_pin: vsel2-pin { }; }; - sdio-pwrseq { - wifi_enable_h: wifi-enable-h { - rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - rt5640 { rt5640_hpcon: rt5640-hpcon { rockchip,pins = <4 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - pmic { - pmic_int_l: pmic-int-l { - rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>; + sdio-pwrseq { + wifi_enable_h: wifi-enable-h { + rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; @@ -663,16 +671,6 @@ wifi_host_wake_l: wifi-host-wake-l { rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - - leds { - work_led_pin: work-led-pin { - rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - diy_led_pin: diy-led-pin { - rockchip,pins = <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; }; &pwm0 { From patchwork Sun Jun 13 21:52:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12317901 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 4096FC48BDF for ; Sun, 13 Jun 2021 21:54:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 F0CE461357 for ; Sun, 13 Jun 2021 21:54:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0CE461357 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ww9X90R50otdKirAg/xLdY4bE+02WAh/2RIQ+8wXdtY=; b=WNAg8P0fU9jl/H 2B/Fo2Ho9BOzIQwj1jTTyuy1Qk2M7CA6qdw/cE2EWDmFqyqrnKPMhgG+Nrsd6IozkOXPJMHVQM6XO 3iWWRx/s58oeTp2P4jugAetBQOFZnYC5lYMLqPjj0EUGisPsXFH4RsJbxYfGrlD5NTjuO9wY+vQ9m 6RVHad9vgcPUb7Uo5GHFUs2kAiaq0/XCelq0tKUodqx4dS50HVK5+4i0YJCw3MFFAcMFrdgpp+dgf JwwN2yfEH7eN9lCDo/FhJsUFWk277qTUPHCTN2zfgIVrctYoQrov3RYEZY4XzCMOXo2tRdME/7AO3 4Lafd632cCqMyB1HCbcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsY44-00BPkp-L4; Sun, 13 Jun 2021 21:54:44 +0000 Received: from mail-wr1-f44.google.com ([209.85.221.44]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsY36-00BPOU-EE; Sun, 13 Jun 2021 21:53:45 +0000 Received: by mail-wr1-f44.google.com with SMTP id c5so12246335wrq.9; Sun, 13 Jun 2021 14:53:43 -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=i33Wbid6ky3Br/tyd/neSkTJIUUEpQjcu45tT9eNBU8=; b=Ektjwxew1IWXwKXbVOsuCfo17xVCA/v89LIX/WXECZuF4bu/8Oh8azzEOv3xsvqcQo eEW+TV4yGUW8qLlT2XgMTsoQoG7PWyeU52Kn4ZRut7Hv4xMdm8xgfm3AzKKulQDFWvZI vfsgCNXVbU9j3WdRS+//JmKTmVXSiVfW3lpK9l+hWT/MUk5sdg2cgPUbH7HN7tGpmHa/ hvZzZXCyxDZpvtJm0FRqH3YMXde8aI4O8vL1vLqfP5Xsyb0RF9+jmejtYhdWm/UDmlRa pRQUMGWcwNwZ0QSCA95O4u8ieZ0y7jMuNz1oso/3uhiGUNdNRyy2XVRiVe2igb6Zml0c HXnw== 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=i33Wbid6ky3Br/tyd/neSkTJIUUEpQjcu45tT9eNBU8=; b=DLeSjjbYuTPQOueoZlhNyk6IrXDp0y1bktQRdRIwpufSYLBfjb6W6I77kJRcE74mF8 uJMn7NdFng4qjy9AA5C9sF9byO49kaR+0KZ9bMyKPGv8iKgdi+e0NZASd50HBPv2MqWm 8XPYuidMax+AWVDbdah41GM2Tq7K3ZUJ0+JMjsecMYkoFP1C1lABd/G1CvHXacngfqCR ZN6fuyB1Ioj6CPUcXgL+3HoCiUuamtzAAUs0grrwTuGuTvhlxfHJ2WTUiMDiYxmw4iXr kXMbOKNOHsvQhk/4b7iIxMuQC0c3Q4ltNo6j5PCPQcYQ9ILlK5VZR233B4XJxUEPwJrH sZHQ== X-Gm-Message-State: AOAM533pL5sfa+PMubIN1l8T9sh76Sn6Xd0B8q6b5E3KPY/MNFPrDeaL kPXAJ0sZsO9i7mek/Z++9ns= X-Google-Smtp-Source: ABdhPJwuCaeMg6ZiqgMY7PJPB2/C4W3n8Jln2U/mBVM+FuhciIOlhtcqS8V+G/goIFZWQhtm728djg== X-Received: by 2002:adf:ee82:: with SMTP id b2mr15621159wro.360.1623621163020; Sun, 13 Jun 2021 14:52:43 -0700 (PDT) Received: from morpheus.home.roving-it.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id a10sm12803883wrr.48.2021.06.13.14.52.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Jun 2021 14:52:42 -0700 (PDT) From: Peter Robinson To: Heiko Stuebner , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Cc: Peter Robinson Subject: [PATCH 4/4] arm64: dts: rockchip: Add USB-C port details for rk3399 Firefly Date: Sun, 13 Jun 2021 22:52:37 +0100 Message-Id: <20210613215237.830160-4-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210613215237.830160-1-pbrobinson@gmail.com> References: <20210613215237.830160-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_145344_511782_B60E9836 X-CRM114-Status: GOOD ( 11.27 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Add the initial details for the USB-C port. Signed-off-by: Peter Robinson --- .../boot/dts/rockchip/rk3399-firefly.dts | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts index e56d47040868..4a427beab1c7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts @@ -6,6 +6,7 @@ /dts-v1/; #include #include +#include #include "rk3399.dtsi" #include "rk3399-opp.dtsi" @@ -220,6 +221,17 @@ vcc5v0_host: vcc5v0-host-regulator { vin-supply = <&vcc_sys>; }; + vcc5v0_typec: vcc5v0-typec-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_typec_en>; + regulator-name = "vcc5v0_typec"; + regulator-always-on; + vin-supply = <&vcc_sys>; + }; + vcc_sys: vcc-sys { compatible = "regulator-fixed"; regulator-name = "vcc_sys"; @@ -551,6 +563,53 @@ accelerometer@68 { interrupt-parent = <&gpio1>; interrupts = ; }; + + fusb0: typec-portc@22 { + compatible = "fcs,fusb302"; + reg = <0x22>; + interrupt-parent = <&gpio1>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&fusb0_int>; + vbus-supply = <&vcc5v0_typec>; + status = "okay"; + + connector { + compatible = "usb-c-connector"; + data-role = "host"; + label = "USB-C"; + op-sink-microwatt = <1000000>; + power-role = "dual"; + sink-pdos = + ; + source-pdos = + ; + try-power-role = "sink"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + usbc_hs: endpoint { + remote-endpoint = + <&u2phy0_typec_hs>; + }; + }; + + port@1 { + reg = <1>; + + usbc_ss: endpoint { + remote-endpoint = + <&tcphy0_typec_ss>; + }; + }; + }; + }; + }; }; &i2s0 { @@ -602,6 +661,12 @@ pwrbtn: pwrbtn { }; }; + fusb302x { + fusb0_int: fusb0-int { + rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + ir { ir_int: ir-int { rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; @@ -660,6 +725,12 @@ wifi_enable_h: wifi-enable-h { }; }; + usb-typec { + vcc5v0_typec_en: vcc5v0_typec_en { + rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + usb2 { vcc5v0_host_en: vcc5v0-host-en { rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; @@ -753,6 +824,14 @@ &tcphy0 { status = "okay"; }; +&tcphy0_usb3 { + port { + tcphy0_typec_ss: endpoint { + remote-endpoint = <&usbc_ss>; + }; + }; +}; + &tcphy1 { status = "okay"; }; @@ -776,6 +855,12 @@ u2phy0_host: host-port { phy-supply = <&vcc5v0_host>; status = "okay"; }; + + port { + u2phy0_typec_hs: endpoint { + remote-endpoint = <&usbc_hs>; + }; + }; }; &u2phy1 {