mx6qsabreauto: Add i2c to mx6qsabreauto board
PATCH 1/2 mx6qsabreauto: Add i2c to mx6qsabreauto board
Add i2c2 and 3 to mx6qsabreauto board, i2c3 is multiplexed use gpio to set steering.
--- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 50 +++++++++++++++++++++++++ include/configs/mx6qsabreauto.h | 6 +++ 2 files changed, 56 insertions(+)
board/freescale/mx6qsabreauto/mx6qsabreauto.c +50 -0
@@ -26,12 +26,14 @@#include <asm/errno.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/mxc_i2c.h> #include <asm/imx-common/boot_mode.h> #include <mmc.h> #include <fsl_esdhc.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/sys_proto.h> +#include <i2c.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -46,6 +48,12 @@ DECLARE_GLOBAL_DATA_PTR;#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) +#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 PC MUX_PAD_CTRL(I2C_PAD_CTRL) +int dram_init (void ) { gd->ram_size =get_ram_size ((void *)PHYS_SDRAM ,PHYS_SDRAM_SIZE );
@@ -76,6 +84,41 @@ iomux_v3_cfg_t const enet_pads[] = { MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), }; +/* I2C2 PMIC, iPod, Tuner, Codec, Touch, HDMI EDID, MIPI CSI2 card */ +struct i2c_pads_info i2c_pad_info1 = { + .scl = { + .i2c_mode =MX6_PAD_EIM_EB2__I2C2_SCL |PC , + .gpio_mode =MX6_PAD_EIM_EB2__GPIO_2_30 |PC , + .gp =IMX_GPIO_NR (2 ,30 ) + }, + .sda = { + .i2c_mode =MX6_PAD_KEY_ROW3__I2C2_SDA |PC , + .gpio_mode =MX6_PAD_KEY_ROW3__GPIO_4_13 |PC , + .gp =IMX_GPIO_NR (4 ,13 ) + } +}; + +/* +* I2C3 MLB, Port Expanders (A, B, C), Video ADC, Light Sensor, +* Compass Sensor, Accelerometer, Res Touch +*/ +struct i2c_pads_info i2c_pad_info2 = { + .scl = { + .i2c_mode =MX6_PAD_GPIO_3__I2C3_SCL |PC , + .gpio_mode =MX6_PAD_GPIO_3__GPIO_1_3 |PC , + .gp =IMX_GPIO_NR (1 ,3 ) + }, + .sda = { + .i2c_mode =MX6_PAD_EIM_D18__I2C3_SDA |PC , + .gpio_mode =MX6_PAD_EIM_D18__GPIO_3_18 |PC , + .gp =IMX_GPIO_NR (3 ,18 ) + } +}; + +iomux_v3_cfg_t const i2c3_pads[] = { +MX6_PAD_EIM_A24__GPIO_5_4 |MUX_PAD_CTRL (NO_PAD_CTRL ), +}; +static void setup_iomux_enet (void ) {imx_iomux_v3_setup_multiple_pads (enet_pads,ARRAY_SIZE (enet_pads));
@@ -216,6 +259,13 @@ int board_init(void)/* address of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; +/* I2C 2 and 3 setup - I2C 3 hw mux with EIM */ +setup_i2c (1 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info1); +/* I2C 3 Steer */ +gpio_direction_output (IMX_GPIO_NR (5 ,4 ),1 ); +imx_iomux_v3_setup_multiple_pads (i2c3_pads,ARRAY_SIZE (i2c3_pads)); +setup_i2c (2 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info2); +return 0 ; }
include/configs/mx6qsabreauto.h +6 -0
@@ -38,4 +38,10 @@#define CONFIG_SYS_MMC_ENV_PART 1/* Boot partition 1 */ #endif +/* I2C Configs */ +#define CONFIG_CMD_I2C +#define CONFIG_I2C_MULTI_BUS +#define CONFIG_I2C_MXC +#define CONFIG_SYS_I2C_SPEED 100000 +#endif /* __MX6QSABREAUTO_CONFIG_H */
Signature · 1 line
1.7.9.5
PATCH 2/2 mx6qsabreauto: Add Port Expander reset
There are 3 IO expanders on the mx6qsabreauto all reset by the same GPIO, just set it to high to use the IO.
--- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 7 +++++++ 1 file changed, 7 insertions(+)
board/freescale/mx6qsabreauto/mx6qsabreauto.c +7 -0
@@ -119,6 +119,10 @@ iomux_v3_cfg_t const i2c3_pads[] = { MX6_PAD_EIM_A24__GPIO_5_4 | MUX_PAD_CTRL(NO_PAD_CTRL), }; +iomux_v3_cfg_t const port_exp[] = { +MX6_PAD_SD2_DAT0__GPIO_1_15 |MUX_PAD_CTRL (NO_PAD_CTRL ), +}; +static void setup_iomux_enet (void ) {imx_iomux_v3_setup_multiple_pads (enet_pads,ARRAY_SIZE (enet_pads));
@@ -266,6 +270,9 @@ int board_init(void)imx_iomux_v3_setup_multiple_pads (i2c3_pads,ARRAY_SIZE (i2c3_pads));setup_i2c (2 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info2); +gpio_direction_output (IMX_GPIO_NR (1 ,15 ),1 ); +imx_iomux_v3_setup_multiple_pads (port_exp,ARRAY_SIZE (port_exp)); +return 0 ; }
Signature · 1 line
1.7.9.5
PATCH 2/2 mx6qsabreauto: Add Port Expander reset
Quoted 25 lines · Renato Frias
There are 3 IO expanders on the mx6qsabreauto all reset by the same GPIO, just set it to high to use the IO.
Signed-off-by Renato Frias <[email protected]>--- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 7 +++++++ 1 file changed, 7 insertions(+)board/freescale/mx6qsabreauto/mx6qsabreauto.c +4
-0@@ -119,6 +119,10 @@ iomux_v3_cfg_t const i2c3_pads[] = { MX6_PAD_EIM_A24__GPIO_5_4 | MUX_PAD_CTRL(NO_PAD_CTRL), }; +iomux_v3_cfg_t const port_exp[] = { +MX6_PAD_SD2_DAT0__GPIO_1_15 |MUX_PAD_CTRL (NO_PAD_CTRL ), +}; +static void setup_iomux_enet (void ) {imx_iomux_v3_setup_multiple_pads (enet_pads,ARRAY_SIZE (enet_pads));
board/freescale/mx6qsabreauto/mx6qsabreauto.c int board_init(void) · line 278
Quoted 9 lines
board/freescale/mx6qsabreauto/mx6qsabreauto.c +3
-0@@ -266,6 +270,9 @@ int board_init(void)imx_iomux_v3_setup_multiple_pads (i2c3_pads,ARRAY_SIZE (i2c3_pads));setup_i2c (2 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info2); +gpio_direction_output (IMX_GPIO_NR (1 ,15 ),1 ); +imx_iomux_v3_setup_multiple_pads (port_exp,ARRAY_SIZE (port_exp)); +return 0 ; }
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 2/2 mx6qsabreauto: Add Port Expander reset
In reply to Renato FriasQuoted 5 lines · Renato Frias
There are 3 IO expanders on the mx6qsabreauto all reset by the same GPIO, just set it to high to use the IO.
Signed-off-by Renato Frias <[email protected]>---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/2 mx6qsabreauto: Add i2c to mx6qsabreauto board
In reply to Renato FriasHello Renato,
When sending patches for Freescale i.MX boards please add Fabio in Cc (just did).
Quoted 4 lines · Renato Frias
Add i2c2 and 3 to mx6qsabreauto board, i2c3 is multiplexed use gpio to set steering.
Signed-off-by Renato Frias <[email protected]>
Code seems fine, I don't have the board so I cannot test.
--
Otavio Salvador O.S. Systems
E-mail: otavio at ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH 1/2 mx6qsabreauto: Add i2c to mx6qsabreauto board
Quoted 6 lines · Otavio Salvador
Hello Renato,
When sending patches for Freescale i.MX boards please add Fabio in Cc (just did).
On Tue, May 14, 2013 at 1:01 AM, Renato Frias <[email protected]> wrote:
Quoted 8 lines
Quoted 4 lines
Add i2c2 and 3 to mx6qsabreauto board, i2c3 is multiplexed use gpio to set steering.
Signed-off-by Renato Frias <[email protected]>Code seems fine, I don't have the board so I cannot test.
Reviewed-by Otavio Salvador <[email protected]>
Both patches look good for me as well:
Thanks
PATCH 1/2 mx6qsabreauto: Add i2c to mx6qsabreauto board
In reply to Renato FriasQuoted 103 lines · Renato Frias
Add i2c2 and 3 to mx6qsabreauto board, i2c3 is multiplexed use gpio to set steering.
Signed-off-by Renato Frias <[email protected]>--- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 50 +++++++++++++++++++++++++ include/configs/mx6qsabreauto.h | 6 +++ 2 files changed, 56 insertions(+)board/freescale/mx6qsabreauto/mx6qsabreauto.c +50
-0@@ -26,12 +26,14 @@#include <asm/errno.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/mxc_i2c.h> #include <asm/imx-common/boot_mode.h> #include <mmc.h> #include <fsl_esdhc.h> #include <miiphy.h> #include <netdev.h> #include <asm/arch/sys_proto.h> +#include <i2c.h> DECLARE_GLOBAL_DATA_PTR ;@@ -46,6 +48,12 @@ DECLARE_GLOBAL_DATA_PTR;#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) +#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 PC MUX_PAD_CTRL(I2C_PAD_CTRL) +int dram_init (void ) { gd->ram_size =get_ram_size ((void *)PHYS_SDRAM ,PHYS_SDRAM_SIZE );@@ -76,6 +84,41 @@ iomux_v3_cfg_t const enet_pads[] = { MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), }; +/* I2C2 PMIC, iPod, Tuner, Codec, Touch, HDMI EDID, MIPI CSI2 card */ +struct i2c_pads_info i2c_pad_info1 = { + .scl = { + .i2c_mode =MX6_PAD_EIM_EB2__I2C2_SCL |PC , + .gpio_mode =MX6_PAD_EIM_EB2__GPIO_2_30 |PC , + .gp =IMX_GPIO_NR (2 ,30 ) + }, + .sda = { + .i2c_mode =MX6_PAD_KEY_ROW3__I2C2_SDA |PC , + .gpio_mode =MX6_PAD_KEY_ROW3__GPIO_4_13 |PC , + .gp =IMX_GPIO_NR (4 ,13 ) + } +}; + +/* +* I2C3 MLB, Port Expanders (A, B, C), Video ADC, Light Sensor, +* Compass Sensor, Accelerometer, Res Touch +*/ +struct i2c_pads_info i2c_pad_info2 = { + .scl = { + .i2c_mode =MX6_PAD_GPIO_3__I2C3_SCL |PC , + .gpio_mode =MX6_PAD_GPIO_3__GPIO_1_3 |PC , + .gp =IMX_GPIO_NR (1 ,3 ) + }, + .sda = { + .i2c_mode =MX6_PAD_EIM_D18__I2C3_SDA |PC , + .gpio_mode =MX6_PAD_EIM_D18__GPIO_3_18 |PC , + .gp =IMX_GPIO_NR (3 ,18 ) + } +}; + +iomux_v3_cfg_t const i2c3_pads[] = { +MX6_PAD_EIM_A24__GPIO_5_4 |MUX_PAD_CTRL (NO_PAD_CTRL ), +}; +static void setup_iomux_enet (void ) {imx_iomux_v3_setup_multiple_pads (enet_pads,ARRAY_SIZE (enet_pads));@@ -216,6 +259,13 @@ int board_init(void)/* address of boot parameters */ gd->bd->bi_boot_params =PHYS_SDRAM +0x100 ; +/* I2C 2 and 3 setup - I2C 3 hw mux with EIM */ +setup_i2c (1 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info1); +/* I2C 3 Steer */ +gpio_direction_output (IMX_GPIO_NR (5 ,4 ),1 ); +imx_iomux_v3_setup_multiple_pads (i2c3_pads,ARRAY_SIZE (i2c3_pads)); +setup_i2c (2 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info2); +return 0 ; }include/configs/mx6qsabreauto.h +0
-0
include/configs/mx6qsabreauto.h line 47
Quoted 10 lines
include/configs/mx6qsabreauto.h +6
-0@@ -38,4 +38,10 @@#define CONFIG_SYS_MMC_ENV_PART 1/* Boot partition 1 */ #endif +/* I2C Configs */ +#define CONFIG_CMD_I2C +#define CONFIG_I2C_MULTI_BUS +#define CONFIG_I2C_MXC +#define CONFIG_SYS_I2C_SPEED 100000 +#endif /* __MX6QSABREAUTO_CONFIG_H */
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 1/2 mx6qsabreauto: Add i2c to mx6qsabreauto board
In reply to Renato FriasQuoted 5 lines · Renato Frias
Add i2c2 and 3 to mx6qsabreauto board, i2c3 is multiplexed use gpio to set steering.
Signed-off-by Renato Frias <[email protected]>---
Applied to u-boot-imx, thanks.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================