diff options
author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-11-10 13:03:18 +0200 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-12-18 23:19:21 +0200 |
commit | f5919b65d4c671fd5083838c7a445f319f9a13c8 (patch) | |
tree | 2c791d2a5dea5bbbb0b85f86f74afce2647c0726 /target/linux/brcm2708/patches-4.14/950-0376-staging-bcm2835-camera-Fix-indentation-of-tables.patch | |
parent | 822b4c3b250a254e74407056ccfd5c6aa38da162 (diff) | |
download | upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.gz upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.bz2 upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.zip |
brcm2708: add kernel 4.14 support
Patch generation process:
- rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable
- git format-patch v4.14.89
Patches skipped during rebase:
- lan78xx: Read MAC address from DT if present
- lan78xx: Enable LEDs and auto-negotiation
- Revert "softirq: Let ksoftirqd do its job"
- sc16is7xx: Fix for multi-channel stall
- lan78xx: Ignore DT MAC address if already valid
- lan78xx: Simple patch to prevent some crashes
- tcp_write_queue_purge clears all the SKBs in the write queue
- Revert "lan78xx: Simple patch to prevent some crashes"
- lan78xx: Connect phy early
- Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro
- Revert "Revert "softirq: Let ksoftirqd do its job""
- ASoC: cs4265: SOC_SINGLE register value error fix
- Revert "ASoC: cs4265: SOC_SINGLE register value error fix"
- Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"
- Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends""
Patches dropped after rebase:
- net: Add non-mainline source for rtl8192cu wlan
- net: Fix rtl8192cu build errors on other platforms
- brcm: adds support for BCM43341 wifi
- brcmfmac: Mute expected startup 'errors'
- ARM64: Fix build break for RTL8187/RTL8192CU wifi
- ARM64: Enable RTL8187/RTL8192CU wifi in build config
- This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator
- brcmfmac: add CLM download support
- brcmfmac: request_firmware_direct is quieter
- Sets the BCDC priority to constant 0
- brcmfmac: Disable ARP offloading when promiscuous
- brcmfmac: Avoid possible out-of-bounds read
- brcmfmac: Delete redundant length check
- net: rtl8192cu: Normalize indentation
- net: rtl8192cu: Fix implicit fallthrough warnings
- Revert "Sets the BCDC priority to constant 0"
- media: cxd2880: Bump to match 4.18.y version
- media: cxd2880-spi: Bump to match 4.18.y version
- Revert "mm: alloc_contig: re-allow CMA to compact FS pages"
- Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages""
- cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with
MEDIA_SUBDRV_AUTOSELECT
- 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch
- 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch
Make I2C built-in instead of modular as in upstream defconfig; also the
easiest way to get MFD_ARIZONA enabled, which is required by
kmod-sound-soc-rpi-cirrus.
Add missing compatible strings from
4.9/960-add-rasbperrypi-compatible.patch, using upstream names for
compute modules.
Add extra patch to enable the LEDs on lan78xx.
Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y)
Runtime-tested: bcm2708, bcm2710
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0376-staging-bcm2835-camera-Fix-indentation-of-tables.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0376-staging-bcm2835-camera-Fix-indentation-of-tables.patch | 321 |
1 files changed, 321 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0376-staging-bcm2835-camera-Fix-indentation-of-tables.patch b/target/linux/brcm2708/patches-4.14/950-0376-staging-bcm2835-camera-Fix-indentation-of-tables.patch new file mode 100644 index 0000000000..f002ecd534 --- /dev/null +++ b/target/linux/brcm2708/patches-4.14/950-0376-staging-bcm2835-camera-Fix-indentation-of-tables.patch @@ -0,0 +1,321 @@ +From 212b50d76ee63b58a59ccb687719583f72ea5e23 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.org> +Date: Thu, 10 May 2018 12:42:17 -0700 +Subject: [PATCH 376/454] staging: bcm2835-camera: Fix indentation of tables + +commit 6166045e7964067dba0da43a122de27ceb49be7b upstream + +As requested by Mauro Carvalho Chehab in review. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +Signed-off-by: Eric Anholt <eric@anholt.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + .../bcm2835-camera/bcm2835-camera.c | 289 +++++++++--------- + 1 file changed, 139 insertions(+), 150 deletions(-) + +--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c ++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +@@ -81,145 +81,132 @@ static const struct v4l2_fract + /* video formats */ + static struct mmal_fmt formats[] = { + { +- .name = "4:2:0, planar, YUV", +- .fourcc = V4L2_PIX_FMT_YUV420, +- .flags = 0, +- .mmal = MMAL_ENCODING_I420, +- .depth = 12, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 1, +- .remove_padding = 1, +- }, +- { +- .name = "4:2:2, packed, YUYV", +- .fourcc = V4L2_PIX_FMT_YUYV, +- .flags = 0, +- .mmal = MMAL_ENCODING_YUYV, +- .depth = 16, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 2, +- .remove_padding = 0, +- }, +- { +- .name = "RGB24 (LE)", +- .fourcc = V4L2_PIX_FMT_RGB24, +- .flags = 0, +- .mmal = MMAL_ENCODING_RGB24, +- .depth = 24, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 3, +- .remove_padding = 0, +- }, +- { +- .name = "JPEG", +- .fourcc = V4L2_PIX_FMT_JPEG, +- .flags = V4L2_FMT_FLAG_COMPRESSED, +- .mmal = MMAL_ENCODING_JPEG, +- .depth = 8, +- .mmal_component = MMAL_COMPONENT_IMAGE_ENCODE, +- .ybbp = 0, +- .remove_padding = 0, +- }, +- { +- .name = "H264", +- .fourcc = V4L2_PIX_FMT_H264, +- .flags = V4L2_FMT_FLAG_COMPRESSED, +- .mmal = MMAL_ENCODING_H264, +- .depth = 8, +- .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE, +- .ybbp = 0, +- .remove_padding = 0, +- }, +- { +- .name = "MJPEG", +- .fourcc = V4L2_PIX_FMT_MJPEG, +- .flags = V4L2_FMT_FLAG_COMPRESSED, +- .mmal = MMAL_ENCODING_MJPEG, +- .depth = 8, +- .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE, +- .ybbp = 0, +- .remove_padding = 0, +- }, +- { +- .name = "4:2:2, packed, YVYU", +- .fourcc = V4L2_PIX_FMT_YVYU, +- .flags = 0, +- .mmal = MMAL_ENCODING_YVYU, +- .depth = 16, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 2, +- .remove_padding = 0, +- }, +- { +- .name = "4:2:2, packed, VYUY", +- .fourcc = V4L2_PIX_FMT_VYUY, +- .flags = 0, +- .mmal = MMAL_ENCODING_VYUY, +- .depth = 16, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 2, +- .remove_padding = 0, +- }, +- { +- .name = "4:2:2, packed, UYVY", +- .fourcc = V4L2_PIX_FMT_UYVY, +- .flags = 0, +- .mmal = MMAL_ENCODING_UYVY, +- .depth = 16, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 2, +- .remove_padding = 0, +- }, +- { +- .name = "4:2:0, planar, NV12", +- .fourcc = V4L2_PIX_FMT_NV12, +- .flags = 0, +- .mmal = MMAL_ENCODING_NV12, +- .depth = 12, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 1, +- .remove_padding = 1, +- }, +- { +- .name = "RGB24 (BE)", +- .fourcc = V4L2_PIX_FMT_BGR24, +- .flags = 0, +- .mmal = MMAL_ENCODING_BGR24, +- .depth = 24, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 3, +- .remove_padding = 0, +- }, +- { +- .name = "4:2:0, planar, YVU", +- .fourcc = V4L2_PIX_FMT_YVU420, +- .flags = 0, +- .mmal = MMAL_ENCODING_YV12, +- .depth = 12, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 1, +- .remove_padding = 1, +- }, +- { +- .name = "4:2:0, planar, NV21", +- .fourcc = V4L2_PIX_FMT_NV21, +- .flags = 0, +- .mmal = MMAL_ENCODING_NV21, +- .depth = 12, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 1, +- .remove_padding = 1, +- }, +- { +- .name = "RGB32 (BE)", +- .fourcc = V4L2_PIX_FMT_BGR32, +- .flags = 0, +- .mmal = MMAL_ENCODING_BGRA, +- .depth = 32, +- .mmal_component = MMAL_COMPONENT_CAMERA, +- .ybbp = 4, +- .remove_padding = 0, +- }, ++ .name = "4:2:0, planar, YUV", ++ .fourcc = V4L2_PIX_FMT_YUV420, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_I420, ++ .depth = 12, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 1, ++ .remove_padding = 1, ++ }, { ++ .name = "4:2:2, packed, YUYV", ++ .fourcc = V4L2_PIX_FMT_YUYV, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_YUYV, ++ .depth = 16, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 2, ++ .remove_padding = 0, ++ }, { ++ .name = "RGB24 (LE)", ++ .fourcc = V4L2_PIX_FMT_RGB24, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_RGB24, ++ .depth = 24, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 3, ++ .remove_padding = 0, ++ }, { ++ .name = "JPEG", ++ .fourcc = V4L2_PIX_FMT_JPEG, ++ .flags = V4L2_FMT_FLAG_COMPRESSED, ++ .mmal = MMAL_ENCODING_JPEG, ++ .depth = 8, ++ .mmal_component = MMAL_COMPONENT_IMAGE_ENCODE, ++ .ybbp = 0, ++ .remove_padding = 0, ++ }, { ++ .name = "H264", ++ .fourcc = V4L2_PIX_FMT_H264, ++ .flags = V4L2_FMT_FLAG_COMPRESSED, ++ .mmal = MMAL_ENCODING_H264, ++ .depth = 8, ++ .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE, ++ .ybbp = 0, ++ .remove_padding = 0, ++ }, { ++ .name = "MJPEG", ++ .fourcc = V4L2_PIX_FMT_MJPEG, ++ .flags = V4L2_FMT_FLAG_COMPRESSED, ++ .mmal = MMAL_ENCODING_MJPEG, ++ .depth = 8, ++ .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE, ++ .ybbp = 0, ++ .remove_padding = 0, ++ }, { ++ .name = "4:2:2, packed, YVYU", ++ .fourcc = V4L2_PIX_FMT_YVYU, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_YVYU, ++ .depth = 16, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 2, ++ .remove_padding = 0, ++ }, { ++ .name = "4:2:2, packed, VYUY", ++ .fourcc = V4L2_PIX_FMT_VYUY, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_VYUY, ++ .depth = 16, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 2, ++ .remove_padding = 0, ++ }, { ++ .name = "4:2:2, packed, UYVY", ++ .fourcc = V4L2_PIX_FMT_UYVY, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_UYVY, ++ .depth = 16, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 2, ++ .remove_padding = 0, ++ }, { ++ .name = "4:2:0, planar, NV12", ++ .fourcc = V4L2_PIX_FMT_NV12, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_NV12, ++ .depth = 12, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 1, ++ .remove_padding = 1, ++ }, { ++ .name = "RGB24 (BE)", ++ .fourcc = V4L2_PIX_FMT_BGR24, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_BGR24, ++ .depth = 24, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 3, ++ .remove_padding = 0, ++ }, { ++ .name = "4:2:0, planar, YVU", ++ .fourcc = V4L2_PIX_FMT_YVU420, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_YV12, ++ .depth = 12, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 1, ++ .remove_padding = 1, ++ }, { ++ .name = "4:2:0, planar, NV21", ++ .fourcc = V4L2_PIX_FMT_NV21, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_NV21, ++ .depth = 12, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 1, ++ .remove_padding = 1, ++ }, { ++ .name = "RGB32 (BE)", ++ .fourcc = V4L2_PIX_FMT_BGR32, ++ .flags = 0, ++ .mmal = MMAL_ENCODING_BGRA, ++ .depth = 32, ++ .mmal_component = MMAL_COMPONENT_CAMERA, ++ .ybbp = 4, ++ .remove_padding = 0, ++ }, + }; + + static struct mmal_fmt *get_format(struct v4l2_format *f) +@@ -709,17 +696,19 @@ static int set_overlay_params(struct bm2 + struct vchiq_mmal_port *port) + { + struct mmal_parameter_displayregion prev_config = { +- .set = MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_ALPHA | +- MMAL_DISPLAY_SET_DEST_RECT | MMAL_DISPLAY_SET_FULLSCREEN, +- .layer = PREVIEW_LAYER, +- .alpha = dev->overlay.global_alpha, +- .fullscreen = 0, +- .dest_rect = { +- .x = dev->overlay.w.left, +- .y = dev->overlay.w.top, +- .width = dev->overlay.w.width, +- .height = dev->overlay.w.height, +- }, ++ .set = MMAL_DISPLAY_SET_LAYER | ++ MMAL_DISPLAY_SET_ALPHA | ++ MMAL_DISPLAY_SET_DEST_RECT | ++ MMAL_DISPLAY_SET_FULLSCREEN, ++ .layer = PREVIEW_LAYER, ++ .alpha = dev->overlay.global_alpha, ++ .fullscreen = 0, ++ .dest_rect = { ++ .x = dev->overlay.w.left, ++ .y = dev->overlay.w.top, ++ .width = dev->overlay.w.width, ++ .height = dev->overlay.w.height, ++ }, + }; + return vchiq_mmal_port_parameter_set(dev->instance, port, + MMAL_PARAMETER_DISPLAYREGION, |