From patchwork Mon Jan 17 15:19:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1580884 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JcwdR5GTFz9ssD for ; Tue, 18 Jan 2022 02:22:51 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1n9TqE-0001JF-Lq; Mon, 17 Jan 2022 15:22:42 +0000 Received: from mail-pl1-f182.google.com ([209.85.214.182]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n9Tnc-0006yX-AD for kernel-team@lists.ubuntu.com; Mon, 17 Jan 2022 15:20:00 +0000 Received: by mail-pl1-f182.google.com with SMTP id u15so21627224ple.2 for ; Mon, 17 Jan 2022 07:19:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g/hBHkxdYHaL1EqO7Vl86xD58b2p2tO1Uxn8yEy6LO0=; b=t1N6VUTVvXIUjQmXPwrkCOhzcNdvXJTmLI7r0sw12eifj4kbBhuYLIuGaFOqwTxJkH GiUlTGJjzWZJtYU4cBV1VY37+uOhDKeC8JtCD9StDRmS/SfH1adGn6qu8YGnJcGplzlp YNgra1QFYiBLEzqwSkNvuB9bW3pbJXBTo9iMbrTZWZmqKHBObq0q76DvZ5mEfNXfdG84 kJOaqVRo1TdX65hA59LTFeyTy/l6Rara/yGdCjVnXue27M4JGlDJo7pP9fW34Ds6Cxlh Q7GPuIrtbh4GGRUoWXrk7+enL0IvLe5xKGHLfbMdSzKjaS2vNJSkTP1S3job4MnYgAWQ Lg3A== X-Gm-Message-State: AOAM5316+fJrxXx/GQPBX50JG8X6Zgp2XjZTT4zyj5Z0Ey64XVtLGNeY OCkz4dkTWXrxnTOcjm5b8LWPPj3I/Bz8/Q== X-Google-Smtp-Source: ABdhPJwvhN8buHdR62cVprmNG0/OYzawzzdErf3Awu/4LjcQr0OgBGpAuYQyeg45N/YwA34hWd/12w== X-Received: by 2002:a17:902:e14c:b0:14a:b711:7357 with SMTP id d12-20020a170902e14c00b0014ab7117357mr6185744pla.110.1642432798277; Mon, 17 Jan 2022 07:19:58 -0800 (PST) Received: from localhost (218-173-149-51.dynamic-ip.hinet.net. [218.173.149.51]) by smtp.gmail.com with ESMTPSA id m12sm5323705pjl.15.2022.01.17.07.19.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jan 2022 07:19:57 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 12/30][SRU][Jammy] UBUNTU: SAUCE: change power control driver to acpi driver Date: Mon, 17 Jan 2022 23:19:10 +0800 Message-Id: <20220117151928.954829-13-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220117151928.954829-1-vicamo.yang@canonical.com> References: <20220117151928.954829-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.182; envelope-from=vicamo@gmail.com; helo=mail-pl1-f182.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wang Yating BugLink: https://bugs.launchpad.net/bugs/1955383 Signed-off-by: Wang Yating (cherry picked from commit 7d9bc3bff21401cf08a99eb37eaead0e86464c8a github.com/intel/ipu6-drivers) Signed-off-by: You-Sheng Yang --- drivers/media/i2c/ov01a1s.c | 16 ++- drivers/media/i2c/power_ctrl_logic.c | 139 ++++++++++++--------------- drivers/media/i2c/power_ctrl_logic.h | 24 ----- 3 files changed, 75 insertions(+), 104 deletions(-) diff --git a/drivers/media/i2c/ov01a1s.c b/drivers/media/i2c/ov01a1s.c index 8c34c0da4bd4..8cd9e2dd4e7e 100644 --- a/drivers/media/i2c/ov01a1s.c +++ b/drivers/media/i2c/ov01a1s.c @@ -836,17 +836,21 @@ static int ov01a1s_probe(struct i2c_client *client) struct ov01a1s *ov01a1s; int ret = 0; + if (power_ctrl_logic_set_power(1)) { + dev_dbg(&client->dev, "power control driver not ready.\n"); + return -EPROBE_DEFER; + } ov01a1s = devm_kzalloc(&client->dev, sizeof(*ov01a1s), GFP_KERNEL); - if (!ov01a1s) - return -ENOMEM; + if (!ov01a1s) { + ret = -ENOMEM; + goto probe_error_ret; + } v4l2_i2c_subdev_init(&ov01a1s->sd, client, &ov01a1s_subdev_ops); - power_ctrl_logic_set_power(0); - power_ctrl_logic_set_power(1); ret = ov01a1s_identify_module(ov01a1s); if (ret) { dev_err(&client->dev, "failed to find sensor: %d", ret); - return ret; + goto probe_error_ret; } mutex_init(&ov01a1s->mutex); @@ -893,6 +897,8 @@ static int ov01a1s_probe(struct i2c_client *client) v4l2_ctrl_handler_free(ov01a1s->sd.ctrl_handler); mutex_destroy(&ov01a1s->mutex); +probe_error_ret: + power_ctrl_logic_set_power(0); return ret; } diff --git a/drivers/media/i2c/power_ctrl_logic.c b/drivers/media/i2c/power_ctrl_logic.c index 17665056eac4..1ccd94f9e97e 100644 --- a/drivers/media/i2c/power_ctrl_logic.c +++ b/drivers/media/i2c/power_ctrl_logic.c @@ -1,9 +1,30 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2020-2021 Intel Corporation. -#include +#include #include -#include "power_ctrl_logic.h" +#include +#include +#include + +#define PCL_DRV_NAME "power_ctrl_logic" + +struct power_ctrl_logic { + /* gpio resource*/ + struct gpio_desc *reset_gpio; + struct gpio_desc *powerdn_gpio; + struct gpio_desc *clocken_gpio; + struct gpio_desc *indled_gpio; + /* status */ + struct mutex status_lock; + bool power_on; + bool gpio_ready; +}; + +struct power_ctrl_gpio { + const char *name; + struct gpio_desc **pin; +}; /* mcu gpio resources*/ static const struct acpi_gpio_params camreset_gpio = { 0, 0, false }; @@ -18,10 +39,6 @@ static const struct acpi_gpio_mapping dsc1_acpi_gpios[] = { { } }; -static const char * const pin_names[] = { - "camreset", "campwdn", "midmclken", "indled" -}; - static struct power_ctrl_logic pcl = { .reset_gpio = NULL, .powerdn_gpio = NULL, @@ -31,65 +48,45 @@ static struct power_ctrl_logic pcl = { .gpio_ready = false, }; -static int get_gpio_pin(struct gpio_desc **pin_d, struct pci_dev *pdev, int idx) -{ - int count = PCL_PROBE_MAX_TRY; - - do { - dev_dbg(&pdev->dev, "get %s:tried once\n", pin_names[idx]); - *pin_d = devm_gpiod_get(&pdev->dev, pin_names[idx], - GPIOD_OUT_LOW); - if (!IS_ERR(*pin_d)) - return 0; - *pin_d = NULL; - msleep_interruptible(PCL_PROBE_TRY_GAP); - } while (--count > 0); - - return -EBUSY; -} +static struct power_ctrl_gpio pcl_gpios[] = { + { "camreset", &pcl.reset_gpio }, + { "campwdn", &pcl.powerdn_gpio }, + { "midmclken", &pcl.clocken_gpio}, + { "indled", &pcl.indled_gpio}, +}; -static int power_ctrl_logic_probe(struct pci_dev *pdev, - const struct pci_device_id *id) +static int power_ctrl_logic_add(struct acpi_device *adev) { - int ret; + int i, ret; - if (!pdev) { - dev_err(&pdev->dev, "@%s: probed null pdev %x:%x\n", - __func__, PCL_PCI_BRG_VEN_ID, PCL_PCI_BRG_PDT_ID); - return -ENODEV; - } - dev_dbg(&pdev->dev, "@%s, enter\n", __func__); + dev_dbg(&adev->dev, "@%s, enter\n", __func__); + set_primary_fwnode(&adev->dev, &adev->fwnode); - ret = devm_acpi_dev_add_driver_gpios(&pdev->dev, dsc1_acpi_gpios); + ret = acpi_dev_add_driver_gpios(adev, dsc1_acpi_gpios); if (ret) { - dev_err(&pdev->dev, "@%s: fail to add gpio\n", __func__); + dev_err(&adev->dev, "@%s: --111---fail to add gpio. ret %d\n", __func__, ret); return -EBUSY; } - ret = get_gpio_pin(&pcl.reset_gpio, pdev, 0); - if (ret) - goto power_ctrl_logic_probe_end; - ret = get_gpio_pin(&pcl.powerdn_gpio, pdev, 1); - if (ret) - goto power_ctrl_logic_probe_end; - ret = get_gpio_pin(&pcl.clocken_gpio, pdev, 2); - if (ret) - goto power_ctrl_logic_probe_end; - ret = get_gpio_pin(&pcl.indled_gpio, pdev, 3); - if (ret) - goto power_ctrl_logic_probe_end; + + for (i = 0; i < ARRAY_SIZE(pcl_gpios); i++) { + *pcl_gpios[i].pin = gpiod_get(&adev->dev, pcl_gpios[i].name, GPIOD_OUT_LOW); + if (IS_ERR(*pcl_gpios[i].pin)) { + dev_dbg(&adev->dev, "failed to get gpio %s\n", pcl_gpios[i].name); + return -EPROBE_DEFER; + } + } mutex_lock(&pcl.status_lock); pcl.gpio_ready = true; mutex_unlock(&pcl.status_lock); -power_ctrl_logic_probe_end: - dev_dbg(&pdev->dev, "@%s, exit\n", __func__); + dev_dbg(&adev->dev, "@%s, exit\n", __func__); return ret; } -static void power_ctrl_logic_remove(struct pci_dev *pdev) +static int power_ctrl_logic_remove(struct acpi_device *adev) { - dev_dbg(&pdev->dev, "@%s, enter\n", __func__); + dev_dbg(&adev->dev, "@%s, enter\n", __func__); mutex_lock(&pcl.status_lock); pcl.gpio_ready = false; gpiod_set_value_cansleep(pcl.reset_gpio, 0); @@ -101,43 +98,35 @@ static void power_ctrl_logic_remove(struct pci_dev *pdev) gpiod_set_value_cansleep(pcl.indled_gpio, 0); gpiod_put(pcl.indled_gpio); mutex_unlock(&pcl.status_lock); - dev_dbg(&pdev->dev, "@%s, exit\n", __func__); + dev_dbg(&adev->dev, "@%s, exit\n", __func__); + return 0; } -static struct pci_device_id power_ctrl_logic_ids[] = { - { PCI_DEVICE(PCL_PCI_BRG_VEN_ID, PCL_PCI_BRG_PDT_ID) }, - { 0, }, +static struct acpi_device_id acpi_ids[] = { + { "INT3472", 0 }, + { }, }; -MODULE_DEVICE_TABLE(pci, power_ctrl_logic_ids); - -static struct pci_driver power_ctrl_logic_driver = { - .name = PCL_DRV_NAME, - .id_table = power_ctrl_logic_ids, - .probe = power_ctrl_logic_probe, - .remove = power_ctrl_logic_remove, +MODULE_DEVICE_TABLE(acpi, acpi_ids); + +static struct acpi_driver _driver = { + .name = PCL_DRV_NAME, + .class = PCL_DRV_NAME, + .ids = acpi_ids, + .ops = { + .add = power_ctrl_logic_add, + .remove = power_ctrl_logic_remove, + }, }; - -static int __init power_ctrl_logic_init(void) -{ - mutex_init(&pcl.status_lock); - return pci_register_driver(&power_ctrl_logic_driver); -} - -static void __exit power_ctrl_logic_exit(void) -{ - pci_unregister_driver(&power_ctrl_logic_driver); -} -module_init(power_ctrl_logic_init); -module_exit(power_ctrl_logic_exit); +module_acpi_driver(_driver); int power_ctrl_logic_set_power(int on) { mutex_lock(&pcl.status_lock); - if (!pcl.gpio_ready || on < 0 || on > 1) { + if (!pcl.gpio_ready) { pr_debug("@%s,failed to set power, gpio_ready=%d, on=%d\n", __func__, pcl.gpio_ready, on); mutex_unlock(&pcl.status_lock); - return -EBUSY; + return -EPROBE_DEFER; } if (pcl.power_on != on) { gpiod_set_value_cansleep(pcl.reset_gpio, on); diff --git a/drivers/media/i2c/power_ctrl_logic.h b/drivers/media/i2c/power_ctrl_logic.h index 1c6d71dcc62f..a7967858fbe9 100644 --- a/drivers/media/i2c/power_ctrl_logic.h +++ b/drivers/media/i2c/power_ctrl_logic.h @@ -4,30 +4,6 @@ #ifndef _POWER_CTRL_LOGIC_H_ #define _POWER_CTRL_LOGIC_H_ -#include -#include -#include - -/* pci id for probe power control logic*/ -#define PCL_PCI_BRG_VEN_ID 0x8086 -#define PCL_PCI_BRG_PDT_ID 0x9a14 - -#define PCL_DRV_NAME "power_ctrl_logic" -#define PCL_PROBE_MAX_TRY 5 -#define PCL_PROBE_TRY_GAP 500 /* in millseconds */ - -struct power_ctrl_logic { - /* gpio resource*/ - struct gpio_desc *reset_gpio; - struct gpio_desc *powerdn_gpio; - struct gpio_desc *clocken_gpio; - struct gpio_desc *indled_gpio; - /* status */ - struct mutex status_lock; - bool power_on; - bool gpio_ready; -}; - /* exported function for extern module */ int power_ctrl_logic_set_power(int on); #endif