projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
exynos5250-arndale.dts
diff --git
a/arch/arm/boot/dts/exynos5250-arndale.dts
b/arch/arm/boot/dts/exynos5250-arndale.dts
index
79546f1
..
a161f62
100644
(file)
--- a/
arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/
arch/arm/boot/dts/exynos5250-arndale.dts
@@
-27,7
+27,7
@@
stdout-path = "serial2:115200n8";
};
stdout-path = "serial2:115200n8";
};
- gpio
_
keys {
+ gpio
-
keys {
compatible = "gpio-keys";
menu {
compatible = "gpio-keys";
menu {
@@
-211,7
+211,7
@@
samsung,i2c-max-bus-freq = <20000>;
samsung,i2c-slave-addr = <0x66>;
samsung,i2c-max-bus-freq = <20000>;
samsung,i2c-slave-addr = <0x66>;
-
s5m8767_
pmic@66 {
+ pmic@66 {
compatible = "samsung,s5m8767-pmic";
reg = <0x66>;
interrupt-parent = <&gpx3>;
compatible = "samsung,s5m8767-pmic";
reg = <0x66>;
interrupt-parent = <&gpx3>;
@@
-511,7
+511,7
@@
&i2c_3 {
status = "okay";
&i2c_3 {
status = "okay";
- wm1811: codec@1a {
+ wm1811:
audio-
codec@1a {
compatible = "wlf,wm1811";
reg = <0x1a>;
clocks = <&i2s0 CLK_I2S_CDCLK>;
compatible = "wlf,wm1811";
reg = <0x1a>;
clocks = <&i2s0 CLK_I2S_CDCLK>;