| Message ID | 1410954633-27025-3-git-send-email-javier.martinez@collabora.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Wed, Sep 17, 2014 at 4:50 AM, Javier Martinez Canillas <javier.martinez@collabora.co.uk> wrote: > commit 546b117fdf17 ("rtc: s3c: add support for RTC of Exynos3250 SoC") > added an "rtc_src" DT property for the Samsung's S3C Real Time Clock > controller that specifies the 32.768 kHz clock that uses the RTC as its > source clock. In the case of the Exynos5250 based Snow board, the Maxim > 77686 32kHz AP clock is used as the source clock. > > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > --- > arch/arm/boot/dts/exynos5250-snow.dts | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts > index e51fcef..56eec56 100644 > --- a/arch/arm/boot/dts/exynos5250-snow.dts > +++ b/arch/arm/boot/dts/exynos5250-snow.dts > @@ -10,6 +10,7 @@ > > /dts-v1/; > #include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/clock/maxim,max77686.h> > #include "exynos5250.dtsi" > > / { > @@ -29,6 +30,8 @@ > > rtc@101E0000 { > status = "okay"; > + clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; > + clock-names = "rtc", "rtc_src"; Wait, seriously? Snow is still using the "rtc@101E0000" syntax? Whatever happened to the series that Andreas worked so hard on, including <https://patchwork.kernel.org/patch/4664801/>? Kukjin: Andreas's patch series was Reviewed long ago I think and by now I'd imagine it's got some conflicts due to it not having been applied in a timely fashion. Perhaps you could fix it up for Andreas (since he's already rebased it several times) and land it? If I had to guess, outstanding from Andreas's series (patchwork IDs listed): 4751131 New [v7] ARM: dts: Prepare node labels for exynos5250 4664801 New [v6,04/10] ARM: dts: Clean up exynos5250-snow 4664771 New [v6,05/10] ARM: dts: Fill in bootargs for exynos5250-snow 4664731 New [v6,06/10] ARM: dts: Clean up exynos5250-smdk5250 4664751 New [v6,07/10] ARM: dts: Clean up exynos5250-arndale 4664711 New [v6,08/10] ARM: dts: Fix apparent GPIO typo in exynos5250-arndale 4664681 New [v6,09/10] ARM: dts: Simplify USB3503 on exynos5250-arndale 4664691 New [v6,10/10] ARM: dts: Add exynos5250-spring device tree > }; > > pinctrl@11400000 { > @@ -350,7 +353,7 @@ > samsung,i2c-sda-delay = <100>; > samsung,i2c-max-bus-freq = <378000>; > > - max77686@09 { > + max77686: max77686@09 { > compatible = "maxim,max77686"; > interrupt-parent = <&gpx3>; > interrupts = <2 0>; In any case, there's nothing wrong with Javier's patch other than the fact that it will eventually need to get merged with Andreas's, so: Reviewed-by: Doug Anderson <dianders@chromium.org>
Am 17.09.2014 um 17:47 schrieb Doug Anderson: > Hi, > > On Wed, Sep 17, 2014 at 4:50 AM, Javier Martinez Canillas > <javier.martinez@collabora.co.uk> wrote: >> commit 546b117fdf17 ("rtc: s3c: add support for RTC of Exynos3250 SoC") >> added an "rtc_src" DT property for the Samsung's S3C Real Time Clock >> controller that specifies the 32.768 kHz clock that uses the RTC as its >> source clock. In the case of the Exynos5250 based Snow board, the Maxim >> 77686 32kHz AP clock is used as the source clock. >> >> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> >> --- >> arch/arm/boot/dts/exynos5250-snow.dts | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts >> index e51fcef..56eec56 100644 >> --- a/arch/arm/boot/dts/exynos5250-snow.dts >> +++ b/arch/arm/boot/dts/exynos5250-snow.dts >> @@ -10,6 +10,7 @@ >> >> /dts-v1/; >> #include <dt-bindings/gpio/gpio.h> >> +#include <dt-bindings/clock/maxim,max77686.h> >> #include "exynos5250.dtsi" >> >> / { >> @@ -29,6 +30,8 @@ >> >> rtc@101E0000 { >> status = "okay"; >> + clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; >> + clock-names = "rtc", "rtc_src"; > > Wait, seriously? Snow is still using the "rtc@101E0000" syntax? > Whatever happened to the series that Andreas worked so hard on, > including <https://patchwork.kernel.org/patch/4664801/>? > > Kukjin: Andreas's patch series was Reviewed long ago I think and by > now I'd imagine it's got some conflicts due to it not having been > applied in a timely fashion. Perhaps you could fix it up for Andreas > (since he's already rebased it several times) and land it? > > If I had to guess, outstanding from Andreas's series (patchwork IDs listed): > > 4751131 New [v7] ARM: dts: Prepare node labels for exynos5250 > 4664801 New [v6,04/10] ARM: dts: Clean up exynos5250-snow > 4664771 New [v6,05/10] ARM: dts: Fill in bootargs for exynos5250-snow > 4664731 New [v6,06/10] ARM: dts: Clean up exynos5250-smdk5250 > 4664751 New [v6,07/10] ARM: dts: Clean up exynos5250-arndale > 4664711 New [v6,08/10] ARM: dts: Fix apparent GPIO typo in > exynos5250-arndale > 4664681 New [v6,09/10] ARM: dts: Simplify USB3503 on exynos5250-arndale > 4664691 New [v6,10/10] ARM: dts: Add exynos5250-spring device tree Yes, Kukjin told me not to resend anything, and I haven't heard back from him since his Kernel Summit trip. Andreas
Hello Doug, Andreas, On 09/17/2014 05:47 PM, Doug Anderson wrote: >> >> rtc@101E0000 { >> status = "okay"; >> + clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; >> + clock-names = "rtc", "rtc_src"; > > Wait, seriously? Snow is still using the "rtc@101E0000" syntax? > Whatever happened to the series that Andreas worked so hard on, > including <https://patchwork.kernel.org/patch/4664801/>? > Andreas, I completely forgot about your series when writing this patch even though I've on my TO-DO to sync the downstream and upstream Snow DTS once your patches land. Sorry about that. > > In any case, there's nothing wrong with Javier's patch other than the > fact that it will eventually need to get merged with Andreas's, so: > > Reviewed-by: Doug Anderson <dianders@chromium.org> > Thanks, I'll re-spin and post again once Kukjin merges Andreas series. Best regards, Javier
Dear Javier, On 09/17/2014 08:50 PM, Javier Martinez Canillas wrote: > commit 546b117fdf17 ("rtc: s3c: add support for RTC of Exynos3250 SoC") > added an "rtc_src" DT property for the Samsung's S3C Real Time Clock > controller that specifies the 32.768 kHz clock that uses the RTC as its > source clock. In the case of the Exynos5250 based Snow board, the Maxim > 77686 32kHz AP clock is used as the source clock. > > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > --- > arch/arm/boot/dts/exynos5250-snow.dts | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts > index e51fcef..56eec56 100644 > --- a/arch/arm/boot/dts/exynos5250-snow.dts > +++ b/arch/arm/boot/dts/exynos5250-snow.dts > @@ -10,6 +10,7 @@ > > /dts-v1/; > #include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/clock/maxim,max77686.h> > #include "exynos5250.dtsi" > > / { > @@ -29,6 +30,8 @@ > > rtc@101E0000 { > status = "okay"; > + clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; > + clock-names = "rtc", "rtc_src"; > }; > > pinctrl@11400000 { > @@ -350,7 +353,7 @@ > samsung,i2c-sda-delay = <100>; > samsung,i2c-max-bus-freq = <378000>; > > - max77686@09 { > + max77686: max77686@09 { > compatible = "maxim,max77686"; > interrupt-parent = <&gpx3>; > interrupts = <2 0>; > Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Thanks, Chanwoo Choi
Andreas Färber wrote: > > Am 17.09.2014 um 17:47 schrieb Doug Anderson: > > Hi, > > > > On Wed, Sep 17, 2014 at 4:50 AM, Javier Martinez Canillas > > <javier.martinez@collabora.co.uk> wrote: > >> commit 546b117fdf17 ("rtc: s3c: add support for RTC of Exynos3250 SoC") > >> added an "rtc_src" DT property for the Samsung's S3C Real Time Clock > >> controller that specifies the 32.768 kHz clock that uses the RTC as its > >> source clock. In the case of the Exynos5250 based Snow board, the Maxim > >> 77686 32kHz AP clock is used as the source clock. > >> > >> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > >> --- > >> arch/arm/boot/dts/exynos5250-snow.dts | 5 ++++- > >> 1 file changed, 4 insertions(+), 1 deletion(-) > >> > >> diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts > >> index e51fcef..56eec56 100644 > >> --- a/arch/arm/boot/dts/exynos5250-snow.dts > >> +++ b/arch/arm/boot/dts/exynos5250-snow.dts > >> @@ -10,6 +10,7 @@ > >> > >> /dts-v1/; > >> #include <dt-bindings/gpio/gpio.h> > >> +#include <dt-bindings/clock/maxim,max77686.h> > >> #include "exynos5250.dtsi" > >> > >> / { > >> @@ -29,6 +30,8 @@ > >> > >> rtc@101E0000 { > >> status = "okay"; > >> + clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; > >> + clock-names = "rtc", "rtc_src"; > > > > Wait, seriously? Snow is still using the "rtc@101E0000" syntax? > > Whatever happened to the series that Andreas worked so hard on, > > including <https://patchwork.kernel.org/patch/4664801/>? > > > > Kukjin: Andreas's patch series was Reviewed long ago I think and by > > now I'd imagine it's got some conflicts due to it not having been > > applied in a timely fashion. Perhaps you could fix it up for Andreas > > (since he's already rebased it several times) and land it? > > > > If I had to guess, outstanding from Andreas's series (patchwork IDs listed): > > > > 4751131 New [v7] ARM: dts: Prepare node labels for exynos5250 > > 4664801 New [v6,04/10] ARM: dts: Clean up exynos5250-snow > > 4664771 New [v6,05/10] ARM: dts: Fill in bootargs for exynos5250-snow > > 4664731 New [v6,06/10] ARM: dts: Clean up exynos5250-smdk5250 > > 4664751 New [v6,07/10] ARM: dts: Clean up exynos5250-arndale > > 4664711 New [v6,08/10] ARM: dts: Fix apparent GPIO typo in > > exynos5250-arndale > > 4664681 New [v6,09/10] ARM: dts: Simplify USB3503 on exynos5250-arndale > > 4664691 New [v6,10/10] ARM: dts: Add exynos5250-spring device tree > > Yes, Kukjin told me not to resend anything, and I haven't heard back > from him since his Kernel Summit trip. > Sorry about that and I thought I took them :( I'll sort them out tonight including this series together. - Kukjin
Kukjin Kim wrote: > > > Andreas Färber wrote: [...] > > > Kukjin: Andreas's patch series was Reviewed long ago I think and by > > > now I'd imagine it's got some conflicts due to it not having been > > > applied in a timely fashion. Perhaps you could fix it up for Andreas > > > (since he's already rebased it several times) and land it? > > > > > > If I had to guess, outstanding from Andreas's series (patchwork IDs listed): > > > > > > 4751131 New [v7] ARM: dts: Prepare node labels for exynos5250 > > > 4664801 New [v6,04/10] ARM: dts: Clean up exynos5250-snow > > > 4664771 New [v6,05/10] ARM: dts: Fill in bootargs for exynos5250-snow > > > 4664731 New [v6,06/10] ARM: dts: Clean up exynos5250-smdk5250 > > > 4664751 New [v6,07/10] ARM: dts: Clean up exynos5250-arndale > > > 4664711 New [v6,08/10] ARM: dts: Fix apparent GPIO typo in > > > exynos5250-arndale > > > 4664681 New [v6,09/10] ARM: dts: Simplify USB3503 on exynos5250-arndale > > > 4664691 New [v6,10/10] ARM: dts: Add exynos5250-spring device tree > > > > Yes, Kukjin told me not to resend anything, and I haven't heard back > > from him since his Kernel Summit trip. > > > Sorry about that and I thought I took them :( I'll sort them out tonight > including this series together. > Hmm...since some conflicts with dp and mmc_slot related patches, I couldn't, but Andreas' patches will be handled by tonight :( - Kukjin
On 09/23/14 15:17, Kukjin Kim wrote: > Kukjin Kim wrote: >>> >> Andreas Färber wrote: > > [...] > >>>> Kukjin: Andreas's patch series was Reviewed long ago I think and by >>>> now I'd imagine it's got some conflicts due to it not having been >>>> applied in a timely fashion. Perhaps you could fix it up for Andreas >>>> (since he's already rebased it several times) and land it? >>>> >>>> If I had to guess, outstanding from Andreas's series (patchwork IDs listed): >>>> >>>> 4751131 New [v7] ARM: dts: Prepare node labels for exynos5250 >>>> 4664801 New [v6,04/10] ARM: dts: Clean up exynos5250-snow >>>> 4664771 New [v6,05/10] ARM: dts: Fill in bootargs for exynos5250-snow >>>> 4664731 New [v6,06/10] ARM: dts: Clean up exynos5250-smdk5250 >>>> 4664751 New [v6,07/10] ARM: dts: Clean up exynos5250-arndale >>>> 4664711 New [v6,08/10] ARM: dts: Fix apparent GPIO typo in >>>> exynos5250-arndale >>>> 4664681 New [v6,09/10] ARM: dts: Simplify USB3503 on exynos5250-arndale >>>> 4664691 New [v6,10/10] ARM: dts: Add exynos5250-spring device tree >>> >>> Yes, Kukjin told me not to resend anything, and I haven't heard back >>> from him since his Kernel Summit trip. >>> >> Sorry about that and I thought I took them :( I'll sort them out tonight >> including this series together. >> > Hmm...since some conflicts with dp and mmc_slot related patches, I couldn't, > but Andreas' patches will be handled by tonight :( > > - Kukjin I've applied above and this series and please double-check the commits in my tree. If no problems, I will send the branch out for v3.18 soon... Thanks, Kukjin
Hello Kukjin, On 09/23/2014 06:00 PM, Kukjin Kim wrote: > On 09/23/14 15:17, Kukjin Kim wrote: > > I've applied above and this series and please double-check the commits > in my tree. If no problems, I will send the branch out for v3.18 soon... > > Thanks, > Kukjin > I've looked the RTC source clock patches and look good to me. Thanks a lot for your help! Best regards, Javier
Hello Kukjin, On 09/23/2014 06:18 PM, Javier Martinez Canillas wrote: > On 09/23/2014 06:00 PM, Kukjin Kim wrote: >> On 09/23/14 15:17, Kukjin Kim wrote: >> >> I've applied above and this series and please double-check the commits >> in my tree. If no problems, I will send the branch out for v3.18 soon... >> >> Thanks, >> Kukjin >> > > I've looked the RTC source clock patches and look good to me. Thanks a lot for your help! > Today I also had time to review the rebased patches from Andreas and found two issues introduced during the merge conflict resolution: 1) The spi_1 dev node on exynos5250-smdk5250.dts now uses the old "cs-gpio" DT property under the controller-data instead of the standard "cs-gpios" under the SPI parent. IOW, is a regression of the bug fixed in commit e138d43 ("ARM: dts: fix the chip select gpios definition in the SPI nodes"). 2) The display-timings child node of the dp-controller was removed in commit a98c3c2 ("ARM: dts: update display related nodes for exynos5250-snow") but was introduced again in the Snow DTS during the merge. I'll post a series that fixes both issues with the following patches: Javier Martinez Canillas (2): ARM: dts: Fix chip select GPIO on smdk5250 ARM: dts: Remove display timings node from exynos5250-snow I see that you already send a pull request to arm-soc maintainers so probably these will be part of the fixes during the 3.18 rc cycle. Best regards, Javier
On 09/25/14 06:41, Javier Martinez Canillas wrote: > Hello Kukjin, > Hi, > On 09/23/2014 06:18 PM, Javier Martinez Canillas wrote: >> On 09/23/2014 06:00 PM, Kukjin Kim wrote: >>> On 09/23/14 15:17, Kukjin Kim wrote: >>> >>> I've applied above and this series and please double-check the commits >>> in my tree. If no problems, I will send the branch out for v3.18 soon... >>> >>> Thanks, >>> Kukjin >>> >> >> I've looked the RTC source clock patches and look good to me. Thanks a lot for your help! >> > > Today I also had time to review the rebased patches from Andreas and found > two issues introduced during the merge conflict resolution: > Oops. Thanks for your quick fix it up. > 1) The spi_1 dev node on exynos5250-smdk5250.dts now uses the old "cs-gpio" > DT property under the controller-data instead of the standard "cs-gpios" > under the SPI parent. IOW, is a regression of the bug fixed in commit > e138d43 ("ARM: dts: fix the chip select gpios definition in the SPI nodes"). > > 2) The display-timings child node of the dp-controller was removed in commit > a98c3c2 ("ARM: dts: update display related nodes for exynos5250-snow") but > was introduced again in the Snow DTS during the merge. > > I'll post a series that fixes both issues with the following patches: > I've applied them. > Javier Martinez Canillas (2): > ARM: dts: Fix chip select GPIO on smdk5250 > ARM: dts: Remove display timings node from exynos5250-snow > > I see that you already send a pull request to arm-soc maintainers so probably > these will be part of the fixes during the 3.18 rc cycle. > I'll queue them in my third pull-request maybe today :) Thanks, Kukjin
Hello Kukjin, On 09/25/2014 01:27 AM, Kukjin Kim wrote: >> >> Today I also had time to review the rebased patches from Andreas and found >> two issues introduced during the merge conflict resolution: >> > Oops. Thanks for your quick fix it up. > You are welcome. >> 1) The spi_1 dev node on exynos5250-smdk5250.dts now uses the old "cs-gpio" >> DT property under the controller-data instead of the standard "cs-gpios" >> under the SPI parent. IOW, is a regression of the bug fixed in commit >> e138d43 ("ARM: dts: fix the chip select gpios definition in the SPI nodes"). >> >> 2) The display-timings child node of the dp-controller was removed in commit >> a98c3c2 ("ARM: dts: update display related nodes for exynos5250-snow") but >> was introduced again in the Snow DTS during the merge. >> >> I'll post a series that fixes both issues with the following patches: >> > I've applied them. > >> Javier Martinez Canillas (2): >> ARM: dts: Fix chip select GPIO on smdk5250 >> ARM: dts: Remove display timings node from exynos5250-snow >> >> I see that you already send a pull request to arm-soc maintainers so probably >> these will be part of the fixes during the 3.18 rc cycle. >> > I'll queue them in my third pull-request maybe today :) > Great. It would be awesome also if you can also pick Sjoerd's USB series [0] which solves an issue with USB on certain configurations. I looked at your for-next branch but I didn't see those patches there. > Thanks, > Kukjin > Thanks a lot and best regards, Javier [0]: https://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg37045.html
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index e51fcef..56eec56 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -10,6 +10,7 @@ /dts-v1/; #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/clock/maxim,max77686.h> #include "exynos5250.dtsi" / { @@ -29,6 +30,8 @@ rtc@101E0000 { status = "okay"; + clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>; + clock-names = "rtc", "rtc_src"; }; pinctrl@11400000 { @@ -350,7 +353,7 @@ samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <378000>; - max77686@09 { + max77686: max77686@09 { compatible = "maxim,max77686"; interrupt-parent = <&gpx3>; interrupts = <2 0>;
commit 546b117fdf17 ("rtc: s3c: add support for RTC of Exynos3250 SoC") added an "rtc_src" DT property for the Samsung's S3C Real Time Clock controller that specifies the 32.768 kHz clock that uses the RTC as its source clock. In the case of the Exynos5250 based Snow board, the Maxim 77686 32kHz AP clock is used as the source clock. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> --- arch/arm/boot/dts/exynos5250-snow.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)