From: Alim Akhtar <alim.akhtar@samsung.com>
To: Krzysztof Kozlowski <k.kozlowski@samsung.com>,
linux-arm-kernel@lists.infradead.org
Cc: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>,
catalin.marinas@arm.com, arnd@arndb.de, olof@lixom.net,
linux-kernel@vger.kernel.org, Kevin Hilman <khilman@kernel.org>
Subject: Re: [PATCH v3] arm64: defconfig: Enable samsung MFD and related configs
Date: Tue, 01 Mar 2016 15:32:25 +0530 [thread overview]
Message-ID: <56D568B1.10808@samsung.com> (raw)
In-Reply-To: <CAJKOXPc_U0fkHzcyJd+KBKoyYLC0GRmrKH0sgna5fYqfRp0gUA@mail.gmail.com>
On 03/01/2016 02:27 PM, Krzysztof Kozlowski wrote:
> 2016-02-14 14:08 GMT+09:00 Krzysztof Kozlowski <k.kozlowski@samsung.com>:
>> W dniu 05.02.2016 o 15:04, Alim Akhtar pisze:
>>> Exynos7 based espresso board uses S2MPS15, a multifunction device.
>>> This patch enables S2MPS1X regulator, pmic-clk and rtc drivers utilized by
>>> the same.
>>>
>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>>> ---
>>> Changes since v2:
>>> * Added Reviewed-by from Krzysztof
>>> * rebased on next-20160204
>>>
>>> Changes since v1:
>>> * updated the comment message to describe which platfrom uses it.
>>> * enable COMMON_CLK_S2MPS11 which is needed to enable pmic-clk block.
>>>
>>> arch/arm64/configs/defconfig | 3 +++
>>> 1 file changed, 3 insertions(+)
>>>
>>
>> Applying this to my tree would cause conflicts with commit efdda175c07f:
>> arm64: defconfig: add spmi and usb related configs
>> Conflicts are trivial (simple additions) but maybe it is better to avoid
>> them.
>>
>> Olof/Arnd/Kevin, can you apply this directly to arm-soc?
>
> Never mind, applied because I have one more defconfig patch. The
> conflict will be still there but easy to solve.
>
Thanks Krzysztof, will take care of conflict with your tree in future.
> Best regards,
> Krzysztof
>
>
prev parent reply other threads:[~2016-03-01 10:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-05 6:04 [PATCH v3] arm64: defconfig: Enable samsung MFD and related configs Alim Akhtar
2016-02-14 5:08 ` Krzysztof Kozlowski
2016-03-01 8:57 ` Krzysztof Kozlowski
2016-03-01 10:02 ` Alim Akhtar [this message]
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=56D568B1.10808@samsung.com \
--to=alim.akhtar@samsung.com \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=k.kozlowski.k@gmail.com \
--cc=k.kozlowski@samsung.com \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).