Commit bf9f0b00 authored by Jai Luthra's avatar Jai Luthra Committed by Greg Kroah-Hartman
Browse files

include: linux: Destage VCHIQ interface headers 



Move the VCHIQ headers from drivers/staging/vc04_services/include to
include/linux/raspberrypi

This is done so that they can be shared between the VCHIQ interface
(which is going to be de-staged in a subsequent commit from staging) and
the VCHIQ drivers left in the staging/vc04_services (namely
bcm2835-audio, bcm2835-camera).

The include/linux/raspberrypi/ provides a central location to serve both of
these areas.

Co-developed-by: default avatarUmang Jain <umang.jain@ideasonboard.com>
Signed-off-by: default avatarUmang Jain <umang.jain@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJai Luthra <jai.luthra@ideasonboard.com>
Link: https://patch.msgid.link/20251029-vchiq-destage-v3-4-da8d6c83c2c5@ideasonboard.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d2115ea

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4829,6 +4829,7 @@ 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/staging/vc04_services

F:	include/linux/raspberrypi/vchiq*

N:	bcm2711

N:	bcm2712

N:	bcm283*

drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c

+3 −2
Original line number Diff line number Diff line
@@ -4,11 +4,12 @@ 
#include <linux/slab.h>

#include <linux/module.h>

#include <linux/completion.h>



#include <linux/raspberrypi/vchiq_arm.h>



#include "bcm2835.h"

#include "vc_vchi_audioserv_defs.h"



#include "../interface/vchiq_arm/vchiq_arm.h"



struct bcm2835_audio_instance {

	struct device *dev;

	unsigned int service_handle;

drivers/staging/vc04_services/bcm2835-audio/bcm2835.c

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
#include <linux/slab.h>

#include <linux/module.h>



#include "../interface/vchiq_arm/vchiq_bus.h"

#include <linux/raspberrypi/vchiq_bus.h>



#include "bcm2835.h"



static bool enable_hdmi;

drivers/staging/vc04_services/bcm2835-audio/bcm2835.h

+1 −2
Original line number Diff line number Diff line
@@ -5,13 +5,12 @@ 
#define __SOUND_ARM_BCM2835_H



#include <linux/device.h>

#include <linux/raspberrypi/vchiq.h>

#include <linux/wait.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm-indirect.h>



#include "../include/linux/raspberrypi/vchiq.h"



#define MAX_SUBSTREAMS   (8)

#define AVAIL_SUBSTREAMS_MASK  (0xff)

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+5 −4
Original line number Diff line number Diff line
@@ -30,11 +30,12 @@ 
#include <linux/uaccess.h>

#include <soc/bcm2835/raspberrypi-firmware.h>



#include "vchiq_core.h"

#include <linux/raspberrypi/vchiq_core.h>

#include <linux/raspberrypi/vchiq_arm.h>

#include <linux/raspberrypi/vchiq_bus.h>

#include <linux/raspberrypi/vchiq_debugfs.h>



#include "vchiq_ioctl.h"

#include "vchiq_arm.h"

#include "vchiq_bus.h"

#include "vchiq_debugfs.h"



#define DEVICE_NAME "vchiq"