diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-01-07 18:52:46 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-07 18:52:58 +0100 |
| commit | 6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d (patch) | |
| tree | f73ca2bee2f77eb965f049d10e10636a0ff718a0 /sound/soc/meson/axg-tdmin.c | |
| parent | 64062869f0d63d118560c15f671376b43f71b102 (diff) | |
| parent | 7b62275507232f01f66d3e7d05c77bbd9009b726 (diff) | |
| download | linux-6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d.tar.gz linux-6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d.tar.bz2 linux-6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d.zip | |
Merge branch 'for-linus' into for-next
Back-merge of 5.11-devel branch for syncing the result changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/meson/axg-tdmin.c')
| -rw-r--r-- | sound/soc/meson/axg-tdmin.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c index 88ed95ae886b..b4faf9d5c1aa 100644 --- a/sound/soc/meson/axg-tdmin.c +++ b/sound/soc/meson/axg-tdmin.c @@ -228,15 +228,6 @@ static const struct axg_tdm_formatter_driver axg_tdmin_drv = { .regmap_cfg = &axg_tdmin_regmap_cfg, .ops = &axg_tdmin_ops, .quirks = &(const struct axg_tdm_formatter_hw) { - .skew_offset = 2, - }, -}; - -static const struct axg_tdm_formatter_driver g12a_tdmin_drv = { - .component_drv = &axg_tdmin_component_drv, - .regmap_cfg = &axg_tdmin_regmap_cfg, - .ops = &axg_tdmin_ops, - .quirks = &(const struct axg_tdm_formatter_hw) { .skew_offset = 3, }, }; @@ -247,10 +238,10 @@ static const struct of_device_id axg_tdmin_of_match[] = { .data = &axg_tdmin_drv, }, { .compatible = "amlogic,g12a-tdmin", - .data = &g12a_tdmin_drv, + .data = &axg_tdmin_drv, }, { .compatible = "amlogic,sm1-tdmin", - .data = &g12a_tdmin_drv, + .data = &axg_tdmin_drv, }, {} }; MODULE_DEVICE_TABLE(of, axg_tdmin_of_match); |