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 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
exynos4210-smdkv310.dts
diff --git
a/arch/arm/boot/dts/exynos4210-smdkv310.dts
b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index
847fae3
..
9c98a37
100644
(file)
--- a/
arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/
arch/arm/boot/dts/exynos4210-smdkv310.dts
@@
-23,7
+23,8
@@
model = "Samsung smdkv310 evaluation board based on Exynos4210";
compatible = "samsung,smdkv310", "samsung,exynos4210", "samsung,exynos4";
model = "Samsung smdkv310 evaluation board based on Exynos4210";
compatible = "samsung,smdkv310", "samsung,exynos4210", "samsung,exynos4";
- memory {
+ memory@40000000 {
+ device_type = "memory";
reg = <0x40000000 0x80000000>;
};
reg = <0x40000000 0x80000000>;
};
@@
-136,17
+137,17
@@
&pinctrl_1 {
keypad_rows: keypad-rows {
samsung,pins = "gpx2-0", "gpx2-1";
&pinctrl_1 {
keypad_rows: keypad-rows {
samsung,pins = "gpx2-0", "gpx2-1";
- samsung,pin-function = <3>;
- samsung,pin-pud = <
3
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_
3>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_UP
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
keypad_cols: keypad-cols {
samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3",
"gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";
};
keypad_cols: keypad-cols {
samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3",
"gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7";
- samsung,pin-function = <3>;
- samsung,pin-pud = <
0
>;
- samsung,pin-drv = <
0
>;
+ samsung,pin-function = <
EXYNOS_PIN_FUNC_
3>;
+ samsung,pin-pud = <
EXYNOS_PIN_PULL_NONE
>;
+ samsung,pin-drv = <
EXYNOS4_PIN_DRV_LV1
>;
};
};
};
};