[GIT PULL 2/2] Samsung defconfig updates for v3.18

[Javier Martinez Canillas]

Hello Kukjin,

On Fri, Oct 17, 2014 at 1:00 AM, Kukjin Kim <kgene.kim at samsung.com> wrote:
> On 10/16/14 16:59, Kukjin Kim wrote:
>>
>> Javier Martinez Canillas wrote:
>>>
>>>
>>> Hello Kukjin,
>>>
>> Hi,
>>
>>> On Thu, Oct 16, 2014 at 3:01 AM, Kukjin Kim<kgene at kernel.org>  wrote:
>>>>
>>>> Sjoerd Simons wrote:
>>>>>>
>>>>>> On Tue, 2014-10-14 at 23:32 -0700, Olof Johansson wrote:
>>>>>> On Tue, Oct 14, 2014 at 4:27 PM, Kukjin Kim<kgene.kim at samsung.com>
>>>>>> wrote:
>>>>>>>
>>>>>>>
>>>>>>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>>>>>>> tags/samsung-defconfig
>>>>>>>
>>>>>>> for you to fetch changes up to
>>>>>>> 508423bebcda29eb0ba7c627f895387dad7cdcd6:
>>>>>>>
>>>>>>>    ARM: exynos_defconfig: enable USB gadget support (2014-09-25
>>>>>>> 18:20:18
>>>>>>> +0900)
>>>>>>
>>>>>>
>>>>>> Merged, thanks.
>>>>>
>>>>>
>>>>> Hrm, enabling USB gadget support will actually regress USB on Exynos
>>>>> peach boards and Arndale Octa without some of the DT fixes that landed
>>>>> in armsoc next/late branch. Specifically:
>>>>>
>>>>> 5c42acdbffff9bab595482b966b22ab5e2f6f359
>>>>> dbb62ef9ade6e92737d3fac199665b8b7c455959
>>>>>
>>>> Yeah...I've missed it. Sorry.
>>>>
>>>>> Might be good to cherry-pick those into for-next at this point (they're
>>>>> rather trivial)
>>>>>
>>>> So...Olof, can you please cherry pick them into arm-soc/fixes? Or shall
>>>> I send
>>>> pull-request for them again?
>>>>
>>>
>> + Arnd, Olof and regarding MLs
>>
>>> There are other bugfixes for 3.18 that ended in next/late so it would
>>> be good if you do a new pull request to include those as well.
>>>
>>> The commits (with hashes from linux-next) are:
>>>
>>> 3f3d046 ARM: dts: Remove display timings node from exynos5250-snow
>>> dd12ac7 ARM: dts: Fix chip select GPIO on exynos5250-smdk5250
>>
>>
> Above patches are not required because there is no my wrong merge ;)
>

Right, for some reason I thought that Andreas' rebased patches ended
in for-next but now I see that are in next/late as well so yes, those
patches are not required for 3.18.

Sorry for the noise then, -ETOOMANYBRANCHES

>>> c04c92e ARM: dts: Add rtc_src clk for s3c-rtc on exynos5250-snow
>>> 8bd43b6 ARM: dts: Add rtc_src clk for s3c-rtc on exynos Peach boards
>>>
>> I checked its dependent clock patches have been merged into mainline just
>> now.
>> As you know, the patches blocked dt patches in this time :( Anyway, I'll
>> try
>> to send a pull-request with including above patches tonight.
>>
> Hmm...
>
> + Chanwoo
>
> I didn't look at the Chanwoo's patch closely at that time but I think we
> don't need to register rtc_src clock for all other Samsung stuff if we don't
> want to gate the clock for rtc driver. So the rtc driver would be fixed like
> below for all Samsung stuff...
>
> diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
> index a6b1252..84f3cbd 100644
> --- a/drivers/rtc/rtc-s3c.c
> +++ b/drivers/rtc/rtc-s3c.c
> @@ -535,13 +535,14 @@ static int s3c_rtc_probe(struct platform_device *pdev)
>         }
>         clk_prepare_enable(info->rtc_clk);
>
> -       info->rtc_src_clk = devm_clk_get(&pdev->dev, "rtc_src");
> -       if (IS_ERR(info->rtc_src_clk)) {
> -               dev_err(&pdev->dev, "failed to find rtc source clock\n");
> -               return PTR_ERR(info->rtc_src_clk);
> +       if (info->data->needs_src_clk)
> +               info->rtc_src_clk = devm_clk_get(&pdev->dev, "rtc_src");
> +               if (IS_ERR(info->rtc_src_clk)) {
> +                       dev_err(&pdev->dev, "failed to find rtc source
> clock\n");
> +                       return PTR_ERR(info->rtc_src_clk);
> +               }
> +               clk_prepare_enable(info->rtc_src_clk);
>         }
> -       clk_prepare_enable(info->rtc_src_clk);
> -
>
>         /* check to see if everything is setup correctly */
>         if (info->data->enable)
>
>
>

The Snow/Peach rtc_src clk for s3c-rtc patches are still needed on
those platforms since the S3C RTC uses the Maxim 77802 32kHz AP clock
as its source clock and this will be disabled by the common clock
framework if are not used.

In practice, most people using mainline are booting with a U-Boot
version that passes the clk_ignore_unused parameter to the kernel
command line so if Marek's patch makes for the 3.18 rc cycle, the
Snow/Peach rtc_src patches can indeed wait for 3.19.

Best regards,
Javier