From mboxrd@z Thu Jan 1 00:00:00 1970 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 BA76FC433EF for ; Mon, 21 Feb 2022 10:43:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355336AbiBUKoQ (ORCPT ); Mon, 21 Feb 2022 05:44:16 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:37664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355247AbiBUKoA (ORCPT ); Mon, 21 Feb 2022 05:44:00 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C901424F31 for ; Mon, 21 Feb 2022 02:04:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645437819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4s8BJxEDtsxmBqxIWggsGjTBGC1Oq+r/eNf7z8ANFYk=; b=iAXOgab5ZM2p8GG049pYnIuof9DtwuYbOK6a1Q44erMWBelQR9KULpxklEf0qb5kzabeeb ceVUy2SvMabdtOq9AdThHKxJidi1UXhNtOa+imiaSLKk4w7tXV5iw85vSiXkJzPmPjJWOz SKHNh+5nGYeNc8ze4A7IoCVbnbgwWUE= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-503-mVH7TTKUOMGPR-BqcvLJKw-1; Mon, 21 Feb 2022 05:03:37 -0500 X-MC-Unique: mVH7TTKUOMGPR-BqcvLJKw-1 Received: by mail-ed1-f71.google.com with SMTP id dy17-20020a05640231f100b00412897682b4so8094103edb.18 for ; Mon, 21 Feb 2022 02:03:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=4s8BJxEDtsxmBqxIWggsGjTBGC1Oq+r/eNf7z8ANFYk=; b=nYxZeMv+lPzBbQLJOs1f9wyvJy6QWqIfnWI2xwBKP3pBS6UH/sdbrtmHfUvyHW0PXB zK1Fi2Q9j4rH0UQz5VUs/oMnXMIX0xlLCY5sHIYH/4cUDXlNOI/Nn/aTcn/az2VK9W0U v8zUPBZ168Rdz+uescJ65y2CV5UgM4TQAvuzgm2nGnQtC7jubnIb+yYJUlsE3RuBOWo7 XRAcWzRbVCZSdMhbS4APBfLxrgFsrzgg8K9ChCzgNJGAX5LZly01C/1d0+feKFOb9Ur6 pX6hD0Z+fkAzSyde/jXevGaSPv32yUEtYAlMBPiIQ7XAt90LPJh1/9W/chs4CozBpH+Y BO+Q== X-Gm-Message-State: AOAM530DRGJhoqx6ww3PSfEw2w1n3PMGt7sV8+thfxg8mvkINIL7XnTD Pxy+kknt++phdVNFhXJRJlCWUmMq/fLo2cuCS1TAvTz8Zwln3vqAPOuvKMm+sH1jgfYpvjrkxRr HtFUCdC41FMqN7UEFeOyF X-Received: by 2002:a17:907:9086:b0:6b3:fce8:50ee with SMTP id ge6-20020a170907908600b006b3fce850eemr15067869ejb.390.1645437816128; Mon, 21 Feb 2022 02:03:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvv6nlokX9BhhIjU9STNKNuRrTxESvHoQlBYb54BYeI5iJ0tI4/MuKELQ416ug8QhL5lmNhA== X-Received: by 2002:a17:907:9086:b0:6b3:fce8:50ee with SMTP id ge6-20020a170907908600b006b3fce850eemr15067860ejb.390.1645437815927; Mon, 21 Feb 2022 02:03:35 -0800 (PST) Received: from [10.40.98.142] ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id b7sm5130124ejl.145.2022.02.21.02.03.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Feb 2022 02:03:35 -0800 (PST) Message-ID: <922e686e-26df-a07b-1c82-860127e8403b@redhat.com> Date: Mon, 21 Feb 2022 11:03:34 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH 5/6] platform/x86: int3472: Support multiple gpio lookups in board data Content-Language: en-US To: Daniel Scally , 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, markgross@kernel.org, robert.moore@intel.com References: <20220216225304.53911-1-djrscally@gmail.com> <20220216225304.53911-6-djrscally@gmail.com> From: Hans de Goede In-Reply-To: <20220216225304.53911-6-djrscally@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Hi, On 2/16/22 23:53, Daniel Scally wrote: > 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. > > Signed-off-by: Daniel Scally > --- > drivers/platform/x86/intel/int3472/tps68470.c | 18 ++++++++++----- > drivers/platform/x86/intel/int3472/tps68470.h | 3 ++- > .../x86/intel/int3472/tps68470_board_data.c | 22 ++++++++++++++++--- > 3 files changed, 33 insertions(+), 10 deletions(-) > > diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c > index b535564712bb..736480961ec3 100644 > --- a/drivers/platform/x86/intel/int3472/tps68470.c > +++ b/drivers/platform/x86/intel/int3472/tps68470.c > @@ -150,6 +150,7 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client) > struct regmap *regmap; > int device_type; > int ret; > + int i; > > n_consumers = skl_int3472_fill_clk_pdata(&client->dev, &clk_pdata); > if (n_consumers < 0) > @@ -194,15 +195,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: > @@ -226,10 +230,12 @@ 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; Please keep an empty line between variable declarations and statements (I believe checkpatch should have warned about this?) > 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 525f09a3b5ff..442a8a2de224 100644 > --- a/drivers/platform/x86/intel/int3472/tps68470_board_data.c > +++ b/drivers/platform/x86/intel/int3472/tps68470_board_data.c > @@ -96,7 +96,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), > @@ -105,16 +105,32 @@ 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 int3472_tps68470_board_data surface_go3_tps68470_board_data = { > .dev_name = "i2c-INT3472:01", > - .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[] = { Otherwise this looks good to me: Reviewed-by: Hans de Goede Regards, Hans