| Message ID | 1354098464-6665-3-git-send-email-ulf.hansson@stericsson.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Ulf, On Wed, Nov 28, 2012 at 11:27:41AM +0100, Ulf Hansson wrote: > From: Lee Jones <lee.jones@linaro.org> > > Since the cpufreq driver for ux500 has been renamed from > cpufreq-db8500 to cpufreq-dbx500, we need to change the > device name here as well. > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > Cc: Samuel Ortiz <sameo@linux.intel.com> > --- > drivers/mfd/db8500-prcmu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) This one doesn't apply to my tree, it would make more sense to push this one through Mike's tree. Or I'll queue it to my for-next branch after the next merge window closes, as you prefer. Cheers, Samuel.
On 30 November 2012 11:50, Samuel Ortiz <sameo@linux.intel.com> wrote: > Hi Ulf, > > On Wed, Nov 28, 2012 at 11:27:41AM +0100, Ulf Hansson wrote: >> From: Lee Jones <lee.jones@linaro.org> >> >> Since the cpufreq driver for ux500 has been renamed from >> cpufreq-db8500 to cpufreq-dbx500, we need to change the >> device name here as well. >> >> Signed-off-by: Lee Jones <lee.jones@linaro.org> >> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> >> Cc: Samuel Ortiz <sameo@linux.intel.com> >> --- >> drivers/mfd/db8500-prcmu.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > This one doesn't apply to my tree, it would make more sense to push this one > through Mike's tree. Yes, you are right! My earlier clock patches which was affecting cpufreq and mfd was merged through Mikes tree. I will suggest this complete patchset shall go though Mikes tree. Do I have your ack for the mfd patch? > Or I'll queue it to my for-next branch after the next merge window closes, as > you prefer. > > Cheers, > Samuel. > > -- > Intel Open Source Technology Centre > http://oss.intel.com/ > -- > To unsubscribe from this list: send the line "unsubscribe cpufreq" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Kind regards Ulf Hansson
Hi Ulf, On Fri, Nov 30, 2012 at 12:54:29PM +0100, Ulf Hansson wrote: > On 30 November 2012 11:50, Samuel Ortiz <sameo@linux.intel.com> wrote: > > Hi Ulf, > > > > On Wed, Nov 28, 2012 at 11:27:41AM +0100, Ulf Hansson wrote: > >> From: Lee Jones <lee.jones@linaro.org> > >> > >> Since the cpufreq driver for ux500 has been renamed from > >> cpufreq-db8500 to cpufreq-dbx500, we need to change the > >> device name here as well. > >> > >> Signed-off-by: Lee Jones <lee.jones@linaro.org> > >> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > >> Cc: Samuel Ortiz <sameo@linux.intel.com> > >> --- > >> drivers/mfd/db8500-prcmu.c | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > > This one doesn't apply to my tree, it would make more sense to push this one > > through Mike's tree. > > Yes, you are right! My earlier clock patches which was affecting > cpufreq and mfd was merged through Mikes tree. > I will suggest this complete patchset shall go though Mikes tree. > > Do I have your ack for the mfd patch? Yes: Acked-by: Samuel Ortiz <sameo@linux.intel.com> Cheers, Samuel.
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index a1b295f..2900132 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -3072,8 +3072,8 @@ static struct mfd_cell db8500_prcmu_devs[] = { .pdata_size = sizeof(db8500_regulators), }, { - .name = "cpufreq-u8500", - .of_compatible = "stericsson,cpufreq-u8500", + .name = "cpufreq-ux500", + .of_compatible = "stericsson,cpufreq-ux500", .platform_data = &db8500_cpufreq_table, .pdata_size = sizeof(db8500_cpufreq_table), },