diff options
| author | Robert Baldyga <r.baldyga@samsung.com> | 2014-08-06 07:37:30 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:35 +0900 |
| commit | 5462edbc9b85a8a05176d6d1da43569f150e37eb (patch) | |
| tree | 0746c4324446b685366d9d53b8f333da3b95b2f8 /drivers/gpu/drm/exynos/exynos_hdmi.c | |
| parent | 58026d71c85ddca3803d572b54e6bd55dcc32a9b (diff) | |
| download | linux-3.10-5462edbc9b85a8a05176d6d1da43569f150e37eb.tar.gz linux-3.10-5462edbc9b85a8a05176d6d1da43569f150e37eb.tar.bz2 linux-3.10-5462edbc9b85a8a05176d6d1da43569f150e37eb.zip | |
drm/exynos: hdmi: fix macros for audio registers
This patch fix two things:
- Remove duplicated HDMI_I2S_SEL_SDATA2(x) macro definition, add
missing HDMI_I2S_SEL_SDATA0(x) macro and fix macro usage.
- Fix HDMI_I2S_IN_DISABLE and HDMI_I2S_IN_ENABLE values and fix
macro usage.
Change-Id: I172913a61011292c3c912a3e8ccd84109924b906
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_hdmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index eabf38bc858..26a90e02299 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1083,7 +1083,7 @@ static void hdmi_audio_init(struct hdmi_context *hdata) hdmi_set_acr(sample_rate, acr); hdmi_reg_acr(hdata, acr); - hdmi_reg_writeb(hdata, HDMI_I2S_MUX_CON, HDMI_I2S_IN_DISABLE + hdmi_reg_writeb(hdata, HDMI_I2S_MUX_CON, HDMI_I2S_IN_ENABLE | HDMI_I2S_AUD_I2S | HDMI_I2S_CUV_I2S_ENABLE | HDMI_I2S_MUX_ENABLE); @@ -1107,7 +1107,7 @@ static void hdmi_audio_init(struct hdmi_context *hdata) hdmi_reg_writeb(hdata, HDMI_I2S_PIN_SEL_0, HDMI_I2S_SEL_SCLK(5) | HDMI_I2S_SEL_LRCK(6)); hdmi_reg_writeb(hdata, HDMI_I2S_PIN_SEL_1, HDMI_I2S_SEL_SDATA1(1) - | HDMI_I2S_SEL_SDATA2(4)); + | HDMI_I2S_SEL_SDATA0(4)); hdmi_reg_writeb(hdata, HDMI_I2S_PIN_SEL_2, HDMI_I2S_SEL_SDATA3(1) | HDMI_I2S_SEL_SDATA2(2)); hdmi_reg_writeb(hdata, HDMI_I2S_PIN_SEL_3, HDMI_I2S_SEL_DSD(0)); |