[7/8] warp7: defconfig: Switch to DM for I2C

Message ID 20190103014444.11134-8-bryan.odonoghue@linaro.org
State Superseded
Headers show
Series
  • Convert i.MX7 WaRP7 ports to DM
Related show

Commit Message

Bryan O'Donoghue Jan. 3, 2019, 1:44 a.m.
This commit switches to DM I2C for warp7 and warp7_bl33 defconfigs.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 board/warp7/warp7.c          | 24 ------------------------
 configs/warp7_bl33_defconfig |  1 +
 configs/warp7_defconfig      |  1 +
 include/configs/warp7.h      |  2 --
 4 files changed, 2 insertions(+), 26 deletions(-)

Comments

Peng Fan Jan. 8, 2019, 1:28 p.m. | #1
> -----Original Message-----

> From: Bryan O'Donoghue [mailto:bryan.odonoghue@linaro.org]

> Sent: 2019年1月3日 9:45

> To: u-boot@lists.denx.de

> Cc: Fabio Estevam <fabio.estevam@nxp.com>; Peng Fan

> <peng.fan@nxp.com>; Bryan O'Donoghue <bryan.odonoghue@linaro.org>;

> Stefano Babic <sbabic@denx.de>

> Subject: [PATCH 7/8] warp7: defconfig: Switch to DM for I2C

> 

> This commit switches to DM I2C for warp7 and warp7_bl33 defconfigs.

> 

> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>

> Cc: Peng Fan <peng.fan@nxp.com>

> Cc: Fabio Estevam <fabio.estevam@nxp.com>

> Cc: Stefano Babic <sbabic@denx.de>

> ---

>  board/warp7/warp7.c          | 24 ------------------------

>  configs/warp7_bl33_defconfig |  1 +

>  configs/warp7_defconfig      |  1 +

>  include/configs/warp7.h      |  2 --

>  4 files changed, 2 insertions(+), 26 deletions(-)

> 

> diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index

> 146d722b15..19f0df4d09 100644

> --- a/board/warp7/warp7.c

> +++ b/board/warp7/warp7.c

> @@ -31,26 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;  #define

> UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM |

> PAD_CTL_PUS_PU100KOHM | \

>  			PAD_CTL_HYS)

> 

> -#define I2C_PAD_CTRL	(PAD_CTL_DSE_3P3V_32OHM |

> PAD_CTL_SRE_SLOW | \

> -	PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)

> -

> -#ifdef CONFIG_SYS_I2C_MXC

> -#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)

> -/* I2C1 for PMIC */

> -static struct i2c_pads_info i2c_pad_info1 = {

> -	.scl = {

> -		.i2c_mode = MX7D_PAD_I2C1_SCL__I2C1_SCL | PC,

> -		.gpio_mode = MX7D_PAD_I2C1_SCL__GPIO4_IO8 | PC,

> -		.gp = IMX_GPIO_NR(4, 8),

> -	},

> -	.sda = {

> -		.i2c_mode = MX7D_PAD_I2C1_SDA__I2C1_SDA | PC,

> -		.gpio_mode = MX7D_PAD_I2C1_SDA__GPIO4_IO9 | PC,

> -		.gp = IMX_GPIO_NR(4, 9),

> -	},

> -};

> -#endif

> -

>  int dram_init(void)

>  {

>  	gd->ram_size = PHYS_SDRAM_SIZE;

> @@ -130,10 +110,6 @@ int board_init(void)

>  	/* address of boot parameters */

>  	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

> 

> -	#ifdef CONFIG_SYS_I2C_MXC

> -		setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);

> -	#endif

> -

>  	return 0;

>  }

> 

> diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig

> index 7f21bb4f53..2e80011cbc 100644

> --- a/configs/warp7_bl33_defconfig

> +++ b/configs/warp7_bl33_defconfig

> @@ -44,3 +44,4 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp"

>  CONFIG_PINCTRL=y

>  CONFIG_PINCTRL_IMX7=y

>  CONFIG_DM_GPIO=y

> +CONFIG_DM_I2C=y

> diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index

> 2d3171e42a..9f7dc73a11 100644

> --- a/configs/warp7_defconfig

> +++ b/configs/warp7_defconfig

> @@ -57,3 +57,4 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp"

>  CONFIG_PINCTRL=y

>  CONFIG_PINCTRL_IMX7=y

>  CONFIG_DM_GPIO=y

> +CONFIG_DM_I2C=y

> diff --git a/include/configs/warp7.h b/include/configs/warp7.h index

> a391dfb5c1..41eb8d7e1d 100644

> --- a/include/configs/warp7.h

> +++ b/include/configs/warp7.h

> @@ -126,9 +126,7 @@

>  	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)

> 

>  /* I2C configs */

> -#define CONFIG_SYS_I2C

>  #define CONFIG_SYS_I2C_MXC

> -#define CONFIG_SYS_I2C_MXC_I2C1

>  #define CONFIG_SYS_I2C_SPEED		100000

> 


Reviewed-by: Peng Fan <peng.fan@nxp.com>


>  /* PMIC */

> --

> 2.20.0

Patch

diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 146d722b15..19f0df4d09 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -31,26 +31,6 @@  DECLARE_GLOBAL_DATA_PTR;
 #define UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUS_PU100KOHM | \
 			PAD_CTL_HYS)
 
-#define I2C_PAD_CTRL	(PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
-	PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
-
-#ifdef CONFIG_SYS_I2C_MXC
-#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-/* I2C1 for PMIC */
-static struct i2c_pads_info i2c_pad_info1 = {
-	.scl = {
-		.i2c_mode = MX7D_PAD_I2C1_SCL__I2C1_SCL | PC,
-		.gpio_mode = MX7D_PAD_I2C1_SCL__GPIO4_IO8 | PC,
-		.gp = IMX_GPIO_NR(4, 8),
-	},
-	.sda = {
-		.i2c_mode = MX7D_PAD_I2C1_SDA__I2C1_SDA | PC,
-		.gpio_mode = MX7D_PAD_I2C1_SDA__GPIO4_IO9 | PC,
-		.gp = IMX_GPIO_NR(4, 9),
-	},
-};
-#endif
-
 int dram_init(void)
 {
 	gd->ram_size = PHYS_SDRAM_SIZE;
@@ -130,10 +110,6 @@  int board_init(void)
 	/* address of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
-	#ifdef CONFIG_SYS_I2C_MXC
-		setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
-	#endif
-
 	return 0;
 }
 
diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig
index 7f21bb4f53..2e80011cbc 100644
--- a/configs/warp7_bl33_defconfig
+++ b/configs/warp7_bl33_defconfig
@@ -44,3 +44,4 @@  CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp"
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 2d3171e42a..9f7dc73a11 100644
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -57,3 +57,4 @@  CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp"
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index a391dfb5c1..41eb8d7e1d 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -126,9 +126,7 @@ 
 	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* I2C configs */
-#define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1
 #define CONFIG_SYS_I2C_SPEED		100000
 
 /* PMIC */