Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.31 Remove upstreamed patches: backport-6.12/780-27-v6.15-r8169-don-t-scan-PHY-addresses-0.patch [1] backport-6.12/780-33-v6.15-r8169-disable-RTL8126-ZRX-DC-timeout.patch [2] bcm27xx/patches-6.12/950-0315-media-i2c-imx219-Correct-the-minimum-vblanking-value.patch [3] bcm27xx/patches-6.12/950-0857-drm-v3d-Add-clock-handling.patch [4] bcm27xx/patches-6.12/950-0874-PCI-brcmstb-Expand-inbound-window-size-up-to-64GB.patch [5] bcm27xx/patches-6.12/950-0877-PCI-brcmstb-Adding-a-softdep-to-MIP-MSI-X-driver.patch [6] bcm27xx/patches-6.12/950-0960-media-imx335-Set-vblank-immediately.patch [7] Manually rebased patches: d1/patches-6.12/0009-ASoC-sunxi-sun4i-codec-add-basic-support-for-D1-audi.patch [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=ba59747562c49974cbace989d76b94a8331da442 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=2780aa8394415df0a69e3b908d6dd8c79e1d1bcc [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=9a981079097bee6a0583877798de0b240717bdde [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=bbd6dc1fb6c56267ad1d58810d92287fcd5b0058 [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=3ffaa2e999380477774e76680ff4cef247451168 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=12153e3948c596737853c3ec4ff7e4e3f4a9f9a6 [7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=8d7e13c31c52690655883dff604238b0760a3644 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/18953 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
45 lines
1.1 KiB
Diff
45 lines
1.1 KiB
Diff
From e64d605dfd61ae4cb471393b0bb0803315d94660 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Wed, 31 Oct 2018 14:57:46 +0000
|
|
Subject: [PATCH] media: adv7180: Default to the first valid input
|
|
|
|
The hardware default is differential CVBS on AIN1 & 2, which
|
|
isn't very useful.
|
|
|
|
Select the first input that is defined as valid for the
|
|
chip variant (typically CVBS_AIN1).
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/media/i2c/adv7180.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
--- a/drivers/media/i2c/adv7180.c
|
|
+++ b/drivers/media/i2c/adv7180.c
|
|
@@ -1362,6 +1362,7 @@ static const struct adv7180_chip_info ad
|
|
static int init_device(struct adv7180_state *state)
|
|
{
|
|
int ret;
|
|
+ int i;
|
|
|
|
mutex_lock(&state->mutex);
|
|
|
|
@@ -1409,6 +1410,18 @@ static int init_device(struct adv7180_st
|
|
goto out_unlock;
|
|
}
|
|
|
|
+ /* Select first valid input */
|
|
+ for (i = 0; i < 32; i++) {
|
|
+ if (BIT(i) & state->chip_info->valid_input_mask) {
|
|
+ ret = state->chip_info->select_input(state, i);
|
|
+
|
|
+ if (ret == 0) {
|
|
+ state->input = i;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
out_unlock:
|
|
mutex_unlock(&state->mutex);
|
|
|