f5919b65d4
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>
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
From 185076ab6bc5dd83f2da62552fbb79a53d36314d Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Tue, 18 Sep 2018 11:08:51 +0100
|
|
Subject: [PATCH 419/454] media: ov5647: Use gpiod_set_value_cansleep
|
|
|
|
All calls to the gpio library are in contexts that can sleep,
|
|
therefore there is no issue with having those GPIOs controlled
|
|
by controllers which require sleeping (eg I2C GPIO expanders).
|
|
|
|
Switch to using gpiod_set_value_cansleep instead of gpiod_set_value
|
|
to avoid triggering the warning in gpiolib should the GPIO
|
|
controller need to sleep.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/media/i2c/ov5647.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/media/i2c/ov5647.c
|
|
+++ b/drivers/media/i2c/ov5647.c
|
|
@@ -348,7 +348,7 @@ static int ov5647_sensor_power(struct v4
|
|
dev_dbg(&client->dev, "OV5647 power on\n");
|
|
|
|
if (ov5647->pwdn) {
|
|
- gpiod_set_value(ov5647->pwdn, 0);
|
|
+ gpiod_set_value_cansleep(ov5647->pwdn, 0);
|
|
msleep(PWDN_ACTIVE_DELAY_MS);
|
|
}
|
|
|
|
@@ -390,7 +390,7 @@ static int ov5647_sensor_power(struct v4
|
|
|
|
clk_disable_unprepare(ov5647->xclk);
|
|
|
|
- gpiod_set_value(ov5647->pwdn, 1);
|
|
+ gpiod_set_value_cansleep(ov5647->pwdn, 1);
|
|
}
|
|
|
|
/* Update the power count. */
|
|
@@ -624,13 +624,13 @@ static int ov5647_probe(struct i2c_clien
|
|
goto mutex_remove;
|
|
|
|
if (sensor->pwdn) {
|
|
- gpiod_set_value(sensor->pwdn, 0);
|
|
+ gpiod_set_value_cansleep(sensor->pwdn, 0);
|
|
msleep(PWDN_ACTIVE_DELAY_MS);
|
|
}
|
|
|
|
ret = ov5647_detect(sd);
|
|
|
|
- gpiod_set_value(sensor->pwdn, 1);
|
|
+ gpiod_set_value_cansleep(sensor->pwdn, 1);
|
|
|
|
if (ret < 0)
|
|
goto error;
|