Commit 02556521 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.10/soc-part2-v2-signed' of... 

Merge tag 'omap-for-v5.10/soc-part2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

One more SoC change for omaps for v5.10 merge window

Remove debugfs dependency for enabling off mode during idle
for omap3 by enabling it automatically based on the PMIC
configuration.

* tag 'omap-for-v5.10/soc-part2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap3: enable off mode automatically

Link: https://lore.kernel.org/r/pull-1601445968-476435@atomide.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1d004afe fb2c599f

arch/arm/mach-omap2/pm-debug.c

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#include "prm2xxx_3xxx.h"

#include "pm.h"



u32 enable_off_mode;



#ifdef CONFIG_DEBUG_FS

#include <linux/debugfs.h>

#include <linux/seq_file.h>

arch/arm/mach-omap2/pm.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include "clockdomain.h"

#include "pm.h"



u32 enable_off_mode;



#ifdef CONFIG_SUSPEND

/*

 * omap_pm_suspend: points to a function that does the SoC-specific

arch/arm/mach-omap2/pm.h

+0 −4
Original line number Diff line number Diff line
@@ -49,11 +49,7 @@ static inline int omap4_opp_init(void) 
extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);

extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);



#ifdef CONFIG_PM_DEBUG

extern u32 enable_off_mode;

#else

#define enable_off_mode 0

#endif



#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)

extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);

arch/arm/mach-omap2/pm34xx.c

+25 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/omap-gpmc.h>



#include <trace/events/power.h>
@@ -410,7 +411,12 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused) 
	if (!pwrst)

		return -ENOMEM;

	pwrst->pwrdm = pwrdm;



	if (enable_off_mode)

		pwrst->next_state = PWRDM_POWER_OFF;

	else

		pwrst->next_state = PWRDM_POWER_RET;



	list_add(&pwrst->node, &pwrst_list);



	if (pwrdm_has_hdwr_sar(pwrdm))
@@ -444,6 +450,22 @@ static void __init pm_errata_configure(void) 
	}

}



static void __init omap3_pm_check_pmic(void)

{

	struct device_node *np;



	np = of_find_compatible_node(NULL, NULL, "ti,twl4030-power-idle");

	if (!np)

		np = of_find_compatible_node(NULL, NULL, "ti,twl4030-power-idle-osc-off");



	if (np) {

		of_node_put(np);

		enable_off_mode = 1;

	} else {

		enable_off_mode = 0;

	}

}



int __init omap3_pm_init(void)

{

	struct power_state *pwrst, *tmp;
@@ -477,6 +499,8 @@ int __init omap3_pm_init(void) 
		goto err2;

	}



	omap3_pm_check_pmic();



	ret = pwrdm_for_each(pwrdms_setup, NULL);

	if (ret) {

		pr_err("Failed to setup powerdomains\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE