From: Chanwoo Choi <cw00.choi@samsung.com>
To: "andrew-sh.cheng" <andrew-sh.cheng@mediatek.com>
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Viresh Kumar <viresh.kumar@linaro.org>,
Nishanth Menon <nm@ti.com>, Stephen Boyd <sboyd@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
srv_heupstream@mediatek.com
Subject: Re: [PATCH 00/12] Add cpufreq and cci devfreq for mt8183, and SVS support
Date: Wed, 20 May 2020 15:24:03 +0900 [thread overview]
Message-ID: <852af745-dfb7-6bb5-da7e-798d166a3370@samsung.com> (raw)
In-Reply-To: <1589953015.8243.2.camel@mtksdaap41>
Hi,
On 5/20/20 2:36 PM, andrew-sh.cheng wrote:
> On Wed, 2020-05-20 at 13:10 +0900, Chanwoo Choi wrote:
>> Hi Andrew,
>>
>> Could you explain the base commit of these patches?
>> When I tried to apply them to v5.7-rc1 for testing,
>> the merge conflict occurs.
>>
>> Thanks,
>> Chanwoo Choi
>
> Hi Chanwoo Choi,
>
> My base commit is
> commit 8f3d9f354286745c751374f5f1fcafee6b3f3136
> Author: Linus Torvalds <torvalds@linux-foundation.org>
> Date: Sun Apr 12 12:35:55 2020 -0700
>
> Linux 5.7-rc1
>
> Could you show me the conflict error?
When I tried to apply first patch with 'git am',
the merge conflict occurred.
git am \[PATCH\ 01_12\]\ OPP\:\ Allow\ required-opps\ even\ if\ the\ device\ doesn\'t\ have\ power-domains.eml
Applying: OPP: Allow required-opps even if the device doesn't have power-domains
error: patch failed: drivers/opp/core.c:755
error: drivers/opp/core.c: patch does not apply
error: patch failed: drivers/opp/of.c:195
error: drivers/opp/of.c: patch does not apply
Patch failed at 0001 OPP: Allow required-opps even if the device doesn't have power-domains
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Regards,
Chanwoo Choi
>
> BR,
> Andrew-sh.Cheng
>>
>> On 5/20/20 12:42 PM, Andrew-sh.Cheng wrote:
>>> MT8183 supports CPU DVFS and CCI DVFS, and LITTLE cpus and CCI are in the same voltage domain.
>>> So, this series is to add drivers to handle the voltage coupling between CPU and CCI DVFS.
>>>
>>> For SVS support, need OPP_EVENT_ADJUST_VOLTAGE and corresponding reaction.
>>>
>>> Change since v5:
>>> - Changing dt-binding format to yaml.
>>> - Extending current devfreq passive_governor instead of create a new one.
>>> - Resend depending patches of Sravana Kannan base on kernel-5.7
>>>
>>>
>>> Andrew-sh.Cheng (6):
>>> cpufreq: mediatek: add clock and regulator enable for intermediate
>>> clock
>>> dt-bindings: devfreq: add compatible for mt8183 cci devfreq
>>> devfreq: add mediatek cci devfreq
>>> opp: Modify opp API, dev_pm_opp_get_freq(), find freq in opp, even it
>>> is disabled
>>> cpufreq: mediatek: add opp notification for SVS support
>>> devfreq: mediatek: cci devfreq register opp notification for SVS
>>> support
>>>
>>> Saravana Kannan (6):
>>> OPP: Allow required-opps even if the device doesn't have power-domains
>>> OPP: Add function to look up required OPP's for a given OPP
>>> OPP: Improve required-opps linking
>>> PM / devfreq: Cache OPP table reference in devfreq
>>> PM / devfreq: Add required OPPs support to passive governor
>>> PM / devfreq: Add cpu based scaling support to passive_governor
>>>
>>> .../devicetree/bindings/devfreq/mt8183-cci.yaml | 51 ++++
>>> drivers/cpufreq/mediatek-cpufreq.c | 122 ++++++++-
>>> drivers/devfreq/Kconfig | 12 +
>>> drivers/devfreq/Makefile | 1 +
>>> drivers/devfreq/devfreq.c | 6 +
>>> drivers/devfreq/governor_passive.c | 298 +++++++++++++++++++--
>>> drivers/devfreq/mt8183-cci-devfreq.c | 233 ++++++++++++++++
>>> drivers/opp/core.c | 85 +++++-
>>> drivers/opp/of.c | 108 ++++----
>>> drivers/opp/opp.h | 5 +
>>> include/linux/devfreq.h | 42 ++-
>>> include/linux/pm_opp.h | 11 +
>>> 12 files changed, 874 insertions(+), 100 deletions(-)
>>> create mode 100644 Documentation/devicetree/bindings/devfreq/mt8183-cci.yaml
>>> create mode 100644 drivers/devfreq/mt8183-cci-devfreq.c
>>>
>
--
Best Regards,
Chanwoo Choi
Samsung Electronics
next prev parent reply other threads:[~2020-05-20 6:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200520034324epcas1p3affbd24bd1f3fe40d51baade07c1abba@epcas1p3.samsung.com>
[not found] ` <20200520034307.20435-1-andrew-sh.cheng@mediatek.com>
2020-05-20 4:10 ` [PATCH 00/12] Add cpufreq and cci devfreq for mt8183, and SVS support Chanwoo Choi
[not found] ` <1589953015.8243.2.camel@mtksdaap41>
2020-05-20 6:24 ` Chanwoo Choi [this message]
[not found] ` <1589958625.23971.2.camel@mtksdaap41>
2020-05-20 14:53 ` Matthias Brugger
[not found] ` <20200520034307.20435-10-andrew-sh.cheng@mediatek.com>
2020-05-20 12:31 ` [PATCH 09/12] devfreq: add mediatek cci devfreq Mark Brown
2020-05-21 8:52 ` andrew-sh.cheng
2020-05-28 7:35 ` Chanwoo Choi
2020-05-28 8:00 ` Chanwoo Choi
[not found] ` <20200520034307.20435-2-andrew-sh.cheng@mediatek.com>
2020-05-20 14:54 ` [PATCH 01/12] OPP: Allow required-opps even if the device doesn't have power-domains Matthias Brugger
[not found] ` <CGME20200520034335epcas1p45a321a1a878fb7cd7b9c9ada0a474ef7@epcas1p4.samsung.com>
[not found] ` <20200520034307.20435-7-andrew-sh.cheng@mediatek.com>
2020-05-28 5:03 ` [PATCH 06/12] PM / devfreq: Add cpu based scaling support to passive_governor Chanwoo Choi
2020-05-28 6:14 ` Chanwoo Choi
2020-05-28 7:17 ` Chanwoo Choi
[not found] ` <1591100614.1804.1.camel@mtksdaap41>
2020-06-03 4:12 ` Chanwoo Choi
[not found] ` <1591098190.30729.15.camel@mtksdaap41>
2020-06-03 4:07 ` Chanwoo Choi
[not found] ` <CGME20200520034339epcas1p1524dea2d7089cb3492384bbe917dcffe@epcas1p1.samsung.com>
[not found] ` <20200520034307.20435-9-andrew-sh.cheng@mediatek.com>
2020-05-28 7:42 ` [PATCH 08/12] dt-bindings: devfreq: add compatible for mt8183 cci devfreq Chanwoo Choi
2020-06-15 7:31 ` [PATCH 00/12] Add cpufreq and cci devfreq for mt8183, and SVS support Viresh Kumar
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=852af745-dfb7-6bb5-da7e-798d166a3370@samsung.com \
--to=cw00.choi@samsung.com \
--cc=andrew-sh.cheng@mediatek.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=myungjoo.ham@samsung.com \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=srv_heupstream@mediatek.com \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).