diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2012-05-02 09:19:16 +0530 |
---|---|---|
committer | Tushar Behera <tushar.behera@linaro.org> | 2012-06-20 11:14:43 +0530 |
commit | 87a4c094508d9f555ccdb9d4f2802b6a120102ea (patch) | |
tree | b41392795b5e58a9b3f125e4a696ab1dfaa7a819 | |
parent | 2e27d644f7baef495a2134fef9bc390eee2e9a44 (diff) |
media: s5p-tv: Add audio support
This patch adds audio support in HDMI driver. This work is heavily based
on commit 3e148baf464e ("drm/exynos: enable hdmi audio feature").
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r-- | drivers/media/video/s5p-tv/hdmi_drv.c | 163 | ||||
-rw-r--r-- | drivers/media/video/s5p-tv/regs-hdmi.h | 107 |
2 files changed, 270 insertions, 0 deletions
diff --git a/drivers/media/video/s5p-tv/hdmi_drv.c b/drivers/media/video/s5p-tv/hdmi_drv.c index a578a5431bc..3ab3c59fc5e 100644 --- a/drivers/media/video/s5p-tv/hdmi_drv.c +++ b/drivers/media/video/s5p-tv/hdmi_drv.c @@ -174,6 +174,167 @@ static irqreturn_t hdmi_irq_handler(int irq, void *dev_data) return IRQ_HANDLED; } +/* Audio related changes */ +static void hdmi_set_acr(u32 freq, u8 *acr) +{ + u32 n, cts; + + switch (freq) { + case 32000: + n = 4096; + cts = 27000; + break; + case 44100: + n = 6272; + cts = 30000; + break; + case 88200: + n = 12544; + cts = 30000; + break; + case 176400: + n = 25088; + cts = 30000; + break; + case 48000: + n = 6144; + cts = 27000; + break; + case 96000: + n = 12288; + cts = 27000; + break; + case 192000: + n = 24576; + cts = 27000; + break; + default: + n = 0; + cts = 0; + break; + } + + acr[1] = cts >> 16; + acr[2] = cts >> 8 & 0xff; + acr[3] = cts & 0xff; + + acr[4] = n >> 16; + acr[5] = n >> 8 & 0xff; + acr[6] = n & 0xff; +} + +static void hdmi_reg_acr(struct hdmi_device *hdev, u8 *acr) +{ + hdmi_writeb(hdev, HDMI_ACR_N0, acr[6]); + hdmi_writeb(hdev, HDMI_ACR_N1, acr[5]); + hdmi_writeb(hdev, HDMI_ACR_N2, acr[4]); + hdmi_writeb(hdev, HDMI_ACR_MCTS0, acr[3]); + hdmi_writeb(hdev, HDMI_ACR_MCTS1, acr[2]); + hdmi_writeb(hdev, HDMI_ACR_MCTS2, acr[1]); + hdmi_writeb(hdev, HDMI_ACR_CTS0, acr[3]); + hdmi_writeb(hdev, HDMI_ACR_CTS1, acr[2]); + hdmi_writeb(hdev, HDMI_ACR_CTS2, acr[1]); + + hdmi_writeb(hdev, HDMI_ACR_CON, 4); +} + +static void hdmi_audio_init(struct hdmi_device *hdev) +{ + u32 sample_rate, bits_per_sample, frame_size_code; + u32 data_num, bit_ch, sample_frq; + u32 val; + u8 acr[7]; + + sample_rate = 44100; + bits_per_sample = 16; + frame_size_code = 0; + + switch (bits_per_sample) { + case 20: + data_num = 2; + bit_ch = 1; + break; + case 24: + data_num = 3; + bit_ch = 1; + break; + default: + data_num = 1; + bit_ch = 0; + break; + } + + hdmi_set_acr(sample_rate, acr); + hdmi_reg_acr(hdev, acr); + + hdmi_writeb(hdev, HDMI_I2S_MUX_CON, HDMI_I2S_IN_DISABLE + | HDMI_I2S_AUD_I2S | HDMI_I2S_CUV_I2S_ENABLE + | HDMI_I2S_MUX_ENABLE); + + hdmi_writeb(hdev, HDMI_I2S_MUX_CH, HDMI_I2S_CH0_EN + | HDMI_I2S_CH1_EN | HDMI_I2S_CH2_EN); + + hdmi_writeb(hdev, HDMI_I2S_MUX_CUV, HDMI_I2S_CUV_RL_EN); + + sample_frq = (sample_rate == 44100) ? 0 : + (sample_rate == 48000) ? 2 : + (sample_rate == 32000) ? 3 : + (sample_rate == 96000) ? 0xa : 0x0; + + hdmi_writeb(hdev, HDMI_I2S_CLK_CON, HDMI_I2S_CLK_DIS); + hdmi_writeb(hdev, HDMI_I2S_CLK_CON, HDMI_I2S_CLK_EN); + + val = hdmi_read(hdev, HDMI_I2S_DSD_CON) | 0x01; + hdmi_writeb(hdev, HDMI_I2S_DSD_CON, val); + + /* Configuration I2S input ports. Configure I2S_PIN_SEL_0~4 */ + hdmi_writeb(hdev, HDMI_I2S_PIN_SEL_0, HDMI_I2S_SEL_SCLK(5) + | HDMI_I2S_SEL_LRCK(6)); + hdmi_writeb(hdev, HDMI_I2S_PIN_SEL_1, HDMI_I2S_SEL_SDATA1(3) + | HDMI_I2S_SEL_SDATA2(4)); + hdmi_writeb(hdev, HDMI_I2S_PIN_SEL_2, HDMI_I2S_SEL_SDATA3(1) + | HDMI_I2S_SEL_SDATA2(2)); + hdmi_writeb(hdev, HDMI_I2S_PIN_SEL_3, HDMI_I2S_SEL_DSD(0)); + + /* I2S_CON_1 & 2 */ + hdmi_writeb(hdev, HDMI_I2S_CON_1, HDMI_I2S_SCLK_FALLING_EDGE + | HDMI_I2S_L_CH_LOW_POL); + hdmi_writeb(hdev, HDMI_I2S_CON_2, HDMI_I2S_MSB_FIRST_MODE + | HDMI_I2S_SET_BIT_CH(bit_ch) + | HDMI_I2S_SET_SDATA_BIT(data_num) + | HDMI_I2S_BASIC_FORMAT); + + /* Configure register related to CUV information */ + hdmi_writeb(hdev, HDMI_I2S_CH_ST_0, HDMI_I2S_CH_STATUS_MODE_0 + | HDMI_I2S_2AUD_CH_WITHOUT_PREEMPH + | HDMI_I2S_COPYRIGHT + | HDMI_I2S_LINEAR_PCM + | HDMI_I2S_CONSUMER_FORMAT); + hdmi_writeb(hdev, HDMI_I2S_CH_ST_1, HDMI_I2S_CD_PLAYER); + hdmi_writeb(hdev, HDMI_I2S_CH_ST_2, HDMI_I2S_SET_SOURCE_NUM(0)); + hdmi_writeb(hdev, HDMI_I2S_CH_ST_3, HDMI_I2S_CLK_ACCUR_LEVEL_2 + | HDMI_I2S_SET_SMP_FREQ(sample_frq)); + hdmi_writeb(hdev, HDMI_I2S_CH_ST_4, + HDMI_I2S_ORG_SMP_FREQ_44_1 + | HDMI_I2S_WORD_LEN_MAX24_24BITS + | HDMI_I2S_WORD_LEN_MAX_24BITS); + + hdmi_writeb(hdev, HDMI_I2S_CH_ST_CON, HDMI_I2S_CH_STATUS_RELOAD); +} + +static void hdmi_audio_control(struct hdmi_device *hdev, bool onoff) +{ + u32 mod; + + mod = hdmi_read(hdev, HDMI_MODE_SEL); + if (mod & HDMI_MODE_DVI_EN) + return; + + hdmi_writeb(hdev, HDMI_AUI_CON, onoff ? 2 : 0); + hdmi_write_mask(hdev, HDMI_CON_0, onoff ? + HDMI_ASP_EN : HDMI_ASP_DIS, HDMI_ASP_MASK); +} + static void hdmi_reg_init(struct hdmi_device *hdev) { /* enable HPD interrupts */ @@ -280,9 +441,11 @@ static int hdmi_conf_apply(struct hdmi_device *hdmi_dev) mdelay(10); hdmi_reg_init(hdmi_dev); + hdmi_audio_init(hdmi_dev); /* setting core registers */ hdmi_timing_apply(hdmi_dev, conf); + hdmi_audio_control(hdmi_dev, true); hdmi_dev->cur_conf_dirty = 0; diff --git a/drivers/media/video/s5p-tv/regs-hdmi.h b/drivers/media/video/s5p-tv/regs-hdmi.h index a889d1f57f2..5d028368120 100644 --- a/drivers/media/video/s5p-tv/regs-hdmi.h +++ b/drivers/media/video/s5p-tv/regs-hdmi.h @@ -19,6 +19,7 @@ #define HDMI_CTRL_BASE(x) ((x) + 0x00000000) #define HDMI_CORE_BASE(x) ((x) + 0x00010000) +#define HDMI_I2S_BASE(x) ((x) + 0x00040000) #define HDMI_TG_BASE(x) ((x) + 0x00050000) /* Control registers */ @@ -73,6 +74,20 @@ #define HDMI_VIDEO_PATTERN_GEN HDMI_CORE_BASE(0x05C4) #define HDMI_HPD_GEN HDMI_CORE_BASE(0x05C8) +/* Audio related registers */ +#define HDMI_ACR_CON HDMI_CORE_BASE(0x0180) +#define HDMI_ACR_MCTS0 HDMI_CORE_BASE(0x0184) +#define HDMI_ACR_MCTS1 HDMI_CORE_BASE(0x0188) +#define HDMI_ACR_MCTS2 HDMI_CORE_BASE(0x018C) +#define HDMI_ACR_CTS0 HDMI_CORE_BASE(0x0190) +#define HDMI_ACR_CTS1 HDMI_CORE_BASE(0x0194) +#define HDMI_ACR_CTS2 HDMI_CORE_BASE(0x0198) +#define HDMI_ACR_N0 HDMI_CORE_BASE(0x01A0) +#define HDMI_ACR_N1 HDMI_CORE_BASE(0x01A4) +#define HDMI_ACR_N2 HDMI_CORE_BASE(0x01A8) + +#define HDMI_AUI_CON HDMI_CORE_BASE(0x0360) + /* Timing generator registers */ #define HDMI_TG_CMD HDMI_TG_BASE(0x0000) #define HDMI_TG_H_FSZ_L HDMI_TG_BASE(0x0018) @@ -125,6 +140,9 @@ /* HDMI_CON_0 */ #define HDMI_BLUE_SCR_EN (1 << 5) +#define HDMI_ASP_EN (1 << 2) +#define HDMI_ASP_DIS (0 << 2) +#define HDMI_ASP_MASK (1 << 2) #define HDMI_EN (1 << 0) /* HDMI_CON_2 */ @@ -139,6 +157,95 @@ #define HDMI_MODE_DVI_EN (1 << 0) #define HDMI_MODE_MASK (3 << 0) +/* HDMI I2S register */ +#define HDMI_I2S_CLK_CON HDMI_I2S_BASE(0x000) +#define HDMI_I2S_CON_1 HDMI_I2S_BASE(0x004) +#define HDMI_I2S_CON_2 HDMI_I2S_BASE(0x008) +#define HDMI_I2S_PIN_SEL_0 HDMI_I2S_BASE(0x00c) +#define HDMI_I2S_PIN_SEL_1 HDMI_I2S_BASE(0x010) +#define HDMI_I2S_PIN_SEL_2 HDMI_I2S_BASE(0x014) +#define HDMI_I2S_PIN_SEL_3 HDMI_I2S_BASE(0x018) +#define HDMI_I2S_DSD_CON HDMI_I2S_BASE(0x01c) +#define HDMI_I2S_MUX_CON HDMI_I2S_BASE(0x020) +#define HDMI_I2S_CH_ST_CON HDMI_I2S_BASE(0x024) +#define HDMI_I2S_CH_ST_0 HDMI_I2S_BASE(0x028) +#define HDMI_I2S_CH_ST_1 HDMI_I2S_BASE(0x02c) +#define HDMI_I2S_CH_ST_2 HDMI_I2S_BASE(0x030) +#define HDMI_I2S_CH_ST_3 HDMI_I2S_BASE(0x034) +#define HDMI_I2S_CH_ST_4 HDMI_I2S_BASE(0x038) +#define HDMI_I2S_MUX_CH HDMI_I2S_BASE(0x054) +#define HDMI_I2S_MUX_CUV HDMI_I2S_BASE(0x058) + +/* I2S bit definition */ + +/* I2S_CLK_CON */ +#define HDMI_I2S_CLK_DIS (0) +#define HDMI_I2S_CLK_EN (1) + +/* I2S_CON_1 */ +#define HDMI_I2S_SCLK_FALLING_EDGE (0 << 1) +#define HDMI_I2S_L_CH_LOW_POL (0) + +/* I2S_CON_2 */ +#define HDMI_I2S_MSB_FIRST_MODE (0 << 6) +#define HDMI_I2S_BASIC_FORMAT (0) +#define HDMI_I2S_SET_BIT_CH(x) (((x) & 0x7) << 4) +#define HDMI_I2S_SET_SDATA_BIT(x) (((x) & 0x7) << 2) + +/* I2S_PIN_SEL_0 */ +#define HDMI_I2S_SEL_SCLK(x) (((x) & 0x7) << 4) +#define HDMI_I2S_SEL_LRCK(x) ((x) & 0x7) + +/* I2S_PIN_SEL_1 */ +#define HDMI_I2S_SEL_SDATA1(x) (((x) & 0x7) << 4) +#define HDMI_I2S_SEL_SDATA2(x) ((x) & 0x7) + +/* I2S_PIN_SEL_2 */ +#define HDMI_I2S_SEL_SDATA3(x) (((x) & 0x7) << 4) +#define HDMI_I2S_SEL_SDATA4(x) ((x) & 0x7) + +/* I2S_PIN_SEL_3 */ +#define HDMI_I2S_SEL_DSD(x) ((x) & 0x7) + +/* I2S_MUX_CON */ +#define HDMI_I2S_IN_DISABLE (1 << 4) +#define HDMI_I2S_AUD_I2S (1 << 2) +#define HDMI_I2S_CUV_I2S_ENABLE (1 << 1) +#define HDMI_I2S_MUX_ENABLE (1) + +/* I2S_CH_ST_CON */ +#define HDMI_I2S_CH_STATUS_RELOAD (1) + +/* I2S_CH_ST_0 / I2S_CH_ST_SH_0 */ +#define HDMI_I2S_CH_STATUS_MODE_0 (0 << 6) +#define HDMI_I2S_2AUD_CH_WITHOUT_PREEMPH (0 << 3) +#define HDMI_I2S_COPYRIGHT (0 << 2) +#define HDMI_I2S_LINEAR_PCM (0 << 1) +#define HDMI_I2S_CONSUMER_FORMAT (0) + +/* I2S_CH_ST_1 / I2S_CH_ST_SH_1 */ +#define HDMI_I2S_CD_PLAYER (0x00) + +/* I2S_CH_ST_2 / I2S_CH_ST_SH_2 */ +#define HDMI_I2S_SET_SOURCE_NUM(x) ((x) & (0xF)) + +/* I2S_CH_ST_3 / I2S_CH_ST_SH_3 */ +#define HDMI_I2S_CLK_ACCUR_LEVEL_2 (0 << 4) +#define HDMI_I2S_SET_SMP_FREQ(x) ((x) & (0xF)) + +/* I2S_CH_ST_4 / I2S_CH_ST_SH_4 */ +#define HDMI_I2S_ORG_SMP_FREQ_44_1 (0xF << 4) +#define HDMI_I2S_WORD_LEN_MAX24_24BITS (0x5 << 1) +#define HDMI_I2S_WORD_LEN_MAX_24BITS (1) + +/* I2S_MUX_CH */ +#define HDMI_I2S_CH2_EN (3 << 4) +#define HDMI_I2S_CH1_EN (3 << 2) +#define HDMI_I2S_CH0_EN (3) + +/* I2S_MUX_CUV */ +#define HDMI_I2S_CUV_RL_EN (0x03) + /* HDMI_TG_CMD */ #define HDMI_TG_FIELD_EN (1 << 1) #define HDMI_TG_EN (1 << 0) |