From patchwork Sun Mar 27 16:13:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 554648 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B28A0C43219 for ; Sun, 27 Mar 2022 16:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235981AbiC0QPf (ORCPT ); Sun, 27 Mar 2022 12:15:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235979AbiC0QPe (ORCPT ); Sun, 27 Mar 2022 12:15:34 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1C83286EA; Sun, 27 Mar 2022 09:13:55 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id h23so17035359wrb.8; Sun, 27 Mar 2022 09:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H+FhRc7KgAfPCLtqzrVvCY/1ZFWM7ONidYWxxdL5dd8=; b=QCb1Mj/vwpfX9vwr60BaT0jWLWOxTdbAaz7fX34nKWOM6q+nxQbAREWHTZIDynYv17 HEgNCWHfQ8OpHfuXfzAaxRlKBPw/97tZmlcjwjuLWbZm1GMFYFNsxkmnsto5GlFb3KZ6 37FvUFK/s27pDvezCj/hM6B4lWc1Gvmt6hzRgXcHxOUl77jRx/XNkCYq2otQFrWc4R3Z shd+qA8ovzULgh2XuNm6Uu5VvGjsRKeh3TA8JlsR7CBhKyECf6zmm2PZQKyGfkxEiNyL fDHDg6wuv7kE8lSa6Wa1MRFd3H46/VCecSQtUfrQaFBuPoii3piu7fnIg1pa4yzjFqFN wKoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H+FhRc7KgAfPCLtqzrVvCY/1ZFWM7ONidYWxxdL5dd8=; b=FWvCEPrsdV1NHOziHRqD+jWyk2rYIypFX/BVkymX33khl1qtzZmCQ55ln4ZKor5UHf 5xmNCXPvnyBNHkvzevk7Kxt2fMRfeP8zNVsHSkaXu6TABw6QgoZ9u4iZ2sOVQlrOkL8C Lvwwm9UUURMbLC2eYZhiN834uv4uHlAUaZIv9kcQZTxT4HgnqqoW2tSQ6FgdhO+tr5GC +y6mGx2pBHOYnYOu6S7g3qA0FtU5RJYirakH4aMWvuM+mtqliibGAO+mq2Vfhfb8uQ09 gZDJ1eFHtyvfsx3kDoSv9tpgpoC+lqY0NUm2KW/xVMF9LQqWKBUR8VSPZ3wbBitnsb62 TfJA== X-Gm-Message-State: AOAM532TskKo6lRLVpU+rLGAnVW47TDy1wrbCmJvJI6Tv27jAricCKnq d8OMzObdja+qz8Pbb0rNd6UBDocpK70= X-Google-Smtp-Source: ABdhPJxf9ssoXELvzGRtdGYfg5LVFmgJBjqFPwAibpmWdBspmgcIajJ21JgroEVUnStLmXyKhnum6w== X-Received: by 2002:adf:f20f:0:b0:203:fc73:a9a0 with SMTP id p15-20020adff20f000000b00203fc73a9a0mr18190442wro.418.1648397634354; Sun, 27 Mar 2022 09:13:54 -0700 (PDT) Received: from localhost.localdomain (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net. [86.13.91.161]) by smtp.gmail.com with ESMTPSA id k2-20020a1ca102000000b0038c78fdd59asm13764924wme.39.2022.03.27.09.13.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 09:13:54 -0700 (PDT) From: Daniel Scally To: linux-acpi@vger.kernel.org, linux-clk@vger.kernel.org, platform-driver-x86@vger.kernel.org Cc: rafael@kernel.org, lenb@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, hdegoede@redhat.com, markgross@kernel.org, robert.moore@intel.com Subject: [PATCH v2 1/5] ACPI: scan: Add acpi_dev_get_next_consumer_dev() Date: Sun, 27 Mar 2022 17:13:40 +0100 Message-Id: <20220327161344.50477-2-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220327161344.50477-1-djrscally@gmail.com> References: <20220327161344.50477-1-djrscally@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org In commit b83e2b306736 ("ACPI: scan: Add function to fetch dependent of ACPI device") we added a means of fetching the first device to declare itself dependent on another ACPI device in the _DEP method. One assumption in that patch was that there would only be a single consuming device, but this has not held. Replace that function with a new function that fetches the next consumer of a supplier device. Where no "previous" consumer is passed in, it behaves identically to the original function. Reviewed-by: Hans de Goede Signed-off-by: Daniel Scally --- Changes in v2: - Removed acpi_dev_get_first_consumer_dev() entirely drivers/acpi/scan.c | 37 +++++++++++++++------ drivers/platform/x86/intel/int3472/common.c | 2 +- include/acpi/acpi_bus.h | 4 ++- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 010ef0b28374..8797e4a33674 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2215,9 +2215,21 @@ static void acpi_bus_attach(struct acpi_device *device, bool first_pass) device->handler->hotplug.notify_online(device); } -static int acpi_dev_get_first_consumer_dev_cb(struct acpi_dep_data *dep, void *data) +static int acpi_dev_get_next_consumer_dev_cb(struct acpi_dep_data *dep, void *data) { - struct acpi_device *adev; + struct acpi_device *adev = *(struct acpi_device **)data; + + /* + * If we're passed a 'previous' consumer device then we need to skip + * any consumers until we meet the previous one, and then NULL @data + * so the next one can be returned. + */ + if (adev) { + if (dep->consumer == adev->handle) + *(struct acpi_device **)data = NULL; + + return 0; + } adev = acpi_bus_get_acpi_device(dep->consumer); if (adev) { @@ -2348,25 +2360,28 @@ bool acpi_dev_ready_for_enumeration(const struct acpi_device *device) EXPORT_SYMBOL_GPL(acpi_dev_ready_for_enumeration); /** - * acpi_dev_get_first_consumer_dev - Return ACPI device dependent on @supplier + * acpi_dev_get_next_consumer_dev - Return the next adev dependent on @supplier * @supplier: Pointer to the dependee device + * @start: Pointer to the current dependent device * - * Returns the first &struct acpi_device which declares itself dependent on + * Returns the next &struct acpi_device which declares itself dependent on * @supplier via the _DEP buffer, parsed from the acpi_dep_list. * - * The caller is responsible for putting the reference to adev when it is no - * longer needed. + * If the returned adev is not passed as @start to this function, the caller is + * responsible for putting the reference to adev when it is no longer needed. */ -struct acpi_device *acpi_dev_get_first_consumer_dev(struct acpi_device *supplier) +struct acpi_device *acpi_dev_get_next_consumer_dev(struct acpi_device *supplier, + struct acpi_device *start) { - struct acpi_device *adev = NULL; + struct acpi_device *adev = start; acpi_walk_dep_device_list(supplier->handle, - acpi_dev_get_first_consumer_dev_cb, &adev); + acpi_dev_get_next_consumer_dev_cb, &adev); - return adev; + acpi_dev_put(start); + return adev == start ? NULL : adev; } -EXPORT_SYMBOL_GPL(acpi_dev_get_first_consumer_dev); +EXPORT_SYMBOL_GPL(acpi_dev_get_next_consumer_dev); /** * acpi_bus_scan - Add ACPI device node objects in a given namespace scope. diff --git a/drivers/platform/x86/intel/int3472/common.c b/drivers/platform/x86/intel/int3472/common.c index 77cf058e4168..9db2bb0bbba4 100644 --- a/drivers/platform/x86/intel/int3472/common.c +++ b/drivers/platform/x86/intel/int3472/common.c @@ -62,7 +62,7 @@ int skl_int3472_get_sensor_adev_and_name(struct device *dev, struct acpi_device *sensor; int ret = 0; - sensor = acpi_dev_get_first_consumer_dev(adev); + sensor = acpi_dev_get_next_consumer_dev(adev, NULL); if (!sensor) { dev_err(dev, "INT3472 seems to have no dependents.\n"); return -ENODEV; diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 2f93ecf05dac..cdc726d251b6 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -696,7 +696,9 @@ bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const ch void acpi_dev_clear_dependencies(struct acpi_device *supplier); bool acpi_dev_ready_for_enumeration(const struct acpi_device *device); -struct acpi_device *acpi_dev_get_first_consumer_dev(struct acpi_device *supplier); +struct acpi_device *acpi_dev_get_next_consumer_dev(struct acpi_device *supplier, + struct acpi_device *start); + struct acpi_device * acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv); struct acpi_device * From patchwork Sun Mar 27 16:13:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 554649 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E6CCC4321E for ; Sun, 27 Mar 2022 16:13:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235979AbiC0QPf (ORCPT ); Sun, 27 Mar 2022 12:15:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235977AbiC0QPf (ORCPT ); Sun, 27 Mar 2022 12:15:35 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0B3427CFF; Sun, 27 Mar 2022 09:13:56 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id w4so17008796wrg.12; Sun, 27 Mar 2022 09:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MoaYREzq6jXyRyPsLV3DSxV09kFGjo/gj37Cv5lUcH8=; b=dbKQRX+2WDNHQwKo+f8wT6nYSnPGKx6p+cuJ4Bk1nqNvOIfJk9VO4Rgro7w+ZwYbDc r3GKJ40MrPoRL8731j2g2mhO4efwTtZDcAjuLV/fWod0FXFWAARiyvyTERf1fPrOLKsE KWDocqGRDXJhjS9YLjIb1yg75cd+bCLdz9Iyse7rT5/pE0hTR8cMCe/dxeea8Y4TTMIy LO/Y/Vmk4OzbI4x5/La7oiBS0KBGoB4JGrvHduEgJeDpPk51ZGUDn41M5aBiQIFWjn3K guJN5ya4tfRgHdSaNEZNQO9cIEryejVsbjoRZrnDvP6Ijqfeb2nPIQ4V3iBZMUHOrLOa UBVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MoaYREzq6jXyRyPsLV3DSxV09kFGjo/gj37Cv5lUcH8=; b=UJx4zeZyLFNFzYTkqSb0WaOu768L2cyv8I8oD/xeP4foq/XUxmNmxNBkoNl9n2zXMg PLBtOUiysDK0oYa3WTVo1g32dSMpP5wtMKc32HuFIwKWdT9vIjZdx34IBQdoLik/9Uzl mpNOClqW0foCpz6sHVWFVXJlPhwtSaTRMfrhXRhxw73CWrjt3zrVRDxrhUTLcDxQDytq /kmq2GRvsTbOtWAoFGH9AmZ6Bg98RKu6uBsjLGhNkpn0P3vs60lRLKfuDkehKL0UYSea CN2b+MB3EmWnuxN8I0oru8ZenLVhf5oZeoG1CUhzQqcUXBVr8yFq3oKH7Bm9L1pqdH9x nTMA== X-Gm-Message-State: AOAM531B2h9M2leLvNqhB40SPYbrvrqshq9R/5kkVpKAZhni1Q3PQS/U Hrvu8utw3uz8VaCFFabeD958S7SfDas= X-Google-Smtp-Source: ABdhPJyWhRnLzY0DHAkT/e+X5XKouMYHpLzaYGdW5A54blCDoptzan9nYsBawMS6AQMxvkcojpD1JA== X-Received: by 2002:adf:e18f:0:b0:204:444:dd0d with SMTP id az15-20020adfe18f000000b002040444dd0dmr17926225wrb.678.1648397635237; Sun, 27 Mar 2022 09:13:55 -0700 (PDT) Received: from localhost.localdomain (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net. [86.13.91.161]) by smtp.gmail.com with ESMTPSA id k2-20020a1ca102000000b0038c78fdd59asm13764924wme.39.2022.03.27.09.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 09:13:54 -0700 (PDT) From: Daniel Scally To: linux-acpi@vger.kernel.org, linux-clk@vger.kernel.org, platform-driver-x86@vger.kernel.org Cc: rafael@kernel.org, lenb@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, hdegoede@redhat.com, markgross@kernel.org, robert.moore@intel.com Subject: [PATCH v2 2/5] ACPI: bus: Add iterator for dependent devices Date: Sun, 27 Mar 2022 17:13:41 +0100 Message-Id: <20220327161344.50477-3-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220327161344.50477-1-djrscally@gmail.com> References: <20220327161344.50477-1-djrscally@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Add a helper macro to iterate over ACPI devices that are flagged as consumers of an initial supplier ACPI device. Reviewed-by: Hans de Goede Signed-off-by: Daniel Scally --- Changes in v2: - switched to use acpi_dev_get_next_consumer_dev() in the loop init include/acpi/acpi_bus.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index cdc726d251b6..7fbe690a5b33 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -699,6 +699,17 @@ bool acpi_dev_ready_for_enumeration(const struct acpi_device *device); struct acpi_device *acpi_dev_get_next_consumer_dev(struct acpi_device *supplier, struct acpi_device *start); +/** + * for_each_acpi_consumer_dev - iterate over the consumer ACPI devices for a + * given supplier + * @supplier: Pointer to the supplier's ACPI device + * @consumer: Pointer to &struct acpi_device to hold the consumer, initially NULL + */ +#define for_each_acpi_consumer_dev(supplier, consumer) \ + for (consumer = acpi_dev_get_next_consumer_dev(supplier, NULL); \ + consumer; \ + consumer = acpi_dev_get_next_consumer_dev(supplier, consumer)) + struct acpi_device * acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv); struct acpi_device * From patchwork Sun Mar 27 16:13:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Scally X-Patchwork-Id: 554647 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 718B7C43217 for ; Sun, 27 Mar 2022 16:14:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235934AbiC0QPn (ORCPT ); Sun, 27 Mar 2022 12:15:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235977AbiC0QPh (ORCPT ); Sun, 27 Mar 2022 12:15:37 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A3E027CFF; Sun, 27 Mar 2022 09:13:58 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id h23so17035438wrb.8; Sun, 27 Mar 2022 09:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MQ+yXcP+51IZJ4kzpsc4cimxpmVHWzF1xr6D+3HdATY=; b=BhwM82qBKXZO5+fqw65QeKhwje18NdeAec7SMOGvtRZxuYSxkGBHoghZDoTsCxb0e1 scVi6+VlF0r4aTLH4eZ++WQDTB0zC3vBNOV0/X2ogIONIscsAfTuOj1S6LQNiZspcVd1 ehwEXIB/eqW5e4LN4WGMXCu4Ankjd/eMt9mkjfmIkQi68RovOmYMkrP2lLIhOWgyEtZX w4y9lH9pXxrVkqkn6DZidDauzmwsINV6+JQoUXqxgnkdxkicfGWj3mrgkkJEBR3okh8/ +J5Tqzj/z3wdT/c6Dkhpp/7nGzPJZZ+rZGqMEU7nNxdJd8B5b8OjmnEmRsmhcpCHkZRB lM/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MQ+yXcP+51IZJ4kzpsc4cimxpmVHWzF1xr6D+3HdATY=; b=f9zaQtJP6K6L/V7rORiH1WY/LgiLi9xhhmZzDUwiKBd6Qq+44oSOI2VnQBwpiTZ82a aYUX0A1G0ixnBt4dECXB1YsCxYNlZb6O9TYs07ew3WSYY0bTLiHLnc5NsxC1TYx0WBMp J8YCyg23EDEVYvDvlbFe5KOZz+M48e1QYzcC+IMMKvgMdM8ioJpJKfI4MmjYC5/ASAs1 foBnC0fcTkoLJVH9aGMwLnqawSzjVm8QMCFugUZzNE0BQFCt3SUWZUo9+ogxKDDN+3pO pjAXWUORCLVJexMlOE3IIEFZKxyEW0YNx2yBAyDAz8RoT/FzIsKGgNMkNigwvZJb3KqV xcQg== X-Gm-Message-State: AOAM530bDkGtRalmiS70gh2Z+PV8ogxRbQLIG7r/0O1UDF6c1ZgllNMq /QPVr4OYCXtSgS3KS94EM9CT72dpjNM= X-Google-Smtp-Source: ABdhPJwJGeTjMAYrE/BetV3s2BBGxZSrId0jcg8xq9fS+6LiG4xN2hBevdo8fyU+SU2yISPrawB+DA== X-Received: by 2002:a05:6000:1184:b0:203:ff46:1d72 with SMTP id g4-20020a056000118400b00203ff461d72mr18164519wrx.165.1648397637071; Sun, 27 Mar 2022 09:13:57 -0700 (PDT) Received: from localhost.localdomain (cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net. [86.13.91.161]) by smtp.gmail.com with ESMTPSA id k2-20020a1ca102000000b0038c78fdd59asm13764924wme.39.2022.03.27.09.13.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 09:13:56 -0700 (PDT) From: Daniel Scally To: linux-acpi@vger.kernel.org, linux-clk@vger.kernel.org, platform-driver-x86@vger.kernel.org Cc: rafael@kernel.org, lenb@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, hdegoede@redhat.com, markgross@kernel.org, robert.moore@intel.com Subject: [PATCH v2 4/5] platform/x86: int3472: Support multiple gpio lookups in board data Date: Sun, 27 Mar 2022 17:13:43 +0100 Message-Id: <20220327161344.50477-5-djrscally@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220327161344.50477-1-djrscally@gmail.com> References: <20220327161344.50477-1-djrscally@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Currently, we only support passing a single gpiod_lookup_table as part of the board data for the tps68470 driver. This carries the implicit assumption that each TPS68470 device will only support a single sensor, which does not hold true. Extend the code to support the possibility of multiple sensors each having a gpiod_lookup_table, and opportunistically add the lookup table for the Surface Go line's IR camera. Reviewed-by: Hans de Goede Signed-off-by: Daniel Scally --- Changes in v2: - Added a missing blank line after "int i;" drivers/platform/x86/intel/int3472/tps68470.c | 17 ++++++++++++----- drivers/platform/x86/intel/int3472/tps68470.h | 3 ++- .../x86/intel/int3472/tps68470_board_data.c | 16 ++++++++++++++-- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c index 907a0eb49f12..471b468a8da3 100644 --- a/drivers/platform/x86/intel/int3472/tps68470.c +++ b/drivers/platform/x86/intel/int3472/tps68470.c @@ -155,6 +155,7 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client) int n_consumers; int device_type; int ret; + int i; n_consumers = skl_int3472_fill_clk_pdata(&client->dev, &clk_pdata); if (n_consumers < 0) @@ -201,15 +202,18 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client) cells[1].pdata_size = sizeof(struct tps68470_regulator_platform_data); cells[2].name = "tps68470-gpio"; - gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_table); + for (i = 0; i < board_data->n_gpiod_lookups; i++) + gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_tables[i]); ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE, cells, TPS68470_WIN_MFD_CELL_COUNT, NULL, 0, NULL); kfree(cells); - if (ret) - gpiod_remove_lookup_table(board_data->tps68470_gpio_lookup_table); + if (ret) { + for (i = 0; i < board_data->n_gpiod_lookups; i++) + gpiod_remove_lookup_table(board_data->tps68470_gpio_lookup_tables[i]); + } break; case DESIGNED_FOR_CHROMEOS: @@ -233,10 +237,13 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client) static int skl_int3472_tps68470_remove(struct i2c_client *client) { const struct int3472_tps68470_board_data *board_data; + int i; board_data = int3472_tps68470_get_board_data(dev_name(&client->dev)); - if (board_data) - gpiod_remove_lookup_table(board_data->tps68470_gpio_lookup_table); + if (board_data) { + for (i = 0; i < board_data->n_gpiod_lookups; i++) + gpiod_remove_lookup_table(board_data->tps68470_gpio_lookup_tables[i]); + } return 0; } diff --git a/drivers/platform/x86/intel/int3472/tps68470.h b/drivers/platform/x86/intel/int3472/tps68470.h index cfd33eb62740..35915e701593 100644 --- a/drivers/platform/x86/intel/int3472/tps68470.h +++ b/drivers/platform/x86/intel/int3472/tps68470.h @@ -16,8 +16,9 @@ struct tps68470_regulator_platform_data; struct int3472_tps68470_board_data { const char *dev_name; - struct gpiod_lookup_table *tps68470_gpio_lookup_table; const struct tps68470_regulator_platform_data *tps68470_regulator_pdata; + unsigned int n_gpiod_lookups; + struct gpiod_lookup_table *tps68470_gpio_lookup_tables[]; }; const struct int3472_tps68470_board_data *int3472_tps68470_get_board_data(const char *dev_name); diff --git a/drivers/platform/x86/intel/int3472/tps68470_board_data.c b/drivers/platform/x86/intel/int3472/tps68470_board_data.c index f63ae7329cd2..dfb9431e4b1b 100644 --- a/drivers/platform/x86/intel/int3472/tps68470_board_data.c +++ b/drivers/platform/x86/intel/int3472/tps68470_board_data.c @@ -85,7 +85,7 @@ static const struct tps68470_regulator_platform_data surface_go_tps68470_pdata = }, }; -static struct gpiod_lookup_table surface_go_tps68470_gpios = { +static struct gpiod_lookup_table surface_go_int347a_gpios = { .dev_id = "i2c-INT347A:00", .table = { GPIO_LOOKUP("tps68470-gpio", 9, "reset", GPIO_ACTIVE_LOW), @@ -94,10 +94,22 @@ static struct gpiod_lookup_table surface_go_tps68470_gpios = { } }; +static struct gpiod_lookup_table surface_go_int347e_gpios = { + .dev_id = "i2c-INT347E:00", + .table = { + GPIO_LOOKUP("tps68470-gpio", 5, "enable", GPIO_ACTIVE_HIGH), + { } + } +}; + static const struct int3472_tps68470_board_data surface_go_tps68470_board_data = { .dev_name = "i2c-INT3472:05", - .tps68470_gpio_lookup_table = &surface_go_tps68470_gpios, .tps68470_regulator_pdata = &surface_go_tps68470_pdata, + .n_gpiod_lookups = 2, + .tps68470_gpio_lookup_tables = { + &surface_go_int347a_gpios, + &surface_go_int347e_gpios, + } }; static const struct dmi_system_id int3472_tps68470_board_data_table[] = {