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-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device...
[linux-2.6-microblaze.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
c5609af
..
d5797a6
100644
(file)
--- a/
arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/
arch/arm/boot/dts/exynos4210-smdkv310.dts
@@
-90,61
+90,61
@@
pinctrl-0 = <&keypad_rows &keypad_cols>;
status = "okay";
pinctrl-0 = <&keypad_rows &keypad_cols>;
status = "okay";
- key
_
1 {
+ key
-
1 {
keypad,row = <0>;
keypad,column = <3>;
linux,code = <2>;
};
keypad,row = <0>;
keypad,column = <3>;
linux,code = <2>;
};
- key
_
2 {
+ key
-
2 {
keypad,row = <0>;
keypad,column = <4>;
linux,code = <3>;
};
keypad,row = <0>;
keypad,column = <4>;
linux,code = <3>;
};
- key
_
3 {
+ key
-
3 {
keypad,row = <0>;
keypad,column = <5>;
linux,code = <4>;
};
keypad,row = <0>;
keypad,column = <5>;
linux,code = <4>;
};
- key
_
4 {
+ key
-
4 {
keypad,row = <0>;
keypad,column = <6>;
linux,code = <5>;
};
keypad,row = <0>;
keypad,column = <6>;
linux,code = <5>;
};
- key
_
5 {
+ key
-
5 {
keypad,row = <0>;
keypad,column = <7>;
linux,code = <6>;
};
keypad,row = <0>;
keypad,column = <7>;
linux,code = <6>;
};
- key
_
a {
+ key
-
a {
keypad,row = <1>;
keypad,column = <3>;
linux,code = <30>;
};
keypad,row = <1>;
keypad,column = <3>;
linux,code = <30>;
};
- key
_
b {
+ key
-
b {
keypad,row = <1>;
keypad,column = <4>;
linux,code = <48>;
};
keypad,row = <1>;
keypad,column = <4>;
linux,code = <48>;
};
- key
_
c {
+ key
-
c {
keypad,row = <1>;
keypad,column = <5>;
linux,code = <46>;
};
keypad,row = <1>;
keypad,column = <5>;
linux,code = <46>;
};
- key
_
d {
+ key
-
d {
keypad,row = <1>;
keypad,column = <6>;
linux,code = <32>;
};
keypad,row = <1>;
keypad,column = <6>;
linux,code = <32>;
};
- key
_
e {
+ key
-
e {
keypad,row = <1>;
keypad,column = <7>;
linux,code = <18>;
keypad,row = <1>;
keypad,column = <7>;
linux,code = <18>;
@@
-200,7
+200,7
@@
cs-gpios = <&gpc1 2 GPIO_ACTIVE_HIGH>;
status = "okay";
cs-gpios = <&gpc1 2 GPIO_ACTIVE_HIGH>;
status = "okay";
-
w25x80
@0 {
+
flash
@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "w25x80";
#address-cells = <1>;
#size-cells = <1>;
compatible = "w25x80";