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
381af13
..
a97a785
100644
(file)
--- a/
arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/
arch/arm/boot/dts/exynos5250-smdk5250.dts
@@
-22,7
+22,8
@@
aliases {
};
aliases {
};
- memory {
+ memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x80000000>;
};
reg = <0x40000000 0x80000000>;
};
@@
-116,7
+117,7
@@
};
&hdmi {
};
&hdmi {
- hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+ hpd-gpio
s
= <&gpx3 7 GPIO_ACTIVE_HIGH>;
};
&i2c_0 {
};
&i2c_0 {
@@
-416,8
+417,8
@@
&pinctrl_0 {
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
&pinctrl_0 {
max77686_irq: max77686-irq {
samsung,pins = "gpx3-2";
- samsung,pin-function = <
0xf
>;
- samsung,pin-pud = <
0
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_F
>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
};
};
};