projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm-soc/for-3.18/cygnus-dts-v9' of http://github.com/brcm/linux into next/dt
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
exynos5800-peach-pi.dts
diff --git
a/arch/arm/boot/dts/exynos5800-peach-pi.dts
b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index
7bb1c8d
..
e8fdda8
100644
(file)
--- a/
arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/
arch/arm/boot/dts/exynos5800-peach-pi.dts
@@
-12,6
+12,7
@@
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/clock/maxim,max77802.h>
#include "exynos5800.dtsi"
/ {
#include "exynos5800.dtsi"
/ {
@@
-150,7
+151,7
@@
status = "okay";
clock-frequency = <400000>;
status = "okay";
clock-frequency = <400000>;
- max77802-pmic@9 {
+ max77802
: max77802
-pmic@9 {
compatible = "maxim,max77802";
interrupt-parent = <&gpx3>;
interrupts = <1 IRQ_TYPE_NONE>;
compatible = "maxim,max77802";
interrupt-parent = <&gpx3>;
interrupts = <1 IRQ_TYPE_NONE>;
@@
-548,7
+549,7
@@
status = "okay";
num-slots = <1>;
broken-cd;
status = "okay";
num-slots = <1>;
broken-cd;
-
caps2-
mmc-hs200-1_8v;
+ mmc-hs200-1_8v;
cap-mmc-highspeed;
non-removable;
card-detect-delay = <200>;
cap-mmc-highspeed;
non-removable;
card-detect-delay = <200>;
@@
-715,6
+716,8
@@
&rtc {
status = "okay";
&rtc {
status = "okay";
+ clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;
+ clock-names = "rtc", "rtc_src";
};
&spi_2 {
};
&spi_2 {