[PATCH v8 4/5] staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type

Umang Jain
2023-06-27T20:16:50Z

Similar to how bcm2385-camera device is registered, register the
bcm2835-audio with vchiq_bus_type as well.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
---
.../vc04_services/bcm2835-audio/bcm2835.c | 17 ++++++++---------
.../interface/vchiq_arm/vchiq_arm.c | 6 +-----
2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
index 00bc898b0189..f81a9a4fbd5d 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: GPL-2.0
/* Copyright 2011 Broadcom Corporation. All rights reserved. */

-#include <linux/platform_device.h>
-
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>

+#include "../interface/vchiq_arm/vchiq_arm.h"
+#include "../interface/vchiq_arm/vchiq_device.h"
#include "bcm2835.h"

static bool enable_hdmi;
@@ -268,9 +268,9 @@ static int snd_add_child_devices(struct device *device, u32 numchans)
return 0;
}

-static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
+static int snd_bcm2835_alsa_probe(struct vchiq_device *device)
{
- struct device *dev = &pdev->dev;
+ struct device *dev = &device->dev;
int err;

if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) {
@@ -292,20 +292,20 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)

#ifdef CONFIG_PM

-static int snd_bcm2835_alsa_suspend(struct platform_device *pdev,
+static int snd_bcm2835_alsa_suspend(struct vchiq_device *device,
pm_message_t state)
{
return 0;
}

-static int snd_bcm2835_alsa_resume(struct platform_device *pdev)
+static int snd_bcm2835_alsa_resume(struct vchiq_device *device)
{
return 0;
}

#endif

-static struct platform_driver bcm2835_alsa_driver = {
+static struct vchiq_driver bcm2835_alsa_driver = {
.probe = snd_bcm2835_alsa_probe,
#ifdef CONFIG_PM
.suspend = snd_bcm2835_alsa_suspend,
@@ -315,9 +315,8 @@ static struct platform_driver bcm2835_alsa_driver = {
.name = "bcm2835_audio",
},
};
-module_platform_driver(bcm2835_alsa_driver);
+module_vchiq_driver(bcm2835_alsa_driver);

MODULE_AUTHOR("Dom Cobley");
MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:bcm2835_audio");
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 79d4d0eeb5fb..75da37fa6372 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -67,8 +67,6 @@ int vchiq_susp_log_level = VCHIQ_LOG_ERROR;
DEFINE_SPINLOCK(msg_queue_spinlock);
struct vchiq_state g_state;

-static struct platform_device *bcm2835_audio;
-
struct vchiq_drvdata {
const unsigned int cache_line_size;
struct rpi_firmware *fw;
@@ -139,6 +137,7 @@ struct vchiq_pagelist_info {
* the interface.
*/
static const char *const vchiq_devices[] = {
+ "bcm2835_audio",
"bcm2835-camera",
};

@@ -1849,8 +1848,6 @@ static int vchiq_probe(struct platform_device *pdev)
goto error_exit;
}

- bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
-
for (i = 0; i < ARRAY_SIZE(vchiq_devices); i++) {
err = vchiq_device_register(&pdev->dev, vchiq_devices[i]);
if (err)
@@ -1868,7 +1865,6 @@ static int vchiq_probe(struct platform_device *pdev)

static void vchiq_remove(struct platform_device *pdev)
{
- platform_device_unregister(bcm2835_audio);
bus_for_each_dev(&vchiq_bus_type, NULL, NULL, vchiq_device_unregister);
vchiq_debugfs_deinit();
vchiq_deregister_chrdev();
--
2.39.1