From bd10acae08aeb9cd2f555acdbacb98b9fbb02a27 Mon Sep 17 00:00:00 2001 From: Jai Luthra Date: Wed, 29 Oct 2025 16:00:11 +0530 Subject: [PATCH] platform/raspberrypi: Destage VCHIQ MMAL driver Destage the VCHIQ MMAL driver to drivers/platform/raspberrypi. Signed-off-by: Jai Luthra Link: https://patch.msgid.link/20251029-vchiq-destage-v3-7-da8d6c83c2c5@ideasonboard.com Signed-off-by: Greg Kroah-Hartman --- drivers/platform/raspberrypi/Kconfig | 2 ++ drivers/platform/raspberrypi/Makefile | 1 + .../vc04_services => platform/raspberrypi}/vchiq-mmal/Kconfig | 0 .../vc04_services => platform/raspberrypi}/vchiq-mmal/Makefile | 0 .../raspberrypi}/vchiq-mmal/mmal-common.h | 0 .../raspberrypi}/vchiq-mmal/mmal-encodings.h | 0 .../raspberrypi}/vchiq-mmal/mmal-msg-common.h | 0 .../raspberrypi}/vchiq-mmal/mmal-msg-format.h | 0 .../raspberrypi}/vchiq-mmal/mmal-msg-port.h | 0 .../raspberrypi}/vchiq-mmal/mmal-msg.h | 0 .../raspberrypi}/vchiq-mmal/mmal-parameters.h | 0 .../raspberrypi}/vchiq-mmal/mmal-vchiq.c | 0 .../raspberrypi}/vchiq-mmal/mmal-vchiq.h | 0 drivers/staging/vc04_services/Kconfig | 2 -- drivers/staging/vc04_services/Makefile | 1 - 15 files changed, 3 insertions(+), 3 deletions(-) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Kconfig (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Makefile (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-common.h (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-encodings.h (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-common.h (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-format.h (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-port.h (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg.h (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-parameters.h (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.c (100%) rename drivers/{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.h (100%) diff --git a/drivers/platform/raspberrypi/Kconfig b/drivers/platform/raspberrypi/Kconfig index 9085e7464ec3..2c928440a47c 100644 --- a/drivers/platform/raspberrypi/Kconfig +++ b/drivers/platform/raspberrypi/Kconfig @@ -47,4 +47,6 @@ config VCHIQ_CDEV endif +source "drivers/platform/raspberrypi/vchiq-mmal/Kconfig" + endif diff --git a/drivers/platform/raspberrypi/Makefile b/drivers/platform/raspberrypi/Makefile index a807571c59a4..2a7c9511e5d8 100644 --- a/drivers/platform/raspberrypi/Makefile +++ b/drivers/platform/raspberrypi/Makefile @@ -12,3 +12,4 @@ ifdef CONFIG_VCHIQ_CDEV vchiq-objs += vchiq-interface/vchiq_dev.o endif +obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += vchiq-mmal/ diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/platform/raspberrypi/vchiq-mmal/Kconfig similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/Kconfig rename to drivers/platform/raspberrypi/vchiq-mmal/Kconfig diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/platform/raspberrypi/vchiq-mmal/Makefile similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/Makefile rename to drivers/platform/raspberrypi/vchiq-mmal/Makefile diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-common.h similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/mmal-common.h rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-common.h diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-encodings.h similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-encodings.h diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-common.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-common.h similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-common.h rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-common.h diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-format.h similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-format.h diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-port.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-port.h similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg-port.h rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg-port.h diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-msg.h similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-msg.h diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-parameters.h similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-parameters.h diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.c diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.h similarity index 100% rename from drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h rename to drivers/platform/raspberrypi/vchiq-mmal/mmal-vchiq.h diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig index b9e6f369f54c..2f6d1aaffdb2 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -3,7 +3,5 @@ if BCM_VIDEOCORE source "drivers/staging/vc04_services/bcm2835-audio/Kconfig" -source "drivers/staging/vc04_services/vchiq-mmal/Kconfig" - endif diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile index 7a716a5c7815..ba15ec663af0 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/ -obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += vchiq-mmal/