Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next
This adds the ASoC codec interfaces for TDA998x HDMI audio from Jyri Sarha. * 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: dts: am335x-boneblack: Add HDMI audio support drm/i2c: tda998x: Register ASoC hdmi-codec and add audio DT binding drm/i2c: tda998x: Improve tda998x_configure_audio() audio related pdata
This commit is contained in:
@@ -1,6 +1,24 @@
|
||||
#ifndef __DRM_I2C_TDA998X_H__
|
||||
#define __DRM_I2C_TDA998X_H__
|
||||
|
||||
#include <linux/hdmi.h>
|
||||
#include <dt-bindings/display/tda998x.h>
|
||||
|
||||
enum {
|
||||
AFMT_UNUSED = 0,
|
||||
AFMT_SPDIF = TDA998x_SPDIF,
|
||||
AFMT_I2S = TDA998x_I2S,
|
||||
};
|
||||
|
||||
struct tda998x_audio_params {
|
||||
u8 config;
|
||||
u8 format;
|
||||
unsigned sample_width;
|
||||
unsigned sample_rate;
|
||||
struct hdmi_audio_infoframe cea;
|
||||
u8 status[5];
|
||||
};
|
||||
|
||||
struct tda998x_encoder_params {
|
||||
u8 swap_b:3;
|
||||
u8 mirr_b:1;
|
||||
@@ -15,16 +33,7 @@ struct tda998x_encoder_params {
|
||||
u8 swap_e:3;
|
||||
u8 mirr_e:1;
|
||||
|
||||
u8 audio_cfg;
|
||||
u8 audio_clk_cfg;
|
||||
u8 audio_frame[6];
|
||||
|
||||
enum {
|
||||
AFMT_SPDIF,
|
||||
AFMT_I2S
|
||||
} audio_format;
|
||||
|
||||
unsigned audio_sample_rate;
|
||||
struct tda998x_audio_params audio_params;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user