udoo_neo: Move to DM for REGULATOR/PMIC/I2C drivers
PATCH v2 1/2 udoo_neo: Move to DM for REGULATOR/PMIC/I2C drivers
This moves over the PMIC power init to DM and the associated i2c and regulator bits.
---
Changes in v2:
- Fix spelling mistake
- Drop unneeded DM_MMC
- Drop dangling comment in udoo_neo.h
board/udoo/neo/neo.c | 139 +++---------------------------------- configs/udoo_neo_defconfig | 9 ++- include/configs/udoo_neo.h | 7 -- 3 files changed, 14 insertions(+), 141 deletions(-)
board/udoo/neo/neo.c +10 -129
@@ -51,11 +51,6 @@ enum { PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) -#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) -#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \ PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
@@ -83,135 +78,25 @@ int dram_init(void)return 0 ; } -#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 =MX6_PAD_GPIO1_IO00__I2C1_SCL |PC , - .gpio_mode =MX6_PAD_GPIO1_IO00__GPIO1_IO_0 |PC , - .gp =IMX_GPIO_NR (1 ,0 ), - }, - .sda = { - .i2c_mode =MX6_PAD_GPIO1_IO01__I2C1_SDA |PC , - .gpio_mode =MX6_PAD_GPIO1_IO01__GPIO1_IO_1 |PC , - .gp =IMX_GPIO_NR (1 ,1 ), - }, -}; -#endif - -#if CONFIG_IS_ENABLED (POWER_LEGACY )int power_init_board (void ) { -struct pmic *p; -int ret; -unsigned int reg, rev_id; - - ret =power_pfuze3000_init (PFUZE3000_I2C_BUS ); -if (ret) -return ret; - - p =pmic_get ("PFUZE3000" ); - ret =pmic_probe (p); -if (ret) -return ret; +struct udevice *dev; +int ret, dev_id, rev_id; -pmic_reg_read (p,PFUZE3000_DEVICEID , ®); -pmic_reg_read (p,PFUZE3000_REVID , &rev_id); -printf ("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n" , reg, rev_id); - -/* disable Low Power Mode during standby mode */ -pmic_reg_read (p,PFUZE3000_LDOGCTL , ®); - reg |=0x1 ; - ret =pmic_reg_write (p,PFUZE3000_LDOGCTL , reg); -if (ret) + ret =pmic_get ("pfuze3000@8" , &dev); +if (ret == -ENODEV ) +return 0 ; +if (ret !=0 )return ret; - ret =pmic_reg_write (p,PFUZE3000_SW1AMODE ,0xc ); -if (ret) -return ret; + dev_id =pmic_reg_read (dev,PFUZE3000_DEVICEID ); + rev_id =pmic_reg_read (dev,PFUZE3000_REVID ); +printf ("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n" , dev_id, rev_id); - ret =pmic_reg_write (p,PFUZE3000_SW1BMODE ,0xc ); -if (ret) -return ret; - - ret =pmic_reg_write (p,PFUZE3000_SW2MODE ,0xc ); -if (ret) -return ret; - - ret =pmic_reg_write (p,PFUZE3000_SW3MODE ,0xc ); -if (ret) -return ret; - -/* set SW1A standby voltage 0.975V */ -pmic_reg_read (p,PFUZE3000_SW1ASTBY , ®); - reg &= ~0x3f ; - reg |=PFUZE3000_SW1AB_SETP (9750 ); - ret =pmic_reg_write (p,PFUZE3000_SW1ASTBY , reg); -if (ret) -return ret; - -/* set SW1B standby voltage 0.975V */ -pmic_reg_read (p,PFUZE3000_SW1BSTBY , ®); - reg &= ~0x3f ; - reg |=PFUZE3000_SW1AB_SETP (9750 ); - ret =pmic_reg_write (p,PFUZE3000_SW1BSTBY , reg); -if (ret) -return ret; - -/* set SW1A/VDD_ARM_IN step ramp up time from 16us to 4us/25mV */ -pmic_reg_read (p,PFUZE3000_SW1ACONF , ®); - reg &= ~0xc0 ; - reg |=0x40 ; - ret =pmic_reg_write (p,PFUZE3000_SW1ACONF , reg); -if (ret) -return ret; - -/* set SW1B/VDD_SOC_IN step ramp up time from 16us to 4us/25mV */ -pmic_reg_read (p,PFUZE3000_SW1BCONF , ®); - reg &= ~0xc0 ; - reg |=0x40 ; - ret =pmic_reg_write (p,PFUZE3000_SW1BCONF , reg); -if (ret) -return ret; - -/* set VDD_ARM_IN to 1.350V */ -pmic_reg_read (p,PFUZE3000_SW1AVOLT , ®); - reg &= ~0x3f ; - reg |=PFUZE3000_SW1AB_SETP (13500 ); - ret =pmic_reg_write (p,PFUZE3000_SW1AVOLT , reg); -if (ret) -return ret; - -/* set VDD_SOC_IN to 1.350V */ -pmic_reg_read (p,PFUZE3000_SW1BVOLT , ®); - reg &= ~0x3f ; - reg |=PFUZE3000_SW1AB_SETP (13500 ); - ret =pmic_reg_write (p,PFUZE3000_SW1BVOLT , reg); -if (ret) -return ret; - -/* set DDR_1_5V to 1.350V */ -pmic_reg_read (p,PFUZE3000_SW3VOLT , ®); - reg &= ~0x0f ; - reg |=PFUZE3000_SW3_SETP (13500 ); - ret =pmic_reg_write (p,PFUZE3000_SW3VOLT , reg); -if (ret) -return ret; - -/* set VGEN2_1V5 to 1.5V */ -pmic_reg_read (p,PFUZE3000_VLDO2CTL , ®); - reg &= ~0x0f ; - reg |=PFUZE3000_VLDO_SETP (15000 ); -/* enable */ - reg |=0x10 ; - ret =pmic_reg_write (p,PFUZE3000_VLDO2CTL , reg); -if (ret) -return ret; +pmic_clrsetbits (dev,PFUZE3000_LDOGCTL ,0 ,1 );return 0 ; } -#endif static iomux_v3_cfg_t const uart1_pads[] = {MX6_PAD_GPIO1_IO04__UART1_TX |MUX_PAD_CTRL (UART_PAD_CTRL ),
@@ -294,10 +179,6 @@ int board_init(void)gpio_request (IMX_GPIO_NR (4 ,16 ),"ncp692" );gpio_direction_output (IMX_GPIO_NR (4 ,16 ) ,1 ); -#ifdef CONFIG_SYS_I2C_MXC -setup_i2c (0 ,CONFIG_SYS_I2C_SPEED ,0x7f , &i2c_pad_info1); -#endif -setup_fec ();return 0 ;
configs/udoo_neo_defconfig +4 -5
@@ -10,7 +10,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x80000 CONFIG_MX6SX=y CONFIG_TARGET_UDOO_NEO=y -CONFIG_SYS_I2C_MXC_I2C1=y +CONFIG_DM_I2C=y CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx6sx-udoo-neo-basic" CONFIG_SPL_TEXT_BASE=0x00908000
@@ -43,8 +43,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_BOUNCE_BUFFER=y -CONFIG_SYS_I2C_LEGACY=y -CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y
@@ -55,11 +53,12 @@ CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y -CONFIG_POWER_LEGACY=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_ANATOP=y -CONFIG_POWER_I2C=y +CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y
include/configs/udoo_neo.h +0 -7
@@ -55,17 +55,10 @@#include <config_distro_bootcmd.h> -/* Miscellaneous configurable options */ -/* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE -/* PMIC */ -#define CONFIG_POWER_PFUZE3000 -#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 -#define PFUZE3000_I2C_BUS 0 -#endif /* __CONFIG_H */
Signature · 1 line
2.38.1
PATCH v2 2/2 udoo_neo: Select DM_SERIAL and drop iomux board level init
Convert to DM_SERIAL and drop the iomux board file level init as it's handled as part of the DM serial layer instead.
---
Changes in v2:
- Drop no longer needed setup_iomux_uart and associated bits
board/udoo/neo/neo.c | 26 +++----------------------- configs/udoo_neo_defconfig | 2 +- 2 files changed, 4 insertions(+), 24 deletions(-)
board/udoo/neo/neo.c +3 -23
@@ -43,10 +43,6 @@ enum { UDOO_NEO_TYPE_EXTENDED, }; -#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS)
@@ -98,11 +94,6 @@ int power_init_board(void)return 0 ; } -static iomux_v3_cfg_t const uart1_pads[] = { -MX6_PAD_GPIO1_IO04__UART1_TX |MUX_PAD_CTRL (UART_PAD_CTRL ), -MX6_PAD_GPIO1_IO05__UART1_RX |MUX_PAD_CTRL (UART_PAD_CTRL ), -}; -static iomux_v3_cfg_t const usdhc2_pads[] = {MX6_PAD_SD2_CLK__USDHC2_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ),MX6_PAD_SD2_CMD__USDHC2_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ),
@@ -130,11 +121,6 @@ static iomux_v3_cfg_t const peri_3v3_pads[] = { MX6_PAD_QSPI1A_DATA0__GPIO4_IO_16 | MUX_PAD_CTRL(NO_PAD_CTRL), }; -static void setup_iomux_uart (void ) -{ -imx_iomux_v3_setup_multiple_pads (uart1_pads,ARRAY_SIZE (uart1_pads)); -} -static int setup_fec (void ) {struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR ;
@@ -184,13 +170,6 @@ int board_init(void)return 0 ; } -int board_early_init_f (void ) -{ -setup_iomux_uart (); - -return 0 ; -} -static struct fsl_esdhc_cfg usdhc_cfg[1 ] = { {USDHC2_BASE_ADDR }, };
@@ -421,11 +400,12 @@ void board_init_f(ulong dummy)/* setup AIPS and disable watchdog */ arch_cpu_init (); -board_early_init_f (); -/* setup GP timer */ timer_init (); +/* Enable device tree and early DM support*/ +spl_early_init (); +/* UART clocks enabled and gd valid - init serial console */ preloader_console_init ();
configs/udoo_neo_defconfig +1 -1
@@ -21,7 +21,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y # CONFIG_CMD_BMODE is not set CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" -CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_FS_EXT4=y
@@ -59,6 +58,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_ANATOP=y CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y
Signature · 1 line
2.38.1
Re: [PATCH v2 2/2] udoo_neo: Select DM_SERIAL and drop iomux board level init
Quoted 6 lines · Peter Robinson
Convert to
DM_SERIALand drop the iomux board file level init as it's handled as part of the DM serial layer instead.Signed-off-by Peter Robinson <[email protected]>
PATCH v2 2/2 udoo_neo: Select DM_SERIAL and drop iomux board level init
In reply to Peter RobinsonQuoted 5 lines
Convert to
DM_SERIALand drop the iomux board file level init as it's handled as part of the DM serial layer instead.Signed-off-by Peter Robinson <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
Quoted 5 lines · Peter Robinson
This moves over the PMIC power init to DM and the associated i2c and regulator bits.
Signed-off-by Peter Robinson <[email protected]>
PATCH v2 1/2 udoo_neo: Move to DM for REGULATOR/PMIC/I2C drivers
In reply to Peter RobinsonQuoted 4 lines
This moves over the PMIC power init to DM and the associated i2c and regulator bits.
Signed-off-by Peter Robinson <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================