Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 062f49c4 authored May 02, 2015 by Krzysztof Kozlowski Committed by Kukjin Kim May 17, 2015

ARM: dts: Use s3c6410-rtc instead of exynos3250-rtc for exynos3250/4415



Mark "samsung,exynos3250-rtc" compatible as deprecated because it
duplicates the "samsung,s3c6410-rtc". Use "samsung,s3c6410-rtc" on
Exynos3250 and Exynos4415 boards.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Kukjin Kim <kgene@kernel.org>

parent 4edf606c

Documentation/devicetree/bindings/rtc/s3c-rtc.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,8 @@ Required properties:
		* "samsung,s3c2416-rtc" - for controllers compatible with s3c2416 rtc.
		* "samsung,s3c2443-rtc" - for controllers compatible with s3c2443 rtc.
		* "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.
		* "samsung,exynos3250-rtc" - for controllers compatible with exynos3250 rtc.
		* "samsung,exynos3250-rtc" - (deprecated) for controllers compatible with
		exynos3250 rtc (use "samsung,s3c6410-rtc").
		- reg: physical base address of the controller and length of memory mapped
		region.
		- interrupts: Two interrupt numbers to the cpu should be specified. First

arch/arm/boot/dts/exynos3250.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@
		};

		rtc: rtc@10070000 {
		compatible = "samsung,exynos3250-rtc";
		compatible = "samsung,s3c6410-rtc";
		reg = <0x10070000 0x100>;
		interrupts = <0 73 0>, <0 74 0>;
		interrupt-parent = <&pmu_system_controller>;

arch/arm/boot/dts/exynos4415.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@
		};

		rtc: rtc@10070000 {
		compatible = "samsung,exynos3250-rtc";
		compatible = "samsung,s3c6410-rtc";
		reg = <0x10070000 0x100>;
		interrupts = <0 73 0>, <0 74 0>;
		status = "disabled";