From mboxrd@z Thu Jan  1 00:00:00 1970
From: k.kozlowski@samsung.com (Krzysztof Kozlowski)
Date: Tue, 23 Jun 2015 08:46:33 +0900
Subject: [PATCH 4/6] ARM: dts: Exynos4210: add CPU OPP and regulator supply
 property
In-Reply-To: <20150622150421.9112.96812@quantum>
References: <'@samsung.com>
 <1428079429-4252-1-git-send-email-b.zolnierkie@samsung.com>
 <1428079429-4252-5-git-send-email-b.zolnierkie@samsung.com>
 <CAJKOXPfR5JS546YS3M-8orxO7+SxnzE06h2cyesExyt8Y9fVKw@mail.gmail.com>
 <CAJKOXPfdXV8qxR3AQEzQJTf6MojUN7Z=06ikxF8u5BuMihDfJQ@mail.gmail.com>
 <00f801d0ac8c$344dfeb0$9ce9fc10$@kernel.org> <558767FC.4090405@samsung.com>
 <011f01d0ac8d$40a25110$c1e6f330$@kernel.org>
 <20150622150421.9112.96812@quantum>
Message-ID: <55889E59.1070001@samsung.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On 23.06.2015 00:04, Michael Turquette wrote:
> Quoting Kukjin Kim (2015-06-21 18:46:26)
>> Krzysztof Kozlowski wrote:
>>>
>>> On 22.06.2015 10:38, Kukjin Kim wrote:
>>>> Krzysztof Kozlowski wrote:
>>>>> 2015-05-08 9:18 GMT+09:00 Krzysztof Kozlowski <k.kozlowski@samsung.com>:
>>>>>> 2015-04-04 1:43 GMT+09:00 Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>:
>>>>>>> From: Thomas Abraham <thomas.ab@samsung.com>
>>>>>>>
>>>>>>> For Exynos4210 platforms, add CPU operating points and CPU
>>>>>>> regulator supply properties for migrating from Exynos specific
>>>>>>> cpufreq driver to using generic cpufreq driver.
>>>>>>>
>>>>>>> Changes by Bartlomiej:
>>>>>>> - removed Exynos5250 and Exynos5420 support for now
>>>>>>>
>>>>>>> Cc: Kukjin Kim <kgene.kim@samsung.com>
>>>>>>> Cc: Doug Anderson <dianders@chromium.org>
>>>>>>> Cc: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
>>>>>>> Cc: Andreas Faerber <afaerber@suse.de>
>>>>>>> Cc: Sachin Kamat <sachin.kamat@linaro.org>
>>>>>>> Cc: Andreas Farber <afaerber@suse.de>
>>>>>>> Cc: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
>>>>>>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>>>>>>> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
>>>>>>
>>>>>> Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>>>>>
>>>>> Rebased and applied to my tree, I'll sent it later to Kukjin unless he
>>>>> picks it by himself from LKML.
>>>>>
>>>> Hi, as far as I know, this is for v4.2 not v4.1 so it will be applied based on
>>>> v4.2-rc1 after v4.2-rc1 release.
>>>
>>> You mean it is for v4.3, not v4.2?
>>>
>> Oops, yes v4.3.
>>
>> Thanks for the correction.
> 
> Kukjin & Krzysztof,
> 
> I'm confused on this point. I was planning to take patches 1, 2, 3, 5
> and 6 towards 4.2 (e.g. in the pull request that I'll send out this
> week).
> 
> Is patch 4 going out for 4.2 or 4.3?

It is quite late for sending pull request to arm-soc for 4.2.
For example SoCFPGA pull request from last week was rejected:
http://comments.gmane.org/gmane.linux.ports.arm.kernel/417980

If you want to take it for 4.2 then I am fine with it but this will
cause some easy but annoying conflicts. There aren't difficult - just
most of nodes in board DTS changed their place.

Example of resolution (target file after merge, with cpu nodes reordered
alphabetically):
https://github.com/krzk/linux/commit/2cec3cb48abaf44848c62f1c0836b772eb4680dd

Best regards,
Krzysztof