From patchwork Thu Mar 26 10:34:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Riesen X-Patchwork-Id: 202784 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=-0.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=no 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 039F9C43331 for ; Thu, 26 Mar 2020 10:35:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE65720748 for ; Thu, 26 Mar 2020 10:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727773AbgCZKf2 (ORCPT ); Thu, 26 Mar 2020 06:35:28 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:39685 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727560AbgCZKf2 (ORCPT ); Thu, 26 Mar 2020 06:35:28 -0400 Received: from mail.cetitecgmbh.com ([87.190.42.90]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MWRi7-1ilNAc2fal-00XvMW for ; Thu, 26 Mar 2020 11:35:25 +0100 Received: from pflvmailgateway.corp.cetitec.com (unknown [127.0.0.1]) by mail.cetitecgmbh.com (Postfix) with ESMTP id 65D88650370 for ; Thu, 26 Mar 2020 10:35:25 +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 jrxaBzmZLCoJ for ; Thu, 26 Mar 2020 11:35:24 +0100 (CET) Received: from pfwsexchange.corp.cetitec.com (unknown [10.10.1.99]) by mail.cetitecgmbh.com (Postfix) with ESMTPS id EE19664FAEC for ; Thu, 26 Mar 2020 11:35:24 +0100 (CET) Received: from pflmari.corp.cetitec.com (10.8.5.79) by PFWSEXCHANGE.corp.cetitec.com (10.10.1.99) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 26 Mar 2020 11:35:24 +0100 Received: by pflmari.corp.cetitec.com (Postfix, from userid 1000) id 5832D804FB; Thu, 26 Mar 2020 11:34:54 +0100 (CET) Date: Thu, 26 Mar 2020 11:34:54 +0100 From: Alex Riesen To: Kieran Bingham CC: Geert Uytterhoeven , Mauro Carvalho Chehab , Hans Verkuil , "Laurent Pinchart" , Rob Herring , Mark Rutland , Kuninori Morimoto , , , , , Subject: [PATCH v4 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.79] 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: 37303A290D7F536A6D7C67 X-Provags-ID: V03:K1:KFtmkScsvQXDtH5wpfdqyAJdIPEt8446wmdoh3RbxC18xii8g0q O6CugshiHK0IeUGHX3PRrNJ/ypdDLR6RC5MldZK5gS2VGGyi18bC6/8kNoeOUg4Cy3boBTC ZkwVqYFS1/aa/HNUnRnDJHNyXj0+B1AyBe8Jo7En13Nw7DjYvbvqFsuVgU8tu574Vj0WbGK yAeErPcrNwan4voKqrITA== X-UI-Out-Filterresults: notjunk:1; V03:K0:1E0PJzZkc/Q=:Ts8fb4rYtEbogd8MsAQ1n0 lUE6QfxJhUQBLBRc9DtIGou7/9JxeMI4XCdUvOyermzS/YkWWIcw9x7MxRGk+yNgZPDqX+Nbx HsCoqynFSeDxAy2D5K6irfwuc4yBeoAKqFdkHCK+q0kUvVUj6o7GlAdhB6h84PXTR8ahcCTKq ywRwIQdy/UUZJ/3Xnb1nKpkvtg74ULiTNsPCn3idXU5rxIQqdOFLwbx8RWcrLcdb6sJU6IrxL SIsRLRIsmZ1jNoVdq/rvHbnPRSCSAvAtgO6jSk5QI71noK4UqmVFIde9GJqEI8re9m3/3wkQy 4/SpbvCsTiroNWwd80ln7+jwvWGVRLVoLQwoBw9CaB2nnX1/B2uy4e4vgIAg2MEDXQc87cyaR NgAFyW6P874PUK2Zu2fGGD+8R1hDW2FNdNiM09CY7acGFHY+967gjRKvLzZs5O4Dl3F+6whwf aVdfuG2nyuAVp4Um2tENo0pUeWLB1GW5NF9MkM6tf6hA2/VKPgVTsLJYRwWAgyqxP6hykBmnO Fczsv+2tuDuT4vKcmykggsRsNBDiTdsRwpKFFQBWYSpKLGS39bGfG//E2Zwi/YjsKUGvToCzk L37QcNWijuPTFMp108X7q6536wVFeOx0AtckYopvJKnnfCYECYDZbOlF0TmT1XO9ZhRIPTPjo XexEDA+PuWdvEQdEspQEadoRuCx21pfT3WC1x0E20Zp+hNJVLj6bVLvQSPjyUAocoKNkIaw5W O5XyJifQnuxftuM54ladXxBKOuiZQ+Dc29fK9feI7Y+ZDp2pgzvEROkuq0MBk1jKOG2rxy5Wx dvsWFBA5YSdcAijCVQYgUkJDylilckBHwvfcA7uEDEhIZnMXSNEjOCKF8nRnWVqeODjXrkc Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@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 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 +- .../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 +++- 10 files changed, 435 insertions(+), 42 deletions(-) create mode 100644 drivers/media/i2c/adv748x/adv748x-dai.c