mfd: Remove db8500-prcmu U8400 legacy
This removes the U8400 legacy from PRCMU and cpufreq drivers. This platform has no current in-kernel users. Signed-off-by: Daniel Willerud <daniel.willerud@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
committed by
Samuel Ortiz
parent
e536b62095
commit
c72fe851df
@@ -22,11 +22,11 @@ static struct cpufreq_frequency_table freq_table[] = {
|
|||||||
},
|
},
|
||||||
[1] = {
|
[1] = {
|
||||||
.index = 1,
|
.index = 1,
|
||||||
.frequency = 300000,
|
.frequency = 400000,
|
||||||
},
|
},
|
||||||
[2] = {
|
[2] = {
|
||||||
.index = 2,
|
.index = 2,
|
||||||
.frequency = 600000,
|
.frequency = 800000,
|
||||||
},
|
},
|
||||||
[3] = {
|
[3] = {
|
||||||
/* Used for MAX_OPP, if available */
|
/* Used for MAX_OPP, if available */
|
||||||
@@ -113,12 +113,9 @@ static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)
|
|||||||
|
|
||||||
BUILD_BUG_ON(ARRAY_SIZE(idx2opp) + 1 != ARRAY_SIZE(freq_table));
|
BUILD_BUG_ON(ARRAY_SIZE(idx2opp) + 1 != ARRAY_SIZE(freq_table));
|
||||||
|
|
||||||
if (!prcmu_is_u8400()) {
|
if (prcmu_has_arm_maxopp())
|
||||||
freq_table[1].frequency = 400000;
|
freq_table[3].frequency = 1000000;
|
||||||
freq_table[2].frequency = 800000;
|
|
||||||
if (prcmu_has_arm_maxopp())
|
|
||||||
freq_table[3].frequency = 1000000;
|
|
||||||
}
|
|
||||||
pr_info("db8500-cpufreq : Available frequencies:\n");
|
pr_info("db8500-cpufreq : Available frequencies:\n");
|
||||||
for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++)
|
for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++)
|
||||||
pr_info(" %d Mhz\n", freq_table[i].frequency/1000);
|
pr_info(" %d Mhz\n", freq_table[i].frequency/1000);
|
||||||
|
|||||||
@@ -503,9 +503,6 @@ static const char *hwacc_ret_regulator_name[NUM_HW_ACC] = {
|
|||||||
/* PLLDIV=12, PLLSW=4 (PLLDDR) */
|
/* PLLDIV=12, PLLSW=4 (PLLDDR) */
|
||||||
#define PRCMU_DSI_CLOCK_SETTING 0x0000008C
|
#define PRCMU_DSI_CLOCK_SETTING 0x0000008C
|
||||||
|
|
||||||
/* PLLDIV=8, PLLSW=4 (PLLDDR) */
|
|
||||||
#define PRCMU_DSI_CLOCK_SETTING_U8400 0x00000088
|
|
||||||
|
|
||||||
/* DPI 50000000 Hz */
|
/* DPI 50000000 Hz */
|
||||||
#define PRCMU_DPI_CLOCK_SETTING ((1 << PRCMU_CLK_PLL_SW_SHIFT) | \
|
#define PRCMU_DPI_CLOCK_SETTING ((1 << PRCMU_CLK_PLL_SW_SHIFT) | \
|
||||||
(16 << PRCMU_CLK_PLL_DIV_SHIFT))
|
(16 << PRCMU_CLK_PLL_DIV_SHIFT))
|
||||||
@@ -514,9 +511,6 @@ static const char *hwacc_ret_regulator_name[NUM_HW_ACC] = {
|
|||||||
/* D=101, N=1, R=4, SELDIV2=0 */
|
/* D=101, N=1, R=4, SELDIV2=0 */
|
||||||
#define PRCMU_PLLDSI_FREQ_SETTING 0x00040165
|
#define PRCMU_PLLDSI_FREQ_SETTING 0x00040165
|
||||||
|
|
||||||
/* D=70, N=1, R=3, SELDIV2=0 */
|
|
||||||
#define PRCMU_PLLDSI_FREQ_SETTING_U8400 0x00030146
|
|
||||||
|
|
||||||
#define PRCMU_ENABLE_PLLDSI 0x00000001
|
#define PRCMU_ENABLE_PLLDSI 0x00000001
|
||||||
#define PRCMU_DISABLE_PLLDSI 0x00000000
|
#define PRCMU_DISABLE_PLLDSI 0x00000000
|
||||||
#define PRCMU_RELEASE_RESET_DSS 0x0000400C
|
#define PRCMU_RELEASE_RESET_DSS 0x0000400C
|
||||||
@@ -539,19 +533,14 @@ static struct {
|
|||||||
int db8500_prcmu_enable_dsipll(void)
|
int db8500_prcmu_enable_dsipll(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
unsigned int plldsifreq;
|
|
||||||
|
|
||||||
/* Clear DSIPLL_RESETN */
|
/* Clear DSIPLL_RESETN */
|
||||||
writel(PRCMU_RESET_DSIPLL, PRCM_APE_RESETN_CLR);
|
writel(PRCMU_RESET_DSIPLL, PRCM_APE_RESETN_CLR);
|
||||||
/* Unclamp DSIPLL in/out */
|
/* Unclamp DSIPLL in/out */
|
||||||
writel(PRCMU_UNCLAMP_DSIPLL, PRCM_MMIP_LS_CLAMP_CLR);
|
writel(PRCMU_UNCLAMP_DSIPLL, PRCM_MMIP_LS_CLAMP_CLR);
|
||||||
|
|
||||||
if (prcmu_is_u8400())
|
|
||||||
plldsifreq = PRCMU_PLLDSI_FREQ_SETTING_U8400;
|
|
||||||
else
|
|
||||||
plldsifreq = PRCMU_PLLDSI_FREQ_SETTING;
|
|
||||||
/* Set DSI PLL FREQ */
|
/* Set DSI PLL FREQ */
|
||||||
writel(plldsifreq, PRCM_PLLDSI_FREQ);
|
writel(PRCMU_PLLDSI_FREQ_SETTING, PRCM_PLLDSI_FREQ);
|
||||||
writel(PRCMU_DSI_PLLOUT_SEL_SETTING, PRCM_DSI_PLLOUT_SEL);
|
writel(PRCMU_DSI_PLLOUT_SEL_SETTING, PRCM_DSI_PLLOUT_SEL);
|
||||||
/* Enable Escape clocks */
|
/* Enable Escape clocks */
|
||||||
writel(PRCMU_ENABLE_ESCAPE_CLOCK_DIV, PRCM_DSITVCLK_DIV);
|
writel(PRCMU_ENABLE_ESCAPE_CLOCK_DIV, PRCM_DSITVCLK_DIV);
|
||||||
@@ -583,12 +572,6 @@ int db8500_prcmu_disable_dsipll(void)
|
|||||||
int db8500_prcmu_set_display_clocks(void)
|
int db8500_prcmu_set_display_clocks(void)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
unsigned int dsiclk;
|
|
||||||
|
|
||||||
if (prcmu_is_u8400())
|
|
||||||
dsiclk = PRCMU_DSI_CLOCK_SETTING_U8400;
|
|
||||||
else
|
|
||||||
dsiclk = PRCMU_DSI_CLOCK_SETTING;
|
|
||||||
|
|
||||||
spin_lock_irqsave(&clk_mgt_lock, flags);
|
spin_lock_irqsave(&clk_mgt_lock, flags);
|
||||||
|
|
||||||
@@ -596,7 +579,7 @@ int db8500_prcmu_set_display_clocks(void)
|
|||||||
while ((readl(PRCM_SEM) & PRCM_SEM_PRCM_SEM) != 0)
|
while ((readl(PRCM_SEM) & PRCM_SEM_PRCM_SEM) != 0)
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
|
|
||||||
writel(dsiclk, PRCM_HDMICLK_MGT);
|
writel(PRCMU_DSI_CLOCK_SETTING, PRCM_HDMICLK_MGT);
|
||||||
writel(PRCMU_DSI_LP_CLOCK_SETTING, PRCM_TVCLK_MGT);
|
writel(PRCMU_DSI_LP_CLOCK_SETTING, PRCM_TVCLK_MGT);
|
||||||
writel(PRCMU_DPI_CLOCK_SETTING, PRCM_LCDCLK_MGT);
|
writel(PRCMU_DPI_CLOCK_SETTING, PRCM_LCDCLK_MGT);
|
||||||
|
|
||||||
@@ -642,11 +625,6 @@ bool prcmu_has_arm_maxopp(void)
|
|||||||
PRCM_AVS_ISMODEENABLE_MASK) == PRCM_AVS_ISMODEENABLE_MASK;
|
PRCM_AVS_ISMODEENABLE_MASK) == PRCM_AVS_ISMODEENABLE_MASK;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool prcmu_is_u8400(void)
|
|
||||||
{
|
|
||||||
return prcmu_version.project_number == PRCMU_PROJECT_ID_8400V2_0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* prcmu_get_boot_status - PRCMU boot status checking
|
* prcmu_get_boot_status - PRCMU boot status checking
|
||||||
* Returns: the current PRCMU boot status
|
* Returns: the current PRCMU boot status
|
||||||
|
|||||||
@@ -500,7 +500,6 @@ int prcmu_set_rc_a2p(enum romcode_write);
|
|||||||
enum romcode_read prcmu_get_rc_p2a(void);
|
enum romcode_read prcmu_get_rc_p2a(void);
|
||||||
enum ap_pwrst prcmu_get_xp70_current_state(void);
|
enum ap_pwrst prcmu_get_xp70_current_state(void);
|
||||||
bool prcmu_has_arm_maxopp(void);
|
bool prcmu_has_arm_maxopp(void);
|
||||||
bool prcmu_is_u8400(void);
|
|
||||||
int prcmu_set_ape_opp(u8 opp);
|
int prcmu_set_ape_opp(u8 opp);
|
||||||
int prcmu_get_ape_opp(void);
|
int prcmu_get_ape_opp(void);
|
||||||
int prcmu_request_ape_opp_100_voltage(bool enable);
|
int prcmu_request_ape_opp_100_voltage(bool enable);
|
||||||
@@ -574,11 +573,6 @@ static inline bool prcmu_has_arm_maxopp(void)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool prcmu_is_u8400(void)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int prcmu_set_ape_opp(u8 opp)
|
static inline int prcmu_set_ape_opp(u8 opp)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user