[U-Boot] [PATCH] i2c: mxc: add CONFIG_CLK support

[Lukasz Majewski]

On Tue, 6 Aug 2019 10:09:12 +0000
Peng Fan <peng.fan at nxp.com> wrote:

> When CONFIG_CLK enabled, use CLK UCLASS for clk related settings.
> 
> Signed-off-by: Peng Fan <peng.fan at nxp.com>
> ---
>  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 <asm-generic/gpio.h>
>  #include <asm/mach-imx/iomux-v3.h>
> +#if CONFIG_IS_ENABLED(CLK)
> +#include <clk.h>
> +#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
> @@ -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;
>  	}
>  

Reviewed-by: Lukasz Majewski <lukma at denx.de>


Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190808/5bdffc4d/attachment.sig>