staging: bcm2835-audio: Register bcm2835-audio with vchiq_bus_type

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

Since we moved away bcm2835-audio from platform driver/device,
we have to set the DMA mask explicitly. Set the DMA mask at probe
time.

Meanwhile at it, change the name and module alias from "bcm2835_audio"
to "bcm2835-audio" to be consistent with bcm2835-camera device. This
does not brings any functional change as '-' and '_' are
interchangeable as per modprobe man pages.

Also, drop vchiq_register_child() helper which is no longer
needed after this patch.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Link: https://lore.kernel.org/r/20230923143200.268063-7-umang.jain@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
index f3ad2543d1c0fdffadf3acf691c673e56079d689..06bdc7673d4b41db6d49a6d968395af08f35e9ab 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
@@ -1,13 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright 2011 Broadcom Corporation.  All rights reserved. */
 
-#include <linux/platform_device.h>
-
 #include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 
+#include "../interface/vchiq_arm/vchiq_bus.h"
 #include "bcm2835.h"
 
 static bool enable_hdmi;
@@ -269,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;
 
        err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
@@ -299,32 +298,32 @@ 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,
        .resume = snd_bcm2835_alsa_resume,
 #endif
        .driver = {
-               .name = "bcm2835_audio",
+               .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");
+MODULE_ALIAS("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 886025f0a4528fb92556ec021a04bf11bb00da81..eef9c8c06e66d763518e3f6116540519c6139a23 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -67,12 +67,12 @@ int vchiq_susp_log_level = VCHIQ_LOG_ERROR;
 DEFINE_SPINLOCK(msg_queue_spinlock);
 struct vchiq_state g_state;
 
-static struct platform_device *bcm2835_audio;
 /*
  * The devices implemented in the VCHIQ firmware are not discoverable,
  * so we need to maintain a list of them in order to register them with
  * the interface.
  */
+static struct vchiq_device *bcm2835_audio;
 static struct vchiq_device *bcm2835_camera;
 
 struct vchiq_drvdata {
@@ -1776,28 +1776,6 @@ static const struct of_device_id vchiq_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, vchiq_of_match);
 
-static struct platform_device *
-vchiq_register_child(struct platform_device *pdev, const char *name)
-{
-       struct platform_device_info pdevinfo;
-       struct platform_device *child;
-
-       memset(&pdevinfo, 0, sizeof(pdevinfo));
-
-       pdevinfo.parent = &pdev->dev;
-       pdevinfo.name = name;
-       pdevinfo.id = PLATFORM_DEVID_NONE;
-       pdevinfo.dma_mask = DMA_BIT_MASK(32);
-
-       child = platform_device_register_full(&pdevinfo);
-       if (IS_ERR(child)) {
-               dev_warn(&pdev->dev, "%s not registered\n", name);
-               child = NULL;
-       }
-
-       return child;
-}
-
 static int vchiq_probe(struct platform_device *pdev)
 {
        struct device_node *fw_node;
@@ -1845,7 +1823,7 @@ static int vchiq_probe(struct platform_device *pdev)
                goto error_exit;
        }
 
-       bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
+       bcm2835_audio = vchiq_device_register(&pdev->dev, "bcm2835-audio");
        bcm2835_camera = vchiq_device_register(&pdev->dev, "bcm2835-camera");
 
        return 0;
@@ -1858,7 +1836,7 @@ error_exit:
 
 static void vchiq_remove(struct platform_device *pdev)
 {
-       platform_device_unregister(bcm2835_audio);
+       vchiq_device_unregister(bcm2835_audio);
        vchiq_device_unregister(bcm2835_camera);
        vchiq_debugfs_deinit();
        vchiq_deregister_chrdev();