The main patch (6/6) is laregly unchanged from v3.
Specific details are elaborated in its commit message.
This series just introduces five extra patches for dropping include
directives from Makefiles (suggested by Greg KH) and rebased.
Changes in v4:
- Introduce patches to drop include directives from Makefile
Changes in v3:
- Rework entirely to replace platform devices/driver model
-v2:
https://lore.kernel.org/all/[email protected]/
-v1:
https://lore.kernel.org/all/[email protected]/
Umang Jain (6):
staging: vc04_services: Drop __VCCOREVER__ remnants
vc04_services: bcm2835-audio: Drop include Makefile directive
vc04_services: bcm2835-camera: Drop include Makefile directive
vc04_services: vchiq-mmal: Drop include Makefile directive
vc04_services: interface: Drop include Makefile directive
staging: vc04_services: vchiq: Register devices with a custom bus_type
drivers/staging/vc04_services/Makefile | 2 -
.../vc04_services/bcm2835-audio/Makefile | 2 -
.../vc04_services/bcm2835-audio/bcm2835.c | 19 ++-
.../vc04_services/bcm2835-audio/bcm2835.h | 3 +-
.../vc04_services/bcm2835-camera/Makefile | 5 -
.../bcm2835-camera/bcm2835-camera.c | 27 ++--
.../vc04_services/bcm2835-camera/controls.c | 6 +-
.../interface/vchiq_arm/vchiq_arm.c | 121 +++++++++++++++---
.../interface/vchiq_arm/vchiq_arm.h | 1 +
.../interface/vchiq_arm/vchiq_core.h | 2 +-
.../interface/vchiq_arm/vchiq_ioctl.h | 3 +-
.../staging/vc04_services/vchiq-mmal/Makefile | 5 -
.../vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +-
13 files changed, 131 insertions(+), 67 deletions(-)
--
2.39.0
Commit 8ba5f91bab63("staging: vc04_services: remove __VCCOREVER__")
was meant to remove all of __VCCOREVER__ definitions but missed to
remove a few. Hence, drop them now.
Signed-off-by: Umang Jain <[email protected]>
---
drivers/staging/vc04_services/bcm2835-audio/Makefile | 2 +-
drivers/staging/vc04_services/bcm2835-camera/Makefile | 3 +--
drivers/staging/vc04_services/vchiq-mmal/Makefile | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/Makefile b/drivers/staging/vc04_services/bcm2835-audio/Makefile
index d59fe4dde615..fc7ac6112a3e 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/Makefile
+++ b/drivers/staging/vc04_services/bcm2835-audio/Makefile
@@ -2,4 +2,4 @@
obj-$(CONFIG_SND_BCM2835) += snd-bcm2835.o
snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o
-ccflags-y += -I $(srctree)/$(src)/../include -D__VCCOREVER__=0x04000000
+ccflags-y += -I $(srctree)/$(src)/../include
diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile
index 3a76d6ade428..3494c82b271a 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/Makefile
+++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile
@@ -7,5 +7,4 @@ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o
ccflags-y += \
-I $(srctree)/$(src)/.. \
- -I $(srctree)/$(src)/../vchiq-mmal/ \
- -D__VCCOREVER__=0x04000000
+ -I $(srctree)/$(src)/../vchiq-mmal/
diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile
index b2a830f48acc..c7d3b06e17ce 100644
--- a/drivers/staging/vc04_services/vchiq-mmal/Makefile
+++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile
@@ -5,5 +5,4 @@ obj-$(CONFIG_BCM2835_VCHIQ_MMAL) += bcm2835-mmal-vchiq.o
ccflags-y += \
-I$(srctree)/$(src)/.. \
- -I$(srctree)/$(src)/../include \
- -D__VCCOREVER__=0x04000000
+ -I$(srctree)/$(src)/../include
--
2.39.0
Drop the include directive they can break the build one only wants to
build a subdirectory. Replace with "../" for the includes, in the
bcm2835-camera files instead.
Suggested-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Umang Jain <[email protected]>
---
drivers/staging/vc04_services/bcm2835-camera/Makefile | 4 ----
.../vc04_services/bcm2835-camera/bcm2835-camera.c | 10 +++++-----
.../staging/vc04_services/bcm2835-camera/controls.c | 6 +++---
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile
index 3494c82b271a..203b93899b20 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/Makefile
+++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile
@@ -4,7 +4,3 @@ bcm2835-v4l2-$(CONFIG_VIDEO_BCM2835) := \
controls.o
obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o
-
-ccflags-y += \
- -I $(srctree)/$(src)/.. \
- -I $(srctree)/$(src)/../vchiq-mmal/
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 797ebe2a973a..4f81765912ea 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -26,11 +26,11 @@
#include <linux/delay.h>
#include <linux/platform_device.h>
-#include "mmal-common.h"
-#include "mmal-encodings.h"
-#include "mmal-vchiq.h"
-#include "mmal-msg.h"
-#include "mmal-parameters.h"
+#include "../vchiq-mmal/mmal-common.h"
+#include "../vchiq-mmal/mmal-encodings.h"
+#include "../vchiq-mmal/mmal-vchiq.h"
+#include "../vchiq-mmal/mmal-msg.h"
+#include "../vchiq-mmal/mmal-parameters.h"
#include "bcm2835-camera.h"
#define MIN_WIDTH 32
diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
index 5644d1d457b9..6bce45925bf1 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
@@ -23,9 +23,9 @@
#include <media/v4l2-event.h>
#include <media/v4l2-common.h>
-#include "mmal-common.h"
-#include "mmal-vchiq.h"
-#include "mmal-parameters.h"
+#include "../vchiq-mmal/mmal-common.h"
+#include "../vchiq-mmal/mmal-vchiq.h"
+#include "../vchiq-mmal/mmal-parameters.h"
#include "bcm2835-camera.h"
/* The supported V4L2_CID_AUTO_EXPOSURE_BIAS values are from -4.0 to +4.0.
--
2.39.0
On Thu, Jan 19, 2023 at 12:48:05AM +0530, Umang Jain wrote:
> The main patch (6/6) is laregly unchanged from v3.
> Specific details are elaborated in its commit message.
>
> This series just introduces five extra patches for dropping include
> directives from Makefiles (suggested by Greg KH) and rebased.
>
> Changes in v4:
> - Introduce patches to drop include directives from Makefile
>
> Changes in v3:
> - Rework entirely to replace platform devices/driver model
>
> -v2:
> https://lore.kernel.org/all/[email protected]/
>
> -v1:
> https://lore.kernel.org/all/[email protected]/
>
> Umang Jain (6):
> staging: vc04_services: Drop __VCCOREVER__ remnants
> vc04_services: bcm2835-audio: Drop include Makefile directive
> vc04_services: bcm2835-camera: Drop include Makefile directive
> vc04_services: vchiq-mmal: Drop include Makefile directive
> vc04_services: interface: Drop include Makefile directive
> staging: vc04_services: vchiq: Register devices with a custom bus_type
Your patch subject lines are odd here, many drop the "staging: " prefix.
Please fix up.
thanks,
greg k-h