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-0336-media-adv7180-Nasty-hack-to-allow-input-selection.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-0336-media-adv7180-Nasty-hack-to-allow-input-selection.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0336-media-adv7180-Nasty-hack-to-allow-input-selection.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0336-media-adv7180-Nasty-hack-to-allow-input-selection.patch b/target/linux/brcm2708/patches-4.14/950-0336-media-adv7180-Nasty-hack-to-allow-input-selection.patch new file mode 100644 index 0000000000..27ad305246 --- /dev/null +++ b/target/linux/brcm2708/patches-4.14/950-0336-media-adv7180-Nasty-hack-to-allow-input-selection.patch @@ -0,0 +1,89 @@ +From f5bc65a235291381313a7a9769b46afbfc267ae0 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.org> +Date: Wed, 18 Apr 2018 14:13:32 +0100 +Subject: [PATCH 336/454] media: adv7180: Nasty hack to allow input selection. + +Whilst the adv7180 driver support s_routing, nothing else +does, and there is a missing lump of framework code to +define the mapping from connectors on a board to the inputs +they represent on the ADV7180. + +Add a nasty hack to take a module parameter that is passed in +to s_routing on any call to G_STD, or S_STD (or subdev +g_input_status call). + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> +--- + drivers/media/i2c/adv7180.c | 30 ++++++++++++++++++++++++++++-- + 1 file changed, 28 insertions(+), 2 deletions(-) + +--- a/drivers/media/i2c/adv7180.c ++++ b/drivers/media/i2c/adv7180.c +@@ -189,6 +189,10 @@ + + #define V4L2_CID_ADV_FAST_SWITCH (V4L2_CID_USER_ADV7180_BASE + 0x00) + ++static int dbg_input; ++module_param(dbg_input, int, 0644); ++MODULE_PARM_DESC(dbg_input, "Input number (0-31)"); ++ + struct adv7180_state; + + #define ADV7180_FLAG_RESET_POWERED BIT(0) +@@ -405,10 +409,24 @@ out: + return ret; + } + ++static void adv7180_check_input(struct v4l2_subdev *sd) ++{ ++ struct adv7180_state *state = to_state(sd); ++ ++ if (state->input != dbg_input) ++ if (adv7180_s_routing(sd, dbg_input, 0, 0)) ++ /* Failed - reset dbg_input */ ++ dbg_input = state->input; ++} ++ + static int adv7180_g_input_status(struct v4l2_subdev *sd, u32 *status) + { + struct adv7180_state *state = to_state(sd); +- int ret = mutex_lock_interruptible(&state->mutex); ++ int ret; ++ ++ adv7180_check_input(sd); ++ ++ ret = mutex_lock_interruptible(&state->mutex); + if (ret) + return ret; + +@@ -434,7 +452,11 @@ static int adv7180_program_std(struct ad + static int adv7180_s_std(struct v4l2_subdev *sd, v4l2_std_id std) + { + struct adv7180_state *state = to_state(sd); +- int ret = mutex_lock_interruptible(&state->mutex); ++ int ret; ++ ++ adv7180_check_input(sd); ++ ++ ret = mutex_lock_interruptible(&state->mutex); + + if (ret) + return ret; +@@ -456,6 +478,8 @@ static int adv7180_g_std(struct v4l2_sub + { + struct adv7180_state *state = to_state(sd); + ++ adv7180_check_input(sd); ++ + *norm = state->curr_norm; + + return 0; +@@ -791,6 +815,8 @@ static int adv7180_s_stream(struct v4l2_ + return 0; + } + ++ adv7180_check_input(sd); ++ + /* Must wait until querystd released the lock */ + ret = mutex_lock_interruptible(&state->mutex); + if (ret) |