Hi John, Thank you for the patch. On Monday 29 Aug 2016 16:41:34 John Stultz wrote: > This patch adds support to Audio for both adv7511 and adv7533 > bridge chips. > > This patch was originally from [1] by Lars-Peter Clausen <lars@xxxxxxxxxx> > and was adapted by Archit Taneja <architt@xxxxxxxxxxxxxx> and > Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>. > > Then I heavily reworked it to use the hdmi-codec driver. So credit > to them, but blame to me. > > [1] > https://github.com/analogdevicesinc/linux/blob/xcomm_zynq/drivers/gpu/drm/i > 2c/adv7511_audio.c > > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Archit Taneja <architt@xxxxxxxxxxxxxx> > Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > Cc: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx> > Cc: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx> > Cc: "Ville Syrjälä" <ville.syrjala@xxxxxxxxxxxxxxx> > Cc: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> > Cc: Andy Green <andy@xxxxxxxxxxx> > Cc: Dave Long <dave.long@xxxxxxxxxx> > Cc: Guodong Xu <guodong.xu@xxxxxxxxxx> > Cc: Zhangfei Gao <zhangfei.gao@xxxxxxxxxx> > Cc: Mark Brown <broonie@xxxxxxxxxx> > Cc: Lars-Peter Clausen <lars@xxxxxxxxxx> > Cc: Jose Abreu <joabreu@xxxxxxxxxxxx> > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx > Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> > --- > v2: Integrated feedback from Srinivas > > drivers/gpu/drm/bridge/adv7511/Kconfig | 1 + > drivers/gpu/drm/bridge/adv7511/Makefile | 2 +- > drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 + > drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 199 ++++++++++++++++++++++ > drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 + > 5 files changed, 211 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/bridge/adv7511/adv7511_audio.c > > diff --git a/drivers/gpu/drm/bridge/adv7511/Kconfig > b/drivers/gpu/drm/bridge/adv7511/Kconfig index d2b0499..e3975e9 100644 > --- a/drivers/gpu/drm/bridge/adv7511/Kconfig > +++ b/drivers/gpu/drm/bridge/adv7511/Kconfig > @@ -3,6 +3,7 @@ config DRM_I2C_ADV7511 > depends on OF > select DRM_KMS_HELPER > select REGMAP_I2C > + select SND_SOC_HDMI_CODEC if SND_SOC Shouldn't sound support be optional ? I can imagine a board that doesn't wire up sound to the ADV7511 but still uses SND_SOC for other purposes. > help > Support for the Analog Device ADV7511(W) and ADV7513 HDMI encoders. > > diff --git a/drivers/gpu/drm/bridge/adv7511/Makefile > b/drivers/gpu/drm/bridge/adv7511/Makefile index 9019327..ad7245d 100644 > --- a/drivers/gpu/drm/bridge/adv7511/Makefile > +++ b/drivers/gpu/drm/bridge/adv7511/Makefile > @@ -1,3 +1,3 @@ > -adv7511-y := adv7511_drv.o > +adv7511-y := adv7511_drv.o adv7511_audio.o Could we avoid compiling adv7511_audio.o if sound support isn't desired to avoid bloating the kernel ? > adv7511-$(CONFIG_DRM_I2C_ADV7533) += adv7533.o > obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h > b/drivers/gpu/drm/bridge/adv7511/adv7511.h index c7002a0..2e4d340 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h > @@ -23,6 +23,8 @@ struct adv7511; > > int adv7511_packet_enable(struct adv7511 *adv7511, unsigned int packet); > int adv7511_packet_disable(struct adv7511 *adv7511, unsigned int packet); > +int adv7511_audio_init(struct device *dev); > +void adv7511_audio_exit(struct device *dev); > > #define ADV7511_REG_CHIP_REVISION 0x00 > #define ADV7511_REG_N0 0x01 > @@ -317,6 +319,8 @@ struct adv7511 { > struct drm_display_mode curr_mode; > > unsigned int f_tmds; > + unsigned int f_audio; > + unsigned int audio_source; > > unsigned int current_edid_segment; > uint8_t edid_buf[256]; > @@ -342,6 +346,7 @@ struct adv7511 { > bool use_timing_gen; > > enum adv7511_type type; > + struct platform_device *audio_pdev; > }; > > #ifdef CONFIG_DRM_I2C_ADV7533 > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c > b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c new file mode 100644 > index 0000000..0e0ea6b > --- /dev/null > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c > @@ -0,0 +1,199 @@ > +/* > + * Analog Devices ADV7511 HDMI transmitter driver > + * > + * Copyright 2012 Analog Devices Inc. > + * Copyright (c) 2016, Linaro Limited > + * > + * Licensed under the GPL-2. > + */ > + > +#include <sound/core.h> > +#include <sound/hdmi-codec.h> > +#include <sound/pcm.h> > +#include <sound/soc.h> > + > +#include "adv7511.h" > + > +static void adv7511_calc_cts_n(unsigned int f_tmds, unsigned int fs, > + unsigned int *cts, unsigned int *n) > +{ > + switch (fs) { > + case 32000: > + *n = 4096; > + break; > + case 44100: > + *n = 6272; > + break; > + case 48000: > + *n = 6144; > + break; > + } > + > + *cts = ((f_tmds * *n) / (128 * fs)) * 1000; > +} > + > +static int adv7511_update_cts_n(struct adv7511 *adv7511) > +{ > + unsigned int cts = 0; > + unsigned int n = 0; > + > + adv7511_calc_cts_n(adv7511->f_tmds, adv7511->f_audio, &cts, &n); > + > + regmap_write(adv7511->regmap, ADV7511_REG_N0, (n >> 16) & 0xf); > + regmap_write(adv7511->regmap, ADV7511_REG_N1, (n >> 8) & 0xff); > + regmap_write(adv7511->regmap, ADV7511_REG_N2, n & 0xff); > + > + regmap_write(adv7511->regmap, ADV7511_REG_CTS_MANUAL0, > + (cts >> 16) & 0xf); > + regmap_write(adv7511->regmap, ADV7511_REG_CTS_MANUAL1, > + (cts >> 8) & 0xff); > + regmap_write(adv7511->regmap, ADV7511_REG_CTS_MANUAL2, > + cts & 0xff); > + > + return 0; > +} > + > +int adv7511_hdmi_hw_params(struct device *dev, void *data, > + struct hdmi_codec_daifmt *fmt, > + struct hdmi_codec_params *hparms) > +{ > + struct adv7511 *adv7511 = dev_get_drvdata(dev); > + unsigned int audio_source, i2s_format = 0; > + unsigned int invert_clock; > + unsigned int rate; > + unsigned int len; > + > + switch (hparms->sample_rate) { > + case 32000: > + rate = ADV7511_SAMPLE_FREQ_32000; > + break; > + case 44100: > + rate = ADV7511_SAMPLE_FREQ_44100; > + break; > + case 48000: > + rate = ADV7511_SAMPLE_FREQ_48000; > + break; > + case 88200: > + rate = ADV7511_SAMPLE_FREQ_88200; > + break; > + case 96000: > + rate = ADV7511_SAMPLE_FREQ_96000; > + break; > + case 176400: > + rate = ADV7511_SAMPLE_FREQ_176400; > + break; > + case 192000: > + rate = ADV7511_SAMPLE_FREQ_192000; > + break; > + default: > + return -EINVAL; > + } > + > + switch (hparms->sample_width) { > + case 16: > + len = ADV7511_I2S_SAMPLE_LEN_16; > + break; > + case 18: > + len = ADV7511_I2S_SAMPLE_LEN_18; > + break; > + case 20: > + len = ADV7511_I2S_SAMPLE_LEN_20; > + break; > + case 24: > + len = ADV7511_I2S_SAMPLE_LEN_24; > + break; > + default: > + return -EINVAL; > + } > + > + switch (fmt->fmt) { > + case HDMI_I2S: > + audio_source = ADV7511_AUDIO_SOURCE_I2S; > + i2s_format = ADV7511_I2S_FORMAT_I2S; > + break; > + case HDMI_RIGHT_J: > + audio_source = ADV7511_AUDIO_SOURCE_I2S; > + i2s_format = ADV7511_I2S_FORMAT_RIGHT_J; > + break; > + case HDMI_LEFT_J: > + audio_source = ADV7511_AUDIO_SOURCE_I2S; > + i2s_format = ADV7511_I2S_FORMAT_LEFT_J; > + break; > +// case HDMI_SPDIF: > +// audio_source = ADV7511_AUDIO_SOURCE_SPDIF; > +// break; No commented out code please. > + default: > + return -EINVAL; > + } > + > + invert_clock = fmt->bit_clk_inv; > + > + regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_SOURCE, 0x70, > + audio_source << 4); > + regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG, BIT(6), > + invert_clock << 6); > + regmap_update_bits(adv7511->regmap, ADV7511_REG_I2S_CONFIG, 0x03, > + i2s_format); > + > + adv7511->audio_source = audio_source; > + > + adv7511->f_audio = hparms->sample_rate; > + > + adv7511_update_cts_n(adv7511); > + > + regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CFG3, > + ADV7511_AUDIO_CFG3_LEN_MASK, len); > + regmap_update_bits(adv7511->regmap, ADV7511_REG_I2C_FREQ_ID_CFG, > + ADV7511_I2C_FREQ_ID_CFG_RATE_MASK, rate << 4); > + regmap_write(adv7511->regmap, 0x73, 0x1); > + > + return 0; > +} > + > +static int audio_startup(struct device *dev, void *data) > +{ > + struct adv7511 *adv7511 = dev_get_drvdata(dev); > + > + regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG, > + BIT(7), 0); > + return 0; > +} > + > +static void audio_shutdown(struct device *dev, void *data) > +{ > + No need for a blank line. > +} > + > +static const struct hdmi_codec_ops adv7511_codec_ops = { > + .hw_params = adv7511_hdmi_hw_params, > + .audio_shutdown = audio_shutdown, > + .audio_startup = audio_startup, > +}; > + > +static struct hdmi_codec_pdata codec_data = { > + .ops = &adv7511_codec_ops, > + .max_i2s_channels = 2, > + .i2s = 1, > +}; > + > +int adv7511_audio_init(struct device *dev) > +{ > + struct adv7511 *adv7511 = dev_get_drvdata(dev); Why don't you pass the struct adv7511 pointer directly to this function ? > + adv7511->audio_pdev = platform_device_register_data(dev, > + HDMI_CODEC_DRV_NAME, > + PLATFORM_DEVID_AUTO, > + &codec_data, > + sizeof(codec_data)); > + return PTR_ERR_OR_ZERO(adv7511->audio_pdev); > +} > + > +void adv7511_audio_exit(struct device *dev) > +{ > + struct adv7511 *adv7511 = dev_get_drvdata(dev); Same here. > + > + if (adv7511->audio_pdev) { > + platform_device_unregister(adv7511->audio_pdev); > + adv7511->audio_pdev = NULL; > + } > +} > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index f8eb7f8..3756994 > 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > @@ -1037,6 +1037,9 @@ static int adv7511_probe(struct i2c_client *i2c, const > struct i2c_device_id *id) goto err_unregister_cec; > } > > + dev_set_drvdata(dev, adv7511); This is already handled by the i2c_set_clientdata() call earlier in this function. > + adv7511_audio_init(dev); > + > return 0; > > err_unregister_cec: > @@ -1058,6 +1061,8 @@ static int adv7511_remove(struct i2c_client *i2c) > > drm_bridge_remove(&adv7511->bridge); > > + adv7511_audio_exit(&i2c->dev); > + > i2c_unregister_device(adv7511->i2c_edid); > > kfree(adv7511->edid); -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
