projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
exynos5250-smdk5250.dts
diff --git
a/arch/arm/boot/dts/exynos5250-smdk5250.dts
b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index
8b39980
..
a97a785
100644
(file)
--- a/
arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/
arch/arm/boot/dts/exynos5250-smdk5250.dts
@@
-22,7
+22,8
@@
aliases {
};
- memory {
+ memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x80000000>;
};
@@
-116,7
+117,7
@@
};
&hdmi {
- hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+ hpd-gpio
s
= <&gpx3 7 GPIO_ACTIVE_HIGH>;
};
&i2c_0 {