On Fri, Jan 10, 2020 at 10:12 PM Stefan Mavrodiev <stefan@xxxxxxxxxx> wrote:
>
> Add HDMI audio support for the sun4i-hdmi encoder, used on
> the older Allwinner chips - A10, A20, A31.
>
> Most of the code is based on the BSP implementation. In it
> dditional formats are supported (S20_3LE and S24_LE), however
> there where some problems with them and only S16_LE is left.
>
> Signed-off-by: Stefan Mavrodiev <stefan@xxxxxxxxxx>
> ---
> drivers/gpu/drm/sun4i/Kconfig | 1 +
> drivers/gpu/drm/sun4i/Makefile | 1 +
> drivers/gpu/drm/sun4i/sun4i_hdmi.h | 30 ++
> drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c | 375 +++++++++++++++++++++++
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 4 +
> 5 files changed, 411 insertions(+)
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c
>
> diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
> index 37e90e42943f..192b732b10cd 100644
> --- a/drivers/gpu/drm/sun4i/Kconfig
> +++ b/drivers/gpu/drm/sun4i/Kconfig
> @@ -19,6 +19,7 @@ if DRM_SUN4I
> config DRM_SUN4I_HDMI
> tristate "Allwinner A10 HDMI Controller Support"
> default DRM_SUN4I
> + select SND_PCM_ELD
> help
> Choose this option if you have an Allwinner SoC with an HDMI
> controller.
> diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile
> index 0d04f2447b01..e2d82b451c36 100644
> --- a/drivers/gpu/drm/sun4i/Makefile
> +++ b/drivers/gpu/drm/sun4i/Makefile
> @@ -5,6 +5,7 @@ sun4i-frontend-y += sun4i_frontend.o
> sun4i-drm-y += sun4i_drv.o
> sun4i-drm-y += sun4i_framebuffer.o
>
> +sun4i-drm-hdmi-y += sun4i_hdmi_audio.o
> sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o
> sun4i-drm-hdmi-y += sun4i_hdmi_enc.o
> sun4i-drm-hdmi-y += sun4i_hdmi_i2c.o
> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi.h b/drivers/gpu/drm/sun4i/sun4i_hdmi.h
> index 7ad3f06c127e..456964e681b0 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_hdmi.h
> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi.h
> @@ -42,7 +42,32 @@
> #define SUN4I_HDMI_VID_TIMING_POL_VSYNC BIT(1)
> #define SUN4I_HDMI_VID_TIMING_POL_HSYNC BIT(0)
>
> +#define SUN4I_HDMI_AUDIO_CTRL_REG 0x040
> +#define SUN4I_HDMI_AUDIO_CTRL_ENABLE BIT(31)
> +#define SUN4I_HDMI_AUDIO_CTRL_RESET BIT(30)
> +
> +#define SUN4I_HDMI_AUDIO_FMT_REG 0x048
> +#define SUN4I_HDMI_AUDIO_FMT_SRC BIT(31)
> +#define SUN4I_HDMI_AUDIO_FMT_LAYOUT BIT(3)
> +#define SUN4I_HDMI_AUDIO_FMT_CH_CFG(n) (n - 1)
> +#define SUN4I_HDMI_AUDIO_FMT_CH_CFG_MASK GENMASK(2, 0)
> +
> +#define SUN4I_HDMI_AUDIO_PCM_REG 0x4c
> +#define SUN4I_HDMI_AUDIO_PCM_CH_MAP(n, m) ((m - 1) << (n * 4))
> +#define SUN4I_HDMI_AUDIO_PCM_CH_MAP_MASK(n) (GENMASK(2, 0) << (n * 4))
> +
> +#define SUN4I_HDMI_AUDIO_CTS_REG 0x050
> +#define SUN4I_HDMI_AUDIO_CTS(n) (n & GENMASK(19, 0))
> +
> +#define SUN4I_HDMI_AUDIO_N_REG 0x054
> +#define SUN4I_HDMI_AUDIO_N(n) (n & GENMASK(19, 0))
> +
> +#define SUN4I_HDMI_AUDIO_STAT0_REG 0x58
> +#define SUN4I_HDMI_AUDIO_STAT0_FREQ(n) (n << 24)
> +#define SUN4I_HDMI_AUDIO_STAT0_FREQ_MASK GENMASK(27, 24)
> +
> #define SUN4I_HDMI_AVI_INFOFRAME_REG(n) (0x080 + (n))
> +#define SUN4I_HDMI_AUDIO_INFOFRAME_REG(n) (0x0a0 + (n))
>
> #define SUN4I_HDMI_PAD_CTRL0_REG 0x200
> #define SUN4I_HDMI_PAD_CTRL0_BIASEN BIT(31)
> @@ -283,9 +308,13 @@ struct sun4i_hdmi {
> struct regmap_field *field_ddc_sda_en;
> struct regmap_field *field_ddc_sck_en;
>
> + u8 hdmi_audio_channels;
> +
> struct sun4i_drv *drv;
>
> bool hdmi_monitor;
> + bool hdmi_audio;
> +
> struct cec_adapter *cec_adap;
>
> const struct sun4i_hdmi_variant *variant;
> @@ -294,5 +323,6 @@ struct sun4i_hdmi {
> int sun4i_ddc_create(struct sun4i_hdmi *hdmi, struct clk *clk);
> int sun4i_tmds_create(struct sun4i_hdmi *hdmi);
> int sun4i_hdmi_i2c_create(struct device *dev, struct sun4i_hdmi *hdmi);
> +int sun4i_hdmi_audio_create(struct sun4i_hdmi *hdmi);
>
> #endif /* _SUN4I_HDMI_H_ */
> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c
> new file mode 100644
> index 000000000000..b6d4199d15ce
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c
> @@ -0,0 +1,375 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (C) 2020 Olimex Ltd.
> + * Author: Stefan Mavrodiev <stefan@xxxxxxxxxx>
> + */
> +#include <linux/dma-mapping.h>
> +#include <linux/dmaengine.h>
> +#include <linux/module.h>
> +#include <linux/of_dma.h>
> +#include <linux/regmap.h>
> +
> +#include <drm/drm_print.h>
> +
> +#include <sound/dmaengine_pcm.h>
> +#include <sound/pcm_drm_eld.h>
> +#include <sound/pcm_params.h>
> +#include <sound/soc.h>
I would drop the ASoC stuff and just do a standard ALSA driver.
You really don't gain anything from using ASoC, since this is
just a really standard PCM DMA interface plus some controls.
There aren't multiple components that need to be strung together.
ChenYu
