mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH v2 1/3] regulator: pfuze: remove unsued define
@ 2020-01-30 18:00 Michael Grzeschik
  2020-01-30 18:00 ` [PATCH v2 2/3] regulator: pfuze: add support to other architectures Michael Grzeschik
  2020-01-30 18:00 ` [PATCH v2 3/3] ARM: phyCORE-i.MX8M SOM: add pmic initialisation for power good Michael Grzeschik
  0 siblings, 2 replies; 4+ messages in thread
From: Michael Grzeschik @ 2020-01-30 18:00 UTC (permalink / raw)
  To: barebox

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
 drivers/regulator/pfuze.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/regulator/pfuze.c b/drivers/regulator/pfuze.c
index 1950ffb04c..55f7eb5d4c 100644
--- a/drivers/regulator/pfuze.c
+++ b/drivers/regulator/pfuze.c
@@ -31,8 +31,6 @@
 
 #define DRIVERNAME		"pfuze"
 
-#define MC13XXX_NUMREGS		0x3f
-
 #define PFUZE100_SW1ABMODE	0x23
 #define PFUZE100_SW1CMODE	0x31
 #define PFUZE100_SW2MODE	0x38
-- 
2.25.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH v2 2/3] regulator: pfuze: add support to other architectures
  2020-01-30 18:00 [PATCH v2 1/3] regulator: pfuze: remove unsued define Michael Grzeschik
