summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2020-01-30 19:00:52 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2020-02-03 09:23:24 +0100
commit5ac25ce6081f39cfb8e9d06a9d0680e2fdb6f706 (patch)
tree99294a2c597b7d9638e5492d888dab19d3dd7a67 /arch
parent577ff43d1318800118b8b97344ef66340e1a5cb1 (diff)
downloadbarebox-5ac25ce6081f39cfb8e9d06a9d0680e2fdb6f706.tar.gz
barebox-5ac25ce6081f39cfb8e9d06a9d0680e2fdb6f706.tar.xz
regulator: pfuze: add support to other architectures
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> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/imx6.c12
-rw-r--r--arch/arm/mach-imx/include/mach/imx6.h4
2 files changed, 12 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index 41e0066add..719bfa8a39 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -27,8 +27,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)
@@ -195,6 +194,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;
@@ -252,6 +256,8 @@ int imx6_init(void)
imx6_setup_ipu_qos();
imx6ul_enet_clk_init();
+ pfuze_register_init_callback(imx6_register_poweroff_init);
+
return 0;
}
@@ -366,7 +372,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