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

Merge tag 'omap-for-v4.18/soc-signed' of... 

Merge tag 'omap-for-v4.18/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

SoC changes for omap variants for v4.18 merge window

This series mostly adds saving of power and clock domain registers for
am335x/am437x suspend to RTC only mode. There is also a non-urgent fix
for omap4 PM where we could end up losing GPIO interrupts if bootloader
has LOGICRETSTATE cleared for domains. And there is a clean-up patch for
omap1 to use device properties for at24 eeprom.

* tag 'omap-for-v4.18/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: Make sure LOGICRETSTATE bits are not cleared
  ARM: OMAP2+: prm44xx: Inroduce cpu_pm notifiers for context save/restore
  ARM: OMAP2+: prm44xx: Introduce context save/restore for am43 PRCM IO
  ARM: OMAP2+: powerdomain: Introduce cpu_pm notifiers for context save/restore
  ARM: OMAP2+: Add functions to save and restore powerdomain context
  ARM: OMAP2+: clockdomain: Inroduce cpu_pm notifiers for context save/restore
  ARM: OMAP2+: Add functions to save and restore clockdomain context en-masse.
  ARM: omap1: osk: use device properties for at24 eeprom

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 280b0471 3bb3799c

arch/arm/mach-omap1/board-osk.c

+5 −5
Original line number Diff line number Diff line
@@ -303,22 +303,22 @@ static const struct omap_lcd_config osk_lcd_config __initconst = { 
#ifdef	CONFIG_OMAP_OSK_MISTRAL



#include <linux/input.h>

#include <linux/platform_data/at24.h>

#include <linux/property.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>



#include <linux/platform_data/keypad-omap.h>



static struct at24_platform_data at24c04 = {

	.byte_len	= SZ_4K / 8,

	.page_size	= 16,

static const struct property_entry mistral_at24_properties[] = {

	PROPERTY_ENTRY_U32("pagesize", 16),

	{ }

};



static struct i2c_board_info __initdata mistral_i2c_board_info[] = {

	{

		/* NOTE:  powered from LCD supply */

		I2C_BOARD_INFO("24c04", 0x50),

		.platform_data	= &at24c04,

		.properties = mistral_at24_properties,

	},

	/* TODO when driver support is ready:

	 *  - optionally ov9640 camera sensor at 0x30

arch/arm/mach-omap2/clockdomain.c

+73 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/limits.h>

#include <linux/err.h>

#include <linux/clk-provider.h>

#include <linux/cpu_pm.h>



#include <linux/io.h>
@@ -31,6 +32,7 @@ 
#include "soc.h"

#include "clock.h"

#include "clockdomain.h"

#include "pm.h"



/* clkdm_list contains all registered struct clockdomains */

static LIST_HEAD(clkdm_list);
@@ -39,6 +41,8 @@ static LIST_HEAD(clkdm_list); 
static struct clkdm_autodep *autodeps;



static struct clkdm_ops *arch_clkdm;

void clkdm_save_context(void);

void clkdm_restore_context(void);



/* Private functions */
@@ -449,6 +453,22 @@ int clkdm_register_autodeps(struct clkdm_autodep *ia) 
	return 0;

}



static int cpu_notifier(struct notifier_block *nb, unsigned long cmd, void *v)

{

	switch (cmd) {

	case CPU_CLUSTER_PM_ENTER:

		if (enable_off_mode)

			clkdm_save_context();

		break;

	case CPU_CLUSTER_PM_EXIT:

		if (enable_off_mode)

			clkdm_restore_context();

		break;

	}



	return NOTIFY_OK;

}



/**

 * clkdm_complete_init - set up the clockdomain layer

 *
@@ -460,6 +480,7 @@ int clkdm_register_autodeps(struct clkdm_autodep *ia) 
int clkdm_complete_init(void)

{

	struct clockdomain *clkdm;

	static struct notifier_block nb;



	if (list_empty(&clkdm_list))

		return -EACCES;
@@ -474,6 +495,12 @@ int clkdm_complete_init(void) 
		clkdm_clear_all_sleepdeps(clkdm);

	}



	/* Only AM43XX can lose clkdm context during rtc-ddr suspend */

	if (soc_is_am43xx()) {

		nb.notifier_call = cpu_notifier;

		cpu_pm_register_notifier(&nb);

	}



	return 0;

}
@@ -1307,3 +1334,49 @@ int clkdm_hwmod_disable(struct clockdomain *clkdm, struct omap_hwmod *oh) 
	return 0;

}



/**

 * _clkdm_save_context - save the context for the control of this clkdm

 *

 * Due to a suspend or hibernation operation, the state of the registers

 * controlling this clkdm will be lost, save their context.

 */

static int _clkdm_save_context(struct clockdomain *clkdm, void *ununsed)

{

	if (!arch_clkdm || !arch_clkdm->clkdm_save_context)

		return -EINVAL;



	return arch_clkdm->clkdm_save_context(clkdm);

}



/**

 * _clkdm_restore_context - restore context for control of this clkdm

 *

 * Restore the register values for this clockdomain.

 */

static int _clkdm_restore_context(struct clockdomain *clkdm, void *ununsed)

{

	if (!arch_clkdm || !arch_clkdm->clkdm_restore_context)

		return -EINVAL;



	return arch_clkdm->clkdm_restore_context(clkdm);

}



/**

 * clkdm_save_context - Saves the context for each registered clkdm

 *

 * Save the context for each registered clockdomain.

 */

void clkdm_save_context(void)

{

	clkdm_for_each(_clkdm_save_context, NULL);

}



/**

 * clkdm_restore_context - Restores the context for each registered clkdm

 *

 * Restore the context for each registered clockdomain.

 */

void clkdm_restore_context(void)

{

	clkdm_for_each(_clkdm_restore_context, NULL);

}

arch/arm/mach-omap2/clockdomain.h

+8 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ struct clockdomain { 
	int usecount;

	int forcewake_count;

	struct list_head node;

	u32 context;

};



/**
@@ -159,6 +160,8 @@ struct clockdomain { 
 * @clkdm_deny_idle: Disable hw supervised idle transitions for clock domain

 * @clkdm_clk_enable: Put the clkdm in right state for a clock enable

 * @clkdm_clk_disable: Put the clkdm in right state for a clock disable

 * @clkdm_save_context: Save the current clkdm context

 * @clkdm_restore_context: Restore the clkdm context

 */

struct clkdm_ops {

	int	(*clkdm_add_wkdep)(struct clockdomain *clkdm1, struct clockdomain *clkdm2);
@@ -175,6 +178,8 @@ struct clkdm_ops { 
	void	(*clkdm_deny_idle)(struct clockdomain *clkdm);

	int	(*clkdm_clk_enable)(struct clockdomain *clkdm);

	int	(*clkdm_clk_disable)(struct clockdomain *clkdm);

	int	(*clkdm_save_context)(struct clockdomain *clkdm);

	int	(*clkdm_restore_context)(struct clockdomain *clkdm);

};



int clkdm_register_platform_funcs(struct clkdm_ops *co);
@@ -214,6 +219,9 @@ int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk); 
int clkdm_hwmod_enable(struct clockdomain *clkdm, struct omap_hwmod *oh);

int clkdm_hwmod_disable(struct clockdomain *clkdm, struct omap_hwmod *oh);



void clkdm_save_context(void);

void clkdm_restore_context(void);



extern void __init omap242x_clockdomains_init(void);

extern void __init omap243x_clockdomains_init(void);

extern void __init omap3xxx_clockdomains_init(void);

arch/arm/mach-omap2/cm33xx.c

+53 −0
Original line number Diff line number Diff line
@@ -72,6 +72,17 @@ static inline u32 am33xx_cm_rmw_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx) 
	return v;

}



static inline u32 am33xx_cm_read_reg_bits(u16 inst, s16 idx, u32 mask)

{

	u32 v;



	v = am33xx_cm_read_reg(inst, idx);

	v &= mask;

	v >>= __ffs(mask);



	return v;

}



/**

 * _clkctrl_idlest - read a CM_*_CLKCTRL register; mask & shift IDLEST bitfield

 * @inst: CM instance register offset (*_INST macro)
@@ -338,6 +349,46 @@ static u32 am33xx_cm_xlate_clkctrl(u8 part, u16 inst, u16 offset) 
	return cm_base.pa + inst + offset;

}



/**

 * am33xx_clkdm_save_context - Save the clockdomain transition context

 * @clkdm: The clockdomain pointer whose context needs to be saved

 *

 * Save the clockdomain transition context.

 */

static int am33xx_clkdm_save_context(struct clockdomain *clkdm)

{

	clkdm->context = am33xx_cm_read_reg_bits(clkdm->cm_inst,

						 clkdm->clkdm_offs,

						 AM33XX_CLKTRCTRL_MASK);



	return 0;

}



/**

 * am33xx_restore_save_context - Restore the clockdomain transition context

 * @clkdm: The clockdomain pointer whose context needs to be restored

 *

 * Restore the clockdomain transition context.

 */

static int am33xx_clkdm_restore_context(struct clockdomain *clkdm)

{

	switch (clkdm->context) {

	case OMAP34XX_CLKSTCTRL_DISABLE_AUTO:

		am33xx_clkdm_deny_idle(clkdm);

		break;

	case OMAP34XX_CLKSTCTRL_FORCE_SLEEP:

		am33xx_clkdm_sleep(clkdm);

		break;

	case OMAP34XX_CLKSTCTRL_FORCE_WAKEUP:

		am33xx_clkdm_wakeup(clkdm);

		break;

	case OMAP34XX_CLKSTCTRL_ENABLE_AUTO:

		am33xx_clkdm_allow_idle(clkdm);

		break;

	}

	return 0;

}



struct clkdm_ops am33xx_clkdm_operations = {

	.clkdm_sleep		= am33xx_clkdm_sleep,

	.clkdm_wakeup		= am33xx_clkdm_wakeup,
@@ -345,6 +396,8 @@ struct clkdm_ops am33xx_clkdm_operations = { 
	.clkdm_deny_idle	= am33xx_clkdm_deny_idle,

	.clkdm_clk_enable	= am33xx_clkdm_clk_enable,

	.clkdm_clk_disable	= am33xx_clkdm_clk_disable,

	.clkdm_save_context	= am33xx_clkdm_save_context,

	.clkdm_restore_context	= am33xx_clkdm_restore_context,

};



static const struct cm_ll_data am33xx_cm_ll_data = {

arch/arm/mach-omap2/cminst44xx.c

+43 −0
Original line number Diff line number Diff line
@@ -481,6 +481,47 @@ static u32 omap4_cminst_xlate_clkctrl(u8 part, u16 inst, u16 offset) 
	return _cm_bases[part].pa + inst + offset;

}



/**

 * omap4_clkdm_save_context - Save the clockdomain modulemode context

 * @clkdm: The clockdomain pointer whose context needs to be saved

 *

 * Save the clockdomain modulemode context.

 */

static int omap4_clkdm_save_context(struct clockdomain *clkdm)

{

	clkdm->context = omap4_cminst_read_inst_reg(clkdm->prcm_partition,

						    clkdm->cm_inst,

						    clkdm->clkdm_offs +

						    OMAP4_CM_CLKSTCTRL);

	clkdm->context &= OMAP4430_MODULEMODE_MASK;

	return 0;

}



/**

 * omap4_clkdm_restore_context - Restore the clockdomain modulemode context

 * @clkdm: The clockdomain pointer whose context needs to be restored

 *

 * Restore the clockdomain modulemode context.

 */

static int omap4_clkdm_restore_context(struct clockdomain *clkdm)

{

	switch (clkdm->context) {

	case OMAP34XX_CLKSTCTRL_DISABLE_AUTO:

		omap4_clkdm_deny_idle(clkdm);

		break;

	case OMAP34XX_CLKSTCTRL_FORCE_SLEEP:

		omap4_clkdm_sleep(clkdm);

		break;

	case OMAP34XX_CLKSTCTRL_FORCE_WAKEUP:

		omap4_clkdm_wakeup(clkdm);

		break;

	case OMAP34XX_CLKSTCTRL_ENABLE_AUTO:

		omap4_clkdm_allow_idle(clkdm);

		break;

	}

	return 0;

}



struct clkdm_ops omap4_clkdm_operations = {

	.clkdm_add_wkdep	= omap4_clkdm_add_wkup_sleep_dep,

	.clkdm_del_wkdep	= omap4_clkdm_del_wkup_sleep_dep,
@@ -496,6 +537,8 @@ struct clkdm_ops omap4_clkdm_operations = { 
	.clkdm_deny_idle	= omap4_clkdm_deny_idle,

	.clkdm_clk_enable	= omap4_clkdm_clk_enable,

	.clkdm_clk_disable	= omap4_clkdm_clk_disable,

	.clkdm_save_context	= omap4_clkdm_save_context,

	.clkdm_restore_context	= omap4_clkdm_restore_context,

};



struct clkdm_ops am43xx_clkdm_operations = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE