2015-04-02 11:03:29

by Krzysztof Kozlowski

Subject: [PATCH 1/2] ARM: dts: Use define for s3c-rtc clock id

Use a define instead of raw number as a ID for "rtc_src" clock.

Signed-off-by: Krzysztof Kozlowski <[email protected]>

---

Patch depends on new file "dt-bindings/clock/samsung,s2mps11.h" from:
1. ARM: dts: Add bindings for 32kHz clocks from s2mps11
http://www.spinics.net/lists/linux-samsung-soc/msg43345.html
---
arch/arm/boot/dts/exynos3250-monk.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts
index 1d483c1c8b48..a5863acc5fff 100644
--- a/arch/arm/boot/dts/exynos3250-monk.dts
+++ b/arch/arm/boot/dts/exynos3250-monk.dts
@@ -16,6 +16,7 @@
#include "exynos3250.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/clock/samsung,s2mps11.h>

/ {
model = "Samsung Monk board";
@@ -432,7 +433,7 @@
};

&rtc {
- clocks = <&cmu CLK_RTC>, <&s2mps14_osc 0>;
+ clocks = <&cmu CLK_RTC>, <&s2mps14_osc S2MPS11_CLK_AP>;
clock-names = "rtc", "rtc_src";
status = "okay";
};
--
1.9.1

2015-04-02 11:03:32

by Krzysztof Kozlowski

Subject: [PATCH 2/2] ARM: dts: Enable S3C RTC on Trats2, Odroid-U3 and Arndale Octa

Extend the S3C RTC node with rtc_src clock so it could be operational.
The rtc_src clock is provided by MAX77686 (Trats2 and Odroid-U3) or
S2MPS11 (Arndale Octa).

Signed-off-by: Krzysztof Kozlowski <[email protected]>

---

Patch depends on new file "dt-bindings/clock/samsung,s2mps11.h"
from:
1. ARM: dts: Add bindings for 32kHz clocks from s2mps11
http://www.spinics.net/lists/linux-samsung-soc/msg43345.html
---
arch/arm/boot/dts/exynos4.dtsi | 2 +-
arch/arm/boot/dts/exynos4412-odroidu3.dts | 7 +++++++
arch/arm/boot/dts/exynos4412-trats2.dts | 9 ++++++++-
arch/arm/boot/dts/exynos5420-arndale-octa.dts | 11 +++++++----
4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 8ea2e374acaf..95efdf805f20 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -266,7 +266,7 @@
status = "disabled";
};

- rtc@10070000 {
+ rtc: rtc@10070000 {
compatible = "samsung,s3c6410-rtc";
reg = <0x10070000 0x100>;
interrupt-parent = <&pmu_system_controller>;
diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts
index 44684e57ead1..2bf7447d02ef 100644
--- a/arch/arm/boot/dts/exynos4412-odroidu3.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts
@@ -13,6 +13,7 @@

/dts-v1/;
#include "exynos4412-odroid-common.dtsi"
+#include <dt-bindings/clock/maxim,max77686.h>

/ {
model = "Hardkernel ODROID-U3 board based on Exynos4412";
@@ -61,3 +62,9 @@
"Speakers", "SPKL",
"Speakers", "SPKR";
};
+
+&rtc {
+ status = "okay";
+ clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
+ clock-names = "rtc", "rtc_src";
+};
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 173ffa479ad3..c032cde11d5c 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -16,6 +16,7 @@
#include "exynos4412.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/clock/maxim,max77686.h>

/ {
model = "Samsung Trats 2 based on Exynos4412";
@@ -214,7 +215,7 @@
pinctrl-names = "default";
status = "okay";

- max77686_pmic@09 {
+ max77686: max77686_pmic@09 {
compatible = "maxim,max77686";
interrupt-parent = <&gpx0>;
interrupts = <7 0>;
@@ -1304,3 +1305,9 @@
PIN_SLP(gpv4-0, INPUT, DOWN);
};
};
+
+&rtc {
+ status = "okay";
+ clocks = <&clock CLK_RTC>, <&max77686 MAX77686_CLK_AP>;
+ clock-names = "rtc", "rtc_src";
+};
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index b82b6fa15f48..d78fcd997ce6 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -13,6 +13,7 @@
#include "exynos5420.dtsi"
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/clock/samsung,s2mps11.h>

/ {
model = "Insignal Arndale Octa evaluation board based on EXYNOS5420";
@@ -38,10 +39,6 @@
};
};

- rtc@101E0000 {
- status = "okay";
- };
-
codec@11000000 {
samsung,mfc-r = <0x43000000 0x800000>;
samsung,mfc-l = <0x51000000 0x800000>;
@@ -376,3 +373,9 @@
&cci {
status = "disabled";
};
+
+&rtc {
+ status = "okay";
+ clocks = <&clock CLK_RTC>, <&s2mps11_osc S2MPS11_CLK_AP>;
+ clock-names = "rtc", "rtc_src";
+};
--
1.9.1

2015-04-02 12:17:20

by Javier Martinez Canillas

Subject: Re: [PATCH 1/2] ARM: dts: Use define for s3c-rtc clock id

Hello Krzysztof,

On 04/02/2015 01:03 PM, Krzysztof Kozlowski wrote:
> Use a define instead of raw number as a ID for "rtc_src" clock.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>

Reviewed-by: Javier Martinez Canillas <[email protected]>

Best regards,
Javier

2015-04-02 12:18:43

by Javier Martinez Canillas

Subject: Re: [PATCH 2/2] ARM: dts: Enable S3C RTC on Trats2, Odroid-U3 and Arndale Octa

Hello Krzysztof,

On 04/02/2015 01:03 PM, Krzysztof Kozlowski wrote:
> Extend the S3C RTC node with rtc_src clock so it could be operational.
> The rtc_src clock is provided by MAX77686 (Trats2 and Odroid-U3) or
> S2MPS11 (Arndale Octa).
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>

Reviewed-by: Javier Martinez Canillas <[email protected]>

Best regards,
Javier