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: 210340 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.8 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 418DDC43331 for ; Thu, 2 Apr 2020 18:36:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1392820675 for ; Thu, 2 Apr 2020 18:36:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389780AbgDBSgV (ORCPT ); Thu, 2 Apr 2020 14:36:21 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:39219 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729033AbgDBSgV (ORCPT ); Thu, 2 Apr 2020 14:36:21 -0400 Received: from mail.cetitecgmbh.com ([87.190.42.90]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N4Q4m-1j9ns43cQQ-011Q2O for ; Thu, 02 Apr 2020 20:36:18 +0200 Received: from pflvmailgateway.corp.cetitec.com (unknown [127.0.0.1]) by mail.cetitecgmbh.com (Postfix) with ESMTP id 983BE650985 for ; Thu, 2 Apr 2020 18:36:18 +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 5mdn_PTe481d for ; Thu, 2 Apr 2020 20:36:18 +0200 (CEST) Received: from pfwsexchange.corp.cetitec.com (unknown [10.10.1.99]) by mail.cetitecgmbh.com (Postfix) with ESMTPS id 27CD164B5A4 for ; Thu, 2 Apr 2020 20:36:18 +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:18 +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:NEL4j14OTLE+E/h1KkMfY6rGRcLirqUPR42G4fCn0yYLp7woJu5 3GGakHSNAsUwfoTInZNcKcqZzrAVIvN4FAj1PkPDtG3iOZZ6/EwvD7VZnaBLRICtu2Bwvn1 /TjFrwD5XjULJd3UkqdywSFm5nOyYWYqTxJmIrkwWHczXaWehZDX970RGzANKdUOPgpE+26 byCtWkAHo7N/6VgafY2HQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:CzJ2fqtLjSk=:n4rCATJomSkSNBdJwZ49e8 YVIjxS5CypZklT/0bUmZ/Z8MPZpMGSXl6uyN6KMgcGpgCZhIIRoFT2xU/TrBJHIrdnHNWS4Ns kC6whJq+ghWKIqwdMpaYBJLzhyJz1/Xy6udtSn67PKLlBvk8x3bzK0u7WTHPIXVCGqADuYytA Lau+imp2EJuCH0Cd7G1PPI/a7v2++ruS99DeaZKJj4tC5kLiztC5lYNH+9/0fmJIyqHB7fcVu 2NuUbfs8b14P+LiM84Q9BT9I0+m+ewuGlGkBxjrMNOatGciqiobouhvOqqm77pxo+R9d5DLsR ZD6YXjxeYV6VJ0nO4LHSVyeY8jH3Y8evplHLw6wt6wDom5D5cjHYLlQ0O7fUfq11UmFTdunhW 2T+zySsNsWoAud6kO78Be3YMQQfZAivsbR2iO3EvaFN3nJwQsBRTt33rAInDmzqpvD640zOsB wHmqDB0H1EJqwqu9Htl5hj2twAyaYZGbMTy4sBrEgI71Xqx9gQvHP7ys9lArPmfIR6NW/HxrZ RPR1IYZYbi+PaShSQ/tIp6jIf03II2b/FaA2SnLgSNXnmL0PBiV4nQVmcLaHjTk4QsOVZSP1/ 3B3xSwaFTA/shKqwD3pEAOvQM/nIgENdLbJjy7XBollfN7td9h8583u5a2pRc2KJqlxktDPSx 0WtHgA//juIMNpqzLkeOJf320/KIuXx5Qc9vd0lUGHRZpW+1uuftyxWw+gBaN3th1iplHcmln 4BldLXqhpOZ02KMGpn0CCQJ2MyycdjVOu4fQgY40b0skRWj2Wg1VKYsDvgBeNj8IQzH02IqM3 CFTg64FVWU49GWLMHoBm1xkUxhlWfWRFz1xxZw1PjOEWSiJ8/z3RnlxFilpdgghGa14/uyL Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@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