dm: imx: i2c: Use gpio_request() to request GPIOs
GPIOs should be requested before use. Without this, driver model will not permit the GPIO to be used. Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
This commit is contained in:
parent
edbf8b4f8c
commit
c6f3f32356
|
@ -4,6 +4,7 @@
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <malloc.h>
|
||||||
#include <asm/arch/clock.h>
|
#include <asm/arch/clock.h>
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <asm/arch/imx-regs.h>
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
|
@ -72,10 +73,27 @@ static void * const i2c_bases[] = {
|
||||||
int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
|
int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
|
||||||
struct i2c_pads_info *p)
|
struct i2c_pads_info *p)
|
||||||
{
|
{
|
||||||
|
char *name1, *name2;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (i2c_index >= ARRAY_SIZE(i2c_bases))
|
if (i2c_index >= ARRAY_SIZE(i2c_bases))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
name1 = malloc(9);
|
||||||
|
name2 = malloc(9);
|
||||||
|
if (!name1 || !name2)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
sprintf(name1, "i2c_sda%d", i2c_index);
|
||||||
|
sprintf(name2, "i2c_scl%d", i2c_index);
|
||||||
|
ret = gpio_request(p->sda.gp, name1);
|
||||||
|
if (ret)
|
||||||
|
goto err_req1;
|
||||||
|
|
||||||
|
ret = gpio_request(p->scl.gp, name2);
|
||||||
|
if (ret)
|
||||||
|
goto err_req2;
|
||||||
|
|
||||||
/* Enable i2c clock */
|
/* Enable i2c clock */
|
||||||
ret = enable_i2c_clk(1, i2c_index);
|
ret = enable_i2c_clk(1, i2c_index);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -93,5 +111,12 @@ int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
|
||||||
|
|
||||||
err_idle:
|
err_idle:
|
||||||
err_clk:
|
err_clk:
|
||||||
|
gpio_free(p->scl.gp);
|
||||||
|
err_req2:
|
||||||
|
gpio_free(p->sda.gp);
|
||||||
|
err_req1:
|
||||||
|
free(name1);
|
||||||
|
free(name2);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue