Message ID | 20221025124132.399729-5-frattaroli.nicolas@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | RK3588 Audio Support | expand |
On Dienstag, 25. Oktober 2022 14:41:32 CEST Nicolas Frattaroli wrote: > 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); > Oops, forgot the signoff on this one. For this purpose: Signed-off-by: Nicolas Frattaroli <frattaroli.nicolas@gmail.com> My apologies.
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);