From patchwork Fri Jan 31 07:37:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "sakari.ailus@linux.intel.com" X-Patchwork-Id: 861146 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81EA71514CE; Fri, 31 Jan 2025 07:37:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738309040; cv=none; b=pKF9x0qgOmzEdpbgdKUCsclTuIOB7qH2Efnt/7aOcjS0uECsC2X3yuVFEwO6BwXcvmJspAT6CqvtkZDVyRWPNH/cOVthQ199IXzLS8vCit9ILSGaianamunmcC5sFWZyttAqNkAfbTnoNuaeYfRaicpny4yMJccM0pNrQh9mMsA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738309040; c=relaxed/simple; bh=aEeNUwcfxR1NM66J42UV7CEKMNYlJDWCn7wDtCm6bo0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=k5eTj6hb8H4y4dbNS+sedAWEHgGTAvhvnGDJtR6dcpVBk2ZLrbigngQ3COBn9NvoP/FLqUX6xHqbjA6nuqJ7bNxMzvMqL2cFy8858ybGDwA62jCne07whNuQWtMK9O2/Ug9wR7tjg2lbCxOrhYTlCE9sKmEGm7ywLSexLof6YoY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=AlWGK9sF; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="AlWGK9sF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738309038; x=1769845038; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aEeNUwcfxR1NM66J42UV7CEKMNYlJDWCn7wDtCm6bo0=; b=AlWGK9sFs6mDiATFCOd+ATyGSug3S8DFzJhP7bRNooqqST9E5pR7/r8Z zE345562wFKaWabGHHr54fbqdT6CQSU2kKA0sBKFhArckLKbJG6F5MXI6 iT9DdWdKacKEFFNZjuUpsw7K6OyWAwJP+pAn63ut39Qwj/zZzVOTjAZbl 0y6UufrBTufhMH1V+VA4o5LGgwvazuENn1Nl3GV2rn52acFAjjjdAtdzn vbUnohnpLbV+V/GF5s8urvLckr5Jo6B1siwTBS4MxWlN7hLFKZLrlp3jw wGTlIsw6tEc0XBJHupW2pnGMtnMrCS3OtIjKJDN0crz1Nu9BHkUILF5aM Q==; X-CSE-ConnectionGUID: 5zZabpkxSzySG/92xCM1sg== X-CSE-MsgGUID: RYjQr4+bTTCVDzvrjYApug== X-IronPort-AV: E=McAfee;i="6700,10204,11331"; a="26481242" X-IronPort-AV: E=Sophos;i="6.13,247,1732608000"; d="scan'208";a="26481242" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 23:37:17 -0800 X-CSE-ConnectionGUID: FqeOWbkbTN2wV2+rEQnnmA== X-CSE-MsgGUID: or9xbrc2QTKqfiGSxgTNkQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="132821486" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 23:37:15 -0800 Received: from svinhufvud.intel.com (maa-artisokka.localdomain [192.168.240.50]) by kekkonen.fi.intel.com (Postfix) with ESMTP id DCC6611FAB1; Fri, 31 Jan 2025 09:37:11 +0200 (EET) Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo From: Sakari Ailus To: Daniel Scally , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: platform-driver-x86@vger.kernel.org, Andy Shevchenko , laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl, linux-media@vger.kernel.org Subject: [PATCH v4 2/3] platform/x86: int3472: Call "reset" GPIO "enable" for INT347E Date: Fri, 31 Jan 2025 09:37:06 +0200 Message-Id: <20250131073707.1082931-3-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250131073707.1082931-1-sakari.ailus@linux.intel.com> References: <20250131073707.1082931-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- drivers/platform/x86/intel/int3472/discrete.c | 45 +++++++++++++++++-- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c index 3f7624714869..3f3f50ce431c 100644 --- a/drivers/platform/x86/intel/int3472/discrete.c +++ b/drivers/platform/x86/intel/int3472/discrete.c @@ -2,6 +2,7 @@ /* Author: Dan Scally */ #include +#include #include #include #include @@ -122,10 +123,46 @@ 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++) { + if (*type != int3472_gpio_map[i].type_from || + !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 +255,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])