From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki•net>,
Kukjin Kim <kgene.kim@samsung•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jonghwan Choi <jhbird.choi@samsung•com>,
Chanwoo Choi <cw00.choi@samsung•com>
Subject: linux-next: manual merge of the pm tree with the samsung tree
Date: Mon, 19 May 2014 12:51:24 +1000 [thread overview]
Message-ID: <20140519125124.6504764d@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-05-19 2:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 2:51 Stephen Rothwell [this message]
2014-05-19 20:40 ` linux-next: manual merge of the pm tree with the samsung tree 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140519125124.6504764d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cw00.choi@samsung$(echo .)com \
--cc=jhbird.choi@samsung$(echo .)com \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@rjwysocki$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox