public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Wang Xingchao <xingchao.wang@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: paulo.r.zanoni@intel.com
Subject: [PATCH V2 1/4] drm/i915: HSW audio registers definition
Date: Tue, 31 Jul 2012 10:47:02 +0800	[thread overview]
Message-ID: <1343702825-15439-2-git-send-email-xingchao.wang@intel.com> (raw)
In-Reply-To: <1343702825-15439-1-git-send-email-xingchao.wang@intel.com>

Add hsw audio registers definition

Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h |   46 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 1310caa..00b0182 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4277,6 +4277,52 @@
 #define   AUD_CONFIG_PIXEL_CLOCK_HDMI		(0xf << 16)
 #define   AUD_CONFIG_DISABLE_NCTS		(1 << 3)
 
+/* HSW Audio */
+#define   HSW_AUD_CONFIG_A			0x65000 /*Audio Configuration Transcoder A*/
+#define   HSW_AUD_CONFIG_B			0x65100 /*Audio Configuration Transcoder B*/
+#define   HSW_AUD_CFG(pipe) _PIPE(pipe, \
+					HSW_AUD_CONFIG_A, \
+					HSW_AUD_CONFIG_B)
+#define   HSW_AUD_MISC_CTRL_A			0x65010 /*Audio Misc Control Convert 1*/
+#define   HSW_AUD_MISC_CTRL_B			0x65110 /*Audio Misc Control Convert 2*/
+#define   HSW_AUD_MISC_CTRL(pipe) _PIPE(pipe, \
+					HSW_AUD_MISC_CTRL_A, \
+					HSW_AUD_MISC_CTRL_B)
+
+#define   HSW_AUD_DIP_ELD_CTRL_ST_A		0x650b4 /*Audio DIP and ELD Control State Transcoder A*/
+#define   HSW_AUD_DIP_ELD_CTRL_ST_B		0x651b4 /*Audio DIP and ELD Control State Transcoder B*/
+#define   HSW_AUD_DIP_ELD_CTRL(pipe) _PIPE(pipe, \
+					HSW_AUD_DIP_ELD_CTRL_ST_A, \
+					HSW_AUD_DIP_ELD_CTRL_ST_B)
+
+#define   HSW_AUD_PIPE_CONV_CFG			0x6507c /*Audio pipe and converter configs*/
+#define   HSW_AUD_PIN_ELD_CP_VLD		0x650c0 /*Audio ELD and CP Ready Status*/
+#define   AUDIO_INACTIVE_C			(1<<11)
+#define   AUDIO_INACTIVE_B			(1<<7)
+#define   AUDIO_INACTIVE_A			(1<<3)
+#define   AUDIO_OUTPUT_ENABLE_AB		(1<<2)
+#define   AUDIO_OUTPUT_ENABLE_BC		(1<<6)
+#define   AUDIO_OUTPUT_ENABLE_CD		(1<<10)
+#define   AUDIO_ELD_VALID_AB			(1<<0)
+#define   AUDIO_ELD_VALID_BC			(1<<4)
+#define   AUDIO_ELD_VALID_CD			(1<<8)
+#define   AUDIO_CP_READY_AB			(1<<1)
+#define   AUDIO_CP_READY_BC			(1<<5)
+#define   AUDIO_CP_READY_CD			(1<<9)
+
+/* Audio Digital Converter*/
+#define   HSW_AUD_DIG_CNVT_1			0x65080 /*Audio Converter 1*/
+#define   HSW_AUD_DIG_CNVT_2			0x65180 /*Audio Converter 1*/
+#define   HSW_AUD_DIG_CNVT_3			0x65280 /*Audio Converter 1*/
+
+#define   HSW_AUD_EDID_DATA			0x65050
+
+#define   TRANS_CONF_A				0xf0008
+#define   AUD_PB_UNSL_DEV_CP			0x65fb0
+#define   AUD_PC_UNSL_DEV_CP			0x65fb4
+#define   AUD_PD_UNSL_DEV_CP			0x65fb8
+
+
 /* HSW Power Wells */
 #define HSW_PWR_WELL_CTL1		0x45400		/* BIOS */
 #define HSW_PWR_WELL_CTL2		0x45404		/* Driver */
-- 
1.7.9.5

  reply	other threads:[~2012-07-31  2:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-31  2:47 [PATCH v2 0/4] Haswell HDMI/DP audio enable Wang Xingchao
2012-07-31  2:47 ` Wang Xingchao [this message]
2012-07-31  2:47 ` [PATCH V2 2/4] drm/i915: write eld info for HDMI audio Wang Xingchao
2012-07-31  2:47 ` [PATCH V2 3/4] drm/i915: Haswell HDMI audio enable Wang Xingchao
2012-08-02  2:12   ` Paulo Zanoni
2012-08-06  7:07     ` Daniel Vetter
2012-08-06 10:10       ` Wang, Xingchao
2012-07-31  2:47 ` [PATCH V2 4/4] ALSA HDA: Force HDMI pins enabled Wang Xingchao
2012-07-31 11:18   ` Takashi Iwai
2012-08-01  0:27     ` Wang, Xingchao
2012-08-01  5:55       ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1343702825-15439-2-git-send-email-xingchao.wang@intel.com \
    --to=xingchao.wang@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=paulo.r.zanoni@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox