mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 12:52:30 +00:00
3b8c4ebb76
While debugging legacy mode vs device tree booted PM regressions, I noticed that omap3 is not toggling sys_clkreq and sys_off_mode pins like it should. The sys_clkreq and sys_off_mode pins are not toggling because of the following issues: 1. The default polarity for the sys_off_mode pin is wrong. OFFMODE_POL needs to be cleared for sys_off_mode to go down when hitting off-idle, while CLKREQ_POL needs to be set so sys_clkreq goes down when hitting retention. 2. The values for voltctrl register need to be updated dynamically. We need to set either the retention idle bits, or off idle bits in the voltctrl register depending the idle mode we're targeting to hit. Let's fix these two issues as otherwise the system will just hang if any twl4030 PMIC idle scripts are loaded. The only case where the system does not hang is if only retention idle over I2C4 is configured by the bootloader. Note that even without the twl4030 PMIC scripts, these fixes will do the proper signaling of sys_clkreq and sys_off_mode pins, so the fixes are needed to fix monitoring of PM states with LEDs or an oscilloscope. Cc: Kevin Hilman <khilman@linaro.org> Cc: Nishanth Menon <nm@ti.com> Cc: Paul Walmsley <paul@pwsan.com> Cc: Tero Kristo <t-kristo@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
135 lines
4.4 KiB
C
135 lines
4.4 KiB
C
/*
|
|
* OMAP3/4 Voltage Controller (VC) structure and macro definitions
|
|
*
|
|
* Copyright (C) 2007, 2010 Texas Instruments, Inc.
|
|
* Rajendra Nayak <rnayak@ti.com>
|
|
* Lesly A M <x0080970@ti.com>
|
|
* Thara Gopinath <thara@ti.com>
|
|
*
|
|
* Copyright (C) 2008, 2011 Nokia Corporation
|
|
* Kalle Jokiniemi
|
|
* Paul Walmsley
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License version
|
|
* 2 as published by the Free Software Foundation.
|
|
*/
|
|
#ifndef __ARCH_ARM_MACH_OMAP2_VC_H
|
|
#define __ARCH_ARM_MACH_OMAP2_VC_H
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
struct voltagedomain;
|
|
|
|
/**
|
|
* struct omap_vc_common - per-VC register/bitfield data
|
|
* @cmd_on_mask: ON bitmask in PRM_VC_CMD_VAL* register
|
|
* @valid: VALID bitmask in PRM_VC_BYPASS_VAL register
|
|
* @bypass_val_reg: Offset of PRM_VC_BYPASS_VAL reg from PRM start
|
|
* @data_shift: DATA field shift in PRM_VC_BYPASS_VAL register
|
|
* @slaveaddr_shift: SLAVEADDR field shift in PRM_VC_BYPASS_VAL register
|
|
* @regaddr_shift: REGADDR field shift in PRM_VC_BYPASS_VAL register
|
|
* @cmd_on_shift: ON field shift in PRM_VC_CMD_VAL_* register
|
|
* @cmd_onlp_shift: ONLP field shift in PRM_VC_CMD_VAL_* register
|
|
* @cmd_ret_shift: RET field shift in PRM_VC_CMD_VAL_* register
|
|
* @cmd_off_shift: OFF field shift in PRM_VC_CMD_VAL_* register
|
|
* @i2c_cfg_reg: I2C configuration register offset
|
|
* @i2c_cfg_hsen_mask: high-speed mode bit field mask in I2C config register
|
|
* @i2c_mcode_mask: MCODE field mask for I2C config register
|
|
*
|
|
* XXX One of cmd_on_mask and cmd_on_shift are not needed
|
|
* XXX VALID should probably be a shift, not a mask
|
|
*/
|
|
struct omap_vc_common {
|
|
u32 cmd_on_mask;
|
|
u32 valid;
|
|
u8 bypass_val_reg;
|
|
u8 data_shift;
|
|
u8 slaveaddr_shift;
|
|
u8 regaddr_shift;
|
|
u8 cmd_on_shift;
|
|
u8 cmd_onlp_shift;
|
|
u8 cmd_ret_shift;
|
|
u8 cmd_off_shift;
|
|
u8 i2c_cfg_reg;
|
|
u8 i2c_cfg_hsen_mask;
|
|
u8 i2c_mcode_mask;
|
|
};
|
|
|
|
/* omap_vc_channel.flags values */
|
|
#define OMAP_VC_CHANNEL_DEFAULT BIT(0)
|
|
#define OMAP_VC_CHANNEL_CFG_MUTANT BIT(1)
|
|
|
|
/**
|
|
* struct omap_vc_channel - VC per-instance data
|
|
* @i2c_slave_addr: I2C slave address of PMIC for this VC channel
|
|
* @volt_reg_addr: voltage configuration register address
|
|
* @cmd_reg_addr: command configuration register address
|
|
* @setup_time: setup time (in sys_clk cycles) of regulator for this channel
|
|
* @cfg_channel: current value of VC channel configuration register
|
|
* @i2c_high_speed: whether or not to use I2C high-speed mode
|
|
*
|
|
* @common: pointer to VC common data for this platform
|
|
* @smps_sa_mask: i2c slave address bitmask in the PRM_VC_SMPS_SA register
|
|
* @smps_volra_mask: VOLRA* bitmask in the PRM_VC_VOL_RA register
|
|
* @smps_cmdra_mask: CMDRA* bitmask in the PRM_VC_CMD_RA register
|
|
* @cmdval_reg: register for on/ret/off voltage level values for this channel
|
|
* @smps_sa_reg: Offset of PRM_VC_SMPS_SA reg from PRM start
|
|
* @smps_volra_reg: Offset of PRM_VC_SMPS_VOL_RA reg from PRM start
|
|
* @smps_cmdra_reg: Offset of PRM_VC_SMPS_CMD_RA reg from PRM start
|
|
* @cfg_channel_reg: VC channel configuration register
|
|
* @cfg_channel_sa_shift: bit shift for slave address cfg_channel register
|
|
* @flags: VC channel-specific flags (optional)
|
|
*/
|
|
struct omap_vc_channel {
|
|
/* channel state */
|
|
u16 i2c_slave_addr;
|
|
u16 volt_reg_addr;
|
|
u16 cmd_reg_addr;
|
|
u8 cfg_channel;
|
|
bool i2c_high_speed;
|
|
|
|
/* register access data */
|
|
const struct omap_vc_common *common;
|
|
u32 smps_sa_mask;
|
|
u32 smps_volra_mask;
|
|
u32 smps_cmdra_mask;
|
|
u8 cmdval_reg;
|
|
u8 smps_sa_reg;
|
|
u8 smps_volra_reg;
|
|
u8 smps_cmdra_reg;
|
|
u8 cfg_channel_reg;
|
|
u8 cfg_channel_sa_shift;
|
|
u8 flags;
|
|
};
|
|
|
|
extern struct omap_vc_channel omap3_vc_mpu;
|
|
extern struct omap_vc_channel omap3_vc_core;
|
|
|
|
extern struct omap_vc_channel omap4_vc_mpu;
|
|
extern struct omap_vc_channel omap4_vc_iva;
|
|
extern struct omap_vc_channel omap4_vc_core;
|
|
|
|
extern struct omap_vc_param omap3_mpu_vc_data;
|
|
extern struct omap_vc_param omap3_core_vc_data;
|
|
|
|
extern struct omap_vc_param omap4_mpu_vc_data;
|
|
extern struct omap_vc_param omap4_iva_vc_data;
|
|
extern struct omap_vc_param omap4_core_vc_data;
|
|
|
|
void omap3_vc_set_pmic_signaling(int core_next_state);
|
|
|
|
|
|
void omap_vc_init_channel(struct voltagedomain *voltdm);
|
|
int omap_vc_pre_scale(struct voltagedomain *voltdm,
|
|
unsigned long target_volt,
|
|
u8 *target_vsel, u8 *current_vsel);
|
|
void omap_vc_post_scale(struct voltagedomain *voltdm,
|
|
unsigned long target_volt,
|
|
u8 target_vsel, u8 current_vsel);
|
|
int omap_vc_bypass_scale(struct voltagedomain *voltdm,
|
|
unsigned long target_volt);
|
|
|
|
#endif
|
|
|