| Message ID | 1420793987-7621-4-git-send-email-Peng.Fan@freescale.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
Hi Peng, On 09/01/2015 09:59, Peng Fan wrote: > Implement power_init_board and related I2C interface configuration. > > After adding this, uboot can successfully detect and configure pmic. > > " > U-Boot 2015.01-rc4-00110-g5697113-dirty (Jan 08 2015 - 21:06:44) > > CPU: Freescale i.MX6SL rev1.0 at 396 MHz > Reset cause: POR > Board: MX6SLEVK > I2C: ready > DRAM: 1 GiB > PMIC: PFUZE100 ID=0x10 > MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 > " > > Signed-off-by: Peng Fan <Peng.Fan@freescale.com> > --- > board/freescale/mx6slevk/mx6slevk.c | 47 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 47 insertions(+) > > diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c > index 838ea6c..f74b237 100644 > --- a/board/freescale/mx6slevk/mx6slevk.c > +++ b/board/freescale/mx6slevk/mx6slevk.c > @@ -13,13 +13,18 @@ > #include <asm/arch/sys_proto.h> > #include <asm/gpio.h> > #include <asm/imx-common/iomux-v3.h> > +#include <asm/imx-common/mxc_i2c.h> > #include <asm/imx-common/spi.h> > #include <asm/io.h> > #include <linux/sizes.h> > #include <common.h> > #include <fsl_esdhc.h> > +#include <i2c.h> > #include <mmc.h> > #include <netdev.h> > +#include <power/pmic.h> > +#include <power/pfuze100_pmic.h> > +#include "../common/pfuze.h" > #include <usb.h> > #include <usb/ehci-fsl.h> > > @@ -40,6 +45,11 @@ DECLARE_GLOBAL_DATA_PTR; > #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ > PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) > > +#define I2C_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ > + PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ > + PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ > + PAD_CTL_ODE | PAD_CTL_SRE_FAST) > + > #define ETH_PHY_RESET IMX_GPIO_NR(4, 21) > > int dram_init(void) > @@ -221,6 +231,39 @@ int board_mmc_init(bd_t *bis) > return 0; > } > > +#ifdef CONFIG_SYS_I2C_MXC > +#define PC MUX_PAD_CTRL(I2C_PAD_CTRL) > +/* I2C1 for PMIC */ > +struct i2c_pads_info i2c_pad_info1 = { > + .sda = { > + .i2c_mode = MX6_PAD_I2C1_SDA__I2C1_SDA | PC, > + .gpio_mode = MX6_PAD_I2C1_SDA__GPIO_3_13 | PC, > + .gp = IMX_GPIO_NR(3, 13), > + }, > + .scl = { > + .i2c_mode = MX6_PAD_I2C1_SCL__I2C1_SCL | PC, > + .gpio_mode = MX6_PAD_I2C1_SCL__GPIO_3_12 | PC, > + .gp = IMX_GPIO_NR(3, 12), > + }, > +}; > + > +int power_init_board(void) > +{ > + struct pmic *p; > + unsigned int ret; > + > + p = pfuze_common_init(I2C_PMIC); > + if (!p) > + return -ENODEV; > + > + ret = pfuze_mode_init(p, APS_PFM); > + if (ret < 0) > + return -EIO; > + > + return 0; > +} > +#endif > + > #ifdef CONFIG_FEC_MXC > int board_eth_init(bd_t *bis) > { > @@ -297,6 +340,10 @@ 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 > + > #ifdef CONFIG_FEC_MXC > setup_fec(); > #endif > Patches are quite orthogonal: patches 1-3 have nothing to do with the subject of the patchset (LDO bypass) and can flawlessly be applied. Best regards, Stefano Babic
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 838ea6c..f74b237 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -13,13 +13,18 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/mxc_i2c.h> #include <asm/imx-common/spi.h> #include <asm/io.h> #include <linux/sizes.h> #include <common.h> #include <fsl_esdhc.h> +#include <i2c.h> #include <mmc.h> #include <netdev.h> +#include <power/pmic.h> +#include <power/pfuze100_pmic.h> +#include "../common/pfuze.h" #include <usb.h> #include <usb/ehci-fsl.h> @@ -40,6 +45,11 @@ DECLARE_GLOBAL_DATA_PTR; #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) +#define I2C_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ + PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ + PAD_CTL_ODE | PAD_CTL_SRE_FAST) + #define ETH_PHY_RESET IMX_GPIO_NR(4, 21) int dram_init(void) @@ -221,6 +231,39 @@ int board_mmc_init(bd_t *bis) return 0; } +#ifdef CONFIG_SYS_I2C_MXC +#define PC MUX_PAD_CTRL(I2C_PAD_CTRL) +/* I2C1 for PMIC */ +struct i2c_pads_info i2c_pad_info1 = { + .sda = { + .i2c_mode = MX6_PAD_I2C1_SDA__I2C1_SDA | PC, + .gpio_mode = MX6_PAD_I2C1_SDA__GPIO_3_13 | PC, + .gp = IMX_GPIO_NR(3, 13), + }, + .scl = { + .i2c_mode = MX6_PAD_I2C1_SCL__I2C1_SCL | PC, + .gpio_mode = MX6_PAD_I2C1_SCL__GPIO_3_12 | PC, + .gp = IMX_GPIO_NR(3, 12), + }, +}; + +int power_init_board(void) +{ + struct pmic *p; + unsigned int ret; + + p = pfuze_common_init(I2C_PMIC); + if (!p) + return -ENODEV; + + ret = pfuze_mode_init(p, APS_PFM); + if (ret < 0) + return -EIO; + + return 0; +} +#endif + #ifdef CONFIG_FEC_MXC int board_eth_init(bd_t *bis) { @@ -297,6 +340,10 @@ 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 + #ifdef CONFIG_FEC_MXC setup_fec(); #endif
Implement power_init_board and related I2C interface configuration. After adding this, uboot can successfully detect and configure pmic. " U-Boot 2015.01-rc4-00110-g5697113-dirty (Jan 08 2015 - 21:06:44) CPU: Freescale i.MX6SL rev1.0 at 396 MHz Reset cause: POR Board: MX6SLEVK I2C: ready DRAM: 1 GiB PMIC: PFUZE100 ID=0x10 MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 " Signed-off-by: Peng Fan <Peng.Fan@freescale.com> --- board/freescale/mx6slevk/mx6slevk.c | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)