projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
exynos54xx.dtsi
diff --git
a/arch/arm/dts/exynos54xx.dtsi
b/arch/arm/dts/exynos54xx.dtsi
index bd3619d75137f0b884824eab6f3a73cc4b8c1098..b4ddf53a2ec18ed64336046252f4b6afb818c8e4 100644
(file)
--- a/
arch/arm/dts/exynos54xx.dtsi
+++ b/
arch/arm/dts/exynos54xx.dtsi
@@
-42,7
+42,14
@@
xhci1 = "/xhci@12400000";
};
xhci1 = "/xhci@12400000";
};
- i2c@12CA0000 {
+ adc@12D10000 {
+ compatible = "samsung,exynos-adc-v2";
+ reg = <0x12D10000 0x100>;
+ interrupts = <0 106 0>;
+ status = "disabled";
+ };
+
+ hsi2c_4: i2c@12CA0000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,exynos5-hsi2c";
#address-cells = <1>;
#size-cells = <0>;
compatible = "samsung,exynos5-hsi2c";
@@
-171,7
+178,7
@@
samsung,pwm-out-gpio = <&gpb2 0 GPIO_ACTIVE_HIGH>;
};
samsung,pwm-out-gpio = <&gpb2 0 GPIO_ACTIVE_HIGH>;
};
- dp@145b0000 {
+ dp
: dp
@145b0000 {
samsung,lt-status = <0>;
samsung,master-mode = <0>;
samsung,lt-status = <0>;
samsung,master-mode = <0>;
@@
-190,6
+197,13
@@
mem-type = "ddr3";
};
mem-type = "ddr3";
};
+ pwm: pwm@12dd0000 {
+ compatible = "samsung,exynos4210-pwm";
+ reg = <0x12dd0000 0x100>;
+ samsung,pwm-outputs = <0>, <1>, <2>, <3>;
+ #pwm-cells = <3>;
+ };
+
xhci1: xhci@12400000 {
compatible = "samsung,exynos5250-xhci";
reg = <0x12400000 0x10000>;
xhci1: xhci@12400000 {
compatible = "samsung,exynos5250-xhci";
reg = <0x12400000 0x10000>;