|
@@ -1,4 +1,4 @@
|
|
-From 6d04b8ab365775a6b1ab7b7c560b5d50e78bb783 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 3bd1828eb612a82371b03e8eb670438ada11ea46 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Sun, 10 Oct 2021 20:56:57 +0200
|
|
Date: Sun, 10 Oct 2021 20:56:57 +0200
|
|
Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
|
|
Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
|
|
@@ -58,7 +58,7 @@ Patchset: cameras
|
|
1 file changed, 3 insertions(+)
|
|
1 file changed, 3 insertions(+)
|
|
|
|
|
|
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
|
|
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
|
|
-index 87e385542576..1183d09c13a6 100644
|
|
|
|
|
|
+index 87e3855425769..1183d09c13a6e 100644
|
|
--- a/drivers/acpi/scan.c
|
|
--- a/drivers/acpi/scan.c
|
|
+++ b/drivers/acpi/scan.c
|
|
+++ b/drivers/acpi/scan.c
|
|
@@ -2105,6 +2105,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
|
|
@@ -2105,6 +2105,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
|
|
@@ -72,9 +72,9 @@ index 87e385542576..1183d09c13a6 100644
|
|
* Do not enumerate devices with enumeration_by_parent flag set as
|
|
* Do not enumerate devices with enumeration_by_parent flag set as
|
|
* they will be enumerated by their respective parents.
|
|
* they will be enumerated by their respective parents.
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From df1aa869818d56d8153223c60d74fb307cf3ff81 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 0e7b9833dcba3b99766296be3cc25fc37b47bf82 Mon Sep 17 00:00:00 2001
|
|
From: zouxiaoh <xiaohong.zou@intel.com>
|
|
From: zouxiaoh <xiaohong.zou@intel.com>
|
|
Date: Fri, 25 Jun 2021 08:52:59 +0800
|
|
Date: Fri, 25 Jun 2021 08:52:59 +0800
|
|
Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
|
|
Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
|
|
@@ -100,7 +100,7 @@ Patchset: cameras
|
|
1 file changed, 30 insertions(+)
|
|
1 file changed, 30 insertions(+)
|
|
|
|
|
|
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
|
|
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
|
|
-index 6387f3a6eccf..d75107c47de0 100644
|
|
|
|
|
|
+index 6387f3a6eccfb..d75107c47de01 100644
|
|
--- a/drivers/iommu/intel/iommu.c
|
|
--- a/drivers/iommu/intel/iommu.c
|
|
+++ b/drivers/iommu/intel/iommu.c
|
|
+++ b/drivers/iommu/intel/iommu.c
|
|
@@ -37,6 +37,12 @@
|
|
@@ -37,6 +37,12 @@
|
|
@@ -189,9 +189,9 @@ index 6387f3a6eccf..d75107c47de0 100644
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
|
|
|
|
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From 58f403707b4b56371254100412f325a30ef1707d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 039171dd80806b8d7089e0b000559297afd97557 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
Date: Sun, 10 Oct 2021 20:57:02 +0200
|
|
Date: Sun, 10 Oct 2021 20:57:02 +0200
|
|
Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
|
|
Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
|
|
@@ -208,7 +208,7 @@ Patchset: cameras
|
|
1 file changed, 7 insertions(+)
|
|
1 file changed, 7 insertions(+)
|
|
|
|
|
|
diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
-index 1e107fd49f82..e3e1696e7f0e 100644
|
|
|
|
|
|
+index 1e107fd49f828..e3e1696e7f0ee 100644
|
|
--- a/drivers/platform/x86/intel/int3472/tps68470.c
|
|
--- a/drivers/platform/x86/intel/int3472/tps68470.c
|
|
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
@@ -46,6 +46,13 @@ static int tps68470_chip_init(struct device *dev, struct regmap *regmap)
|
|
@@ -46,6 +46,13 @@ static int tps68470_chip_init(struct device *dev, struct regmap *regmap)
|
|
@@ -226,9 +226,9 @@ index 1e107fd49f82..e3e1696e7f0e 100644
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From 60a2d404d65225351612a7d3d3d5a1d1a382ca82 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 26e6f573ebc965bc0a428c5d5cc538c0d4acaab8 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
Date: Wed, 4 May 2022 23:21:45 +0100
|
|
Date: Wed, 4 May 2022 23:21:45 +0100
|
|
Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to
|
|
Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to
|
|
@@ -247,7 +247,7 @@ Patchset: cameras
|
|
1 file changed, 21 insertions(+), 38 deletions(-)
|
|
1 file changed, 21 insertions(+), 38 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
-index ca51776a961f..c027b2bfd851 100644
|
|
|
|
|
|
+index ca51776a961fb..c027b2bfd8517 100644
|
|
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
@@ -1386,7 +1386,10 @@ static int cio2_notifier_bound(struct v4l2_async_notifier *notifier,
|
|
@@ -1386,7 +1386,10 @@ static int cio2_notifier_bound(struct v4l2_async_notifier *notifier,
|
|
@@ -335,9 +335,9 @@ index ca51776a961f..c027b2bfd851 100644
|
|
|
|
|
|
static int cio2_parse_firmware(struct cio2_device *cio2)
|
|
static int cio2_parse_firmware(struct cio2_device *cio2)
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From e9b59c24855f146141b665efed05b7455aeb5fd4 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 9e998b25ba1baddd5ca98d4bd877ad00e074e60b Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
Date: Thu, 2 Jun 2022 22:15:56 +0100
|
|
Date: Thu, 2 Jun 2022 22:15:56 +0100
|
|
Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2
|
|
Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2
|
|
@@ -355,7 +355,7 @@ Patchset: cameras
|
|
1 file changed, 9 insertions(+)
|
|
1 file changed, 9 insertions(+)
|
|
|
|
|
|
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
-index c027b2bfd851..031acee26553 100644
|
|
|
|
|
|
+index c027b2bfd8517..031acee265534 100644
|
|
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
@@ -1431,9 +1431,18 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
|
|
@@ -1431,9 +1431,18 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
|
|
@@ -378,9 +378,9 @@ index c027b2bfd851..031acee26553 100644
|
|
|
|
|
|
static int cio2_parse_firmware(struct cio2_device *cio2)
|
|
static int cio2_parse_firmware(struct cio2_device *cio2)
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From 0926490302f353661c1a454f27611f5c94d928f0 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 23a74d099b28238e892c3b016b149be4dbadf664 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
Date: Thu, 28 Oct 2021 21:55:16 +0100
|
|
Date: Thu, 28 Oct 2021 21:55:16 +0100
|
|
Subject: [PATCH] media: i2c: Add driver for DW9719 VCM
|
|
Subject: [PATCH] media: i2c: Add driver for DW9719 VCM
|
|
@@ -399,7 +399,7 @@ Patchset: cameras
|
|
create mode 100644 drivers/media/i2c/dw9719.c
|
|
create mode 100644 drivers/media/i2c/dw9719.c
|
|
|
|
|
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
|
-index 4cc6bf79fdd8..439cf523b80e 100644
|
|
|
|
|
|
+index 4cc6bf79fdd83..439cf523b80ed 100644
|
|
--- a/MAINTAINERS
|
|
--- a/MAINTAINERS
|
|
+++ b/MAINTAINERS
|
|
+++ b/MAINTAINERS
|
|
@@ -6251,6 +6251,13 @@ T: git git://linuxtv.org/media_tree.git
|
|
@@ -6251,6 +6251,13 @@ T: git git://linuxtv.org/media_tree.git
|
|
@@ -417,7 +417,7 @@ index 4cc6bf79fdd8..439cf523b80e 100644
|
|
M: Dongchun Zhu <dongchun.zhu@mediatek.com>
|
|
M: Dongchun Zhu <dongchun.zhu@mediatek.com>
|
|
L: linux-media@vger.kernel.org
|
|
L: linux-media@vger.kernel.org
|
|
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
|
|
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
|
|
-index 0669aea3eba3..6959ee1a89fb 100644
|
|
|
|
|
|
+index 0669aea3eba35..6959ee1a89fb3 100644
|
|
--- a/drivers/media/i2c/Kconfig
|
|
--- a/drivers/media/i2c/Kconfig
|
|
+++ b/drivers/media/i2c/Kconfig
|
|
+++ b/drivers/media/i2c/Kconfig
|
|
@@ -855,6 +855,17 @@ config VIDEO_DW9714
|
|
@@ -855,6 +855,17 @@ config VIDEO_DW9714
|
|
@@ -439,7 +439,7 @@ index 0669aea3eba3..6959ee1a89fb 100644
|
|
tristate "DW9768 lens voice coil support"
|
|
tristate "DW9768 lens voice coil support"
|
|
depends on I2C && VIDEO_DEV
|
|
depends on I2C && VIDEO_DEV
|
|
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
|
|
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
|
|
-index c743aeb5d1ad..db1ebf5cadfe 100644
|
|
|
|
|
|
+index c743aeb5d1ad3..db1ebf5cadfed 100644
|
|
--- a/drivers/media/i2c/Makefile
|
|
--- a/drivers/media/i2c/Makefile
|
|
+++ b/drivers/media/i2c/Makefile
|
|
+++ b/drivers/media/i2c/Makefile
|
|
@@ -29,6 +29,7 @@ obj-$(CONFIG_VIDEO_CS5345) += cs5345.o
|
|
@@ -29,6 +29,7 @@ obj-$(CONFIG_VIDEO_CS5345) += cs5345.o
|
|
@@ -452,7 +452,7 @@ index c743aeb5d1ad..db1ebf5cadfe 100644
|
|
obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
|
|
obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
|
|
diff --git a/drivers/media/i2c/dw9719.c b/drivers/media/i2c/dw9719.c
|
|
diff --git a/drivers/media/i2c/dw9719.c b/drivers/media/i2c/dw9719.c
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 000000000000..180b04d2a6b3
|
|
|
|
|
|
+index 0000000000000..180b04d2a6b3a
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/media/i2c/dw9719.c
|
|
+++ b/drivers/media/i2c/dw9719.c
|
|
@@ -0,0 +1,425 @@
|
|
@@ -0,0 +1,425 @@
|
|
@@ -882,9 +882,9 @@ index 000000000000..180b04d2a6b3
|
|
+MODULE_DESCRIPTION("DW9719 VCM Driver");
|
|
+MODULE_DESCRIPTION("DW9719 VCM Driver");
|
|
+MODULE_LICENSE("GPL");
|
|
+MODULE_LICENSE("GPL");
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From 3a35f5894c7e979357c64bbf198bd35dc3489a0a Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 372b3321e3462832adfda5690ef348c22582a6cf Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 15 Jul 2022 23:48:00 +0200
|
|
Date: Fri, 15 Jul 2022 23:48:00 +0200
|
|
Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies
|
|
Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies
|
|
@@ -898,7 +898,7 @@ Patchset: cameras
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
|
|
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
|
|
-index 6959ee1a89fb..1d5082fe9ce3 100644
|
|
|
|
|
|
+index 6959ee1a89fb3..1d5082fe9ce39 100644
|
|
--- a/drivers/media/i2c/Kconfig
|
|
--- a/drivers/media/i2c/Kconfig
|
|
+++ b/drivers/media/i2c/Kconfig
|
|
+++ b/drivers/media/i2c/Kconfig
|
|
@@ -857,7 +857,7 @@ config VIDEO_DW9714
|
|
@@ -857,7 +857,7 @@ config VIDEO_DW9714
|
|
@@ -911,9 +911,9 @@ index 6959ee1a89fb..1d5082fe9ce3 100644
|
|
select VIDEO_V4L2_SUBDEV_API
|
|
select VIDEO_V4L2_SUBDEV_API
|
|
select V4L2_ASYNC
|
|
select V4L2_ASYNC
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From acbd8c1b38ffee270862e8efcf68ae3580b1b82d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From cfdf63f59fd91c0111189d43785edc90855cbef3 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Date: Thu, 2 Mar 2023 12:59:39 +0000
|
|
Date: Thu, 2 Mar 2023 12:59:39 +0000
|
|
Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E
|
|
Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E
|
|
@@ -935,7 +935,7 @@ Patchset: cameras
|
|
1 file changed, 14 insertions(+)
|
|
1 file changed, 14 insertions(+)
|
|
|
|
|
|
diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
|
|
diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
|
|
-index e33c2d75975c..c0c90ae66b70 100644
|
|
|
|
|
|
+index e33c2d75975cf..c0c90ae66b705 100644
|
|
--- a/drivers/platform/x86/intel/int3472/discrete.c
|
|
--- a/drivers/platform/x86/intel/int3472/discrete.c
|
|
+++ b/drivers/platform/x86/intel/int3472/discrete.c
|
|
+++ b/drivers/platform/x86/intel/int3472/discrete.c
|
|
@@ -57,6 +57,9 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
|
|
@@ -57,6 +57,9 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
|
|
@@ -967,9 +967,9 @@ index e33c2d75975c..c0c90ae66b70 100644
|
|
if (ACPI_FAILURE(status))
|
|
if (ACPI_FAILURE(status))
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From b2ae8fc0aecde894bf6e8f52e515de645f1b4739 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 0bb036da0593c579eabfa14b3acc38e84e474696 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Date: Tue, 21 Mar 2023 13:45:26 +0000
|
|
Date: Tue, 21 Mar 2023 13:45:26 +0000
|
|
Subject: [PATCH] media: i2c: Clarify that gain is Analogue gain in OV7251
|
|
Subject: [PATCH] media: i2c: Clarify that gain is Analogue gain in OV7251
|
|
@@ -984,7 +984,7 @@ Patchset: cameras
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c
|
|
diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c
|
|
-index 675fb37a6fea..43b30db08c9e 100644
|
|
|
|
|
|
+index 675fb37a6feae..43b30db08c9e4 100644
|
|
--- a/drivers/media/i2c/ov7251.c
|
|
--- a/drivers/media/i2c/ov7251.c
|
|
+++ b/drivers/media/i2c/ov7251.c
|
|
+++ b/drivers/media/i2c/ov7251.c
|
|
@@ -1051,7 +1051,7 @@ static int ov7251_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
@@ -1051,7 +1051,7 @@ static int ov7251_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
@@ -1006,9 +1006,9 @@ index 675fb37a6fea..43b30db08c9e 100644
|
|
V4L2_CID_TEST_PATTERN,
|
|
V4L2_CID_TEST_PATTERN,
|
|
ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
|
|
ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From 590fe333492348f48411fd9c2fc14d4302223266 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 9759d130bda102305ddd1abac9e47cf70905ff84 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Date: Wed, 22 Mar 2023 11:01:42 +0000
|
|
Date: Wed, 22 Mar 2023 11:01:42 +0000
|
|
Subject: [PATCH] media: v4l2-core: Acquire privacy led in
|
|
Subject: [PATCH] media: v4l2-core: Acquire privacy led in
|
|
@@ -1027,7 +1027,7 @@ Patchset: cameras
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
|
|
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
|
|
-index b16b5f4cb91e..33739a979cbc 100644
|
|
|
|
|
|
+index b16b5f4cb91e2..33739a979cbc0 100644
|
|
--- a/drivers/media/v4l2-core/v4l2-async.c
|
|
--- a/drivers/media/v4l2-core/v4l2-async.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-async.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-async.c
|
|
@@ -760,6 +760,10 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)
|
|
@@ -760,6 +760,10 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)
|
|
@@ -1042,7 +1042,7 @@ index b16b5f4cb91e..33739a979cbc 100644
|
|
* No reference taken. The reference is held by the device
|
|
* No reference taken. The reference is held by the device
|
|
* (struct v4l2_subdev.dev), and async sub-device does not
|
|
* (struct v4l2_subdev.dev), and async sub-device does not
|
|
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
|
|
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
|
|
-index 4fa9225aa3d9..ed4c75253cbc 100644
|
|
|
|
|
|
+index 4fa9225aa3d93..ed4c75253cbc5 100644
|
|
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
|
|
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
|
|
@@ -1314,10 +1314,6 @@ int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd)
|
|
@@ -1314,10 +1314,6 @@ int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd)
|
|
@@ -1057,9 +1057,9 @@ index 4fa9225aa3d9..ed4c75253cbc 100644
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
goto out_cleanup;
|
|
goto out_cleanup;
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From cf42b6660ce6a705292e0cd0df8e7d39dcae8f04 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From cececc4f8a97a0d55211bd5143d6e9115a56d588 Mon Sep 17 00:00:00 2001
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
Date: Tue, 21 Mar 2023 23:37:16 +0800
|
|
Date: Tue, 21 Mar 2023 23:37:16 +0800
|
|
Subject: [PATCH] platform: x86: int3472: Add MFD cell for tps68470 LED
|
|
Subject: [PATCH] platform: x86: int3472: Add MFD cell for tps68470 LED
|
|
@@ -1075,7 +1075,7 @@ Patchset: cameras
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
-index e3e1696e7f0e..423dc555093f 100644
|
|
|
|
|
|
+index e3e1696e7f0ee..423dc555093f7 100644
|
|
--- a/drivers/platform/x86/intel/int3472/tps68470.c
|
|
--- a/drivers/platform/x86/intel/int3472/tps68470.c
|
|
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
@@ -17,7 +17,7 @@
|
|
@@ -17,7 +17,7 @@
|
|
@@ -1098,9 +1098,9 @@ index e3e1696e7f0e..423dc555093f 100644
|
|
for (i = 0; i < board_data->n_gpiod_lookups; i++)
|
|
for (i = 0; i < board_data->n_gpiod_lookups; i++)
|
|
gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_tables[i]);
|
|
gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_tables[i]);
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From 5ef4b0088658da64a7f39c37e33aad3469b3fb39 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 98de362094c367d01d930db0d5e34d68c4620694 Mon Sep 17 00:00:00 2001
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
Date: Tue, 21 Mar 2023 23:37:17 +0800
|
|
Date: Tue, 21 Mar 2023 23:37:17 +0800
|
|
Subject: [PATCH] include: mfd: tps68470: Add masks for LEDA and LEDB
|
|
Subject: [PATCH] include: mfd: tps68470: Add masks for LEDA and LEDB
|
|
@@ -1118,7 +1118,7 @@ Patchset: cameras
|
|
1 file changed, 5 insertions(+)
|
|
1 file changed, 5 insertions(+)
|
|
|
|
|
|
diff --git a/include/linux/mfd/tps68470.h b/include/linux/mfd/tps68470.h
|
|
diff --git a/include/linux/mfd/tps68470.h b/include/linux/mfd/tps68470.h
|
|
-index 7807fa329db0..2d2abb25b944 100644
|
|
|
|
|
|
+index 7807fa329db00..2d2abb25b944f 100644
|
|
--- a/include/linux/mfd/tps68470.h
|
|
--- a/include/linux/mfd/tps68470.h
|
|
+++ b/include/linux/mfd/tps68470.h
|
|
+++ b/include/linux/mfd/tps68470.h
|
|
@@ -34,6 +34,7 @@
|
|
@@ -34,6 +34,7 @@
|
|
@@ -1139,9 +1139,9 @@ index 7807fa329db0..2d2abb25b944 100644
|
|
+
|
|
+
|
|
#endif /* __LINUX_MFD_TPS68470_H */
|
|
#endif /* __LINUX_MFD_TPS68470_H */
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|
|
-From 3296fb49f2be7439c31fb45250c403a484107463 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 11fe0140ff1cdaf8241e89aaf72fbd3dc503ca47 Mon Sep 17 00:00:00 2001
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
Date: Tue, 21 Mar 2023 23:37:18 +0800
|
|
Date: Tue, 21 Mar 2023 23:37:18 +0800
|
|
Subject: [PATCH] leds: tps68470: Add LED control for tps68470
|
|
Subject: [PATCH] leds: tps68470: Add LED control for tps68470
|
|
@@ -1164,7 +1164,7 @@ Patchset: cameras
|
|
create mode 100644 drivers/leds/leds-tps68470.c
|
|
create mode 100644 drivers/leds/leds-tps68470.c
|
|
|
|
|
|
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
|
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
|
-index 6046dfeca16f..385c06e4f1d3 100644
|
|
|
|
|
|
+index 6046dfeca16fc..385c06e4f1d3c 100644
|
|
--- a/drivers/leds/Kconfig
|
|
--- a/drivers/leds/Kconfig
|
|
+++ b/drivers/leds/Kconfig
|
|
+++ b/drivers/leds/Kconfig
|
|
@@ -864,6 +864,18 @@ config LEDS_TPS6105X
|
|
@@ -864,6 +864,18 @@ config LEDS_TPS6105X
|
|
@@ -1187,7 +1187,7 @@ index 6046dfeca16f..385c06e4f1d3 100644
|
|
tristate "LED support for SGI Octane machines"
|
|
tristate "LED support for SGI Octane machines"
|
|
depends on LEDS_CLASS
|
|
depends on LEDS_CLASS
|
|
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
|
|
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
|
|
-index d71f1226540c..e2002b535967 100644
|
|
|
|
|
|
+index d71f1226540c2..e2002b5359675 100644
|
|
--- a/drivers/leds/Makefile
|
|
--- a/drivers/leds/Makefile
|
|
+++ b/drivers/leds/Makefile
|
|
+++ b/drivers/leds/Makefile
|
|
@@ -83,6 +83,7 @@ obj-$(CONFIG_LEDS_TCA6507) += leds-tca6507.o
|
|
@@ -83,6 +83,7 @@ obj-$(CONFIG_LEDS_TCA6507) += leds-tca6507.o
|
|
@@ -1200,7 +1200,7 @@ index d71f1226540c..e2002b535967 100644
|
|
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
|
|
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
|
|
diff --git a/drivers/leds/leds-tps68470.c b/drivers/leds/leds-tps68470.c
|
|
diff --git a/drivers/leds/leds-tps68470.c b/drivers/leds/leds-tps68470.c
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 000000000000..35aeb5db89c8
|
|
|
|
|
|
+index 0000000000000..35aeb5db89c8f
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/leds/leds-tps68470.c
|
|
+++ b/drivers/leds/leds-tps68470.c
|
|
@@ -0,0 +1,185 @@
|
|
@@ -0,0 +1,185 @@
|
|
@@ -1390,5 +1390,5 @@ index 000000000000..35aeb5db89c8
|
|
+MODULE_DESCRIPTION("LED driver for TPS68470 PMIC");
|
|
+MODULE_DESCRIPTION("LED driver for TPS68470 PMIC");
|
|
+MODULE_LICENSE("GPL v2");
|
|
+MODULE_LICENSE("GPL v2");
|
|
--
|
|
--
|
|
-2.42.0
|
|
|
|
|
|
+2.42.1
|
|
|
|
|