From patchwork Thu Apr 2 18:33:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Riesen X-Patchwork-Id: 11471231 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 27E6414DD for ; Thu, 2 Apr 2020 18:36:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0465A2064A for ; Thu, 2 Apr 2020 18:36:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389788AbgDBSgh (ORCPT ); Thu, 2 Apr 2020 14:36:37 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:60521 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729033AbgDBSgh (ORCPT ); Thu, 2 Apr 2020 14:36:37 -0400 Received: from mail.cetitecgmbh.com ([87.190.42.90]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mdv2u-1ijN2a1zde-00azv9 for ; Thu, 02 Apr 2020 20:36:34 +0200 Received: from pflvmailgateway.corp.cetitec.com (unknown [127.0.0.1]) by mail.cetitecgmbh.com (Postfix) with ESMTP id 39532650985 for ; Thu, 2 Apr 2020 18:36:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at cetitec.com Received: from mail.cetitecgmbh.com ([127.0.0.1]) by pflvmailgateway.corp.cetitec.com (pflvmailgateway.corp.cetitec.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q8hTx5NwelqI for ; Thu, 2 Apr 2020 20:36:33 +0200 (CEST) Received: from pfwsexchange.corp.cetitec.com (unknown [10.10.1.99]) by mail.cetitecgmbh.com (Postfix) with ESMTPS id B6BF865084E for ; Thu, 2 Apr 2020 20:36:33 +0200 (CEST) Received: from pflmari.corp.cetitec.com (10.8.5.12) by PFWSEXCHANGE.corp.cetitec.com (10.10.1.99) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 2 Apr 2020 20:36:33 +0200 Received: by pflmari.corp.cetitec.com (Postfix, from userid 1000) id BBC93804FB; Thu, 2 Apr 2020 20:33:58 +0200 (CEST) Date: Thu, 2 Apr 2020 20:33:58 +0200 From: Alex Riesen To: Kieran Bingham CC: Geert Uytterhoeven , Mauro Carvalho Chehab , Hans Verkuil , "Laurent Pinchart" , Rob Herring , Mark Rutland , Kuninori Morimoto , , , , , Subject: [PATCH v5 0/9] media: adv748x: add support for HDMI audio Message-ID: Mail-Followup-To: Alex Riesen , Kieran Bingham , Geert Uytterhoeven , Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Rob Herring , Mark Rutland , Kuninori Morimoto , devel@driverdev.osuosl.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline X-Originating-IP: [10.8.5.12] X-ClientProxiedBy: PFWSEXCHANGE.corp.cetitec.com (10.10.1.99) To PFWSEXCHANGE.corp.cetitec.com (10.10.1.99) X-EsetResult: clean, is OK X-EsetId: 37303A290D7F536A6C7266 X-Provags-ID: V03:K1:9GjbDMdHRo2FM7iu8FfWDwBRJjW2z62kP2bXYNPMmTCuEf00/5G dIvvdsG5GJLAkkJw2jTjH94wxpByCgp/7QLefxOAdRqSHbu9gCltTQZo0rrvhp7AZJJ27RW yQDwNUC/mpiCrRyXJoAKfUi7HuEi0pNNo2wLMvVHas+CWKqujKT+XeOObS/g2gt7nwWaX5z A4QCc2GftBWcLTyw9+FKw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:cTa78QsUn0w=:+jvkWMfYigw/LnF+TqIgpf v/1p8Fk2AKF6divUbXMEAu4D1dRP3FO5i3qa+ySz6u81h29nPq2kVnbYC/lJkwWOtBvPF//m4 nqYxjqZCLTVbRWRq0g0bBBoVgPGWzDtx18nNSwpxgX4Xu9CuLY7ZtHs4fv12TSnv5Wm/Tf6+I NAZLZljyPHkRUEnNZetdcmLsRvAGnFUpOq2lKpBiGwQVMfY4TvWvzcjtv1sDqYvNRvUhAsJii XI64BJtoT27ftkE9T6yJjOK4+CAgILXgGMitIe8+blGbzYg5pau/qe60kIYaoFUrTC96b3Xk3 w7KFkqY9JlqiNpinV42tbswcs4ewz85JebzwxcAWlfgwFtQKPWABO17YaqFofDykjSjPl5Pn2 /LIqLTTbfxBQbJEKXrtSU3PYnJAJ5fNuIOhTlLFMPkf5OT/SghoK4fPeCTi2nwJ2sWn+hBbyq ygglPkdwNCHcCBeSQtXCGMPs9yUvKx6clQwtb65DU4NMJbLaKItPEdGhySi2a8Z9T59ZXid4g yNeAZkJVzWD6T1dUVuLF9buc0w8JBdt5/XpolAyQOhz6KYVohc4zEIhOALRpPBglWlL/olZGu IOZ4/GSr5I82sKrgwAMGZXfo+tCbnqKYV195FuOe0OnREZfIqnAUzk5Q8T0HUtoexCSwlU1+8 wMPKTKrY4+OqY5/m7Xtcfpn0jLfnUdRLU17VQY/FJFX0aJotTK/31URV5/mV/qxsrJhs8flVi R+3Uj5KrG3uNK//ra6DM429Z6sX4vh4uiUyx70tktGxdyLJ1NMuI6VqbN0RkAr8UYfTyEgRQe gQbfCLUMNYgZb8kLG142Ve40qMGhY25BIHk1le1GUPb6j8GdX0QKUUJwOXfImJDVlZ/V5aQ Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org This adds minimal support for accessing the HDMI audio provided through the I2S port available on ADV7481 and ADV7482 decoder devices by ADI. The port carries audio signal from the decoded HDMI stream. Currently, the driver only supports I2S in TDM, 8 channels a 24bit at 48kHz. Furthermore, only left-justified, 8 slots, 32bit/slot TDM, at 256fs has been ever tried. An ADV7482 on the Renesas Salvator-X ES1.1 (R8A77950 SoC) was used during development of this code. Changes since v4: - rebased on v5.6 - Add dummy ssi4 node to the rcar sound card, as the r8a77961 devices also reference salvator-common.dts. Suggested-by: Geert Uytterhoeven Changes since v3: - use clk_hw instead of clk Suggested-by: Stephen Boyd - formatting improvements and use const where possible - removed implementation of log_status and EDID setting ioctls, those will be submitted as separate patches. Suggested-by: Hans Verkuil Changes since v2: - prepare/enable the clock when it is used, as it seems nothing else does this otherwise - give the clock a unique name to ensure it can be registered if there are multiple adv748x devices in the system - remove optionality note from clock cell description to ensure the device description matches the real device (the line is always present, even if not used) Changes since v1: - Add ssi4_ctrl pin group to the sound pins. The pins are responsible for SCK4 (sample clock) WS4 and (word boundary input), and are required for SSI audio input over I2S. Reported-by: Geert Uytterhoeven - Removed the audio clock C from the list of clocks of adv748x, it is exactly the other way around. Reported-by: Geert Uytterhoeven - Add an instance of (currently) fixed rate I2S master clock (MCLK), connected to the audio_clk_c line of the R-Car SoC. Explicitly declare the device a clock producer and add it to the list of clocks used by the audio system of the Salvator-X board. Suggested-by: Geert Uytterhoeven - The implementation of DAI driver has been moved in a separate file and modified to activate audio decoding and I2S streaming using snd_soc_dai_... interfaces. This allows the driver to be used with just ALSA interfaces. - The ioctls for selecting audio output and muting have been removed, as not applicable. Suggested-by: Hans Verkuil I have left implementation of the QUERYCAP in, as it seems to be required by v4l-ctl to support loading of EDID for this node. And setting the EDID is one feature I desperately need: there are devices which plainly refuse to talk to the sink if it does not provide EDID they like. - A device tree configuration without audio port will disable the audio code altogether, supporting integrations where the port is not connected. - The patches have been re-arranged, starting with the generic changes and changes not related to audio directly. Those will be probably sent as a separate series later. - The whole series has been rebased on top of v5.6-rc6 Alex Riesen (9): media: adv748x: fix end-of-line terminators in diagnostic statements media: adv748x: include everything adv748x.h needs into the file media: adv748x: reduce amount of code for bitwise modifications of device registers media: adv748x: add definitions for audio output related registers media: adv748x: add support for HDMI audio media: adv748x: prepare/enable mclk when the audio is used media: adv748x: only activate DAI if it is described in device tree dt-bindings: adv748x: add information about serial audio interface (I2S/TDM) arm64: dts: renesas: salvator: add a connection from adv748x codec (HDMI input) to the R-Car SoC .../devicetree/bindings/media/i2c/adv748x.txt | 16 +- .../boot/dts/renesas/r8a77950-salvator-x.dts | 3 +- arch/arm64/boot/dts/renesas/r8a77961.dtsi | 1 + .../boot/dts/renesas/salvator-common.dtsi | 47 ++- drivers/media/i2c/adv748x/Makefile | 3 +- drivers/media/i2c/adv748x/adv748x-afe.c | 6 +- drivers/media/i2c/adv748x/adv748x-core.c | 45 +-- drivers/media/i2c/adv748x/adv748x-csi2.c | 8 +- drivers/media/i2c/adv748x/adv748x-dai.c | 278 ++++++++++++++++++ drivers/media/i2c/adv748x/adv748x-hdmi.c | 6 +- drivers/media/i2c/adv748x/adv748x.h | 65 +++- 11 files changed, 436 insertions(+), 42 deletions(-) create mode 100644 drivers/media/i2c/adv748x/adv748x-dai.c