regulator: pbias: Handle extended drain IO when changing omap36 PBIAS
PATCH 1/1 regulator: pbias: Handle extended drain IO when changing omap36 PBIAS
The OMAP36 and DM37 TRM state to disable extneded drain IO before changing the PBIAS. This patch does this before pmic writes if the CONFIG_MMC_OMAP36XX_PINS flag is set and the cpu family is omap36xx
drivers/power/regulator/pbias_regulator.c +47 -2
@@ -14,6 +14,11 @@#include <linux/bitops.h> #include <linux/ioport.h> #include <dm/read.h> +#ifdef CONFIG_MMC_OMAP36XX_PINS +#include <asm/arch/sys_proto.h> +#include <asm/io.h> +#include <asm/arch/mux.h> +#endif struct pbias_reg_info {u32 enable;
@@ -223,8 +228,11 @@ static int pbias_regulator_get_value(struct udevice *dev)static int pbias_regulator_set_value (struct udevice *dev,int uV) {const struct pbias_reg_info *p =dev_get_priv (dev); -int rc; +int rc, ret;u32 reg; +#ifdef CONFIG_MMC_OMAP36XX_PINS +u32 wkup_ctrl =readl (OMAP34XX_CTRL_WKUP_CTRL ); +#endif rc =pmic_read (dev->parent,0 , (uint8_t *)®,sizeof (reg));if (rc)
@@ -240,7 +248,23 @@ static int pbias_regulator_set_value(struct udevice *dev, int uV)debug ("Setting %s voltage to %s\n" , p->name, (reg & p->vmode) ?"3.0v" :"1.8v" ); -return pmic_write (dev->parent,0 , (uint8_t *)®,sizeof (reg)); +#ifdef CONFIG_MMC_OMAP36XX_PINS +if (get_cpu_family () ==CPU_OMAP36XX ) { +/* Disable extended drain IO before changing PBIAS */ + wkup_ctrl &= ~OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ ; +writel (wkup_ctrl,OMAP34XX_CTRL_WKUP_CTRL ); + } +#endif + ret =pmic_write (dev->parent,0 , (uint8_t *)®,sizeof (reg)); +#ifdef CONFIG_MMC_OMAP36XX_PINS +if (get_cpu_family () ==CPU_OMAP36XX ) { +/* Enable extended drain IO after changing PBIAS */ +writel (wkup_ctrl | +OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ , +OMAP34XX_CTRL_WKUP_CTRL ); + } +#endif +return ret; }static int pbias_regulator_get_enable (struct udevice *dev)
@@ -264,9 +288,20 @@ static int pbias_regulator_set_enable(struct udevice *dev, bool enable)const struct pbias_reg_info *p =dev_get_priv (dev);int rc;u32 reg; +#ifdef CONFIG_MMC_OMAP36XX_PINS +u32 wkup_ctrl =readl (OMAP34XX_CTRL_WKUP_CTRL ); +#endif debug ("Turning %s %s\n" , enable ?"on" :"off" , p->name); +#ifdef CONFIG_MMC_OMAP36XX_PINS +if (get_cpu_family () ==CPU_OMAP36XX ) { +/* Disable extended drain IO before changing PBIAS */ + wkup_ctrl &= ~OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ ; +writel (wkup_ctrl,OMAP34XX_CTRL_WKUP_CTRL ); + } +#endif + rc =pmic_read (dev->parent,0 , (uint8_t *)®,sizeof (reg));if (rc)return rc;
@@ -278,6 +313,16 @@ static int pbias_regulator_set_enable(struct udevice *dev, bool enable) reg |= p->disable_val; rc =pmic_write (dev->parent,0 , (uint8_t *)®,sizeof (reg)); + +#ifdef CONFIG_MMC_OMAP36XX_PINS +if (get_cpu_family () ==CPU_OMAP36XX ) { +/* Enable extended drain IO after changing PBIAS */ +writel (wkup_ctrl | +OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ , +OMAP34XX_CTRL_WKUP_CTRL ); + } +#endif +if (rc)return rc;
Signature · 1 line
2.17.1
PATCH 1/1 regulator: pbias: Handle extended drain IO when changing omap36 PBIAS
Hi Adam,
Quoted 4 lines · Adam Ford
The OMAP36 and DM37 TRM state to disable extneded drain IO before changing the PBIAS. This patch does this before pmic writes if the
CONFIG_MMC_OMAP36XX_PINSflag is set and the cpu family is omap36xx
I believe things could be done without all the #ifdef, in a more dynamic way.
Quoted 20 lines
Signed-off-by Adam Ford <[email protected]>drivers/power/regulator/pbias_regulator.c +5
-0@@ -14,6 +14,11 @@#include <linux/bitops.h> #include <linux/ioport.h> #include <dm/read.h> +#ifdef CONFIG_MMC_OMAP36XX_PINS +#include <asm/arch/sys_proto.h> +#include <asm/io.h> +#include <asm/arch/mux.h> +#endif struct pbias_reg_info {u32 enable;
drivers/power/regulator/pbias_regulator.c static int pbias_regulator_get_value(struct udevice *dev) · line 235
Quoted 9 lines
drivers/power/regulator/pbias_regulator.c +3
-1@@ -223,8 +228,11 @@ static int pbias_regulator_get_value(struct udevice *dev)static int pbias_regulator_set_value (struct udevice *dev,int uV) {const struct pbias_reg_info *p =dev_get_priv (dev); -int rc; +int rc, ret;u32 reg; +#ifdef CONFIG_MMC_OMAP36XX_PINS +u32 wkup_ctrl =readl (OMAP34XX_CTRL_WKUP_CTRL );
Could usage of OMAP34XX_CTRL_WKUP_CTRLbe removed and replaced by something coming from DT ?
JJ
Quoted 67 lines
drivers/power/regulator/pbias_regulator.c +1
-0+#endif rc =pmic_read (dev->parent,0 , (uint8_t *)®,sizeof (reg));if (rc)
drivers/power/regulator/pbias_regulator.c +38
-1@@ -240,7 +248,23 @@ static int pbias_regulator_set_value(struct udevice *dev, int uV)debug ("Setting %s voltage to %s\n" , p->name, (reg & p->vmode) ?"3.0v" :"1.8v" ); -return pmic_write (dev->parent,0 , (uint8_t *)®,sizeof (reg)); +#ifdef CONFIG_MMC_OMAP36XX_PINS +if (get_cpu_family () ==CPU_OMAP36XX ) { +/* Disable extended drain IO before changing PBIAS */ + wkup_ctrl &= ~OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ ; +writel (wkup_ctrl,OMAP34XX_CTRL_WKUP_CTRL ); + } +#endif + ret =pmic_write (dev->parent,0 , (uint8_t *)®,sizeof (reg)); +#ifdef CONFIG_MMC_OMAP36XX_PINS +if (get_cpu_family () ==CPU_OMAP36XX ) { +/* Enable extended drain IO after changing PBIAS */ +writel (wkup_ctrl | +OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ , +OMAP34XX_CTRL_WKUP_CTRL ); + } +#endif +return ret; }static int pbias_regulator_get_enable (struct udevice *dev)@@ -264,9 +288,20 @@ static int pbias_regulator_set_enable(struct udevice *dev, bool enable)const struct pbias_reg_info *p =dev_get_priv (dev);int rc;u32 reg; +#ifdef CONFIG_MMC_OMAP36XX_PINS +u32 wkup_ctrl =readl (OMAP34XX_CTRL_WKUP_CTRL ); +#endif debug ("Turning %s %s\n" , enable ?"on" :"off" , p->name); +#ifdef CONFIG_MMC_OMAP36XX_PINS +if (get_cpu_family () ==CPU_OMAP36XX ) { +/* Disable extended drain IO before changing PBIAS */ + wkup_ctrl &= ~OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ ; +writel (wkup_ctrl,OMAP34XX_CTRL_WKUP_CTRL ); + } +#endif + rc =pmic_read (dev->parent,0 , (uint8_t *)®,sizeof (reg));if (rc)return rc;@@ -278,6 +313,16 @@ static int pbias_regulator_set_enable(struct udevice *dev, bool enable) reg |= p->disable_val; rc =pmic_write (dev->parent,0 , (uint8_t *)®,sizeof (reg)); + +#ifdef CONFIG_MMC_OMAP36XX_PINS +if (get_cpu_family () ==CPU_OMAP36XX ) { +/* Enable extended drain IO after changing PBIAS */ +writel (wkup_ctrl | +OMAP34XX_CTRL_WKUP_CTRL_GPIO_IO_PWRDNZ , +OMAP34XX_CTRL_WKUP_CTRL ); + } +#endif +if (rc)return rc;
drivers/power/regulator/pbias_regulator.c
Quoted 9 lines · Adam Ford
The OMAP36 and DM37 TRM state to disable extneded drain IO before changing the PBIAS. This patch does this before pmic writes if the
CONFIG_MMC_OMAP36XX_PINSflag is set and the cpu family is omap36xxSigned-off-by Adam Ford <[email protected]>drivers/power/regulator/pbias_regulator.c +0
-0
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/7b37c56e/attachment.sig>