| Message ID | 1397184881-12223-1-git-send-email-skannan@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
MyungJoo/Kyungmin, Bump. Can we accept this patch please? -Saravana On 04/10/2014 07:54 PM, Saravana Kannan wrote: > Some devices use freq_table instead of OPP. For those devices, the > available_frequencies file shows up empty. Fix that by using freq_table to > generate the available_frequencies data when OPP is not present. > > Signed-off-by: Saravana Kannan <skannan@codeaurora.org> > --- > drivers/devfreq/devfreq.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c > index 2042ec3..a715d15 100644 > --- a/drivers/devfreq/devfreq.c > +++ b/drivers/devfreq/devfreq.c > @@ -912,19 +912,26 @@ static ssize_t available_frequencies_show(struct device *d, > struct devfreq *df = to_devfreq(d); > struct device *dev = df->dev.parent; > struct dev_pm_opp *opp; > + unsigned int i = 0, max_state = df->profile->max_state; > + bool use_opp; > ssize_t count = 0; > unsigned long freq = 0; > > rcu_read_lock(); > + use_opp = dev_pm_opp_get_opp_count(dev) > 0; > do { > - opp = dev_pm_opp_find_freq_ceil(dev, &freq); > - if (IS_ERR(opp)) > - break; > + if (use_opp) { > + opp = dev_pm_opp_find_freq_ceil(dev, &freq); > + if (IS_ERR(opp)) > + break; > + } else { > + freq = df->profile->freq_table[i++]; > + } > > count += scnprintf(&buf[count], (PAGE_SIZE - count - 2), > "%lu ", freq); > freq++; > - } while (1); > + } while (use_opp || (!use_opp && i < max_state)); > rcu_read_unlock(); > > /* Truncate the trailing space */ >
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 2042ec3..a715d15 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -912,19 +912,26 @@ static ssize_t available_frequencies_show(struct device *d, struct devfreq *df = to_devfreq(d); struct device *dev = df->dev.parent; struct dev_pm_opp *opp; + unsigned int i = 0, max_state = df->profile->max_state; + bool use_opp; ssize_t count = 0; unsigned long freq = 0; rcu_read_lock(); + use_opp = dev_pm_opp_get_opp_count(dev) > 0; do { - opp = dev_pm_opp_find_freq_ceil(dev, &freq); - if (IS_ERR(opp)) - break; + if (use_opp) { + opp = dev_pm_opp_find_freq_ceil(dev, &freq); + if (IS_ERR(opp)) + break; + } else { + freq = df->profile->freq_table[i++]; + } count += scnprintf(&buf[count], (PAGE_SIZE - count - 2), "%lu ", freq); freq++; - } while (1); + } while (use_opp || (!use_opp && i < max_state)); rcu_read_unlock(); /* Truncate the trailing space */
Some devices use freq_table instead of OPP. For those devices, the available_frequencies file shows up empty. Fix that by using freq_table to generate the available_frequencies data when OPP is not present. Signed-off-by: Saravana Kannan <skannan@codeaurora.org> --- drivers/devfreq/devfreq.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)