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 X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F8E1C4338F for ; Thu, 19 Aug 2021 11:46:59 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0AAD6108B for ; Thu, 19 Aug 2021 11:46:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B0AAD6108B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=foss.st.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C804382EDA; Thu, 19 Aug 2021 13:46:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=foss.st.com header.i=@foss.st.com header.b="XK+tlKE+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4A56782C39; Thu, 19 Aug 2021 13:46:47 +0200 (CEST) Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5DD5882E7A for ; Thu, 19 Aug 2021 13:46:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=2865fff45f=patrice.chotard@foss.st.com Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17JBaTkw014877; Thu, 19 Aug 2021 13:46:42 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=selector1; bh=Ybo9MYH/DKVHfd41EQyZz5aX+C02fzHPjBJWsKLmS/s=; b=XK+tlKE+VR5AlTR8zckQ1T15HaDGrCIMLz5gLBfSvrlgZNrEvbXVWflYjLBpOCq5UDuj uo4hSZH6bR1aDCAXDZMVDIwF4rIruuZLa6t8d0RzAk9QY0tDNO37W5v9gWP3QUAAVU3N L8pwogpgRlli3IwprztrOMpReZ6ZxQs42t9veeeThE1siD06hy/jpjbIxwQvUhyu4QIQ /z0IIPKBI4AF9gX2Rg0Cf114CuGA1YFTpVMyXRM3WmURjfQ8Lo3mWZbgDUEo4nSNPg7M TM3x643daP8jfmiRl4e+DGUI8/REmkOBgVAyQfXWgKR+WbanBZbcDfpSi8Q2qmT1h+VR rw== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 3ahe1su7m8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Aug 2021 13:46:42 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 88E8910002A; Thu, 19 Aug 2021 13:46:41 +0200 (CEST) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 6223B231467; Thu, 19 Aug 2021 13:46:41 +0200 (CEST) Received: from lmecxl0573.lme.st.com (10.75.127.49) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 19 Aug 2021 13:46:40 +0200 Subject: Re: [PATCH v1 1/7] i2c: stm32f7: move driver data of each instance in a privdata To: CC: Patrick DELAUNAY , U-Boot STM32 , Heiko Schocher References: <20210803100515.29383-1-patrice.chotard@foss.st.com> <20210803100515.29383-2-patrice.chotard@foss.st.com> From: Patrice CHOTARD Message-ID: <16c72cf4-8928-7d68-6059-1821a923862c@foss.st.com> Date: Thu, 19 Aug 2021 13:46:40 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210803100515.29383-2-patrice.chotard@foss.st.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.75.127.49] X-ClientProxiedBy: SFHDAG2NODE1.st.com (10.75.127.4) To SFHDAG2NODE3.st.com (10.75.127.6) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-08-19_04:2021-08-17, 2021-08-19 signatures=0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean HI Patrick On 8/3/21 12:05 PM, Patrice Chotard wrote: > From: Patrick Delaunay > > Today all the I2C instance point on the same global > variable stm32_i2c_setup according the compatible: i2c_priv->setup = > pointer to the same driver data. > > This patch changes this driver data (stm32f7_setup and stm32mp15_setup) > to a const struct and move the timing struct 'setup' as element of i2c > privdata, initialized in stm32_ofdata_to_platdata() with the driver > configuration data. > > This patch solves issues when several I2C instance have not the same > clock source or not the same configuration: each timing setup is saved > is the I2C privdata. > > Signed-off-by: Patrick Delaunay > Signed-off-by: Patrice Chotard > --- > > drivers/i2c/stm32f7_i2c.c | 53 ++++++++++++++++++++------------------- > 1 file changed, 27 insertions(+), 26 deletions(-) > > diff --git a/drivers/i2c/stm32f7_i2c.c b/drivers/i2c/stm32f7_i2c.c > index 7b04a09de0..b449084b5f 100644 > --- a/drivers/i2c/stm32f7_i2c.c > +++ b/drivers/i2c/stm32f7_i2c.c > @@ -158,7 +158,6 @@ struct stm32_i2c_spec { > * @fall_time: Fall time (ns) > * @dnf: Digital filter coefficient (0-16) > * @analog_filter: Analog filter delay (On/Off) > - * @fmp_clr_offset: Fast Mode Plus clear register offset from set register > */ > struct stm32_i2c_setup { > u32 speed_freq; > @@ -167,6 +166,13 @@ struct stm32_i2c_setup { > u32 fall_time; > u8 dnf; > bool analog_filter; > +}; > + > +/** > + * struct stm32_i2c_data - driver data for I2C configuration by compatible > + * @fmp_clr_offset: Fast Mode Plus clear register offset from set register > + */ > +struct stm32_i2c_data { > u32 fmp_clr_offset; > }; > > @@ -201,7 +207,7 @@ struct stm32_i2c_timings { > struct stm32_i2c_priv { > struct stm32_i2c_regs *regs; > struct clk clk; > - struct stm32_i2c_setup *setup; > + struct stm32_i2c_setup setup; > u32 speed; > struct regmap *regmap; > u32 regmap_sreg; > @@ -251,18 +257,11 @@ static const struct stm32_i2c_spec i2c_specs[] = { > }, > }; > > -static const struct stm32_i2c_setup stm32f7_setup = { > - .rise_time = STM32_I2C_RISE_TIME_DEFAULT, > - .fall_time = STM32_I2C_FALL_TIME_DEFAULT, > - .dnf = STM32_I2C_DNF_DEFAULT, > - .analog_filter = STM32_I2C_ANALOG_FILTER_ENABLE, > +static const struct stm32_i2c_data stm32f7_data = { > + .fmp_clr_offset = 0x00, > }; > > -static const struct stm32_i2c_setup stm32mp15_setup = { > - .rise_time = STM32_I2C_RISE_TIME_DEFAULT, > - .fall_time = STM32_I2C_FALL_TIME_DEFAULT, > - .dnf = STM32_I2C_DNF_DEFAULT, > - .analog_filter = STM32_I2C_ANALOG_FILTER_ENABLE, > +static const struct stm32_i2c_data stm32mp15_data = { > .fmp_clr_offset = 0x40, > }; > > @@ -745,7 +744,7 @@ static u32 get_lower_rate(u32 rate) > static int stm32_i2c_setup_timing(struct stm32_i2c_priv *i2c_priv, > struct stm32_i2c_timings *timing) > { > - struct stm32_i2c_setup *setup = i2c_priv->setup; > + struct stm32_i2c_setup *setup = &i2c_priv->setup; > int ret = 0; > > setup->speed_freq = i2c_priv->speed; > @@ -839,10 +838,11 @@ static int stm32_i2c_hw_config(struct stm32_i2c_priv *i2c_priv) > writel(timing, ®s->timingr); > > /* Enable I2C */ > - if (i2c_priv->setup->analog_filter) > + if (i2c_priv->setup.analog_filter) > clrbits_le32(®s->cr1, STM32_I2C_CR1_ANFOFF); > else > setbits_le32(®s->cr1, STM32_I2C_CR1_ANFOFF); > + > setbits_le32(®s->cr1, STM32_I2C_CR1_PE); > > return 0; > @@ -903,21 +903,23 @@ clk_free: > > static int stm32_of_to_plat(struct udevice *dev) > { > + const struct stm32_i2c_data *data; > struct stm32_i2c_priv *i2c_priv = dev_get_priv(dev); > u32 rise_time, fall_time; > int ret; > > - i2c_priv->setup = (struct stm32_i2c_setup *)dev_get_driver_data(dev); > - if (!i2c_priv->setup) > + data = (const struct stm32_i2c_data *)dev_get_driver_data(dev); > + if (!data) > return -EINVAL; > > - rise_time = dev_read_u32_default(dev, "i2c-scl-rising-time-ns", 0); > - if (rise_time) > - i2c_priv->setup->rise_time = rise_time; > + rise_time = dev_read_u32_default(dev, "i2c-scl-rising-time-ns", > + STM32_I2C_RISE_TIME_DEFAULT); > + > + fall_time = dev_read_u32_default(dev, "i2c-scl-falling-time-ns", > + STM32_I2C_FALL_TIME_DEFAULT); > > - fall_time = dev_read_u32_default(dev, "i2c-scl-falling-time-ns", 0); > - if (fall_time) > - i2c_priv->setup->fall_time = fall_time; > + i2c_priv->setup.dnf = STM32_I2C_DNF_DEFAULT; > + i2c_priv->setup.analog_filter = STM32_I2C_ANALOG_FILTER_ENABLE; > > /* Optional */ > i2c_priv->regmap = syscon_regmap_lookup_by_phandle(dev, > @@ -930,8 +932,7 @@ static int stm32_of_to_plat(struct udevice *dev) > return ret; > > i2c_priv->regmap_sreg = fmp[1]; > - i2c_priv->regmap_creg = fmp[1] + > - i2c_priv->setup->fmp_clr_offset; > + i2c_priv->regmap_creg = fmp[1] + data->fmp_clr_offset; > i2c_priv->regmap_mask = fmp[2]; > } > > @@ -944,8 +945,8 @@ static const struct dm_i2c_ops stm32_i2c_ops = { > }; > > static const struct udevice_id stm32_i2c_of_match[] = { > - { .compatible = "st,stm32f7-i2c", .data = (ulong)&stm32f7_setup }, > - { .compatible = "st,stm32mp15-i2c", .data = (ulong)&stm32mp15_setup }, > + { .compatible = "st,stm32f7-i2c", .data = (ulong)&stm32f7_data }, > + { .compatible = "st,stm32mp15-i2c", .data = (ulong)&stm32mp15_data }, > {} > }; > > Reviewed-by: Patrice Chotard Thanks Patrice