github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 22:14:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: xilinx: replace OF with device handlers

Browse Source 
All of these usages of OF handlers use the node from the
platform_device. Use the device member to simplify slightly.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Link: https://patch.msgid.link/20260803231823.95147-1-rosenp@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Rosen Penev 2026-08-03 16:18:23 -07:00 committed by Mark Brown
parent 431c15610d
commit 99ddfbba9e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/xilinx/xlnx_formatter_pcm.c
View File

@ -9,8 +9,6 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/sizes.h>
#include <sound/asoundef.h>

12
sound/soc/xilinx/xlnx_i2s.c
View File

@ -9,9 +9,8 @@
#include <linux/io.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@ -174,7 +173,6 @@ static int xlnx_i2s_probe(struct platform_device *pdev)
int ret;
u32 format;
struct device *dev = &pdev->dev;
struct device_node *node = dev->of_node;
drv_data = devm_kzalloc(&pdev->dev, sizeof(*drv_data), GFP_KERNEL);
if (!drv_data)
@ -184,13 +182,13 @@ static int xlnx_i2s_probe(struct platform_device *pdev)
if (IS_ERR(drv_data->base))
return PTR_ERR(drv_data->base);
ret = of_property_read_u32(node, "xlnx,num-channels", &drv_data->channels);
ret = device_property_read_u32(dev, "xlnx,num-channels", &drv_data->channels);
if (ret < 0)
return dev_err_probe(dev, ret, "cannot get supported channels\n");
drv_data->channels *= 2;
ret = of_property_read_u32(node, "xlnx,dwidth", &drv_data->data_width);
ret = device_property_read_u32(dev, "xlnx,dwidth", &drv_data->data_width);
if (ret < 0)
return dev_err_probe(dev, ret, "cannot get data width\n");
@ -205,7 +203,7 @@ static int xlnx_i2s_probe(struct platform_device *pdev)
return -EINVAL;
}
if (of_device_is_compatible(node, "xlnx,i2s-transmitter-1.0")) {
if (device_is_compatible(dev, "xlnx,i2s-transmitter-1.0")) {
drv_data->dai_drv.name = "xlnx_i2s_playback";
drv_data->dai_drv.playback.stream_name = "Playback";
drv_data->dai_drv.playback.formats = format;
@ -213,7 +211,7 @@ static int xlnx_i2s_probe(struct platform_device *pdev)
drv_data->dai_drv.playback.channels_max = drv_data->channels;
drv_data->dai_drv.playback.rates = SNDRV_PCM_RATE_8000_192000;
drv_data->dai_drv.ops = &xlnx_i2s_dai_ops;
} else if (of_device_is_compatible(node, "xlnx,i2s-receiver-1.0")) {
} else if (device_is_compatible(dev, "xlnx,i2s-receiver-1.0")) {
drv_data->dai_drv.name = "xlnx_i2s_capture";
drv_data->dai_drv.capture.stream_name = "Capture";
drv_data->dai_drv.capture.formats = format;

8
sound/soc/xilinx/xlnx_spdif.c
View File

@ -10,8 +10,7 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/property.h>
#include <linux/platform_device.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@ -242,7 +241,6 @@ static int xlnx_spdif_probe(struct platform_device *pdev)
struct spdif_dev_data *ctx;
struct device *dev = &pdev->dev;
struct device_node *node = dev->of_node;
ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
if (!ctx)
@ -257,7 +255,7 @@ static int xlnx_spdif_probe(struct platform_device *pdev)
if (IS_ERR(ctx->base))
return PTR_ERR(ctx->base);
ret = of_property_read_u32(node, "xlnx,spdif-mode", &ctx->mode);
ret = device_property_read_u32(dev, "xlnx,spdif-mode", &ctx->mode);
if (ret < 0)
return dev_err_probe(dev, ret, "cannot get SPDIF mode\n");
@ -278,7 +276,7 @@ static int xlnx_spdif_probe(struct platform_device *pdev)
dai_drv = &xlnx_spdif_rx_dai;
}
ret = of_property_read_u32(node, "xlnx,aud_clk_i", &ctx->aclk);
ret = device_property_read_u32(dev, "xlnx,aud_clk_i", &ctx->aclk);
if (ret < 0)
return dev_err_probe(dev, ret, "cannot get aud_clk_i value\n");