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 18B19C433EF for ; Mon, 21 Feb 2022 10:36:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354986AbiBUKhR (ORCPT ); Mon, 21 Feb 2022 05:37:17 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:50738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354936AbiBUKhA (ORCPT ); Mon, 21 Feb 2022 05:37:00 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BF66B22BCC for ; Mon, 21 Feb 2022 01:59:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645437553; 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=/hYpLDEDmzY94nyryC694ggAPaCfSED0v0r+A/ovP+4=; b=fWAQaFLytGOI78LKNxhTb8ndHicbrN3IpouQtcZyInvOcgmJvfkwnBhSALTNFE8ZH35vo9 JnTPeC+lKJ7Sbozfe0Ec/D9lVO/1v+TiNCvconqp8H0C4cfYHg1utMn6OhL85Yd5Y4bveM Tr9slUmprXaDxZoQxAgi5CE9Vw4QFlA= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-634-Zsibe5AxPIuIQSWbzRbR1w-1; Mon, 21 Feb 2022 04:59:12 -0500 X-MC-Unique: Zsibe5AxPIuIQSWbzRbR1w-1 Received: by mail-ej1-f71.google.com with SMTP id m4-20020a170906160400b006be3f85906eso4437783ejd.23 for ; Mon, 21 Feb 2022 01:59:12 -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=/hYpLDEDmzY94nyryC694ggAPaCfSED0v0r+A/ovP+4=; b=wYcgFlOGPgkpsaEsXjxcwzOMsK7OpdPhW0LvC+a6Xbhi8M1FLfmg+tRi63TpW2KsGr 6vhH7ZdEQDswu9S0BFv+yzkSFJKUXY59gy3riGOkb4/R22bEMVzeekahpAykKhXl2Rrk N8i3M+3TPFIk7CJgOzrYcq767OEL3MeUvF3jsfE/vWHdD8ZzxA/73rXs8oXRfajge7Zm e0873PiVdzfCYG1SOIJA6dTpgjLtGDAetXJQDg+b3ih1uvb4/7mtXnSlQDJ8aJzRVJqv 8AyiVYnxUFjumYGcL+1VRG+Vhf0WVrEeTwDc2E8CvS85NCN2V0iJE9NfHgTqji5tllW7 oMwA== X-Gm-Message-State: AOAM530C2G81587m1tffXG7L6sCxtc3pRAjfRpvHDHmXw6pu94TphjAn BZZ5PdLDfQjSgisHesBoI1h9S7bt3V2yijdUfyudu75HfVvnYfzgcOpRgIEdBh2AY5d5BpaIuSJ aigf2bGh5B9CgdlevqFwP X-Received: by 2002:a05:6402:1e8c:b0:411:7180:7dfc with SMTP id f12-20020a0564021e8c00b0041171807dfcmr20678747edf.74.1645437551228; Mon, 21 Feb 2022 01:59:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXCgjwJruMzMPmsDnimR/8OECtj6YaQy4WLvWE/e1wsXHbGK7ufQirtUop/bB5YG4otwqRAA== X-Received: by 2002:a05:6402:1e8c:b0:411:7180:7dfc with SMTP id f12-20020a0564021e8c00b0041171807dfcmr20678737edf.74.1645437551057; Mon, 21 Feb 2022 01:59:11 -0800 (PST) Received: from [10.40.98.142] ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id hs25sm4998969ejc.172.2022.02.21.01.59.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Feb 2022 01:59:10 -0800 (PST) Message-ID: Date: Mon, 21 Feb 2022 10:59:09 +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 3/6] platform/x86: int3472: Support multiple clock consumers Content-Language: en-US To: Daniel Scally , Michael Turquette Cc: rafael@kernel.org, lenb@kernel.org, sboyd@kernel.org, markgross@kernel.org, robert.moore@intel.com, linux-acpi@vger.kernel.org, linux-clk@vger.kernel.org, platform-driver-x86@vger.kernel.org References: <20220216225304.53911-1-djrscally@gmail.com> <20220216225304.53911-4-djrscally@gmail.com> From: Hans de Goede In-Reply-To: <20220216225304.53911-4-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: > At present, the int3472-tps68470 only supports a single clock consumer when > passing platform data to the clock driver. In some devices multiple > sensors depend on the clock provided by a single TPS68470 and so all > need to be able to acquire the clock. Support passing multiple > consumers as platform data. > > Signed-off-by: Daniel Scally Thanks, patch looks good to me: Reviewed-by: Hans de Goede Michael, I plan to merge this entire series through the platform-drivers-x86 git tree, may I have your ack for merging the clk bits from this ? Regards, Hans > --- > drivers/clk/clk-tps68470.c | 13 ++-- > drivers/platform/x86/intel/int3472/tps68470.c | 59 ++++++++++++++++--- > include/linux/platform_data/tps68470.h | 7 ++- > 3 files changed, 67 insertions(+), 12 deletions(-) > > diff --git a/drivers/clk/clk-tps68470.c b/drivers/clk/clk-tps68470.c > index e5fbefd6ac2d..38f44b5b9b1b 100644 > --- a/drivers/clk/clk-tps68470.c > +++ b/drivers/clk/clk-tps68470.c > @@ -200,7 +200,9 @@ static int tps68470_clk_probe(struct platform_device *pdev) > .flags = CLK_SET_RATE_GATE, > }; > struct tps68470_clkdata *tps68470_clkdata; > + struct tps68470_clk_consumer *consumer; > int ret; > + int i; > > tps68470_clkdata = devm_kzalloc(&pdev->dev, sizeof(*tps68470_clkdata), > GFP_KERNEL); > @@ -223,10 +225,13 @@ static int tps68470_clk_probe(struct platform_device *pdev) > return ret; > > if (pdata) { > - ret = devm_clk_hw_register_clkdev(&pdev->dev, > - &tps68470_clkdata->clkout_hw, > - pdata->consumer_con_id, > - pdata->consumer_dev_name); > + for (i = 0; i < pdata->n_consumers; i++) { > + consumer = &pdata->consumers[i]; > + ret = devm_clk_hw_register_clkdev(&pdev->dev, > + &tps68470_clkdata->clkout_hw, > + consumer->consumer_con_id, > + consumer->consumer_dev_name); > + } > } > > return ret; > diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c > index 22f61b47f9e5..b535564712bb 100644 > --- a/drivers/platform/x86/intel/int3472/tps68470.c > +++ b/drivers/platform/x86/intel/int3472/tps68470.c > @@ -1,6 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > /* Author: Dan Scally */ > > +#include > #include > #include > #include > @@ -95,20 +96,64 @@ static int skl_int3472_tps68470_calc_type(struct acpi_device *adev) > return DESIGNED_FOR_WINDOWS; > } > > +/* > + * Return the size of the flexible array member, because we'll need that later > + * on to pass .pdata_size to cells. > + */ > +static int > +skl_int3472_fill_clk_pdata(struct device *dev, struct tps68470_clk_platform_data **clk_pdata) > +{ > + struct acpi_device *adev = ACPI_COMPANION(dev); > + struct acpi_device *consumer; > + unsigned int n_consumers = 0; > + const char *sensor_name; > + unsigned int i = 0; > + > + for_each_acpi_consumer_dev(adev, consumer) > + n_consumers++; > + > + if (!n_consumers) { > + dev_err(dev, "INT3472 seems to have no dependents\n"); > + return -ENODEV; > + } > + > + *clk_pdata = devm_kzalloc(dev, struct_size(*clk_pdata, consumers, n_consumers), > + GFP_KERNEL); > + if (!*clk_pdata) > + return -ENOMEM; > + > + (*clk_pdata)->n_consumers = n_consumers; > + i = 0; > + > + for_each_acpi_consumer_dev(adev, consumer) { > + sensor_name = devm_kasprintf(dev, GFP_KERNEL, I2C_DEV_NAME_FORMAT, > + acpi_dev_name(consumer)); > + if (!sensor_name) > + return -ENOMEM; > + > + (*clk_pdata)->consumers[i].consumer_dev_name = sensor_name; > + i++; > + } > + > + acpi_dev_put(consumer); > + > + return n_consumers; > +} > + > static int skl_int3472_tps68470_probe(struct i2c_client *client) > { > struct acpi_device *adev = ACPI_COMPANION(&client->dev); > const struct int3472_tps68470_board_data *board_data; > - struct tps68470_clk_platform_data clk_pdata = {}; > + struct tps68470_clk_platform_data *clk_pdata; > + unsigned int n_consumers; > struct mfd_cell *cells; > struct regmap *regmap; > int device_type; > int ret; > > - ret = skl_int3472_get_sensor_adev_and_name(&client->dev, NULL, > - &clk_pdata.consumer_dev_name); > - if (ret) > - return ret; > + n_consumers = skl_int3472_fill_clk_pdata(&client->dev, &clk_pdata); > + if (n_consumers < 0) > + return n_consumers; > > regmap = devm_regmap_init_i2c(client, &tps68470_regmap_config); > if (IS_ERR(regmap)) { > @@ -142,8 +187,8 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client) > * the clk + regulators must be ready when this happens. > */ > cells[0].name = "tps68470-clk"; > - cells[0].platform_data = &clk_pdata; > - cells[0].pdata_size = sizeof(clk_pdata); > + cells[0].platform_data = clk_pdata; > + cells[0].pdata_size = struct_size(clk_pdata, consumers, n_consumers); > cells[1].name = "tps68470-regulator"; > cells[1].platform_data = (void *)board_data->tps68470_regulator_pdata; > cells[1].pdata_size = sizeof(struct tps68470_regulator_platform_data); > diff --git a/include/linux/platform_data/tps68470.h b/include/linux/platform_data/tps68470.h > index 126d082c3f2e..e605a2cab07f 100644 > --- a/include/linux/platform_data/tps68470.h > +++ b/include/linux/platform_data/tps68470.h > @@ -27,9 +27,14 @@ struct tps68470_regulator_platform_data { > const struct regulator_init_data *reg_init_data[TPS68470_NUM_REGULATORS]; > }; > > -struct tps68470_clk_platform_data { > +struct tps68470_clk_consumer { > const char *consumer_dev_name; > const char *consumer_con_id; > }; > > +struct tps68470_clk_platform_data { > + unsigned int n_consumers; > + struct tps68470_clk_consumer consumers[]; > +}; > + > #endif