* linux-next: manual merge of the pm tree with the samsung tree
@ 2014-05-19 2:51 Stephen Rothwell
2014-05-19 20:40 ` Rafael J. Wysocki
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2014-05-19 2:51 UTC (permalink / raw)
To: Rafael J. Wysocki, Kukjin Kim
Cc: linux-next, linux-kernel, Jonghwan Choi, Chanwoo Choi
[-- Attachment #1: Type: text/plain, Size: 2136 bytes --]
Hi Rafael,
Today's linux-next merge of the pm tree got conflicts in
drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h
between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error")
from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use
dev_err/info function instead of pr_err/info") from the pm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/cpufreq/exynos-cpufreq.c
index e8a4a7ed38c1,c3e55aa28cf8..000000000000
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@@ -164,22 -163,16 +164,24 @@@ static int exynos_cpufreq_probe(struct
if (!exynos_info)
return -ENOMEM;
+ exynos_info->dev = &pdev->dev;
+
- if (soc_is_exynos4210())
+ if (of_machine_is_compatible("samsung,exynos4210")) {
+ exynos_info->type = EXYNOS_SOC_4210;
ret = exynos4210_cpufreq_init(exynos_info);
- else if (soc_is_exynos4212() || soc_is_exynos4412())
+ } else if (of_machine_is_compatible("samsung,exynos4212")) {
+ exynos_info->type = EXYNOS_SOC_4212;
ret = exynos4x12_cpufreq_init(exynos_info);
- else if (soc_is_exynos5250())
+ } else if (of_machine_is_compatible("samsung,exynos4412")) {
+ exynos_info->type = EXYNOS_SOC_4412;
+ ret = exynos4x12_cpufreq_init(exynos_info);
+ } else if (of_machine_is_compatible("samsung,exynos5250")) {
+ exynos_info->type = EXYNOS_SOC_5250;
ret = exynos5250_cpufreq_init(exynos_info);
- else
- return 0;
+ } else {
+ pr_err("%s: Unknown SoC type\n", __func__);
+ return -ENODEV;
+ }
if (ret)
goto err_vdd_arm;
diff --cc drivers/cpufreq/exynos-cpufreq.h
index f189547bb447,b72ff10a040e..000000000000
--- a/drivers/cpufreq/exynos-cpufreq.h
+++ b/drivers/cpufreq/exynos-cpufreq.h
@@@ -41,7 -34,7 +41,8 @@@ struct apll_freq
};
struct exynos_dvfs_info {
+ struct device *dev;
+ enum exynos_soc_type type;
unsigned long mpll_freq_khz;
unsigned int pll_safe_idx;
struct clk *cpu_clk;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pm tree with the samsung tree
2014-05-19 2:51 linux-next: manual merge of the pm tree with the samsung tree Stephen Rothwell
@ 2014-05-19 20:40 ` Rafael J. Wysocki
2014-05-20 0:27 ` Kukjin Kim
0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2014-05-19 20:40 UTC (permalink / raw)
To: Stephen Rothwell, Kukjin Kim
Cc: linux-next, linux-kernel, Jonghwan Choi, Chanwoo Choi
On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote:
>
> --Sig_/n+GoYBpTr9ERl.sTIEYr/Og
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got conflicts in
> drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h
> between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error")
> from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use
> dev_err/info function instead of pr_err/info") from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks for fixing that Stephen!
Kukjin, are you going to handle all Exynos cpufreq commits in the future?
Rafael
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: linux-next: manual merge of the pm tree with the samsung tree
2014-05-19 20:40 ` Rafael J. Wysocki
@ 2014-05-20 0:27 ` Kukjin Kim
2014-05-20 12:48 ` Rafael J. Wysocki
0 siblings, 1 reply; 6+ messages in thread
From: Kukjin Kim @ 2014-05-20 0:27 UTC (permalink / raw)
To: 'Rafael J. Wysocki', 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'Jonghwan Choi',
'Chanwoo Choi'
Rafael J. Wysocki wrote:
>
> On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote:
> >
> > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> >
> > Hi Rafael,
> >
> > Today's linux-next merge of the pm tree got conflicts in
> > drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h
> > between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error")
> > from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use
> > dev_err/info function instead of pr_err/info") from the pm tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Thanks for fixing that Stephen!
>
Same here ;-)
> Kukjin, are you going to handle all Exynos cpufreq commits in the future?
>
If you're OK, would be better to us I think.
- Kukjin
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the pm tree with the samsung tree
2014-05-20 0:27 ` Kukjin Kim
@ 2014-05-20 12:48 ` Rafael J. Wysocki
2014-05-21 13:32 ` Kukjin Kim
0 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2014-05-20 12:48 UTC (permalink / raw)
To: Kukjin Kim
Cc: 'Stephen Rothwell', linux-next, linux-kernel,
'Jonghwan Choi', 'Chanwoo Choi', Viresh Kumar
On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote:
> Rafael J. Wysocki wrote:
> >
> > On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote:
> > >
> > > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og
> > > Content-Type: text/plain; charset=US-ASCII
> > > Content-Transfer-Encoding: quoted-printable
> > >
> > > Hi Rafael,
> > >
> > > Today's linux-next merge of the pm tree got conflicts in
> > > drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h
> > > between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error")
> > > from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use
> > > dev_err/info function instead of pr_err/info") from the pm tree.
> > >
> > > I fixed it up (see below) and can carry the fix as necessary (no action
> > > is required).
> >
> > Thanks for fixing that Stephen!
> >
> Same here ;-)
>
> > Kukjin, are you going to handle all Exynos cpufreq commits in the future?
> >
> If you're OK, would be better to us I think.
OK, I'll leave them to you, then. Please ask Viresh for ACKs if needed. :-)
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: linux-next: manual merge of the pm tree with the samsung tree
2014-05-20 12:48 ` Rafael J. Wysocki
@ 2014-05-21 13:32 ` Kukjin Kim
0 siblings, 0 replies; 6+ messages in thread
From: Kukjin Kim @ 2014-05-21 13:32 UTC (permalink / raw)
To: 'Rafael J. Wysocki'
Cc: 'Stephen Rothwell', linux-next, linux-kernel,
'Jonghwan Choi', 'Chanwoo Choi',
'Viresh Kumar'
Rafael J. Wysocki wrote:
>
> On Tuesday, May 20, 2014 09:27:58 AM Kukjin Kim wrote:
> > Rafael J. Wysocki wrote:
> > >
> > > On Monday, May 19, 2014 12:51:24 PM Stephen Rothwell wrote:
> > > >
> > > > --Sig_/n+GoYBpTr9ERl.sTIEYr/Og
> > > > Content-Type: text/plain; charset=US-ASCII
> > > > Content-Transfer-Encoding: quoted-printable
> > > >
> > > > Hi Rafael,
> > > >
> > > > Today's linux-next merge of the pm tree got conflicts in
> > > > drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h
> > > > between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error")
> > > > from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use
> > > > dev_err/info function instead of pr_err/info") from the pm tree.
> > > >
> > > > I fixed it up (see below) and can carry the fix as necessary (no
> action
> > > > is required).
> > >
> > > Thanks for fixing that Stephen!
> > >
> > Same here ;-)
> >
> > > Kukjin, are you going to handle all Exynos cpufreq commits in the future?
> > >
> > If you're OK, would be better to us I think.
>
> OK, I'll leave them to you, then. Please ask Viresh for ACKs if needed. :-)
>
I will.
Thanks,
Kukjin
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the pm tree with the samsung tree
@ 2015-08-17 1:36 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2015-08-17 1:36 UTC (permalink / raw)
To: Rafael J. Wysocki, Kukjin Kim
Cc: linux-next, linux-kernel, Shailendra Verma,
Bartlomiej Zolnierkiewicz
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/cpufreq/exynos-cpufreq.c
between commit:
966f2a71a92d ("cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support")
from the samsung tree and commit:
62c3f2fddd43 ("cpufreq: exynos: Fix for memory leak in case SoC name does not match")
from the pm tree.
I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-08-17 1:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-19 2:51 linux-next: manual merge of the pm tree with the samsung tree Stephen Rothwell
2014-05-19 20:40 ` Rafael J. Wysocki
2014-05-20 0:27 ` Kukjin Kim
2014-05-20 12:48 ` Rafael J. Wysocki
2014-05-21 13:32 ` Kukjin Kim
-- strict thread matches above, loose matches on Subject: below --
2015-08-17 1:36 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox