[PATCH v2 5/5] platform/broadcom: Destage VCHIQ MMAL driver

[Jai Luthra]

Quoting Jai Luthra (2025-09-07 14:26:25)
> Destage the VCHIQ MMAL driver to drivers/platform/broadcom.

s/broadcom/raspberrypi in the commit description and title as well

Will fix in next version

> 
> Signed-off-by: Jai Luthra <jai.luthra at ideasonboard.com>
> ---
>  MAINTAINERS                                                             | 2 +-
>  drivers/platform/raspberrypi/Kconfig                                    | 2 ++
>  drivers/platform/raspberrypi/Makefile                                   | 1 +
>  .../{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Kconfig  | 0
>  .../{staging/vc04_services => platform/raspberrypi}/vchiq-mmal/Makefile | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-common.h     | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-encodings.h  | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-common.h | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-format.h | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg-port.h   | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-msg.h        | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-parameters.h | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.c      | 0
>  .../vc04_services => platform/raspberrypi}/vchiq-mmal/mmal-vchiq.h      | 0
>  drivers/staging/vc04_services/Kconfig                                   | 2 --
>  drivers/staging/vc04_services/Makefile                                  | 1 -
>  16 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index fc74a9e2e5a47b8c82cf68ef7c1fe3d37e2fe89b..856a2a489afbc95780769a708540444aa5aa983a 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4753,7 +4753,7 @@ S:        Maintained
>  T:     git https://github.com/broadcom/stblinux.git
>  F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
>  F:     drivers/pci/controller/pcie-brcmstb.c
> -F:     drivers/platform/raspberrypi/vchiq-interface
> +F:     drivers/platform/raspberrypi/vchiq-*
>  F:     drivers/staging/vc04_services
>  F:     include/linux/raspberrypi/vchiq*
>  N:     bcm2711
> diff --git a/drivers/platform/raspberrypi/Kconfig b/drivers/platform/raspberrypi/Kconfig
> index 9085e7464ec348fce5ec9f41a9019ab12eee964b..2c928440a47c08e4d452fe838fe4105c608995a4 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 a807571c59a47bb418cbb1dfcc389219d0d0ff22..2a7c9511e5d8bbe11c05680eea016ef40796b648 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 b9e6f369f54c3af6225f181e08ac14e3de044062..2f6d1aaffdb2c1f11ec27e0fb8050fef56e6a875 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 7a716a5c781530b673027b9f82ec94ebfd615f8a..ba15ec663af0fabaf0060456fc997deb5e5e0533 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/
>  
> 
> -- 
> 2.50.1
>