From patchwork Fri Mar 20 16:11:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Riesen X-Patchwork-Id: 203041 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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 06274C4332B for ; Fri, 20 Mar 2020 16:25:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D815A20724 for ; Fri, 20 Mar 2020 16:25:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727120AbgCTQZq (ORCPT ); Fri, 20 Mar 2020 12:25:46 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:58869 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727093AbgCTQZq (ORCPT ); Fri, 20 Mar 2020 12:25:46 -0400 Received: from mail.cetitecgmbh.com ([87.190.42.90]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MEC8L-1j5fQr0OW5-00AEqo for ; Fri, 20 Mar 2020 17:25:44 +0100 Received: from pflvmailgateway.corp.cetitec.com (unknown [127.0.0.1]) by mail.cetitecgmbh.com (Postfix) with ESMTP id DD040650374 for ; Fri, 20 Mar 2020 16:25:43 +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 U21_0FIhEPxh for ; Fri, 20 Mar 2020 17:25:43 +0100 (CET) Received: from pfwsexchange.corp.cetitec.com (unknown [10.10.1.99]) by mail.cetitecgmbh.com (Postfix) with ESMTPS id 8D27964F928 for ; Fri, 20 Mar 2020 17:25:43 +0100 (CET) Received: from pflmari.corp.cetitec.com (10.8.5.41) by PFWSEXCHANGE.corp.cetitec.com (10.10.1.99) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 20 Mar 2020 17:25:43 +0100 Received: by pflmari.corp.cetitec.com (Postfix, from userid 1000) id E8DB480501; Fri, 20 Mar 2020 17:11:47 +0100 (CET) Date: Fri, 20 Mar 2020 17:11:47 +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 v3 04/11] media: adv748x: add definitions for audio output related registers 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 References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Originating-IP: [10.8.5.41] 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: 37303A290D7F536A6D7662 X-Provags-ID: V03:K1:r5Z/9UBEjfW+5U64WYUGRa4CmPs+JuE/v3OPUTf6dn+/V66EnuK OjZkgckbt2B6XHxCEwZMw/6vRqWMG0azymgczJVZqu/9K/21L+h1xETISXxY5u4asYKkftT UFddKTy4N/ky0+WOKQ74rmVutly7rHjxshHt7Ltph/a3tYikFfP160tTyqQm2bcxBjFwPrd o5mglV77thJbhj5sU+3Yg== X-UI-Out-Filterresults: notjunk:1; V03:K0:j39cjU4+s3Q=:oJgTfsAd1EYSTRjoxbCwFO jWCR4LVMza1Qk1UqnbVgOSEoS3tnAAaPfmQQLc4eukbVjxStgg/HJYraIhKHc9pyRYai33R71 ibgG5Dck62pVDvYaot5MynR+G8GagUxTc2fH+gwY/R6GF4GLKD9+wdAfHaH2Ke4sjceECBgbb fnZvBge4XxVJWhemkZoVOtlw6lTSNSCLj3lgecx+l9/PuzMFjsKEvOWypP8Dm03njJcL97KB/ DPIvTjAgRleXZmnpGomPCUTSsC/E+mUtUnU4kOl/hVO6pmBTOfLB7Vg5SvLRBaH1BUYfe+7iw Tu010xrHjT01sL5oIzls3DThXyq3p5znUTVyKpUIP479VURlwrJzrxhZgXf8nh+Z4r3iUdBMU f/249v3FrtkpbM5YiQsOgULihI1VqNhpF1RihgClAbzbKHrN0IhQgn7xzyr7a7ibwEz/Sc/3J 0jZN6/8fJW/sGy3HkRTMAvztBqo/rH7fK16WTCXJgFpt1kmU12JAyw661gjmsNH2t4VvsRcut 0pVvYPwTdrYr729bVTzc4EQHXVm5nZAMNDd7cR2X6bzrSfvSc4F6C6q57yO2kwDK4G2iMwBAw 47gw+nFx3DRbs5W0AYeqYzBjbd+SPRRH6OgkW+DFrb3UUsGgOVV7rVbLvvWUu3C6eK8PqwCV5 9x4H5cWh3dt8JAtLta+zLBVibXRCavnus7y8qtlTh+aQ7IDC+I6agc3z6PRu/YUTGA5DMYiAM WVOIM8z+mvHfs38pVH9L0bVLnOtJuXkIqaaKbbqjSTBSuRQq/3UJYJNprdt+BLD50JFXLiE6q 7QetB8W//IRWQqhwjl+QYfrZWiAoYtXsa9Fd9kMkt/dydLgEjls3oc2aq1fPrxmdX57Qpk6 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Signed-off-by: Alexander Riesen --- drivers/media/i2c/adv748x/adv748x.h | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h index 0a9d78c2870b..1a1ea70086c6 100644 --- a/drivers/media/i2c/adv748x/adv748x.h +++ b/drivers/media/i2c/adv748x/adv748x.h @@ -226,6 +226,11 @@ struct adv748x_state { #define ADV748X_IO_VID_STD 0x05 +#define ADV748X_IO_PAD_CONTROLS 0x0e +#define ADV748X_IO_PAD_CONTROLS_TRI_AUD BIT(5) +#define ADV748X_IO_PAD_CONTROLS_PDN_AUD BIT(1) +#define ADV748X_IO_PAD_CONTROLS1 0x1d + #define ADV748X_IO_10 0x10 /* io_reg_10 */ #define ADV748X_IO_10_CSI4_EN BIT(7) #define ADV748X_IO_10_CSI1_EN BIT(6) @@ -248,7 +253,21 @@ struct adv748x_state { #define ADV748X_IO_REG_FF 0xff #define ADV748X_IO_REG_FF_MAIN_RESET 0xff +/* DPLL Map */ +#define ADV748X_DPLL_MCLK_FS 0xb5 +#define ADV748X_DPLL_MCLK_FS_N_MASK GENMASK(2, 0) + /* HDMI RX Map */ +#define ADV748X_HDMI_I2S 0x03 /* I2S mode and width */ +#define ADV748X_HDMI_I2SBITWIDTH_MASK GENMASK(4, 0) +#define ADV748X_HDMI_I2SOUTMODE_SHIFT 5 +#define ADV748X_HDMI_I2SOUTMODE_MASK \ + GENMASK(6, ADV748X_HDMI_I2SOUTMODE_SHIFT) +#define ADV748X_I2SOUTMODE_I2S 0 +#define ADV748X_I2SOUTMODE_RIGHT_J 1 +#define ADV748X_I2SOUTMODE_LEFT_J 2 +#define ADV748X_I2SOUTMODE_SPDIF 3 + #define ADV748X_HDMI_LW1 0x07 /* line width_1 */ #define ADV748X_HDMI_LW1_VERT_FILTER BIT(7) #define ADV748X_HDMI_LW1_DE_REGEN BIT(5) @@ -260,6 +279,16 @@ struct adv748x_state { #define ADV748X_HDMI_F1H1 0x0b /* field1 height_1 */ #define ADV748X_HDMI_F1H1_INTERLACED BIT(5) +#define ADV748X_HDMI_MUTE_CTRL 0x1a +#define ADV748X_HDMI_MUTE_CTRL_MUTE_AUDIO BIT(4) +#define ADV748X_HDMI_MUTE_CTRL_WAIT_UNMUTE_MASK GENMASK(3, 1) +#define ADV748X_HDMI_MUTE_CTRL_NOT_AUTO_UNMUTE BIT(0) + +#define ADV748X_HDMI_AUDIO_MUTE_SPEED 0x0f +#define ADV748X_HDMI_AUDIO_MUTE_SPEED_MASK GENMASK(4, 0) +#define ADV748X_MAN_AUDIO_DL_BYPASS BIT(7) +#define ADV748X_AUDIO_DELAY_LINE_BYPASS BIT(6) + #define ADV748X_HDMI_HFRONT_PORCH 0x20 /* hsync_front_porch_1 */ #define ADV748X_HDMI_HFRONT_PORCH_MASK 0x1fff @@ -281,6 +310,9 @@ struct adv748x_state { #define ADV748X_HDMI_TMDS_1 0x51 /* hdmi_reg_51 */ #define ADV748X_HDMI_TMDS_2 0x52 /* hdmi_reg_52 */ +#define ADV748X_HDMI_REG_6D 0x6d /* hdmi_reg_6d */ +#define ADV748X_I2S_TDM_MODE_ENABLE BIT(7) + /* HDMI RX Repeater Map */ #define ADV748X_REPEATER_EDID_SZ 0x70 /* primary_edid_size */ #define ADV748X_REPEATER_EDID_SZ_SHIFT 4