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-0396-staging-bcm2835-camera-Fix-spacing-around-operators.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-0396-staging-bcm2835-camera-Fix-spacing-around-operators.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0396-staging-bcm2835-camera-Fix-spacing-around-operators.patch | 145 |
1 files changed, 145 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0396-staging-bcm2835-camera-Fix-spacing-around-operators.patch b/target/linux/brcm2708/patches-4.14/950-0396-staging-bcm2835-camera-Fix-spacing-around-operators.patch new file mode 100644 index 0000000000..022c12eec9 --- /dev/null +++ b/target/linux/brcm2708/patches-4.14/950-0396-staging-bcm2835-camera-Fix-spacing-around-operators.patch @@ -0,0 +1,145 @@ +From 4310db07054697c7c1750cafa57b843f76fd7df0 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.org> +Date: Wed, 21 Feb 2018 14:13:03 +0000 +Subject: [PATCH 396/454] staging: bcm2835-camera: Fix spacing around operators + +Fix checkpatch warnings over spaces around operators. +Many were around operations that can be replaced with the +BIT(x) macro, so replace with that where appropriate. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +--- + .../vc04_services/bcm2835-camera/controls.c | 32 +++++++++---------- + .../vc04_services/bcm2835-camera/mmal-msg.h | 25 ++++++++------- + .../bcm2835-camera/mmal-parameters.h | 12 +++---- + 3 files changed, 35 insertions(+), 34 deletions(-) + +--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c ++++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c +@@ -1126,10 +1126,10 @@ static const struct bm2835_mmal_v4l2_ctr + { + V4L2_CID_MPEG_VIDEO_H264_PROFILE, + MMAL_CONTROL_TYPE_STD_MENU, +- ~((1<<V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) | +- (1<<V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) | +- (1<<V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) | +- (1<<V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)), ++ ~(BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) | ++ BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) | ++ BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) | ++ BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)), + V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, + V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, 1, NULL, + MMAL_PARAMETER_PROFILE, +@@ -1138,18 +1138,18 @@ static const struct bm2835_mmal_v4l2_ctr + }, + { + V4L2_CID_MPEG_VIDEO_H264_LEVEL, MMAL_CONTROL_TYPE_STD_MENU, +- ~((1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_0) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1B) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_1) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_2) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_3) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_0) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_1) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_2) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_0) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_1) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_2) | +- (1<<V4L2_MPEG_VIDEO_H264_LEVEL_4_0)), ++ ~(BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) | ++ BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0)), + V4L2_MPEG_VIDEO_H264_LEVEL_4_0, + V4L2_MPEG_VIDEO_H264_LEVEL_4_0, 1, NULL, + MMAL_PARAMETER_PROFILE, +--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h ++++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h +@@ -219,39 +219,40 @@ struct mmal_msg_port_action_reply { + #define MMAL_VC_SHORT_DATA 128 + + /* Signals that the current payload is the end of the stream of data */ +-#define MMAL_BUFFER_HEADER_FLAG_EOS (1<<0) ++#define MMAL_BUFFER_HEADER_FLAG_EOS BIT(0) + /* Signals that the start of the current payload starts a frame */ +-#define MMAL_BUFFER_HEADER_FLAG_FRAME_START (1<<1) ++#define MMAL_BUFFER_HEADER_FLAG_FRAME_START BIT(1) + /* Signals that the end of the current payload ends a frame */ +-#define MMAL_BUFFER_HEADER_FLAG_FRAME_END (1<<2) ++#define MMAL_BUFFER_HEADER_FLAG_FRAME_END BIT(2) + /* Signals that the current payload contains only complete frames (>1) */ + #define MMAL_BUFFER_HEADER_FLAG_FRAME \ +- (MMAL_BUFFER_HEADER_FLAG_FRAME_START|MMAL_BUFFER_HEADER_FLAG_FRAME_END) ++ (MMAL_BUFFER_HEADER_FLAG_FRAME_START | \ ++ MMAL_BUFFER_HEADER_FLAG_FRAME_END) + /* Signals that the current payload is a keyframe (i.e. self decodable) */ +-#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME (1<<3) ++#define MMAL_BUFFER_HEADER_FLAG_KEYFRAME BIT(3) + /* + * Signals a discontinuity in the stream of data (e.g. after a seek). + * Can be used for instance by a decoder to reset its state + */ +-#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY (1<<4) ++#define MMAL_BUFFER_HEADER_FLAG_DISCONTINUITY BIT(4) + /* + * Signals a buffer containing some kind of config data for the component + * (e.g. codec config data) + */ +-#define MMAL_BUFFER_HEADER_FLAG_CONFIG (1<<5) ++#define MMAL_BUFFER_HEADER_FLAG_CONFIG BIT(5) + /* Signals an encrypted payload */ +-#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED (1<<6) ++#define MMAL_BUFFER_HEADER_FLAG_ENCRYPTED BIT(6) + /* Signals a buffer containing side information */ +-#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO (1<<7) ++#define MMAL_BUFFER_HEADER_FLAG_CODECSIDEINFO BIT(7) + /* + * Signals a buffer which is the snapshot/postview image from a stills + * capture + */ +-#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT (1<<8) ++#define MMAL_BUFFER_HEADER_FLAGS_SNAPSHOT BIT(8) + /* Signals a buffer which contains data known to be corrupted */ +-#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED (1<<9) ++#define MMAL_BUFFER_HEADER_FLAG_CORRUPTED BIT(9) + /* Signals that a buffer failed to be transmitted */ +-#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED (1<<10) ++#define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED BIT(10) + + struct mmal_driver_buffer { + u32 magic; +--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h ++++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +@@ -26,17 +26,17 @@ + #define __MMAL_PARAMETERS_H + + /** Common parameter ID group, used with many types of component. */ +-#define MMAL_PARAMETER_GROUP_COMMON (0<<16) ++#define MMAL_PARAMETER_GROUP_COMMON (0 << 16) + /** Camera-specific parameter ID group. */ +-#define MMAL_PARAMETER_GROUP_CAMERA (1<<16) ++#define MMAL_PARAMETER_GROUP_CAMERA (1 << 16) + /** Video-specific parameter ID group. */ +-#define MMAL_PARAMETER_GROUP_VIDEO (2<<16) ++#define MMAL_PARAMETER_GROUP_VIDEO (2 << 16) + /** Audio-specific parameter ID group. */ +-#define MMAL_PARAMETER_GROUP_AUDIO (3<<16) ++#define MMAL_PARAMETER_GROUP_AUDIO (3 << 16) + /** Clock-specific parameter ID group. */ +-#define MMAL_PARAMETER_GROUP_CLOCK (4<<16) ++#define MMAL_PARAMETER_GROUP_CLOCK (4 << 16) + /** Miracast-specific parameter ID group. */ +-#define MMAL_PARAMETER_GROUP_MIRACAST (5<<16) ++#define MMAL_PARAMETER_GROUP_MIRACAST (5 << 16) + + /* Common parameters */ + enum mmal_parameter_common_type { |