aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0402-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-11-10 13:03:18 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-12-18 23:19:21 +0200
commitf5919b65d4c671fd5083838c7a445f319f9a13c8 (patch)
tree2c791d2a5dea5bbbb0b85f86f74afce2647c0726 /target/linux/brcm2708/patches-4.14/950-0402-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch
parent822b4c3b250a254e74407056ccfd5c6aa38da162 (diff)
downloadupstream-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-0402-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0402-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch137
1 files changed, 137 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0402-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch b/target/linux/brcm2708/patches-4.14/950-0402-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch
new file mode 100644
index 0000000000..3e5fc2b401
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0402-staging-bcm2835-camera-Fix-open-parenthesis-alignmen.patch
@@ -0,0 +1,137 @@
+From ebbe1b1aad0b52d27beed714cb075e1c83af651f Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Wed, 21 Feb 2018 15:53:59 +0000
+Subject: [PATCH 402/454] staging: bcm2835-camera: Fix open parenthesis
+ alignment
+
+Fix checkpatch "Alignment should match open parenthesis"
+errors.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
+---
+ .../bcm2835-camera/bcm2835-camera.c | 12 ++++-----
+ .../vc04_services/bcm2835-camera/controls.c | 25 ++++++++++++-------
+ .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +-
+ .../vc04_services/bcm2835-camera/mmal-vchiq.h | 6 ++---
+ 4 files changed, 25 insertions(+), 20 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+@@ -419,8 +419,7 @@ static void buffer_cb(struct vchiq_mmal_
+ buf->vb.flags |= V4L2_BUF_FLAG_KEYFRAME;
+
+ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+- "Buffer has ts %llu",
+- dev->capture.last_timestamp);
++ "Buffer has ts %llu", dev->capture.last_timestamp);
+ vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+
+ if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS &&
+@@ -589,8 +588,8 @@ static int start_streaming(struct vb2_qu
+ vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
+ if (ret) {
+ v4l2_err(&dev->v4l2_dev,
+- "Failed to enable capture port - error %d. Disabling camera port again\n",
+- ret);
++ "Failed to enable capture port - error %d. Disabling camera port again\n",
++ ret);
+
+ vchiq_mmal_port_disable(dev->instance,
+ dev->capture.camera_port);
+@@ -998,8 +997,7 @@ static int vidioc_try_fmt_vid_cap(struct
+ f->fmt.pix.bytesperline =
+ (f->fmt.pix.bytesperline + align_mask) & ~align_mask;
+ v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
+- "Not removing padding, so bytes/line = %d, "
+- "(align_mask %d)\n",
++ "Not removing padding, so bytes/line = %d, (align_mask %d)\n",
+ f->fmt.pix.bytesperline, align_mask);
+ }
+
+@@ -1345,7 +1343,7 @@ static int vidioc_s_fmt_vid_cap(struct f
+ }
+
+ static int vidioc_enum_framesizes(struct file *file, void *fh,
+- struct v4l2_frmsizeenum *fsize)
++ struct v4l2_frmsizeenum *fsize)
+ {
+ struct bm2835_mmal_dev *dev = video_drvdata(file);
+ static const struct v4l2_frmsize_stepwise sizes = {
+--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
+@@ -1257,9 +1257,12 @@ int bm2835_mmal_init_controls(struct bm2
+
+ switch (ctrl->type) {
+ case MMAL_CONTROL_TYPE_STD:
+- dev->ctrls[c] = v4l2_ctrl_new_std(hdl,
+- &bm2835_mmal_ctrl_ops, ctrl->id,
+- ctrl->min, ctrl->max, ctrl->step, ctrl->def);
++ dev->ctrls[c] =
++ v4l2_ctrl_new_std(hdl,
++ &bm2835_mmal_ctrl_ops,
++ ctrl->id, ctrl->min,
++ ctrl->max, ctrl->step,
++ ctrl->def);
+ break;
+
+ case MMAL_CONTROL_TYPE_STD_MENU:
+@@ -1283,16 +1286,20 @@ int bm2835_mmal_init_controls(struct bm2
+ mask = ~mask;
+ }
+
+- dev->ctrls[c] = v4l2_ctrl_new_std_menu(hdl,
+- &bm2835_mmal_ctrl_ops, ctrl->id,
+- ctrl->max, mask, ctrl->def);
++ dev->ctrls[c] =
++ v4l2_ctrl_new_std_menu(hdl,
++ &bm2835_mmal_ctrl_ops,
++ ctrl->id, ctrl->max,
++ mask, ctrl->def);
+ break;
+ }
+
+ case MMAL_CONTROL_TYPE_INT_MENU:
+- dev->ctrls[c] = v4l2_ctrl_new_int_menu(hdl,
+- &bm2835_mmal_ctrl_ops, ctrl->id,
+- ctrl->max, ctrl->def, ctrl->imenu);
++ dev->ctrls[c] =
++ v4l2_ctrl_new_int_menu(hdl,
++ &bm2835_mmal_ctrl_ops,
++ ctrl->id, ctrl->max,
++ ctrl->def, ctrl->imenu);
+ break;
+
+ case MMAL_CONTROL_TYPE_CLUSTER:
+--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+@@ -717,7 +717,7 @@ static int send_synchronous_mmal_msg(str
+ if (payload_len >
+ (MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header))) {
+ pr_err("payload length %d exceeds max:%d\n", payload_len,
+- (int)(MMAL_MSG_MAX_SIZE -
++ (int)(MMAL_MSG_MAX_SIZE -
+ sizeof(struct mmal_msg_header)));
+ return -EINVAL;
+ }
+--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
++++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
+@@ -131,7 +131,7 @@ int vchiq_mmal_port_enable(
+ * disable a port will dequeue any pending buffers
+ */
+ int vchiq_mmal_port_disable(struct vchiq_mmal_instance *instance,
+- struct vchiq_mmal_port *port);
++ struct vchiq_mmal_port *port);
+
+ int vchiq_mmal_port_parameter_set(struct vchiq_mmal_instance *instance,
+ struct vchiq_mmal_port *port,
+@@ -149,8 +149,8 @@ int vchiq_mmal_port_set_format(struct vc
+ struct vchiq_mmal_port *port);
+
+ int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance,
+- struct vchiq_mmal_port *src,
+- struct vchiq_mmal_port *dst);
++ struct vchiq_mmal_port *src,
++ struct vchiq_mmal_port *dst);
+
+ int vchiq_mmal_version(struct vchiq_mmal_instance *instance,
+ u32 *major_out,