|
@@ -1,4 +1,4 @@
|
|
|
-From 87808db00a9bec80f5c7e61af87d8920c1140276 Mon Sep 17 00:00:00 2001
|
|
|
+From 5e0db9203b307a7eb9af7f888e1cb23cc6078cd2 Mon Sep 17 00:00:00 2001
|
|
|
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
|
Date: Wed, 30 Dec 2020 22:44:05 +0200
|
|
|
Subject: [PATCH] media: ipu3-cio2: Add headers that ipu3-cio2.h is direct user
|
|
@@ -48,9 +48,9 @@ index ccf0b85ae36f..62187ab5ae43 100644
|
|
|
#define CIO2_DEVICE_NAME "Intel IPU3 CIO2"
|
|
|
#define CIO2_ENTITY_NAME "ipu3-csi2"
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 7d3ab2200e50851ec1020f291231b7f9b98e857b Mon Sep 17 00:00:00 2001
|
|
|
+From 0c3dd9a8fb38fd61ebabc254ceab9568f5edadba Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 24 Oct 2020 22:42:28 +0100
|
|
|
Subject: [PATCH] device property: Return true in fwnode_device_is_available
|
|
@@ -93,9 +93,9 @@ index 35b95c6ac0c6..0bf5260f14c6 100644
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(fwnode_device_is_available);
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From fbcf60d36e7a531adc97e0a1b46ae8ce45feee65 Mon Sep 17 00:00:00 2001
|
|
|
+From 907568ade701706c52db5ada861d06086419402d Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 21 Nov 2020 22:06:38 +0000
|
|
|
Subject: [PATCH] device property: Call fwnode_graph_get_endpoint_by_id() for
|
|
@@ -137,9 +137,9 @@ index 0bf5260f14c6..1421e9548857 100644
|
|
|
EXPORT_SYMBOL_GPL(fwnode_graph_get_endpoint_by_id);
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 0610f7bece4792c305fde64c2a50c1bf366e0e49 Mon Sep 17 00:00:00 2001
|
|
|
+From b8173132178b10a5efd83839c9a1e24082bc3ee7 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sun, 25 Oct 2020 22:49:08 +0000
|
|
|
Subject: [PATCH] software_node: Enforce parent before child ordering of nodes
|
|
@@ -164,7 +164,7 @@ Patchset: cameras
|
|
|
1 file changed, 30 insertions(+), 12 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
|
|
|
-index 4fcc1a6fb724..166c5cc73f39 100644
|
|
|
+index fbfb01ff1856..edfdd67daccd 100644
|
|
|
--- a/drivers/base/swnode.c
|
|
|
+++ b/drivers/base/swnode.c
|
|
|
@@ -692,7 +692,11 @@ swnode_register(const struct software_node *node, struct swnode *parent,
|
|
@@ -240,9 +240,9 @@ index 4fcc1a6fb724..166c5cc73f39 100644
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(software_node_unregister_nodes);
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From d295abae3b2f332c1687829eb1513e02f54c88b8 Mon Sep 17 00:00:00 2001
|
|
|
+From a1f61094b389d93a8e6cf0f5e08264b0069e9146 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 21 Oct 2020 22:25:03 +0100
|
|
|
Subject: [PATCH] software_node: unregister software_nodes in reverse order
|
|
@@ -263,7 +263,7 @@ Patchset: cameras
|
|
|
1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
|
|
|
-index 166c5cc73f39..6f7443c6d3b5 100644
|
|
|
+index edfdd67daccd..b22290106284 100644
|
|
|
--- a/drivers/base/swnode.c
|
|
|
+++ b/drivers/base/swnode.c
|
|
|
@@ -779,16 +779,23 @@ EXPORT_SYMBOL_GPL(software_node_register_node_group);
|
|
@@ -295,9 +295,9 @@ index 166c5cc73f39..6f7443c6d3b5 100644
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(software_node_unregister_node_group);
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 2c65b3e862143735638f649a89649e82f51cc241 Mon Sep 17 00:00:00 2001
|
|
|
+From 1a4eae6e534912d480db0cc53d0c6ab50b550c43 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Tue, 22 Dec 2020 13:09:05 +0000
|
|
|
Subject: [PATCH] device property: Define format macros for ports and endpoints
|
|
@@ -336,9 +336,9 @@ index fde4ad97564c..77414e431e89 100644
|
|
|
|
|
|
/**
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 7d7da50bc117568c5d399cdc7017e030b8194f8e Mon Sep 17 00:00:00 2001
|
|
|
+From 155436919a50af503a0203003dec913c8a6e6a7a Mon Sep 17 00:00:00 2001
|
|
|
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
|
|
|
Date: Tue, 15 Sep 2020 15:47:46 +0100
|
|
|
Subject: [PATCH] software_node: Add support for fwnode_graph*() family of
|
|
@@ -371,7 +371,7 @@ Patchset: cameras
|
|
|
1 file changed, 114 insertions(+), 1 deletion(-)
|
|
|
|
|
|
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
|
|
|
-index 6f7443c6d3b5..9104a0abd531 100644
|
|
|
+index b22290106284..0e90bbf6e08c 100644
|
|
|
--- a/drivers/base/swnode.c
|
|
|
+++ b/drivers/base/swnode.c
|
|
|
@@ -540,6 +540,115 @@ software_node_get_reference_args(const struct fwnode_handle *fwnode,
|
|
@@ -504,9 +504,9 @@ index 6f7443c6d3b5..9104a0abd531 100644
|
|
|
|
|
|
/* -------------------------------------------------------------------------- */
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 987fcc4a7f64afcf7ea9b05de6b4f936adf6744f Mon Sep 17 00:00:00 2001
|
|
|
+From df9365bcf1c4ebfa01bbe4fe23c52f50970b660b Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 10 Oct 2020 23:07:22 +0100
|
|
|
Subject: [PATCH] lib/test_printf.c: Use helper function to unwind array of
|
|
@@ -542,9 +542,9 @@ index 7ac87f18a10f..7d60f24240a4 100644
|
|
|
|
|
|
static void __init
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 5209d9e8919d703ceb63d6f7c88c1274a7d30a25 Mon Sep 17 00:00:00 2001
|
|
|
+From 9d03aff220feb9ea3c7cb29115574281fa452b0e Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 10 Oct 2020 23:11:36 +0100
|
|
|
Subject: [PATCH] ipu3-cio2: Add T: entry to MAINTAINERS
|
|
@@ -573,9 +573,9 @@ index a4a0519ce88c..66ce274c17d7 100644
|
|
|
F: drivers/media/pci/intel/ipu3/
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From b3710b74d073a6e0c1638e52488301bfadd4c1e7 Mon Sep 17 00:00:00 2001
|
|
|
+From ec9d366f1259c210888d647795c8750317ef9249 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 10 Oct 2020 22:47:21 +0100
|
|
|
Subject: [PATCH] ipu3-cio2: Rename ipu3-cio2.c
|
|
@@ -608,9 +608,9 @@ similarity index 100%
|
|
|
rename from drivers/media/pci/intel/ipu3/ipu3-cio2.c
|
|
|
rename to drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 0fa14fefa139cc528a9c24eab102a44b5979656d Mon Sep 17 00:00:00 2001
|
|
|
+From a243aad5b8534ec2837c1fbf5839da3fa957c5fd Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 21 Oct 2020 21:53:05 +0100
|
|
|
Subject: [PATCH] media: v4l2-core: v4l2-async: Check sd->fwnode->secondary in
|
|
@@ -649,9 +649,9 @@ index e3ab003a6c85..9dd896d085ec 100644
|
|
|
* Otherwise, check if the sd fwnode and the asd fwnode refer to an
|
|
|
* endpoint or a device. If they're of the same type, there's no match.
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 990e177da9a00f84f6d1779c9b84fd4a5b8d83a2 Mon Sep 17 00:00:00 2001
|
|
|
+From 3b64a0e65a19c7cab1a57dfba6d143b9d31a288d Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sun, 15 Nov 2020 08:15:34 +0000
|
|
|
Subject: [PATCH] ACPI / bus: Add acpi_dev_get_next_match_dev() and helper
|
|
@@ -758,9 +758,9 @@ index 6d1879bf9440..02a716a0af5d 100644
|
|
|
{
|
|
|
put_device(&adev->dev);
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From b62cadbe3c03cc44806af0bd2785c7798cf5830a Mon Sep 17 00:00:00 2001
|
|
|
+From 5af0b88107de82d0aa052e63793d3c10b8cd9daf Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 19 Dec 2020 23:55:04 +0000
|
|
|
Subject: [PATCH] media: v4l2-fwnode: Include v4l2_fwnode_bus_type
|
|
@@ -835,9 +835,9 @@ index 4365430eea6f..77fd6a3ec308 100644
|
|
|
* v4l2_fwnode_endpoint_parse() - parse all fwnode node properties
|
|
|
* @fwnode: pointer to the endpoint's fwnode handle
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From d92eb11b231d731f2f1bc96df934a08129a59297 Mon Sep 17 00:00:00 2001
|
|
|
+From 623daac6c5a3c1cf77224556595489947df98855 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 21 Oct 2020 21:53:44 +0100
|
|
|
Subject: [PATCH] ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver
|
|
@@ -1433,9 +1433,9 @@ index 62187ab5ae43..dc3e343a37fb 100644
|
|
|
+
|
|
|
#endif
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 7ef611d32079b60fdb259e02a7e38a88704eb080 Mon Sep 17 00:00:00 2001
|
|
|
+From 0084db1ee29a46212979f5ab35a79d9ad9cbcf21 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 2 Dec 2020 12:38:10 +0000
|
|
|
Subject: [PATCH] acpi: utils: move acpi_lpss_dep() to utils
|
|
@@ -1535,9 +1535,9 @@ index ddca1550cce6..78b38775f18b 100644
|
|
|
* acpi_dev_present - Detect that a given ACPI device is present
|
|
|
* @hid: Hardware ID of the device.
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 926f38272c0bcefe876c97d66af84b3a9bfa0a40 Mon Sep 17 00:00:00 2001
|
|
|
+From 29fa2a65a4b24ea7a2bfd6894ec562cb11c384e7 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Thu, 26 Nov 2020 21:12:41 +0000
|
|
|
Subject: [PATCH] acpi: utils: Add function to fetch dependent acpi_devices
|
|
@@ -1621,9 +1621,9 @@ index 02a716a0af5d..33deb22294f2 100644
|
|
|
acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv);
|
|
|
struct acpi_device *
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 44cf4f3e3eb4d9fc28fb4bb25969f63e9ffb6e5b Mon Sep 17 00:00:00 2001
|
|
|
+From aee20d9e38198361a376559aa417b978925eb13c Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Mon, 16 Nov 2020 21:38:49 +0000
|
|
|
Subject: [PATCH] i2c: i2c-core-base: Use format macro in i2c_dev_set_name()
|
|
@@ -1689,9 +1689,9 @@ index 56622658b215..65acae61dc5c 100644
|
|
|
{
|
|
|
return NULL;
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 81c4f7153d35280aee130326b0063dfc1e7e993d Mon Sep 17 00:00:00 2001
|
|
|
+From de7a2ba11b6a7f0b8dd43527f5dc7f8df87a3016 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 2 Dec 2020 16:41:42 +0000
|
|
|
Subject: [PATCH] i2c: i2c-core-acpi: Add i2c_acpi_dev_name()
|
|
@@ -1747,9 +1747,9 @@ index 65acae61dc5c..b82aac05b17f 100644
|
|
|
#else
|
|
|
static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 0344c27fbf5d528d3224015a11bc714d1fafe8ef Mon Sep 17 00:00:00 2001
|
|
|
+From 00d6d054cded0e77fd8d565747d4f36d7beca611 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Mon, 16 Nov 2020 00:16:56 +0000
|
|
|
Subject: [PATCH] gpio: gpiolib-acpi: Export acpi_get_gpiod()
|
|
@@ -1767,7 +1767,7 @@ Patchset: cameras
|
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
|
|
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
|
|
|
-index e37a57d0a2f0..83f9f85cd0ab 100644
|
|
|
+index 495f779b2ab9..00d183165ce3 100644
|
|
|
--- a/drivers/gpio/gpiolib-acpi.c
|
|
|
+++ b/drivers/gpio/gpiolib-acpi.c
|
|
|
@@ -111,7 +111,7 @@ static int acpi_gpiochip_find(struct gpio_chip *gc, void *data)
|
|
@@ -1788,18 +1788,18 @@ index e37a57d0a2f0..83f9f85cd0ab 100644
|
|
|
static irqreturn_t acpi_gpio_irq_handler(int irq, void *data)
|
|
|
{
|
|
|
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
|
|
|
-index 053bf05fb1f7..626d43b00c4f 100644
|
|
|
+index b20568c44001..c085527b7a86 100644
|
|
|
--- a/include/linux/acpi.h
|
|
|
+++ b/include/linux/acpi.h
|
|
|
@@ -1073,6 +1073,7 @@ void __acpi_handle_debug(struct _ddebug *descriptor, acpi_handle handle, const c
|
|
|
bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,
|
|
|
struct acpi_resource_gpio **agpio);
|
|
|
- int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index);
|
|
|
+ int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, const char *name, int index);
|
|
|
+struct gpio_desc *acpi_get_gpiod(char *path, int pin);
|
|
|
#else
|
|
|
static inline bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,
|
|
|
struct acpi_resource_gpio **agpio)
|
|
|
-@@ -1083,6 +1084,10 @@ static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
|
|
|
+@@ -1084,6 +1085,10 @@ static inline int acpi_dev_gpio_irq_get_by(struct acpi_device *adev,
|
|
|
{
|
|
|
return -ENXIO;
|
|
|
}
|
|
@@ -1809,11 +1809,11 @@ index 053bf05fb1f7..626d43b00c4f 100644
|
|
|
+}
|
|
|
#endif
|
|
|
|
|
|
- /* Device properties */
|
|
|
+ static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 6a9bc940f7bdfa0dfa25e1a0540a0d4624313746 Mon Sep 17 00:00:00 2001
|
|
|
+From 4780c90a39c2e82619a0330e8ec200209cde4c7b Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 12 Dec 2020 23:56:59 +0000
|
|
|
Subject: [PATCH] mfd: Remove tps68470 MFD driver
|
|
@@ -2002,9 +2002,9 @@ index 4a4df4ffd18c..000000000000
|
|
|
-};
|
|
|
-builtin_i2c_driver(tps68470_driver);
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 22cc6004e98f1ff2dd83a77278bd8f04f6f22dc6 Mon Sep 17 00:00:00 2001
|
|
|
+From 1ce9b701d669408fbc3bca2320c253753adce3c9 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Fri, 15 Jan 2021 12:37:31 +0000
|
|
|
Subject: [PATCH] platform: x86: Add intel_skl_int3472 driver
|
|
@@ -2971,9 +2971,9 @@ index 000000000000..3fe27ec0caff
|
|
|
+ return ret;
|
|
|
+}
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From e0e56e5c4ec4483bc3b85d0ebbf3c2251c5d8398 Mon Sep 17 00:00:00 2001
|
|
|
+From b619ccbccae02127a7a7e490fc51ee6db4a1651d Mon Sep 17 00:00:00 2001
|
|
|
From: Jake Day <jake@ninebysix.com>
|
|
|
Date: Fri, 25 Sep 2020 10:24:53 -0400
|
|
|
Subject: [PATCH] media: i2c: Add support for the OV5693 image sensor
|
|
@@ -6328,9 +6328,9 @@ index 000000000000..9a508e1f3624
|
|
|
+static unsigned long N_RES = N_RES_VIDEO;
|
|
|
+#endif
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From b71f733a7cbdfaefad333d218a23f5902a405e7e Mon Sep 17 00:00:00 2001
|
|
|
+From 7008c7cc1e110d2cb29f5aba80d49c12aa916cc6 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sun, 17 Jan 2021 19:08:18 +0000
|
|
|
Subject: [PATCH] media: i2c: Add reset pin toggling to ov5693
|
|
@@ -6369,9 +6369,9 @@ index 32485e4ed42b..f9ced52ad37a 100644
|
|
|
|
|
|
if (dev->indicator_led)
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 23d3da32422d08c3deb15c324e68944b424ff08d Mon Sep 17 00:00:00 2001
|
|
|
+From 193d5f339de2dc71b6ad3073c0b9353508993bcf Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sun, 17 Jan 2021 21:39:15 +0000
|
|
|
Subject: [PATCH] media: i2c: Fix misnamed variable in power_down() for ov5693
|
|
@@ -6398,9 +6398,9 @@ index f9ced52ad37a..9fd44a3d1d85 100644
|
|
|
clk_disable_unprepare(dev->clk);
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 36dd147f28b485c502868acae951a61e3a034d31 Mon Sep 17 00:00:00 2001
|
|
|
+From 76890c8c39d9275de804e7252dd651439a4d8966 Mon Sep 17 00:00:00 2001
|
|
|
From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
|
|
|
Date: Fri, 22 Jan 2021 20:58:13 +0100
|
|
|
Subject: [PATCH] cio2-bridge: Parse sensor orientation and rotation
|
|
@@ -6561,9 +6561,9 @@ index dd0ffcafa489..924d99d20328 100644
|
|
|
struct property_entry ep_properties[5];
|
|
|
struct property_entry dev_properties[3];
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 173d655455237910750b8f08f53c1fbef0ea20a2 Mon Sep 17 00:00:00 2001
|
|
|
+From 335693a0a095860a463e55f0c06f434626fd8e16 Mon Sep 17 00:00:00 2001
|
|
|
From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
|
|
|
Date: Fri, 22 Jan 2021 21:23:47 +0100
|
|
|
Subject: [PATCH] ov5693: Add orientation and rotation controls
|
|
@@ -6617,9 +6617,9 @@ index 9fd44a3d1d85..1a85800df7ed 100644
|
|
|
ov5693->ctrl_handler.lock = &ov5693->input_lock;
|
|
|
ov5693->sd.ctrl_handler = &ov5693->ctrl_handler;
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From a23bd2514938e1063b40ce374f9474ee0c738c67 Mon Sep 17 00:00:00 2001
|
|
|
+From 135b0054dd8e66a9de06337d358106fc9de4c1cc Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 23 Jan 2021 00:28:32 +0000
|
|
|
Subject: [PATCH] platform: x86: Stylistic updates for intel-skl-int3472
|
|
@@ -7034,9 +7034,9 @@ index 3fe27ec0caff..40629291b339 100644
|
|
|
return -EINVAL;
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From bfa0494efc110ec10b813fa251d110e3adb651fc Mon Sep 17 00:00:00 2001
|
|
|
+From b0daf26490e9cd4f0bf154e90a139c269da9916b Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 23 Jan 2021 00:30:15 +0000
|
|
|
Subject: [PATCH] platform: x86: Add recalc_rate opp to int3472-discrete clock
|
|
@@ -7161,9 +7161,9 @@ index 42ae8396eb64..98eb1ec3399e 100644
|
|
|
|
|
|
acpi_dev_put(int3472->sensor);
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From e0ad52e910564795fb13077e195efe47d9450d9b Mon Sep 17 00:00:00 2001
|
|
|
+From 04a41adcdd92296d4b19f342f03179e340389c80 Mon Sep 17 00:00:00 2001
|
|
|
From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
|
|
|
Date: Sun, 24 Jan 2021 11:07:42 +0100
|
|
|
Subject: [PATCH] cio2-bridge: Use macros and add warnings
|
|
@@ -7265,9 +7265,9 @@ index 924d99d20328..e1e388cc9f45 100644
|
|
|
(const struct cio2_sensor_config) { \
|
|
|
.hid = _HID, \
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 7bd176a9e98e9a199232975799c180e65e2693ad Mon Sep 17 00:00:00 2001
|
|
|
+From a7b13ff8f42feaf7c1d29c80fecf8e0e56d23801 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Mon, 8 Feb 2021 21:44:38 +0000
|
|
|
Subject: [PATCH] media: i2c: Tidy up ov5693_init_controls()
|
|
@@ -7387,9 +7387,9 @@ index 9a508e1f3624..26819cf3f4d2 100644
|
|
|
|
|
|
enum ov5693_tok_type {
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 75e46b44c5e81c3eae596e9fd54e4c8a53f8c670 Mon Sep 17 00:00:00 2001
|
|
|
+From bc8bbeaeeb4d949fe8b89c3980eef20bec9cb893 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Mon, 8 Feb 2021 21:46:49 +0000
|
|
|
Subject: [PATCH] media: i2c: Remove OV5693_PPL_DEFAULT
|
|
@@ -7425,9 +7425,9 @@ index a9747ab783d7..7fb368eec327 100644
|
|
|
V4L2_CID_HBLANK, hblank, hblank,
|
|
|
1, hblank);
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 99b3425614d465dff825f507cc56616549a4b6d4 Mon Sep 17 00:00:00 2001
|
|
|
+From 1d78ddc8bb898ece79b0716348168f406fdf1097 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Mon, 8 Feb 2021 22:53:02 +0000
|
|
|
Subject: [PATCH] media: i2c: Add vblank control to ov5693 driver
|
|
@@ -7501,9 +7501,9 @@ index 26819cf3f4d2..9d7eed97963b 100644
|
|
|
|
|
|
};
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 69a956301158060de1297d2c04300af6f4e23c09 Mon Sep 17 00:00:00 2001
|
|
|
+From db98eae83dfe22a0c2f1eda888e22dc596d1613d Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 10 Feb 2021 00:36:32 +0000
|
|
|
Subject: [PATCH] media: i2c: update exposure control for ov5693
|
|
@@ -7576,9 +7576,9 @@ index 1950d7ac2d54..cea767230aa9 100644
|
|
|
/* Gain */
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From c86a8c5729d9b4cf9f193801fe56ee8ef7730ee6 Mon Sep 17 00:00:00 2001
|
|
|
+From efeb00cdfc879862a6c9059f15a6ec4ecb6ead08 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 10 Feb 2021 00:39:42 +0000
|
|
|
Subject: [PATCH] media: i2c: Fix incorrect bit-setting
|
|
@@ -7612,9 +7612,9 @@ index cea767230aa9..f681dbfcec56 100644
|
|
|
|
|
|
#define OV5693_GAIN_CTRL_H_REG 0x3504
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 7c18b8ef50454eafb757838859f0faed7efb62fc Mon Sep 17 00:00:00 2001
|
|
|
+From e62e8d64226776b3cd42a790e72a4a2fda17e811 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 10 Feb 2021 16:25:48 +0000
|
|
|
Subject: [PATCH] media: i2c: Don't set stream on during mode config
|
|
@@ -7762,9 +7762,9 @@ index 9d7eed97963b..965208078c2b 100644
|
|
|
};
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 7c1acdf7f6e92976050a3d9eab123cd9700426ab Mon Sep 17 00:00:00 2001
|
|
|
+From b85f8668f3beea5396ec39fdbde1e0c4b4c4e730 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 10 Feb 2021 16:35:24 +0000
|
|
|
Subject: [PATCH] media: i2c: Update gain control for ov5693
|
|
@@ -7834,9 +7834,9 @@ index f681dbfcec56..51eb3b05d121 100644
|
|
|
/* Flip */
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 31fef3605057bace741136d282dee35da1c44bd6 Mon Sep 17 00:00:00 2001
|
|
|
+From baae02c2bb64ae6ea78b19c9123b9eee1f9dd2fc Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Wed, 10 Feb 2021 23:44:39 +0000
|
|
|
Subject: [PATCH] media: i2c: Fixup gain read
|
|
@@ -7897,9 +7897,9 @@ index 51eb3b05d121..952558c4f33b 100644
|
|
|
}
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 34030f540523c5db8c6497bf4fce8ff7bed129fe Mon Sep 17 00:00:00 2001
|
|
|
+From 2adb26d5293d286d959750a651bf43fc0fa12de5 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Thu, 11 Feb 2021 00:40:10 +0000
|
|
|
Subject: [PATCH] media: i2c: Update controls on stream
|
|
@@ -7932,9 +7932,9 @@ index 952558c4f33b..dd31083eeb7b 100644
|
|
|
enable ? OV5693_START_STREAMING :
|
|
|
OV5693_STOP_STREAMING);
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 3e1edf7b50b78525cb03b2ebc209929bf343fb06 Mon Sep 17 00:00:00 2001
|
|
|
+From 3490179f86c2175f74a7190d376b47f5bbc92284 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Thu, 11 Feb 2021 23:29:15 +0000
|
|
|
Subject: [PATCH] media: i2c: Correct link frequency value
|
|
@@ -7971,9 +7971,9 @@ index 965208078c2b..7f1d31a82d3d 100644
|
|
|
|
|
|
#define OV5693_NUM_SUPPLIES 2
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From eb6ecc3d06a479b8f470da0507151e506c607d60 Mon Sep 17 00:00:00 2001
|
|
|
+From 0a1db7e833219342b865af21780a13fbfed32a7a Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Mon, 25 Jan 2021 23:12:09 +0000
|
|
|
Subject: [PATCH] media: i2c: Cleanup ov5693 driver
|
|
@@ -8892,9 +8892,9 @@ index 7f1d31a82d3d..70ccb3aae4c7 100644
|
|
|
struct regulator_bulk_data supplies[OV5693_NUM_SUPPLIES];
|
|
|
struct clk *clk;
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From a68625a771c755ca74154aa7d0af9bf2477096e5 Mon Sep 17 00:00:00 2001
|
|
|
+From feb8b98fff5b056ac13be53e7af63a81291da3c7 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Thu, 28 Jan 2021 12:04:38 +0000
|
|
|
Subject: [PATCH] media: i2c: Add pm_runtime support to ov5693 driver
|
|
@@ -9237,9 +9237,9 @@ index 70ccb3aae4c7..b78d3b474a43 100644
|
|
|
struct camera_sensor_platform_data *platform_data;
|
|
|
ktime_t timestamp_t_focus_abs;
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From eb586cf951c1a5f78774686c3cc62642fad497b1 Mon Sep 17 00:00:00 2001
|
|
|
+From cac338cf318ff40af30639baa99127e5603ad7f2 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Thu, 28 Jan 2021 12:07:36 +0000
|
|
|
Subject: [PATCH] media: i2c: Remove old power methods from ov5693
|
|
@@ -9408,9 +9408,9 @@ index f2eaa5f71a31..ce26ce86fbd5 100644
|
|
|
.pad = &ov5693_pad_ops,
|
|
|
};
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From e27947a296518692f81a77e17c3539519c269da8 Mon Sep 17 00:00:00 2001
|
|
|
+From bf3efec5a06ac86251599d38f60579aff25df9d3 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Thu, 28 Jan 2021 12:14:00 +0000
|
|
|
Subject: [PATCH] media: i2c: Trim unused headers from ov5693
|
|
@@ -9449,9 +9449,9 @@ index ce26ce86fbd5..b3b391a49fdb 100644
|
|
|
#include <media/v4l2-fwnode.h>
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 8d15bc69fe81ad66f40e822a1b26f534e78ae185 Mon Sep 17 00:00:00 2001
|
|
|
+From 51e0074104510541222eb159c7e8010db35a93f2 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 13 Feb 2021 21:39:35 +0000
|
|
|
Subject: [PATCH] media: i2c: Remove VCM stuff
|
|
@@ -9868,9 +9868,9 @@ index b3b391a49fdb..2c82b6578de9 100644
|
|
|
|
|
|
v4l2_i2c_subdev_init(&ov5693->sd, client, &ov5693_ops);
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 8acae4db377a938ff089d3b673a359aac1bca75c Mon Sep 17 00:00:00 2001
|
|
|
+From 2129eaad596582a261633d2e1862fd9c25820a84 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 13 Feb 2021 22:16:08 +0000
|
|
|
Subject: [PATCH] media: i2c: Tidy up ov5693 sensor init
|
|
@@ -10024,9 +10024,9 @@ index 2c82b6578de9..313bc9177328 100644
|
|
|
mutex_unlock(&ov5693->lock);
|
|
|
return ret;
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 0efea969af985e646868a2e03acb61d9088c29fe Mon Sep 17 00:00:00 2001
|
|
|
+From c1b03a98809d85108ad18a1c729343b3ca211403 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Fri, 12 Feb 2021 16:14:04 +0000
|
|
|
Subject: [PATCH] media: i2c: cleanup macros in ov5693.h
|
|
@@ -10170,9 +10170,9 @@ index b78d3b474a43..6502777eb5f3 100644
|
|
|
#define OV5693_FRAME_OFF_NUM 0x4202
|
|
|
#define OV5693_OTP_BYTE_MAX 32 //change to 32 as needed by otpdata
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 6b76a59d6a7964aefaffd4df2621d111398e5dff Mon Sep 17 00:00:00 2001
|
|
|
+From 818a12ef30abff182adce38b1071e85f2da70070 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Fri, 12 Feb 2021 16:19:09 +0000
|
|
|
Subject: [PATCH] media: i2c: use devm_kzalloc() to initialise ov5693
|
|
@@ -10200,9 +10200,9 @@ index 313bc9177328..d092ed698eb3 100644
|
|
|
return -ENOMEM;
|
|
|
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 6cdaa6994c03c4edd4b27cda4413d62478653bf5 Mon Sep 17 00:00:00 2001
|
|
|
+From 94f99a2b4b329a7e734d7c5ce4e08dc455c269fd Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Fri, 12 Feb 2021 16:26:21 +0000
|
|
|
Subject: [PATCH] media: i2c: Check for supported clk rate in probe
|
|
@@ -10257,9 +10257,9 @@ index 6502777eb5f3..0dfbbe9a0ff2 100644
|
|
|
#define OV5693_LINK_FREQ_400MHZ 400000000
|
|
|
/* pixel_rate = link_freq * 2 * nr_of_lanes / bits_per_sample
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 05b3e1c013910ee54877cb0883ec68bde48f910d Mon Sep 17 00:00:00 2001
|
|
|
+From bbddf0681b06c9b5535be5fd31b7c2f0eccdae8f Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 13 Feb 2021 23:17:50 +0000
|
|
|
Subject: [PATCH] media: i2c: Use devres to fetch gpios
|
|
@@ -10331,9 +10331,9 @@ index 8082d37841da..c580159079d2 100644
|
|
|
|
|
|
static int ov5693_get_regulators(struct ov5693_device *ov5693)
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 44f8b2d74cf8d0ecda0b34119675977be5f60cc0 Mon Sep 17 00:00:00 2001
|
|
|
+From 2bbb3485914eeb58a3e73bf3784aead407eb16ac Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sat, 13 Feb 2021 23:20:47 +0000
|
|
|
Subject: [PATCH] media: i2c: Use devres to fetch regulators
|
|
@@ -10374,9 +10374,9 @@ index c580159079d2..9f61b470f8ba 100644
|
|
|
ov5693->supplies);
|
|
|
}
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From 8851c67a028b75aa25876baeef5637872e0bddc0 Mon Sep 17 00:00:00 2001
|
|
|
+From 6ba293288b1c108ffdd4e2903c115d37e40f5085 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sun, 14 Feb 2021 12:39:14 +0000
|
|
|
Subject: [PATCH] media: i2c: remove debug print
|
|
@@ -10453,9 +10453,9 @@ index 9f61b470f8ba..622a7ddf4063 100644
|
|
|
return 0;
|
|
|
}
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From dccc0c21df12e39bc3eb994ca23650b9445d2261 Mon Sep 17 00:00:00 2001
|
|
|
+From e9aa454eb3ce8a133d3466e4755343861247df41 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sun, 14 Feb 2021 14:32:50 +0000
|
|
|
Subject: [PATCH] media: i2c: Remove unused resolutions from ov5693
|
|
@@ -10882,9 +10882,9 @@ index 0dfbbe9a0ff2..29e6735112da 100644
|
|
|
static unsigned long N_RES = N_RES_VIDEO;
|
|
|
-#endif
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|
|
|
-From dcf7ffb69fd62c1ea6e821d5203346c4637cada9 Mon Sep 17 00:00:00 2001
|
|
|
+From 6eec190c44ab70bedee00c2d816ab5786a70e221 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
Date: Sun, 14 Feb 2021 14:45:58 +0000
|
|
|
Subject: [PATCH] media: i2c: update set_fmt() for ov5693
|
|
@@ -11123,5 +11123,5 @@ index 29e6735112da..0377853f8b2b 100644
|
|
|
int otp_size;
|
|
|
u8 *otp_data;
|
|
|
--
|
|
|
-2.30.1
|
|
|
+2.30.2
|
|
|
|