From mboxrd@z Thu Jan 1 00:00:00 1970 From: Schrempf Frieder Date: Wed, 10 Jul 2019 14:10:15 +0000 Subject: [U-Boot] [PATCH V2 04/51] i2c: mxc: add CONFIG_CLK support In-Reply-To: <20190708015333.20411-5-peng.fan@nxp.com> References: <20190708015333.20411-1-peng.fan@nxp.com> <20190708015333.20411-5-peng.fan@nxp.com> Message-ID: <11df78ec-71f7-64e2-e3b3-0a58b227fbb4@kontron.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Peng, On 08.07.19 03:38, Peng Fan wrote: > When CONFIG_CLK enabled, use CLK UCLASS for clk related settings. > > Signed-off-by: Peng Fan > --- > arch/arm/include/asm/mach-imx/mxc_i2c.h | 6 ++++++ > drivers/i2c/mxc_i2c.c | 17 +++++++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/arch/arm/include/asm/mach-imx/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h > index 8e1ea9af19..81fd981444 100644 > --- a/arch/arm/include/asm/mach-imx/mxc_i2c.h > +++ b/arch/arm/include/asm/mach-imx/mxc_i2c.h > @@ -6,6 +6,9 @@ > #define __ASM_ARCH_MXC_MXC_I2C_H__ > #include > #include > +#if CONFIG_IS_ENABLED(CLK) > +#include > +#endif > > struct i2c_pin_ctrl { > iomux_v3_cfg_t i2c_mode; > @@ -47,6 +50,9 @@ struct mxc_i2c_bus { > ulong driver_data; > int speed; > struct i2c_pads_info *pads_info; > +#if CONFIG_IS_ENABLED(CLK) > + struct clk per_clk; > +#endif > #ifndef CONFIG_DM_I2C > int (*idle_bus_fn)(void *p); > void *idle_bus_data; > diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c > index 23119cce65..2e157bca58 100644 > --- a/drivers/i2c/mxc_i2c.c > +++ b/drivers/i2c/mxc_i2c.c I think this patch should also contain the following diff: @@ -149,7 +149,11 @@ static uint8_t i2c_imx_get_clk(struct mxc_i2c_bus *i2c_bus, unsigned int rate) #endif /* Divider value calculation */ +#if CONFIG_IS_ENABLED(CLK) + i2c_clk_rate = clk_get_rate(&i2c_bus->per_clk); +#else i2c_clk_rate = mxc_get_clock(MXC_I2C_CLK); +#endif div = (i2c_clk_rate + rate - 1) / rate; if (div < i2c_clk_div[0][0]) clk_div = 0; Regards, Frieder > @@ -890,9 +890,22 @@ static int mxc_i2c_probe(struct udevice *bus) > i2c_bus->bus = bus; > > /* Enable clk */ > +#if CONFIG_IS_ENABLED(CLK) > + ret = clk_get_by_index(bus, 0, &i2c_bus->per_clk); > + if (ret) { > + printf("Failed to get i2c clk\n"); > + return ret; > + } > + ret = clk_enable(&i2c_bus->per_clk); > + if (ret) { > + printf("Failed to enable i2c clk\n"); > + return ret; > + } > +#else > ret = enable_i2c_clk(1, bus->seq); > if (ret < 0) > return ret; > +#endif > > /* > * See Documentation/devicetree/bindings/i2c/i2c-imx.txt > @@ -919,7 +932,11 @@ static int mxc_i2c_probe(struct udevice *bus) > ret = i2c_idle_bus(i2c_bus); > if (ret < 0) { > /* Disable clk */ > +#if CONFIG_IS_ENABLED(CLK) > + clk_disable(&i2c_bus->per_clk); > +#else > enable_i2c_clk(0, bus->seq); > +#endif > return ret; > } > >