linux-next: manual merge of the pm tree with the samsung tree

linux-next: manual merge of the pm tree with the samsung tree

[Stephen Rothwell]

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

RE: linux-next: manual merge of the pm tree with the samsung tree

[Kukjin Kim]

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

Re: linux-next: manual merge of the pm tree with the samsung tree

[Rafael J. Wysocki]

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.

RE: linux-next: manual merge of the pm tree with the samsung tree

[Kukjin Kim]

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

Re: linux-next: manual merge of the pm tree with the samsung tree

[Rafael J. Wysocki]

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

linux-next: manual merge of the pm tree with the samsung tree

[Stephen Rothwell]

[-- 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 --]