ARM: imx6: DHCOM i.MX6 PDK: Switch to DM for I2C
PATCH 1/1 ARM: imx6: DHCOM i.MX6 PDK: Switch to DM for I2C
This patch enables DM I2C for DHCOM i.MX6 PDK2 boards and removes non DM I2C code.
Tested with DHCOM i.MX6dl and DHCOM i.MX6q.
Signed-off-by Ludwig Zenz <[email protected]>
--- board/dhelectronics/dh_imx6/dh_imx6.c | 105 ++-------------------------------- configs/dh_imx6_defconfig | 7 +++ include/configs/dh_imx6.h | 8 --- 3 files changed, 13 insertions(+), 107 deletions(-)
board/dhelectronics/dh_imx6/dh_imx6.c +6 -99
@@ -36,92 +36,8 @@DECLARE_GLOBAL_DATA_PTR ; -#define I2C_PAD_CTRL \ - (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ - PAD_CTL_HYS | PAD_CTL_ODE | PAD_CTL_SRE_FAST) -#define EEPROM_I2C_ADDRESS 0x50 -#define PC MUX_PAD_CTRL(I2C_PAD_CTRL) - -static struct i2c_pads_info dh6sdl_i2c_pad_info0 = { - .scl = { - .i2c_mode =MX6DL_PAD_EIM_D21__I2C1_SCL |PC , - .gpio_mode =MX6DL_PAD_EIM_D21__GPIO3_IO21 |PC , - .gp =IMX_GPIO_NR (3 ,21 ) - }, - .sda = { - .i2c_mode =MX6DL_PAD_EIM_D28__I2C1_SDA |PC , - .gpio_mode =MX6DL_PAD_EIM_D28__GPIO3_IO28 |PC , - .gp =IMX_GPIO_NR (3 ,28 ) - } -}; - -static struct i2c_pads_info dh6sdl_i2c_pad_info1 = { - .scl = { - .i2c_mode =MX6DL_PAD_KEY_COL3__I2C2_SCL |PC , - .gpio_mode =MX6DL_PAD_KEY_COL3__GPIO4_IO12 |PC , - .gp =IMX_GPIO_NR (4 ,12 ) - }, - .sda = { - .i2c_mode =MX6DL_PAD_KEY_ROW3__I2C2_SDA |PC , - .gpio_mode =MX6DL_PAD_KEY_ROW3__GPIO4_IO13 |PC , - .gp =IMX_GPIO_NR (4 ,13 ) - } -}; - -static struct i2c_pads_info dh6sdl_i2c_pad_info2 = { - .scl = { - .i2c_mode =MX6DL_PAD_GPIO_3__I2C3_SCL |PC , - .gpio_mode =MX6DL_PAD_GPIO_3__GPIO1_IO03 |PC , - .gp =IMX_GPIO_NR (1 ,3 ) - }, - .sda = { - .i2c_mode =MX6DL_PAD_GPIO_6__I2C3_SDA |PC , - .gpio_mode =MX6DL_PAD_GPIO_6__GPIO1_IO06 |PC , - .gp =IMX_GPIO_NR (1 ,6 ) - } -}; - -static struct i2c_pads_info dh6dq_i2c_pad_info0 = { - .scl = { - .i2c_mode =MX6Q_PAD_EIM_D21__I2C1_SCL |PC , - .gpio_mode =MX6Q_PAD_EIM_D21__GPIO3_IO21 |PC , - .gp =IMX_GPIO_NR (3 ,21 ) - }, - .sda = { - .i2c_mode =MX6Q_PAD_EIM_D28__I2C1_SDA |PC , - .gpio_mode =MX6Q_PAD_EIM_D28__GPIO3_IO28 |PC , - .gp =IMX_GPIO_NR (3 ,28 ) - } -}; - -static struct i2c_pads_info dh6dq_i2c_pad_info1 = { - .scl = { - .i2c_mode =MX6Q_PAD_KEY_COL3__I2C2_SCL |PC , - .gpio_mode =MX6Q_PAD_KEY_COL3__GPIO4_IO12 |PC , - .gp =IMX_GPIO_NR (4 ,12 ) - }, - .sda = { - .i2c_mode =MX6Q_PAD_KEY_ROW3__I2C2_SDA |PC , - .gpio_mode =MX6Q_PAD_KEY_ROW3__GPIO4_IO13 |PC , - .gp =IMX_GPIO_NR (4 ,13 ) - } -}; - -static struct i2c_pads_info dh6dq_i2c_pad_info2 = { - .scl = { - .i2c_mode =MX6Q_PAD_GPIO_3__I2C3_SCL |PC , - .gpio_mode =MX6Q_PAD_GPIO_3__GPIO1_IO03 |PC , - .gp =IMX_GPIO_NR (1 ,3 ) - }, - .sda = { - .i2c_mode =MX6Q_PAD_GPIO_6__I2C3_SDA |PC , - .gpio_mode =MX6Q_PAD_GPIO_6__GPIO1_IO06 |PC , - .gp =IMX_GPIO_NR (1 ,6 ) - } -}; -int dram_init (void ) { gd->ram_size =imx_ddr_size ();
@@ -214,6 +130,7 @@ int board_usb_phy_mode(int port)static int setup_dhcom_mac_from_fuse (void ) { +struct udevice *dev;unsigned char enetaddr[6 ];int ret;
@@ -228,13 +145,14 @@ static int setup_dhcom_mac_from_fuse(void)return 0 ; } - ret =i2c_set_bus_num (2 ); +#ifdef CONFIG_SYS_I2C_MXC_I2C3 + ret =i2c_get_chip_for_busnum (2 ,EEPROM_I2C_ADDRESS ,1 , &dev);if (ret) { -printf ("Error switching I2C bus!\n" ); +printf ("Cannot find EEPROM!\n" );return ret; } - ret =i2c_read (EEPROM_I2C_ADDRESS ,0xfa ,0x1 , enetaddr,0x6 ); + ret =dm_i2c_read (dev,0xfa , enetaddr,0x6 );if (ret) {printf ("Error reading configuration EEPROM!\n" );return ret;
@@ -242,6 +160,7 @@ static int setup_dhcom_mac_from_fuse(void)if (is_valid_ethaddr (enetaddr))eth_env_set_enetaddr ("ethaddr" , enetaddr); +#endif return 0 ; }
@@ -265,18 +184,6 @@ int board_init(void)/* Enable eim_slow clocks */ setbits_le32 (&mxc_ccm->CCGR6,0x1 <<MXC_CCM_CCGR6_EMI_SLOW_OFFSET ); -#ifdef CONFIG_SYS_I2C_MXC -if (is_mx6dq ()) { -setup_i2c (0 ,CONFIG_SYS_I2C_SPEED ,0x7f , &dh6dq_i2c_pad_info0); -setup_i2c (1 ,CONFIG_SYS_I2C_SPEED ,0x7f , &dh6dq_i2c_pad_info1); -setup_i2c (2 ,CONFIG_SYS_I2C_SPEED ,0x7f , &dh6dq_i2c_pad_info2); - }else { -setup_i2c (0 ,CONFIG_SYS_I2C_SPEED ,0x7f , &dh6sdl_i2c_pad_info0); -setup_i2c (1 ,CONFIG_SYS_I2C_SPEED ,0x7f , &dh6sdl_i2c_pad_info1); -setup_i2c (2 ,CONFIG_SYS_I2C_SPEED ,0x7f , &dh6sdl_i2c_pad_info2); - } -#endif -setup_dhcom_mac_from_fuse ();return 0 ;
configs/dh_imx6_defconfig +7 -0
@@ -48,6 +48,13 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y +CONFIG_I2C_SET_DEFAULT_BUS_NUM=y +CONFIG_I2C_DEFAULT_BUS_NUMBER=0x2 +CONFIG_SYS_I2C_MXC=y +CONFIG_SYS_I2C_MXC_I2C1=y +CONFIG_SYS_I2C_MXC_I2C2=y +CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y
include/configs/dh_imx6.h +0 -8
@@ -48,14 +48,6 @@#define CONFIG_FEC_MXC_PHYADDR 0#define CONFIG_ARP_TIMEOUT 200UL -/* I2C Configs */ -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_MXC -#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ -#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ -#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ -#define CONFIG_SYS_I2C_SPEED 100000 -/* MMC Configs */ #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0
Signature · 1 line
2.11.0
PATCH 1/1 ARM: imx6: DHCOM i.MX6 PDK: Switch to DM for I2C
On 7/3/19 10:20 AM, Ludwig Zenz wrote:
[...]
board/dhelectronics/dh_imx6/dh_imx6.c static int setup_dhcom_mac_from_fuse(void) · line 149
Quoted 13 lines
static int
setup_dhcom_mac_from_fuse(void)
{board/dhelectronics/dh_imx6/dh_imx6.c +3
-1+struct udevice *dev;unsigned char enetaddr[6 ];int ret;@@ -228,13 +145,14 @@ static int setup_dhcom_mac_from_fuse(void)return 0 ; } - ret =i2c_set_bus_num (2 ); +#ifdef CONFIG_SYS_I2C_MXC_I2C3 + ret =i2c_get_chip_for_busnum (2 ,EEPROM_I2C_ADDRESS ,1 , &dev);
Isn't there some DM way which avoids using bus sequence numbers ? If there is, subsequent patch is fine.
Quoted 11 lines
board/dhelectronics/dh_imx6/dh_imx6.c +2
-2if (ret) { -printf ("Error switching I2C bus!\n" ); +printf ("Cannot find EEPROM!\n" );return ret; } - ret =i2c_read (EEPROM_I2C_ADDRESS ,0xfa ,0x1 , enetaddr,0x6 ); + ret =dm_i2c_read (dev,0xfa , enetaddr,0x6 );if (ret) {printf ("Error reading configuration EEPROM!\n" );return ret;
[...]
configs/dh_imx6_defconfig CONFIG_ENV_IS_IN_SPI_FLASH=y · line 53
Quoted 11 lines
configs/dh_imx6_defconfig +3
-0@@ -48,6 +48,13 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DWC_AHSATA=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y +CONFIG_I2C_SET_DEFAULT_BUS_NUM=y +CONFIG_I2C_DEFAULT_BUS_NUMBER=0x2
Are these two ^ needed ?
configs/dh_imx6_defconfig CONFIG_ENV_IS_IN_SPI_FLASH=y · line 57
Quoted 4 lines
configs/dh_imx6_defconfig +4
-0+CONFIG_SYS_I2C_MXC=y +CONFIG_SYS_I2C_MXC_I2C1=y +CONFIG_SYS_I2C_MXC_I2C2=y +CONFIG_SYS_I2C_MXC_I2C3=y
Are these three ^ really needed ?
[...]