diff options
Diffstat (limited to 'target/linux/brcm2708/patches-3.18/0027-bcm2835-add-v4l2-camera-device.patch')
| -rw-r--r--[-rwxr-xr-x] | target/linux/brcm2708/patches-3.18/0027-bcm2835-add-v4l2-camera-device.patch | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/target/linux/brcm2708/patches-3.18/0027-bcm2835-add-v4l2-camera-device.patch b/target/linux/brcm2708/patches-3.18/0027-bcm2835-add-v4l2-camera-device.patch index bfbf804..8e8071d 100755..100644 --- a/target/linux/brcm2708/patches-3.18/0027-bcm2835-add-v4l2-camera-device.patch +++ b/target/linux/brcm2708/patches-3.18/0027-bcm2835-add-v4l2-camera-device.patch @@ -46,9 +46,6 @@ Signed-off-by: Luke Diamand <luked@broadcom.com> create mode 100644 drivers/media/platform/bcm2835/mmal-vchiq.c create mode 100644 drivers/media/platform/bcm2835/mmal-vchiq.h -diff --git a/Documentation/video4linux/bcm2835-v4l2.txt b/Documentation/video4linux/bcm2835-v4l2.txt -new file mode 100644 -index 0000000..c585a8f --- /dev/null +++ b/Documentation/video4linux/bcm2835-v4l2.txt @@ -0,0 +1,60 @@ @@ -112,8 +109,6 @@ index 0000000..c585a8f +List of available formats: + +$ v4l2-ctl --list-formats -diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig -index 3aac88f..9bc18aa 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -126,6 +126,7 @@ config VIDEO_S3C_CAMIF @@ -124,20 +119,15 @@ index 3aac88f..9bc18aa 100644 endif # V4L_PLATFORM_DRIVERS -diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile -index 579046b..9c9cb34 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile -@@ -49,4 +49,6 @@ obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/ +@@ -49,4 +49,6 @@ obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1 obj-y += omap/ +obj-$(CONFIG_VIDEO_BCM2835) += bcm2835/ + ccflags-y += -I$(srctree)/drivers/media/i2c -diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig -new file mode 100644 -index 0000000..a8fd172 --- /dev/null +++ b/drivers/media/platform/bcm2835/Kconfig @@ -0,0 +1,25 @@ @@ -166,9 +156,6 @@ index 0000000..a8fd172 + + +endif # VIDEO_BM2835 -diff --git a/drivers/media/platform/bcm2835/Makefile b/drivers/media/platform/bcm2835/Makefile -new file mode 100644 -index 0000000..f17c79c --- /dev/null +++ b/drivers/media/platform/bcm2835/Makefile @@ -0,0 +1,5 @@ @@ -177,9 +164,6 @@ index 0000000..f17c79c +obj-$(CONFIG_VIDEO_BCM2835_MMAL) += bcm2835-v4l2.o + +ccflags-$(CONFIG_VIDEO_BCM2835) += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 -diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c -new file mode 100644 -index 0000000..1c9d9d5 --- /dev/null +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c @@ -0,0 +1,1476 @@ @@ -1659,9 +1643,6 @@ index 0000000..1c9d9d5 + +module_init(bm2835_mmal_init); +module_exit(bm2835_mmal_exit); -diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.h b/drivers/media/platform/bcm2835/bcm2835-camera.h -new file mode 100644 -index 0000000..883eab7 --- /dev/null +++ b/drivers/media/platform/bcm2835/bcm2835-camera.h @@ -0,0 +1,113 @@ @@ -1778,9 +1759,6 @@ index 0000000..883eab7 + (pix_fmt)->pixelformat, (pix_fmt)->bytesperline, \ + (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \ +} -diff --git a/drivers/media/platform/bcm2835/controls.c b/drivers/media/platform/bcm2835/controls.c -new file mode 100644 -index 0000000..d1408e5 --- /dev/null +++ b/drivers/media/platform/bcm2835/controls.c @@ -0,0 +1,725 @@ @@ -2509,9 +2487,6 @@ index 0000000..d1408e5 + + return 0; +} -diff --git a/drivers/media/platform/bcm2835/mmal-common.h b/drivers/media/platform/bcm2835/mmal-common.h -new file mode 100644 -index 0000000..84abbb3 --- /dev/null +++ b/drivers/media/platform/bcm2835/mmal-common.h @@ -0,0 +1,51 @@ @@ -2566,9 +2541,6 @@ index 0000000..84abbb3 + u32 u; + u32 v; +}; -diff --git a/drivers/media/platform/bcm2835/mmal-encodings.h b/drivers/media/platform/bcm2835/mmal-encodings.h -new file mode 100644 -index 0000000..856e80e --- /dev/null +++ b/drivers/media/platform/bcm2835/mmal-encodings.h @@ -0,0 +1,93 @@ @@ -2665,9 +2637,6 @@ index 0000000..856e80e +#define MMAL_ENCODING_VARIANT_H264_AVC1 MMAL_FOURCC('A', 'V', 'C', '1') +/** Implicitly delineated NAL units without emulation prevention */ +#define MMAL_ENCODING_VARIANT_H264_RAW MMAL_FOURCC('R', 'A', 'W', ' ') -diff --git a/drivers/media/platform/bcm2835/mmal-msg-common.h b/drivers/media/platform/bcm2835/mmal-msg-common.h -new file mode 100644 -index 0000000..66e8a6e --- /dev/null +++ b/drivers/media/platform/bcm2835/mmal-msg-common.h @@ -0,0 +1,50 @@ @@ -2721,9 +2690,6 @@ index 0000000..66e8a6e +}; + +#endif /* MMAL_MSG_COMMON_H */ -diff --git a/drivers/media/platform/bcm2835/mmal-msg-format.h b/drivers/media/platform/bcm2835/mmal-msg-format.h -new file mode 100644 -index 0000000..123d86e --- /dev/null +++ b/drivers/media/platform/bcm2835/mmal-msg-format.h @@ -0,0 +1,81 @@ @@ -2808,9 +2774,6 @@ index 0000000..123d86e +}; + +#endif /* MMAL_MSG_FORMAT_H */ -diff --git a/drivers/media/platform/bcm2835/mmal-msg-port.h b/drivers/media/platform/bcm2835/mmal-msg-port.h -new file mode 100644 -index 0000000..a55c1ea --- /dev/null +++ b/drivers/media/platform/bcm2835/mmal-msg-port.h @@ -0,0 +1,107 @@ @@ -2921,9 +2884,6 @@ index 0000000..a55c1ea + */ + +}; -diff --git a/drivers/media/platform/bcm2835/mmal-msg.h b/drivers/media/platform/bcm2835/mmal-msg.h -new file mode 100644 -index 0000000..67b1076 --- /dev/null +++ b/drivers/media/platform/bcm2835/mmal-msg.h @@ -0,0 +1,404 @@ @@ -3331,9 +3291,6 @@ index 0000000..67b1076 + u8 payload[MMAL_MSG_MAX_PAYLOAD]; + } u; +}; -diff --git a/drivers/media/platform/bcm2835/mmal-parameters.h b/drivers/media/platform/bcm2835/mmal-parameters.h -new file mode 100644 -index 0000000..c611b58 --- /dev/null +++ b/drivers/media/platform/bcm2835/mmal-parameters.h @@ -0,0 +1,539 @@ @@ -3876,9 +3833,6 @@ index 0000000..c611b58 + u32 num_effect_params; + u32 effect_parameter[MMAL_MAX_IMAGEFX_PARAMETERS]; +}; -diff --git a/drivers/media/platform/bcm2835/mmal-vchiq.c b/drivers/media/platform/bcm2835/mmal-vchiq.c -new file mode 100644 -index 0000000..a06fb44 --- /dev/null +++ b/drivers/media/platform/bcm2835/mmal-vchiq.c @@ -0,0 +1,1916 @@ @@ -5798,9 +5752,6 @@ index 0000000..a06fb44 + kfree(instance); + return -ENODEV; +} -diff --git a/drivers/media/platform/bcm2835/mmal-vchiq.h b/drivers/media/platform/bcm2835/mmal-vchiq.h -new file mode 100644 -index 0000000..9d1d11e --- /dev/null +++ b/drivers/media/platform/bcm2835/mmal-vchiq.h @@ -0,0 +1,178 @@ @@ -5982,6 +5933,3 @@ index 0000000..9d1d11e + struct mmal_buffer *buf); + +#endif /* MMAL_VCHIQ_H */ --- -1.8.3.2 - |