From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Sasha Levin" <sashal@kernel.org>,
djrscally@gmail.com, platform-driver-x86@vger.kernel.org
Subject: [PATCH AUTOSEL 6.12 18/31] platform/x86: int3472: Call "reset" GPIO "enable" for INT347E
Date: Tue, 18 Feb 2025 15:26:04 -0500 [thread overview]
Message-ID: <20250218202619.3592630-18-sashal@kernel.org> (raw)
In-Reply-To: <20250218202619.3592630-1-sashal@kernel.org>
From: Sakari Ailus <sakari.ailus@linux.intel.com>
[ Upstream commit 569617dbbd06286fb73f3f1c2ac91e51d863c7de ]
The DT bindings for ov7251 specify "enable" GPIO (xshutdown in
documentation) but the int3472 indiscriminately provides this as a "reset"
GPIO to sensor drivers. Take this into account by assigning it as "enable"
with active high polarity for INT347E devices, i.e. ov7251. "reset" with
active low polarity remains the default GPIO name for other devices.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250211072841.7713-3-sakari.ailus@linux.intel.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/platform/x86/intel/int3472/discrete.c | 52 +++++++++++++++++--
1 file changed, 48 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
index dc4d09611c5ab..9e69ac9cfb92c 100644
--- a/drivers/platform/x86/intel/int3472/discrete.c
+++ b/drivers/platform/x86/intel/int3472/discrete.c
@@ -2,6 +2,7 @@
/* Author: Dan Scally <djrscally@gmail.com> */
#include <linux/acpi.h>
+#include <linux/array_size.h>
#include <linux/bitfield.h>
#include <linux/device.h>
#include <linux/gpio/consumer.h>
@@ -122,10 +123,53 @@ skl_int3472_gpiod_get_from_temp_lookup(struct int3472_discrete_device *int3472,
return desc;
}
-static void int3472_get_func_and_polarity(u8 type, const char **func,
- unsigned long *gpio_flags)
+/**
+ * struct int3472_gpio_map - Map GPIOs to whatever is expected by the
+ * sensor driver (as in DT bindings)
+ * @hid: The ACPI HID of the device without the instance number e.g. INT347E
+ * @type_from: The GPIO type from ACPI ?SDT
+ * @type_to: The assigned GPIO type, typically same as @type_from
+ * @func: The function, e.g. "enable"
+ * @polarity_low: GPIO_ACTIVE_LOW true if the @polarity_low is true,
+ * GPIO_ACTIVE_HIGH otherwise
+ */
+struct int3472_gpio_map {
+ const char *hid;
+ u8 type_from;
+ u8 type_to;
+ bool polarity_low;
+ const char *func;
+};
+
+static const struct int3472_gpio_map int3472_gpio_map[] = {
+ { "INT347E", INT3472_GPIO_TYPE_RESET, INT3472_GPIO_TYPE_RESET, false, "enable" },
+};
+
+static void int3472_get_func_and_polarity(struct acpi_device *adev, u8 *type,
+ const char **func, unsigned long *gpio_flags)
{
- switch (type) {
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(int3472_gpio_map); i++) {
+ /*
+ * Map the firmware-provided GPIO to whatever a driver expects
+ * (as in DT bindings). First check if the type matches with the
+ * GPIO map, then further check that the device _HID matches.
+ */
+ if (*type != int3472_gpio_map[i].type_from)
+ continue;
+
+ if (!acpi_dev_hid_uid_match(adev, int3472_gpio_map[i].hid, NULL))
+ continue;
+
+ *type = int3472_gpio_map[i].type_to;
+ *gpio_flags = int3472_gpio_map[i].polarity_low ?
+ GPIO_ACTIVE_LOW : GPIO_ACTIVE_HIGH;
+ *func = int3472_gpio_map[i].func;
+ return;
+ }
+
+ switch (*type) {
case INT3472_GPIO_TYPE_RESET:
*func = "reset";
*gpio_flags = GPIO_ACTIVE_LOW;
@@ -218,7 +262,7 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
type = FIELD_GET(INT3472_GPIO_DSM_TYPE, obj->integer.value);
- int3472_get_func_and_polarity(type, &func, &gpio_flags);
+ int3472_get_func_and_polarity(int3472->sensor, &type, &func, &gpio_flags);
pin = FIELD_GET(INT3472_GPIO_DSM_PIN, obj->integer.value);
if (pin != agpio->pin_table[0])
--
2.39.5
next prev parent reply other threads:[~2025-02-18 20:26 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 20:25 [PATCH AUTOSEL 6.12 01/31] sched_ext: selftests/dsp_local_on: Fix sporadic failures Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 02/31] HID: intel-ish-hid: fix the length of MNG_SYNC_FW_CLOCK in doorbell Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 03/31] HID: intel-ish-hid: Send clock sync message immediately after reset Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 04/31] HID: ignore non-functional sensor in HP 5MP Camera Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 05/31] HID: hid-steam: Fix issues with disabling both gamepad mode and lizard mode Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 06/31] usb: phy: generic: Use proper helper for property detection Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 07/31] HID: intel-ish-hid: ipc: Add Panther Lake PCI device IDs Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 08/31] HID: topre: Fix n-key rollover on Realforce R3S TKL boards Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 09/31] selftests/cgroup: use bash in test_cpuset_v1_hp.sh Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 10/31] HID: hid-apple: Apple Magic Keyboard a3203 USB-C support Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 11/31] HID: apple: fix up the F6 key on the Omoton KB066 keyboard Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 12/31] btrfs: fix two misuses of folio_shift() Sasha Levin
2025-02-18 20:25 ` [PATCH AUTOSEL 6.12 13/31] objtool: Ignore dangling jump table entries Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 14/31] sched: Clarify wake_up_q()'s write to task->wake_q.next Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 15/31] platform/x86: thinkpad_acpi: Fix invalid fan speed on ThinkPad X120e Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 16/31] platform/x86: thinkpad_acpi: Support for V9 DYTC platform profiles Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 17/31] platform/x86: int3472: Use correct type for "polarity", call it gpio_flags Sasha Levin
2025-02-18 20:26 ` Sasha Levin [this message]
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 19/31] s390/cio: Fix CHPID "configure" attribute caching Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 20/31] thermal/cpufreq_cooling: Remove structure member documentation Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 21/31] um: virt-pci: don't use kmalloc() Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 22/31] um: virtio_uml: use raw spinlock Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 23/31] um: convert irq_lock to " Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 24/31] LoongArch: Fix kernel_page_present() for KPRANGE/XKPRANGE Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 25/31] LoongArch: KVM: Set host with kernel mode when switch to VM mode Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 26/31] arm64: amu: Delay allocating cpumask for AMU FIE support Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 27/31] Xen/swiotlb: mark xen_swiotlb_fixup() __init Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 28/31] Bluetooth: L2CAP: Fix slab-use-after-free Read in l2cap_send_cmd Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 29/31] drm/tests: hdmi: Remove redundant assignments Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 30/31] drm/tests: hdmi: Reorder DRM entities variables assignment Sasha Levin
2025-02-18 20:26 ` [PATCH AUTOSEL 6.12 31/31] drm/tests: hdmi: Fix recursive locking Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250218202619.3592630-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=djrscally@gmail.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox