This patchset refactors the Rockchip I2S/TDM driver in order to
support the RK3588 SoC, and then adds the necessary compatible
string to load the driver for it.
Patch 1 rectifies a problem with the bindings where we were too
strict about requiring the rockchip,grf property. Most features
of this audio device don't need access to the GRF to function.
Patch 2 modifies the driver to adjust its behaviour to what the
changed bindings now allow, namely using most things without the
GRF.
Patch 3 and 4 are boring compatible string stuff that enables
RK3588 support. No special data is needed to initialise the
driver for this instance of the I2S/TDM IP.
Nicolas Frattaroli (4):
ASoC: dt-bindings: rockchip: i2s-tdm: Make grf property optional
ASoC: rockchip: i2s_tdm: Make the grf property optional
ASoC: dt-bindings: rockchip: i2s-tdm: Add RK3588 compatible
ASoC: rockchip: i2s_tdm: Add support for RK3588
.../bindings/sound/rockchip,i2s-tdm.yaml | 2 +-
sound/soc/rockchip/rockchip_i2s_tdm.c | 19 ++++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
--
2.38.1
This adds support for the RK3588 SoC to the I2S/TDM driver.
---
sound/soc/rockchip/rockchip_i2s_tdm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c
index 917f17107891..08b90ec5cc80 100644
--- a/sound/soc/rockchip/rockchip_i2s_tdm.c
+++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
@@ -1318,6 +1318,7 @@ static const struct of_device_id rockchip_i2s_tdm_match[] = {
{ .compatible = "rockchip,rk1808-i2s-tdm", .data = &rk1808_i2s_soc_data },
{ .compatible = "rockchip,rk3308-i2s-tdm", .data = &rk3308_i2s_soc_data },
{ .compatible = "rockchip,rk3568-i2s-tdm", .data = &rk3568_i2s_soc_data },
+ { .compatible = "rockchip,rk3588-i2s-tdm" },
{ .compatible = "rockchip,rv1126-i2s-tdm", .data = &rv1126_i2s_soc_data },
{},
};
@@ -1556,7 +1557,7 @@ static int rockchip_i2s_tdm_probe(struct platform_device *pdev)
i2s_tdm->dev = &pdev->dev;
of_id = of_match_device(rockchip_i2s_tdm_match, &pdev->dev);
- if (!of_id || !of_id->data)
+ if (!of_id)
return -EINVAL;
spin_lock_init(&i2s_tdm->lock);
--
2.38.1
On Tue, 25 Oct 2022 14:41:28 +0200, Nicolas Frattaroli wrote:
> This patchset refactors the Rockchip I2S/TDM driver in order to
> support the RK3588 SoC, and then adds the necessary compatible
> string to load the driver for it.
>
> Patch 1 rectifies a problem with the bindings where we were too
> strict about requiring the rockchip,grf property. Most features
> of this audio device don't need access to the GRF to function.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/4] ASoC: dt-bindings: rockchip: i2s-tdm: Make grf property optional
commit: 1024a5b29e90a18530588b3f161e81cf3fae7dcf
[2/4] ASoC: rockchip: i2s_tdm: Make the grf property optional
commit: d980004e349049a3fcbffc6096d14896f6a122ed
[3/4] ASoC: dt-bindings: rockchip: i2s-tdm: Add RK3588 compatible
commit: 0643fd3669f5c33bab5b05a813459a2d00a83465
[4/4] ASoC: rockchip: i2s_tdm: Add support for RK3588
commit: c619bd4268ff9895760dab303b4eb15ed3d0f7e9
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark