Samsung defconfig updates for v3.18

GIT PULL Applied Kukjin Kim 6 participants 8 messages Oct 14, 2014 – Oct 17, 2014 1 message not in the archive

Subsystems (2)

Arm Samsung Exynos Real time clock (RTC)

lore

Share & tools

lore

Kukjin Kim

author

2014-10-14 23:27 UTC #0 lore raw

The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:

Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)

are available in the git repository at:

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)

----------------------------------------------------------------
Samsung defconfig, actually exynos_defconig updates for v3.18
- enable USB gadget support
- enable Maxim77802 support
- enable Maxim77693 and I2C GPIO drivers
- enable Atmel maXTouch support
- enable SBS battery support
- enable Control Groups support

----------------------------------------------------------------
Javier Martinez Canillas (3):
ARM: exynos_defconfig: Enable Atmel maXTouch support
ARM: exynos_defconfig: Enable Control Groups support
ARM: exynos_defconfig: Enable SBS battery support

Krzysztof Kozlowski (1):
ARM: exynos_defconfig: Enable Maxim 77693 and I2C GPIO drivers

Sjoerd Simons (1):
ARM: exynos_defconfig: enable USB gadget support

Vivek Gautam (1):
ARM: exynos_defconfig: Enable MAX77802

  arch/arm/configs/exynos_defconfig | 10 ++++++++++
  1 file changed, 10 insertions(+)

Olof Johansson

Applied

2014-10-15 06:32 UTC #1 lore raw

Quoted 6 lines · Kukjin Kim

The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
are available in the git repository at:

Quoted 7 lines

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.

-Olof

Sjoerd Simons

2014-10-15 13:37 UTC #2 lore raw

Quoted 10 lines · Olof Johansson

Quoted 7 lines · Kukjin Kim
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

Might be good to cherry-pick those into for-next at this point (they're rather trivial)

Signature · 9 lines

Sjoerd Simons <[email protected]>
Collabora Ltd.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 6170 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141015/83e7551f/attachment.bin>

Kukjin Kim

2014-10-16 01:01 UTC #3 lore raw

Quoted 10 lines · Sjoerd Simons

Quoted 10 lines · Olof Johansson
Quoted 7 lines · Kukjin Kim
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)

Quoted 9 lines

Quoted 1 line
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.

Quoted 3 lines

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?

- Kukjin

A message that is not in the archive (sent off-list or not yet received): CABxcv==HK5F5vv7g7XXBLofTVxx9Q8ZYj6bPfeMS7rWKTMb5pg@mail.gmail.com

Kukjin Kim

2014-10-16 07:59 UTC #5 lore raw

Quoted 3 lines · Javier Martinez Canillas

Hello Kukjin,

Hi,

Quoted 21 lines · Kukjin Kim

Quoted 20 lines
Quoted 19 lines · Sjoerd Simons
Quoted 11 lines · Olof Johansson
Quoted 7 lines · Kukjin Kim
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

Quoted 9 lines

Quoted 8 lines
Yeah...I've missed it. Sorry.
Quoted 3 lines
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

Quoted 11 lines

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
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.

Thanks for your gentle reminder.

Olof, I think it makes sense because it is related fixes for 3.18 ;)

Sorry for late noise...

Thanks,
Kukjin

Kukjin Kim

author

2014-10-16 23:00 UTC #6 lore raw

Quoted 29 lines · Kukjin Kim

Quoted 3 lines · Javier Martinez Canillas
Hello Kukjin,
Hi,
Quoted 23 lines · Kukjin Kim
Quoted 22 lines
Quoted 10 lines · Sjoerd Simons
Quoted 10 lines · Olof Johansson
Quoted 7 lines · Kukjin Kim
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)
Quoted 9 lines
Quoted 1 line
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.

Quoted 17 lines

Quoted 7 lines
Quoted 6 lines
Quoted 3 lines
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
Quoted 7 lines
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 ;)

Quoted 7 lines

Quoted 3 lines
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...

drivers/rtc/rtc-s3c.c +7 -6

index a6b1252..84f3cbd 100644
@@ -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)

Quoted 8 lines

Thanks for your gentle reminder.
Olof, I think it makes sense because it is related fixes for 3.18 ;)
Sorry for late noise...
Thanks,
Kukjin

Chanwoo Choi

2014-10-16 23:42 UTC #7 lore raw

Dear Kukjin,

Quoted 56 lines · Kukjin Kim

Quoted 29 lines · Kukjin Kim
Quoted 3 lines · Javier Martinez Canillas
Hello Kukjin,
Hi,
Quoted 23 lines · Kukjin Kim
Quoted 22 lines
Quoted 10 lines · Sjoerd Simons
Quoted 10 lines · Olof Johansson
Quoted 7 lines · Kukjin Kim
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)
Quoted 9 lines
Quoted 1 line
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.
Quoted 17 lines
Quoted 7 lines
Quoted 6 lines
Quoted 3 lines
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
Quoted 7 lines
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 ;)
Quoted 7 lines
Quoted 3 lines
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.

Quoted 5 lines

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...

You are right. It is my mistake when sending rtc patchset.
So, Marek sent a patch[1] to fix this bug as following:
[1] https://lkml.org/lkml/2014/10/15/605
- [PATCH] drivers: rtc: fix s3c-rtc initialization failure without rtc source clock

And then Andrew Morton (akpm at linux-foundation.org) picked up this patch and will apply it on linux-next branch.
http://ozlabs.org/~akpm/mmots/broken-out/drivers-rtc-fix-s3c-rtc-initialization-failure-without-rtc-source-clock.patch

Best Regards,
Chanwoo Choi

Quoted 37 lines

drivers/rtc/rtc-s3c.c +7 -6

index a6b1252..84f3cbd 100644
@@ -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)

Quoted 10 lines

Thanks for your gentle reminder.
Olof, I think it makes sense because it is related fixes for 3.18 ;)
Sorry for late noise...
Thanks,
Kukjin

Javier Martinez Canillas

2014-10-17 06:16 UTC #8 lore raw

In reply to Kukjin Kim

Hello Kukjin,

Quoted 54 lines · Kukjin Kim

Quoted 53 lines · Kukjin Kim
Quoted 4 lines · Javier Martinez Canillas
Hello Kukjin,
Hi,
Quoted 32 lines · Kukjin Kim
Quoted 31 lines
Quoted 20 lines · Sjoerd Simons
Quoted 12 lines · Olof Johansson
Quoted 8 lines · Kukjin Kim
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
tags/samsung-defconfig
for you to fetch changes up to
508423bebcda29eb0ba7c627f895387dad7cdcd6:
Quoted 6 lines
Quoted 3 lines
ARM: exynos_defconfig: enable USB gadget support (2014-09-25
18:20:18
+0900)
Merged, thanks.
Quoted 7 lines
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.
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
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
Quoted 3 lines
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.

Quoted 8 lines

Quoted 6 lines
Quoted 4 lines
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

Quoted 43 lines

Quoted 9 lines
Quoted 3 lines
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...
drivers/rtc/rtc-s3c.c +7 -6
index a6b1252..84f3cbd 100644
@@ -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 */

Quoted 4 lines

        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