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 'zynq-dt-for-v5.10' of https://github.com/Xilinx/linux-xlnx into arm/dt
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
s5pv210-goni.dts
diff --git
a/arch/arm/boot/dts/s5pv210-goni.dts
b/arch/arm/boot/dts/s5pv210-goni.dts
index
ad8d5d2
..
5c1e12d
100644
(file)
--- a/
arch/arm/boot/dts/s5pv210-goni.dts
+++ b/
arch/arm/boot/dts/s5pv210-goni.dts
@@
-259,37
+259,37
@@
<&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
status = "okay";
<&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
status = "okay";
- key
_
1 {
+ key
-
1 {
keypad,row = <0>;
keypad,column = <1>;
linux,code = <KEY_CONNECT>;
};
keypad,row = <0>;
keypad,column = <1>;
linux,code = <KEY_CONNECT>;
};
- key
_
2 {
+ key
-
2 {
keypad,row = <0>;
keypad,column = <2>;
linux,code = <KEY_BACK>;
};
keypad,row = <0>;
keypad,column = <2>;
linux,code = <KEY_BACK>;
};
- key
_
3 {
+ key
-
3 {
keypad,row = <1>;
keypad,column = <1>;
linux,code = <KEY_CAMERA_FOCUS>;
};
keypad,row = <1>;
keypad,column = <1>;
linux,code = <KEY_CAMERA_FOCUS>;
};
- key
_
4 {
+ key
-
4 {
keypad,row = <1>;
keypad,column = <2>;
linux,code = <KEY_VOLUMEUP>;
};
keypad,row = <1>;
keypad,column = <2>;
linux,code = <KEY_VOLUMEUP>;
};
- key
_
5 {
+ key
-
5 {
keypad,row = <2>;
keypad,column = <1>;
linux,code = <KEY_CAMERA>;
};
keypad,row = <2>;
keypad,column = <1>;
linux,code = <KEY_CAMERA>;
};
- key
_
6 {
+ key
-
6 {
keypad,row = <2>;
keypad,column = <2>;
linux,code = <KEY_VOLUMEDOWN>;
keypad,row = <2>;
keypad,column = <2>;
linux,code = <KEY_VOLUMEDOWN>;
@@
-353,7
+353,7
@@
samsung,i2c-slave-addr = <0x10>;
status = "okay";
samsung,i2c-slave-addr = <0x10>;
status = "okay";
- t
sp
@4a {
+ t
ouchscreen
@4a {
compatible = "atmel,maxtouch";
reg = <0x4a>;
interrupt-parent = <&gpj0>;
compatible = "atmel,maxtouch";
reg = <0x4a>;
interrupt-parent = <&gpj0>;