|
@@ -1,4 +1,4 @@
|
|
-From 8678f0c1ed1a9d4f5cad1e0c0c677630a242d4bd Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 673bc3f1e5f697afc8066e59245458935f28546c 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,10 +58,10 @@ 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 9f4efa8f75a6..7c7ef03cafa4 100644
|
|
|
|
|
|
+index fb1fe9f3b1a3..5be8893b3912 100644
|
|
--- a/drivers/acpi/scan.c
|
|
--- a/drivers/acpi/scan.c
|
|
+++ b/drivers/acpi/scan.c
|
|
+++ b/drivers/acpi/scan.c
|
|
-@@ -2204,6 +2204,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
|
|
|
|
|
|
+@@ -2197,6 +2197,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
|
|
|
|
|
|
static void acpi_default_enumeration(struct acpi_device *device)
|
|
static void acpi_default_enumeration(struct acpi_device *device)
|
|
{
|
|
{
|
|
@@ -72,9 +72,9 @@ index 9f4efa8f75a6..7c7ef03cafa4 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.49.0
|
|
|
|
|
|
+2.50.0
|
|
|
|
|
|
-From 069b8c0dd7460410d2e4d333bc533221d709cb17 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From cf8447073f3dee50253c653d9b20ae9cc52a5106 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 3735ed60032d..71cccee6e4a9 100644
|
|
|
|
|
|
+index c07d15343f76..f0fd3155340a 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
|
|
@@ -44,6 +44,13 @@
|
|
@@ -44,6 +44,13 @@
|
|
@@ -132,7 +132,7 @@ index 3735ed60032d..71cccee6e4a9 100644
|
|
#define IDENTMAP_IPTS 16
|
|
#define IDENTMAP_IPTS 16
|
|
|
|
|
|
const struct iommu_ops intel_iommu_ops;
|
|
const struct iommu_ops intel_iommu_ops;
|
|
-@@ -1910,6 +1919,9 @@ static int device_def_domain_type(struct device *dev)
|
|
|
|
|
|
+@@ -1943,6 +1952,9 @@ static int device_def_domain_type(struct device *dev)
|
|
if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
|
|
if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev))
|
|
return IOMMU_DOMAIN_IDENTITY;
|
|
return IOMMU_DOMAIN_IDENTITY;
|
|
|
|
|
|
@@ -142,7 +142,7 @@ index 3735ed60032d..71cccee6e4a9 100644
|
|
if ((iommu_identity_mapping & IDENTMAP_IPTS) && IS_IPTS(pdev))
|
|
if ((iommu_identity_mapping & IDENTMAP_IPTS) && IS_IPTS(pdev))
|
|
return IOMMU_DOMAIN_IDENTITY;
|
|
return IOMMU_DOMAIN_IDENTITY;
|
|
}
|
|
}
|
|
-@@ -2206,6 +2218,9 @@ static int __init init_dmars(void)
|
|
|
|
|
|
+@@ -2239,6 +2251,9 @@ static int __init init_dmars(void)
|
|
iommu_set_root_entry(iommu);
|
|
iommu_set_root_entry(iommu);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -152,7 +152,7 @@ index 3735ed60032d..71cccee6e4a9 100644
|
|
if (!dmar_map_ipts)
|
|
if (!dmar_map_ipts)
|
|
iommu_identity_mapping |= IDENTMAP_IPTS;
|
|
iommu_identity_mapping |= IDENTMAP_IPTS;
|
|
|
|
|
|
-@@ -4506,6 +4521,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
|
|
|
|
|
|
+@@ -4443,6 +4458,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
|
|
disable_igfx_iommu = 1;
|
|
disable_igfx_iommu = 1;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -171,7 +171,7 @@ index 3735ed60032d..71cccee6e4a9 100644
|
|
static void quirk_iommu_ipts(struct pci_dev *dev)
|
|
static void quirk_iommu_ipts(struct pci_dev *dev)
|
|
{
|
|
{
|
|
if (!IS_IPTS(dev))
|
|
if (!IS_IPTS(dev))
|
|
-@@ -4553,6 +4580,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
|
|
|
|
|
|
+@@ -4493,6 +4520,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
|
|
|
|
|
|
@@ -182,9 +182,9 @@ index 3735ed60032d..71cccee6e4a9 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);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x34E4, quirk_iommu_ipts);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x34E4, quirk_iommu_ipts);
|
|
--
|
|
--
|
|
-2.49.0
|
|
|
|
|
|
+2.50.0
|
|
|
|
|
|
-From 5bc57f06d3dc085a2a0757fc5c35be36c2d6d341 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From d4df94633dd54daa123fb5497a741d5f0d8d9b9e 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
|
|
@@ -219,71 +219,9 @@ index 81ac4c691963..f453c9043042 100644
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
--
|
|
--
|
|
-2.49.0
|
|
|
|
|
|
+2.50.0
|
|
|
|
|
|
-From c7a4afe01bfd24fbfc3735d1b60f08be3aef0b81 Mon Sep 17 00:00:00 2001
|
|
|
|
-From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
|
|
-Date: Thu, 2 Mar 2023 12:59:39 +0000
|
|
|
|
-Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E
|
|
|
|
-
|
|
|
|
-ACPI _HID INT347E represents the OmniVision 7251 camera sensor. The
|
|
|
|
-driver for this sensor expects a single pin named "enable", but on
|
|
|
|
-some Microsoft Surface platforms the sensor is assigned a single
|
|
|
|
-GPIO who's type flag is INT3472_GPIO_TYPE_RESET.
|
|
|
|
-
|
|
|
|
-Remap the GPIO pin's function from "reset" to "enable". This is done
|
|
|
|
-outside of the existing remap table since it is a more widespread
|
|
|
|
-discrepancy than that method is designed for. Additionally swap the
|
|
|
|
-polarity of the pin to match the driver's expectation.
|
|
|
|
-
|
|
|
|
-Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
|
|
|
|
-Patchset: cameras
|
|
|
|
----
|
|
|
|
- drivers/platform/x86/intel/int3472/discrete.c | 15 +++++++++++++++
|
|
|
|
- 1 file changed, 15 insertions(+)
|
|
|
|
-
|
|
|
|
-diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
|
|
|
|
-index 092252eb95a8..7a73d5f903a9 100644
|
|
|
|
---- a/drivers/platform/x86/intel/int3472/discrete.c
|
|
|
|
-+++ b/drivers/platform/x86/intel/int3472/discrete.c
|
|
|
|
-@@ -81,18 +81,33 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int3472,
|
|
|
|
- struct acpi_resource_gpio *agpio,
|
|
|
|
- const char *con_id, unsigned long gpio_flags)
|
|
|
|
- {
|
|
|
|
- int ret;
|
|
|
|
-+ const struct acpi_device_id ov7251_ids[] = {
|
|
|
|
-+ { "INT347E" },
|
|
|
|
-+ { }
|
|
|
|
-+ };
|
|
|
|
-
|
|
|
|
- if (int3472->n_sensor_gpios >= INT3472_MAX_SENSOR_GPIOS) {
|
|
|
|
- dev_warn(int3472->dev, "Too many GPIOs mapped\n");
|
|
|
|
- return -EINVAL;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-+ /*
|
|
|
|
-+ * In addition to the function remap table we need to bulk remap the
|
|
|
|
-+ * "reset" GPIO for the OmniVision 7251 sensor, as the driver for that
|
|
|
|
-+ * expects its only GPIO pin to be called "enable" (and to have the
|
|
|
|
-+ * opposite polarity).
|
|
|
|
-+ */
|
|
|
|
-+ if (!strcmp(func, "reset") && !acpi_match_device_ids(int3472->sensor, ov7251_ids)) {
|
|
|
|
-+ func = "enable";
|
|
|
|
-+ gpio_flags ^= GPIO_ACTIVE_LOW;
|
|
|
|
-+ }
|
|
|
|
-+
|
|
|
|
- ret = skl_int3472_fill_gpiod_lookup(&int3472->gpios.table[int3472->n_sensor_gpios],
|
|
|
|
- agpio, con_id, gpio_flags);
|
|
|
|
- if (ret)
|
|
|
|
- return ret;
|
|
|
|
-
|
|
|
|
- int3472->n_sensor_gpios++;
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
---
|
|
|
|
-2.49.0
|
|
|
|
-
|
|
|
|
-From 9ab2f02228baf5661844d4ba55810273b75cb456 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From a0ce4892cc5518186d1fb1f54d61aaf7fd4ca64e 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
|
|
@@ -298,10 +236,10 @@ 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 30f61e04ecaf..9c1292ca8552 100644
|
|
|
|
|
|
+index 3226888d77e9..3bfe45b764f7 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)
|
|
|
|
|
|
+@@ -1053,7 +1053,7 @@ static int ov7251_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
case V4L2_CID_EXPOSURE:
|
|
case V4L2_CID_EXPOSURE:
|
|
ret = ov7251_set_exposure(ov7251, ctrl->val);
|
|
ret = ov7251_set_exposure(ov7251, ctrl->val);
|
|
break;
|
|
break;
|
|
@@ -310,7 +248,7 @@ index 30f61e04ecaf..9c1292ca8552 100644
|
|
ret = ov7251_set_gain(ov7251, ctrl->val);
|
|
ret = ov7251_set_gain(ov7251, ctrl->val);
|
|
break;
|
|
break;
|
|
case V4L2_CID_TEST_PATTERN:
|
|
case V4L2_CID_TEST_PATTERN:
|
|
-@@ -1572,7 +1572,7 @@ static int ov7251_init_ctrls(struct ov7251 *ov7251)
|
|
|
|
|
|
+@@ -1574,7 +1574,7 @@ static int ov7251_init_ctrls(struct ov7251 *ov7251)
|
|
ov7251->exposure = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
|
|
ov7251->exposure = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
|
|
V4L2_CID_EXPOSURE, 1, 32, 1, 32);
|
|
V4L2_CID_EXPOSURE, 1, 32, 1, 32);
|
|
ov7251->gain = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
|
|
ov7251->gain = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
|
|
@@ -320,9 +258,9 @@ index 30f61e04ecaf..9c1292ca8552 100644
|
|
V4L2_CID_TEST_PATTERN,
|
|
V4L2_CID_TEST_PATTERN,
|
|
ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
|
|
ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
|
|
--
|
|
--
|
|
-2.49.0
|
|
|
|
|
|
+2.50.0
|
|
|
|
|
|
-From 4cfbc183671a5e27fb1808a0489dc4053ff970aa Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 75ac36f76af5da0031f58d842158d2a07fc2fe28 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
|
|
@@ -371,9 +309,9 @@ index cb153ce42c45..f11b499e14bb 100644
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
goto out_cleanup;
|
|
goto out_cleanup;
|
|
--
|
|
--
|
|
-2.49.0
|
|
|
|
|
|
+2.50.0
|
|
|
|
|
|
-From 6bede17be7b28d507138775eda22c15c020ee22d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From a726339cb0b04a33e5cf091d7e400e46d3a0fe00 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
|
|
@@ -412,9 +350,9 @@ index f453c9043042..b8ad6b413e8b 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.49.0
|
|
|
|
|
|
+2.50.0
|
|
|
|
|
|
-From 4b91d36e045045a2f5029a47b33984c33a1d58cf Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 15ebc12622ba3d93a9f554e927a63e9e8672f40b 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
|
|
@@ -453,9 +391,9 @@ index 7807fa329db0..2d2abb25b944 100644
|
|
+
|
|
+
|
|
#endif /* __LINUX_MFD_TPS68470_H */
|
|
#endif /* __LINUX_MFD_TPS68470_H */
|
|
--
|
|
--
|
|
-2.49.0
|
|
|
|
|
|
+2.50.0
|
|
|
|
|
|
-From 4606e818fd812630708c340acdc7a493d703842d Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 726379fff106ed4f53dd44877af3a23fd879145c 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
|
|
@@ -478,10 +416,10 @@ 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 2b27d043921c..22a8c20de32a 100644
|
|
|
|
|
|
+index a104cbb0a001..535a10cbbff1 100644
|
|
--- a/drivers/leds/Kconfig
|
|
--- a/drivers/leds/Kconfig
|
|
+++ b/drivers/leds/Kconfig
|
|
+++ b/drivers/leds/Kconfig
|
|
-@@ -985,6 +985,18 @@ config LEDS_TPS6105X
|
|
|
|
|
|
+@@ -995,6 +995,18 @@ config LEDS_TPS6105X
|
|
It is a single boost converter primarily for white LEDs and
|
|
It is a single boost converter primarily for white LEDs and
|
|
audio amplifiers.
|
|
audio amplifiers.
|
|
|
|
|
|
@@ -501,10 +439,10 @@ index 2b27d043921c..22a8c20de32a 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 6ad52e219ec6..3519b4c32c9e 100644
|
|
|
|
|
|
+index 2f170d69dcbf..17f0ecd1f52e 100644
|
|
--- a/drivers/leds/Makefile
|
|
--- a/drivers/leds/Makefile
|
|
+++ b/drivers/leds/Makefile
|
|
+++ b/drivers/leds/Makefile
|
|
-@@ -91,6 +91,7 @@ obj-$(CONFIG_LEDS_TCA6507) += leds-tca6507.o
|
|
|
|
|
|
+@@ -92,6 +92,7 @@ obj-$(CONFIG_LEDS_TCA6507) += leds-tca6507.o
|
|
obj-$(CONFIG_LEDS_TI_LMU_COMMON) += leds-ti-lmu-common.o
|
|
obj-$(CONFIG_LEDS_TI_LMU_COMMON) += leds-ti-lmu-common.o
|
|
obj-$(CONFIG_LEDS_TLC591XX) += leds-tlc591xx.o
|
|
obj-$(CONFIG_LEDS_TLC591XX) += leds-tlc591xx.o
|
|
obj-$(CONFIG_LEDS_TPS6105X) += leds-tps6105x.o
|
|
obj-$(CONFIG_LEDS_TPS6105X) += leds-tps6105x.o
|
|
@@ -704,9 +642,9 @@ 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.49.0
|
|
|
|
|
|
+2.50.0
|
|
|
|
|
|
-From 2666871d2780d86053ac2d61350de05de6888204 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 2e92d47015628f6ed7e3fbd68f2df381fb739876 Mon Sep 17 00:00:00 2001
|
|
From: mojyack <mojyack@gmail.com>
|
|
From: mojyack <mojyack@gmail.com>
|
|
Date: Tue, 26 Mar 2024 05:55:44 +0900
|
|
Date: Tue, 26 Mar 2024 05:55:44 +0900
|
|
Subject: [PATCH] media: i2c: dw9719: fix probe error on surface go 2
|
|
Subject: [PATCH] media: i2c: dw9719: fix probe error on surface go 2
|
|
@@ -722,10 +660,10 @@ Patchset: cameras
|
|
1 file changed, 3 insertions(+)
|
|
1 file changed, 3 insertions(+)
|
|
|
|
|
|
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
|
|
-index c626ed845928..0094cfda57ea 100644
|
|
|
|
|
|
+index 032fbcb981f2..e03a1d8cdcb4 100644
|
|
--- a/drivers/media/i2c/dw9719.c
|
|
--- a/drivers/media/i2c/dw9719.c
|
|
+++ b/drivers/media/i2c/dw9719.c
|
|
+++ b/drivers/media/i2c/dw9719.c
|
|
-@@ -82,9 +82,12 @@ static int dw9719_power_up(struct dw9719_device *dw9719)
|
|
|
|
|
|
+@@ -87,6 +87,9 @@ static int dw9719_power_up(struct dw9719_device *dw9719, bool detect)
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
@@ -735,9 +673,6 @@ index c626ed845928..0094cfda57ea 100644
|
|
/* Jiggle SCL pin to wake up device */
|
|
/* Jiggle SCL pin to wake up device */
|
|
cci_write(dw9719->regmap, DW9719_CONTROL, DW9719_SHUTDOWN, &ret);
|
|
cci_write(dw9719->regmap, DW9719_CONTROL, DW9719_SHUTDOWN, &ret);
|
|
fsleep(100);
|
|
fsleep(100);
|
|
- cci_write(dw9719->regmap, DW9719_CONTROL, DW9719_STANDBY, &ret);
|
|
|
|
- /* Need 100us to transit from SHUTDOWN to STANDBY */
|
|
|
|
- fsleep(100);
|
|
|
|
--
|
|
--
|
|
-2.49.0
|
|
|
|
|
|
+2.50.0
|
|
|
|
|