summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/exynos4412-trats2.dts
diff options
context:
space:
mode:
authorKukjin Kim <kgene@kernel.org>2015-06-03 09:56:00 +0900
committerKukjin Kim <kgene@kernel.org>2015-06-03 09:56:00 +0900
commitb9974fa208d9175a6d1d21f6b1068e1779295934 (patch)
treeda818bd7872f468f87f925bfe636b4818874827b /arch/arm/boot/dts/exynos4412-trats2.dts
parentc65b99f046843d2455aa231747b5a07a999a9f3d (diff)
parent5ec1d441a4227b2dfdc47fdc13aa7c6c50496194 (diff)
Merge branch 'v4.2-next/dt-samsung-3rd' into v4.2-next/dt-samsung-4th
Diffstat (limited to 'arch/arm/boot/dts/exynos4412-trats2.dts')
-rw-r--r--arch/arm/boot/dts/exynos4412-trats2.dts9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 792394dd0f2a..0b228ee14c64 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";
+};