From patchwork Thu Nov 26 07:33:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 11932839 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 A1568C63777 for ; Thu, 26 Nov 2020 07:34:15 +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 2AC332145D for ; Thu, 26 Nov 2020 07:34:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xs5B+Yz4"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="DlNpl7uz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2AC332145D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=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=M64qXHsnJ/7Ueg8g1zfFe4F75AV9jPzBcqJTK0r0qVw=; b=xs5B+Yz4YXLUSx24JQbeQ04LX F8HV5wSSMBG8AORsnVhr7w/Oe95xAcQ0fjL3h7eQn+Qfr3qoaTi75QfJEDEi6WIzLEH/Fj1ulZ8rR 1SOdZyegFf8UtAw4cfUG5F2nSW09ohM+4JguKpuT2h32Gh0D4EKCrh4CGpmmpBrgD0c6U/MPymi3O 9PZyymz0VzdkwDb2qB0K2ZLe2AMZld9y+Wnfmlff+n/4LFIpqgsdShFKdMp8phgKDO0YeiGPR4SxB rfdO9SThkw3K9nMLKJzPWsDBXd0otl+eEhYXLovmWO5ewxvooMIg1wmcWhEhE/BmoK/I7mMoNI0DW depOuK0WQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiBn1-0002wf-AG; Thu, 26 Nov 2020 07:34:03 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiBml-0002sw-Qj; Thu, 26 Nov 2020 07:33:49 +0000 Received: from wens.tw (mirror2.csie.ntu.edu.tw [140.112.30.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B81902145D; Thu, 26 Nov 2020 07:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606376025; bh=KDD41CmV4iq/zVokYN1U7B8lL+F2kYydcU65HLWjkW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DlNpl7uze499uv2DWFselQ1kdIifK/GUCMrX6ao2fwLQNUAOVZ4cpupYIFK4eZYtV pnmNejo9TYMrkjAiX5zSEsT+0y6PRFaqICe0cUUc3EOlKFm6U6vgOEouc+Vni0J8MG Z+4gua/i2YgqhOmFbbpNM6/qGXOUtdXF4BCPUN98= Received: by wens.tw (Postfix, from userid 1000) id DD5025F755; Thu, 26 Nov 2020 15:33:42 +0800 (CST) From: Chen-Yu Tsai To: Heiko Stuebner , Rob Herring Subject: [PATCH 1/3] arm64: dts: rockchip: rk3328-roc-cc: Set dr_mode to "host" for OTG Date: Thu, 26 Nov 2020 15:33:34 +0800 Message-Id: <20201126073336.30794-2-wens@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126073336.30794-1-wens@kernel.org> References: <20201126073336.30794-1-wens@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201126_023348_017370_7B30FD56 X-CRM114-Status: GOOD ( 13.69 ) 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, Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Chen-Yu Tsai The board has a standard USB A female port connected to the USB OTG controller's data pins. Set dr_mode in the OTG controller node to indicate this usage, instead of having the implementation guess. Fixes: 2171f4fdac06 ("arm64: dts: rockchip: add roc-rk3328-cc board") Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts index b70ffb1c6a63..b76282e704de 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts @@ -334,6 +334,7 @@ &uart2 { }; &usb20_otg { + dr_mode = "host"; status = "okay"; }; From patchwork Thu Nov 26 07:33:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 11932841 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 AF42DC56202 for ; Thu, 26 Nov 2020 07:34:15 +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 353E42173E for ; Thu, 26 Nov 2020 07:34:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pfxYqnwM"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="DaZ/H3Pa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 353E42173E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=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=CBgXnJzwSL+sdBywwObd4qq3ss9XNe+r3akciQv4Rqc=; b=pfxYqnwMntU9URrl3xFCrh0Tj sXIC6S8rc/AhJ4ekNaNEGbZk5DfJK8tJ1kbC8hQHQ8gccBBXNUDXHxTWkIZYvWtwA193E8BSAKlir 7gnFs31l5TERm/kHX3ZqQDdw9z92iommhn1LCXP+T/ega6UmljOC4cVdzdSjEjDo9lT9AaySnhXwe P/beZawoOoB8J2ASJ+bb7ERNaCHFakrUtqaRi5f5J/82Ij8d7S+ZmwV96IKTZcp5N80/B3Ail0N4G rdxBQVMmC1fXfNVLmGR910+dH1Nr4c96yWelEvUdEQFR1m9vGR6/qQgUbJCcf9esRJpqc3sxn6/Ge +UnO/4KBA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiBn9-0002xr-Se; Thu, 26 Nov 2020 07:34:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiBmm-0002sy-BI; Thu, 26 Nov 2020 07:33:49 +0000 Received: from wens.tw (mirror2.csie.ntu.edu.tw [140.112.30.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D12F21D93; Thu, 26 Nov 2020 07:33:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606376026; bh=CX6BU1Zni/drTwYoTIuGnFbbK6HsOMzc5TdCbHxmoMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DaZ/H3PaGS3CLckuKq8ZAXKPcg3LTvmGKlHW71zN+g3CwgMxcq3IrpaWeuUkM7Cue PUaEWNDfZrZ1fYsVHAwop47RuSc/nsuVXFhEi2y64zFDf5sHptNNWWJnlDjpukLptk jfnobTkQddMUJXip8aQoI/PQDlUMWKjKO6CjSb00= Received: by wens.tw (Postfix, from userid 1000) id E60805FA83; Thu, 26 Nov 2020 15:33:42 +0800 (CST) From: Chen-Yu Tsai To: Heiko Stuebner , Rob Herring Subject: [PATCH 2/3] arm64: dts: rockchip: rk3328-roc-cc: Enable HDMI audio Date: Thu, 26 Nov 2020 15:33:35 +0800 Message-Id: <20201126073336.30794-3-wens@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126073336.30794-1-wens@kernel.org> References: <20201126073336.30794-1-wens@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201126_023348_500204_549BF4CA X-CRM114-Status: GOOD ( 12.56 ) 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, Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Chen-Yu Tsai The RK3328-ROC-CC already has HDMI display output enabled. Now that audio for the HDMI controller is supported, it can be enabled as well. Enable the simple-audio-card, and the I2S interface the audio is fed from. Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts index b76282e704de..697fce709031 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts @@ -161,6 +161,10 @@ &hdmiphy { status = "okay"; }; +&hdmi_sound { + status = "okay"; +}; + &i2c1 { status = "okay"; @@ -270,6 +274,10 @@ regulator-state-mem { }; }; +&i2s0 { + status = "okay"; +}; + &io_domains { status = "okay"; From patchwork Thu Nov 26 07:33:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 11932835 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 F06E4C63777 for ; Thu, 26 Nov 2020 07:34:01 +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 4BF302145D for ; Thu, 26 Nov 2020 07:34:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JKc1fMpp"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="nQ25SNWD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BF302145D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=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=18oRd1jOWZ9xW5Npb2Ixp9DzBZ9QI0hMCUS9gXOoeUQ=; b=JKc1fMppXJDfU9uOtqBHmF8nh tKMy0BZMuOd7b9Cf38W0xSvDYfQZPrVrSx330nPfSv2SU62aaJ4R4WpBx4Im3y0e/TNgW3uifW4+s JeoKbG/z5YPSeDhFwGvK9yKLgsOSiNsTYYFIfS705P1drOQu6Fj+St04U7DZlTpd5keSz2a1E3wG+ 02on/VsyA3Dx2uVQ9QfPMhc1J0xa4LIJLFIuvgp5U3mEi41d1XGe1gMzb90FDASMHZNP73/NVZAoP Vr9AM9j1/70T+QwMStj+I9hWyiwDOEHZV+/O5GBsHYdcaDENl9uYsx+f0wdctgVUVc63461Xjjgui W06zx5WZA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiBmt-0002uz-2L; Thu, 26 Nov 2020 07:33:55 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiBml-0002sv-P1; Thu, 26 Nov 2020 07:33:48 +0000 Received: from wens.tw (mirror2.csie.ntu.edu.tw [140.112.30.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B384F20DD4; Thu, 26 Nov 2020 07:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606376025; bh=k//4bcHWV3nCxnjDrzlPndrPPL6OH6Rfq6mk/LsgvYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nQ25SNWDPvlhULo5y/v3hZxy0D5Y5KnvPzF6ryvoGEEIByVcu4bW1oAsdH3EagQdg y3loBePWgef3x4D+CNfLNXR3MC3zq5Il6RFzNlG9Jgx/hbFWeHnkzylSuQe2DiYlR5 7ZucM2vxRUlABizcyz8aPLTBJlliJY0g517QjgA0= Received: by wens.tw (Postfix, from userid 1000) id F103C5FA9D; Thu, 26 Nov 2020 15:33:42 +0800 (CST) From: Chen-Yu Tsai To: Heiko Stuebner , Rob Herring Subject: [PATCH 3/3] arm64: dts: rockchip: rk3328-roc-cc: Enable analog audio Date: Thu, 26 Nov 2020 15:33:36 +0800 Message-Id: <20201126073336.30794-4-wens@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126073336.30794-1-wens@kernel.org> References: <20201126073336.30794-1-wens@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201126_023347_949520_7BEFC5B8 X-CRM114-Status: GOOD ( 12.80 ) 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, Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Chen-Yu Tsai Now that driver support for the RK3328's audio codec, and the plumbing is defined at the SoC level, we can enable analog audio at the board level. Enable analog audio by enabling the codec and the I2S interface connected and the simple-audio-card that binds them together. Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts index 697fce709031..19959bfba451 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts @@ -104,6 +104,14 @@ user_led: led-1 { }; }; +&analog_sound { + status = "okay"; +}; + +&codec { + status = "okay"; +}; + &cpu0 { cpu-supply = <&vdd_arm>; }; @@ -278,6 +286,10 @@ &i2s0 { status = "okay"; }; +&i2s1 { + status = "okay"; +}; + &io_domains { status = "okay";