Revert "cpufreq: ti-cpufreq: Introduce quirks to handle syscon fails appropriately"
This reverts commit 28db8e78d5
.
This commit is contained in:
parent
8b8bebf286
commit
a7f8791d22
1 changed files with 2 additions and 8 deletions
|
@ -53,9 +53,6 @@ struct ti_cpufreq_soc_data {
|
||||||
unsigned long efuse_shift;
|
unsigned long efuse_shift;
|
||||||
unsigned long rev_offset;
|
unsigned long rev_offset;
|
||||||
bool multi_regulator;
|
bool multi_regulator;
|
||||||
/* Backward compatibility hack: Might have missing syscon */
|
|
||||||
#define TI_QUIRK_SYSCON_MAY_BE_MISSING 0x1
|
|
||||||
u8 quirks;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ti_cpufreq_data {
|
struct ti_cpufreq_data {
|
||||||
|
@ -159,7 +156,6 @@ static struct ti_cpufreq_soc_data omap34xx_soc_data = {
|
||||||
.efuse_mask = BIT(3),
|
.efuse_mask = BIT(3),
|
||||||
.rev_offset = OMAP3_CONTROL_IDCODE - OMAP3_SYSCON_BASE,
|
.rev_offset = OMAP3_CONTROL_IDCODE - OMAP3_SYSCON_BASE,
|
||||||
.multi_regulator = false,
|
.multi_regulator = false,
|
||||||
.quirks = TI_QUIRK_SYSCON_MAY_BE_MISSING,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -187,7 +183,6 @@ static struct ti_cpufreq_soc_data omap36xx_soc_data = {
|
||||||
.efuse_mask = BIT(9),
|
.efuse_mask = BIT(9),
|
||||||
.rev_offset = OMAP3_CONTROL_IDCODE - OMAP3_SYSCON_BASE,
|
.rev_offset = OMAP3_CONTROL_IDCODE - OMAP3_SYSCON_BASE,
|
||||||
.multi_regulator = true,
|
.multi_regulator = true,
|
||||||
.quirks = TI_QUIRK_SYSCON_MAY_BE_MISSING,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -202,7 +197,6 @@ static struct ti_cpufreq_soc_data am3517_soc_data = {
|
||||||
.efuse_mask = 0,
|
.efuse_mask = 0,
|
||||||
.rev_offset = OMAP3_CONTROL_IDCODE - OMAP3_SYSCON_BASE,
|
.rev_offset = OMAP3_CONTROL_IDCODE - OMAP3_SYSCON_BASE,
|
||||||
.multi_regulator = false,
|
.multi_regulator = false,
|
||||||
.quirks = TI_QUIRK_SYSCON_MAY_BE_MISSING,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -222,7 +216,7 @@ static int ti_cpufreq_get_efuse(struct ti_cpufreq_data *opp_data,
|
||||||
|
|
||||||
ret = regmap_read(opp_data->syscon, opp_data->soc_data->efuse_offset,
|
ret = regmap_read(opp_data->syscon, opp_data->soc_data->efuse_offset,
|
||||||
&efuse);
|
&efuse);
|
||||||
if (opp_data->soc_data->quirks & TI_QUIRK_SYSCON_MAY_BE_MISSING && ret == -EIO) {
|
if (ret == -EIO) {
|
||||||
/* not a syscon register! */
|
/* not a syscon register! */
|
||||||
void __iomem *regs = ioremap(OMAP3_SYSCON_BASE +
|
void __iomem *regs = ioremap(OMAP3_SYSCON_BASE +
|
||||||
opp_data->soc_data->efuse_offset, 4);
|
opp_data->soc_data->efuse_offset, 4);
|
||||||
|
@ -263,7 +257,7 @@ static int ti_cpufreq_get_rev(struct ti_cpufreq_data *opp_data,
|
||||||
|
|
||||||
ret = regmap_read(opp_data->syscon, opp_data->soc_data->rev_offset,
|
ret = regmap_read(opp_data->syscon, opp_data->soc_data->rev_offset,
|
||||||
&revision);
|
&revision);
|
||||||
if (opp_data->soc_data->quirks & TI_QUIRK_SYSCON_MAY_BE_MISSING && ret == -EIO) {
|
if (ret == -EIO) {
|
||||||
/* not a syscon register! */
|
/* not a syscon register! */
|
||||||
void __iomem *regs = ioremap(OMAP3_SYSCON_BASE +
|
void __iomem *regs = ioremap(OMAP3_SYSCON_BASE +
|
||||||
opp_data->soc_data->rev_offset, 4);
|
opp_data->soc_data->rev_offset, 4);
|
||||||
|
|
Loading…
Add table
Reference in a new issue