@ 2020-01-30 18:00 ` Michael Grzeschik
  2020-02-03  8:24   ` Sascha Hauer
  2020-01-30 18:00 ` [PATCH v2 3/3] ARM: phyCORE-i.MX8M SOM: add pmic initialisation for power good Michael Grzeschik
  1 sibling, 1 reply; 4+ messages in thread
From: Michael Grzeschik @ 2020-01-30 18:00 UTC (permalink / raw)
  To: barebox

Currently the pfuze driver is build dependent to ARCH_IMX6. To make it
possible to work with ARCH_IMX8 we move the imx6_poweroff call to an own
poweroff handler.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
v1 -> v2: - added static inline wrapper for pfuze_register_init_callback
          - moved the poweroff handler registration to pfuze init callback
	  - registering pfuze init callback from imx6_init

 arch/arm/mach-imx/imx6.c              | 12 +++++++++---
 arch/arm/mach-imx/include/mach/imx6.h |  4 +++-
 drivers/regulator/Kconfig             |  2 +-
 drivers/regulator/pfuze.c             |  2 --
 include/mfd/pfuze.h                   | 13 +++++++++++++
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index ef6a57b5cd..6a9ea23c71 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -28,8 +28,7 @@
 #include <mach/usb.h>
 #include <asm/mmu.h>
 #include <asm/cache-l2x0.h>
-
-#include <poweroff.h>
+#include <mfd/pfuze.h>
 
 #define CLPCR				0x54
 #define BP_CLPCR_LPM(mode)		((mode) & 0x3)
@@ -205,6 +204,11 @@ u64 imx6_uid(void)
 	return imx_ocotp_read_uid(IOMEM(MX6_OCOTP_BASE_ADDR));
 }
 
+static void imx6_register_poweroff_init(struct regmap *map)
+{
+	poweroff_handler_register_fn(imx6_pm_stby_poweroff);
+}
+
 int imx6_init(void)
 {
 	const char *cputypestr;
@@ -262,6 +266,8 @@ int imx6_init(void)
 	imx6_setup_ipu_qos();
 	imx6ul_enet_clk_init();
 
+	pfuze_register_init_callback(imx6_register_poweroff_init);
+
 	return 0;
 }
 
@@ -395,7 +401,7 @@ static int imx6_fixup_cpus_register(void)
 }
 device_initcall(imx6_fixup_cpus_register);
 
-void __noreturn imx6_pm_stby_poweroff(void)
+void __noreturn imx6_pm_stby_poweroff(struct poweroff_handler *handler)
 {
 	void *ccm_base = IOMEM(MX6_CCM_BASE_ADDR);
 	void *gpc_base = IOMEM(MX6_GPC_BASE_ADDR);
diff --git a/arch/arm/mach-imx/include/mach/imx6.h b/arch/arm/mach-imx/include/mach/imx6.h
index f0d20833fd..5560774de9 100644
--- a/arch/arm/mach-imx/include/mach/imx6.h
+++ b/arch/arm/mach-imx/include/mach/imx6.h
@@ -6,7 +6,9 @@
 #include <mach/imx6-regs.h>
 #include <mach/revision.h>
 
-void __noreturn imx6_pm_stby_poweroff(void);
+#include <poweroff.h>
+
+void __noreturn imx6_pm_stby_poweroff(struct poweroff_handler *handler);
 
 #define IMX6_ANATOP_SI_REV 0x260
 #define IMX6SL_ANATOP_SI_REV 0x280
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 28bd69a2a5..f47a115da2 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -19,7 +19,7 @@ config REGULATOR_BCM283X
 config REGULATOR_PFUZE
 	bool "Freescale PFUZE100/200/3000 regulator driver"
 	depends on I2C
-	depends on ARCH_IMX6
+	depends on ARCH_IMX6 || ARCH_IMX8MQ
 
 config REGULATOR_STPMIC1
 	tristate "STMicroelectronics STPMIC1 PMIC Regulators"
diff --git a/drivers/regulator/pfuze.c b/drivers/regulator/pfuze.c
index 55f7eb5d4c..91aaec0e7e 100644
--- a/drivers/regulator/pfuze.c
+++ b/drivers/regulator/pfuze.c
@@ -142,8 +142,6 @@ static void pfuze_power_off_prepare(struct poweroff_handler *handler)
 	regmap_write_bits(pfuze_dev->map, PFUZE100_VGEN6VOL,
 			  PFUZE100_VGENxLPWR | PFUZE100_VGENxSTBY,
 			  PFUZE100_VGENxSTBY);
-
-	imx6_pm_stby_poweroff();
 }
 
 static struct regmap_bus regmap_pfuze_i2c_bus = {
diff --git a/include/mfd/pfuze.h b/include/mfd/pfuze.h
index 6045ceec0a..85cee08c00 100644
--- a/include/mfd/pfuze.h
+++ b/include/mfd/pfuze.h
@@ -1,6 +1,19 @@
 #ifndef __INCLUDE_PFUZE_H
 #define __INCLUDE_PFUZE_H
 
+#include <regmap.h>
+
+#ifdef CONFIG_REGULATOR_PFUZE
+/* For proper poweroff sequencing, users on imx6 needs to call
+ * poweroff_handler_register_fn(imx6_pm_stby_poweroff);
+ * inside of the callback, to ensure a proper poweroff sequence
+ */
 int pfuze_register_init_callback(void(*callback)(struct regmap *map));
+#else
+int pfuze_register_init_callback(void(*callback)(struct regmap *map))
+{
+	return -ENODEV;
+}
+#endif
 
 #endif /* __INCLUDE_PFUZE_H */
-- 
2.25.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH v2 3/3] ARM: phyCORE-i.MX8M SOM: add pmic initialisation for power good
  2020-01-30 18:00 [PATCH v2 1/3] regulator: pfuze: remove unsued define Michael Grzeschik
  2020-01-30 18:00 ` [PATCH v2 2/3] regulator: pfuze: add support to other architectures Michael Grzeschik
@ 2020-01-30 18:00 ` Michael Grzeschik
  1 sibling, 0 replies; 4+ messages in thread
From: Michael Grzeschik @ 2020-01-30 18:00 UTC (permalink / raw)
  To: barebox

This patch is adding the same PMIC handling as the u-boot spl does for
this Board. It ensures sane defaults.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
 arch/arm/boards/phytec-som-imx8mq/board.c | 38 +++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/arch/arm/boards/phytec-som-imx8mq/board.c b/arch/arm/boards/phytec-som-imx8mq/board.c
index 4fd098c5f6..7df53a7cfb 100644
--- a/arch/arm/boards/phytec-som-imx8mq/board.c
+++ b/arch/arm/boards/phytec-som-imx8mq/board.c
@@ -10,9 +10,45 @@
 #include <init.h>
 #include <linux/sizes.h>
 #include <mach/bbu.h>
+#include <mfd/pfuze.h>
 
 #include <envfs.h>
 
+#define PFUZE100_DEVICEID	0x0
+#define PFUZE100_REVID		0x3
+
+#define PFUZE100_SW1ABMODE	0x23
+#define PFUZE100_SW2MODE	0x38
+#define PFUZE100_SW1CMODE	0x31
+#define PFUZE100_SW3AVOL	0x3c
+
+#define APS_PFM			0xc
+
+static void imx8mq_setup_pmic_voltages(struct regmap *map)
+{
+	int offset = PFUZE100_SW1CMODE;
+	int switch_num = 6;
+	int val, i;
+
+	regmap_read(map, PFUZE100_SW3AVOL, &val);
+
+	/* ensure the correct VDD_DRAM_0V9 output voltage */
+	regmap_write_bits(map, PFUZE100_SW3AVOL, 0x3f, 0x18);
+
+	/* pfuze200 */
+	regmap_read(map, PFUZE100_DEVICEID, &val);
+	if (val & 0xf) {
+		offset = PFUZE100_SW2MODE;
+		switch_num = 4;
+	}
+
+	/* set all switches APS in normal and PFM mode in standby */
+	regmap_write(map, PFUZE100_SW1ABMODE, APS_PFM);
+
+	for (i = 0; i < switch_num - 1; i++)
+		regmap_write(map, offset + i * 7, APS_PFM);
+}
+
 static int physom_imx8mq_devices_init(void)
 {
 	int flag_emmc = 0;
@@ -23,6 +59,8 @@ static int physom_imx8mq_devices_init(void)
 
 	barebox_set_hostname("phycore-imx8mq");
 
+	pfuze_register_init_callback(imx8mq_setup_pmic_voltages);
+
 	switch (bootsource_get_instance()) {
 	case 0:
 		flag_emmc = BBU_HANDLER_FLAG_DEFAULT;
-- 
2.25.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/3] regulator: pfuze: add support to other architectures
  2020-01-30 18:00 ` [PATCH v2 2/3] regulator: pfuze: add support to other architectures Michael Grzeschik
@ 2020-02-03  8:24   ` Sascha Hauer
  0 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2020-02-03  8:24 UTC (permalink / raw)
  To: Michael Grzeschik; +Cc: barebox

On Thu, Jan 30, 2020 at 07:00:52PM +0100, Michael Grzeschik wrote:
> Currently the pfuze driver is build dependent to ARCH_IMX6. To make it
> possible to work with ARCH_IMX8 we move the imx6_poweroff call to an own
> poweroff handler.
> 
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> ---
> v1 -> v2: - added static inline wrapper for pfuze_register_init_callback
>           - moved the poweroff handler registration to pfuze init callback
> 	  - registering pfuze init callback from imx6_init
> 
>  arch/arm/mach-imx/imx6.c              | 12 +++++++++---
>  arch/arm/mach-imx/include/mach/imx6.h |  4 +++-
>  drivers/regulator/Kconfig             |  2 +-
>  drivers/regulator/pfuze.c             |  2 --
>  include/mfd/pfuze.h                   | 13 +++++++++++++
>  5 files changed, 26 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
> index ef6a57b5cd..6a9ea23c71 100644
> --- a/arch/arm/mach-imx/imx6.c
> +++ b/arch/arm/mach-imx/imx6.c
> @@ -28,8 +28,7 @@
>  #include <mach/usb.h>
>  #include <asm/mmu.h>
>  #include <asm/cache-l2x0.h>
> -
> -#include <poweroff.h>
> +#include <mfd/pfuze.h>
>  
>  #define CLPCR				0x54
>  #define BP_CLPCR_LPM(mode)		((mode) & 0x3)
> @@ -205,6 +204,11 @@ u64 imx6_uid(void)
>  	return imx_ocotp_read_uid(IOMEM(MX6_OCOTP_BASE_ADDR));
>  }
>  
> +static void imx6_register_poweroff_init(struct regmap *map)
> +{
> +	poweroff_handler_register_fn(imx6_pm_stby_poweroff);
> +}
> +
>  int imx6_init(void)
>  {
>  	const char *cputypestr;
> @@ -262,6 +266,8 @@ int imx6_init(void)
>  	imx6_setup_ipu_qos();
>  	imx6ul_enet_clk_init();
>  
> +	pfuze_register_init_callback(imx6_register_poweroff_init);
> +
>  	return 0;
>  }
>  
> @@ -395,7 +401,7 @@ static int imx6_fixup_cpus_register(void)
>  }
>  device_initcall(imx6_fixup_cpus_register);
>  
> -void __noreturn imx6_pm_stby_poweroff(void)
> +void __noreturn imx6_pm_stby_poweroff(struct poweroff_handler *handler)
>  {
>  	void *ccm_base = IOMEM(MX6_CCM_BASE_ADDR);
>  	void *gpc_base = IOMEM(MX6_GPC_BASE_ADDR);
> diff --git a/arch/arm/mach-imx/include/mach/imx6.h b/arch/arm/mach-imx/include/mach/imx6.h
> index f0d20833fd..5560774de9 100644
> --- a/arch/arm/mach-imx/include/mach/imx6.h
> +++ b/arch/arm/mach-imx/include/mach/imx6.h
> @@ -6,7 +6,9 @@
>  #include <mach/imx6-regs.h>
>  #include <mach/revision.h>
>  
> -void __noreturn imx6_pm_stby_poweroff(void);
> +#include <poweroff.h>
> +
> +void __noreturn imx6_pm_stby_poweroff(struct poweroff_handler *handler);
>  
>  #define IMX6_ANATOP_SI_REV 0x260
>  #define IMX6SL_ANATOP_SI_REV 0x280
> diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
> index 28bd69a2a5..f47a115da2 100644
> --- a/drivers/regulator/Kconfig
> +++ b/drivers/regulator/Kconfig
> @@ -19,7 +19,7 @@ config REGULATOR_BCM283X
>  config REGULATOR_PFUZE
>  	bool "Freescale PFUZE100/200/3000 regulator driver"
>  	depends on I2C
> -	depends on ARCH_IMX6
> +	depends on ARCH_IMX6 || ARCH_IMX8MQ
>  
>  config REGULATOR_STPMIC1
>  	tristate "STMicroelectronics STPMIC1 PMIC Regulators"
> diff --git a/drivers/regulator/pfuze.c b/drivers/regulator/pfuze.c
> index 55f7eb5d4c..91aaec0e7e 100644
> --- a/drivers/regulator/pfuze.c
> +++ b/drivers/regulator/pfuze.c
> @@ -142,8 +142,6 @@ static void pfuze_power_off_prepare(struct poweroff_handler *handler)
>  	regmap_write_bits(pfuze_dev->map, PFUZE100_VGEN6VOL,
>  			  PFUZE100_VGENxLPWR | PFUZE100_VGENxSTBY,
>  			  PFUZE100_VGENxSTBY);
> -
> -	imx6_pm_stby_poweroff();
>  }
>  
>  static struct regmap_bus regmap_pfuze_i2c_bus = {
> diff --git a/include/mfd/pfuze.h b/include/mfd/pfuze.h
> index 6045ceec0a..85cee08c00 100644
> --- a/include/mfd/pfuze.h
> +++ b/include/mfd/pfuze.h
> @@ -1,6 +1,19 @@
>  #ifndef __INCLUDE_PFUZE_H
>  #define __INCLUDE_PFUZE_H
>  
> +#include <regmap.h>
> +
> +#ifdef CONFIG_REGULATOR_PFUZE
> +/* For proper poweroff sequencing, users on imx6 needs to call
> + * poweroff_handler_register_fn(imx6_pm_stby_poweroff);
> + * inside of the callback, to ensure a proper poweroff sequence
> + */
>  int pfuze_register_init_callback(void(*callback)(struct regmap *map));
> +#else
> +int pfuze_register_init_callback(void(*callback)(struct regmap *map))
> +{
> +	return -ENODEV;
> +}

Should be static inline int. Fixed while applying, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-03  8:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-30 18:00 [PATCH v2 1/3] regulator: pfuze: remove unsued define Michael Grzeschik
2020-01-30 18:00 ` [PATCH v2 2/3] regulator: pfuze: add support to other architectures Michael Grzeschik
2020-02-03  8:24   ` Sascha Hauer
2020-01-30 18:00 ` [PATCH v2 3/3] ARM: phyCORE-i.MX8M SOM: add pmic initialisation for power good Michael Grzeschik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox