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 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
at91sam9g45.dtsi
diff --git
a/arch/arm/boot/dts/at91sam9g45.dtsi
b/arch/arm/boot/dts/at91sam9g45.dtsi
index
8837b7e
..
b3501ae
100644
(file)
--- a/
arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/
arch/arm/boot/dts/at91sam9g45.dtsi
@@
-1044,28
+1044,24
@@
atmel,adc-res-names = "lowres", "highres";
atmel,adc-use-res = "highres";
atmel,adc-res-names = "lowres", "highres";
atmel,adc-use-res = "highres";
- trigger@0 {
- reg = <0>;
+ trigger0 {
trigger-name = "external-rising";
trigger-value = <0x1>;
trigger-external;
};
trigger-name = "external-rising";
trigger-value = <0x1>;
trigger-external;
};
- trigger@1 {
- reg = <1>;
+ trigger1 {
trigger-name = "external-falling";
trigger-value = <0x2>;
trigger-external;
};
trigger-name = "external-falling";
trigger-value = <0x2>;
trigger-external;
};
- trigger@2 {
- reg = <2>;
+ trigger2 {
trigger-name = "external-any";
trigger-value = <0x3>;
trigger-external;
};
trigger-name = "external-any";
trigger-value = <0x3>;
trigger-external;
};
- trigger@3 {
- reg = <3>;
+ trigger3 {
trigger-name = "continuous";
trigger-value = <0x6>;
};
trigger-name = "continuous";
trigger-value = <0x6>;
};
@@
-1169,13
+1165,13
@@
clock-names = "pclk", "hclk";
status = "disabled";
clock-names = "pclk", "hclk";
status = "disabled";
- ep0 {
+ ep
@
0 {
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
reg = <0>;
atmel,fifo-size = <64>;
atmel,nb-banks = <1>;
};
- ep1 {
+ ep
@
1 {
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
@@
-1183,7
+1179,7
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep2 {
+ ep
@
2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
@@
-1191,21
+1187,21
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep3 {
+ ep
@
3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
- ep4 {
+ ep
@
4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
atmel,can-dma;
};
- ep5 {
+ ep
@
5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
@@
-1213,7
+1209,7
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep6 {
+ ep
@
6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
@@
-1320,7
+1316,7
@@
};
};
};
};
- i2c
@
0 {
+ i2c
-gpio-
0 {
compatible = "i2c-gpio";
gpios = <&pioA 20 GPIO_ACTIVE_HIGH /* sda */
&pioA 21 GPIO_ACTIVE_HIGH /* scl */
compatible = "i2c-gpio";
gpios = <&pioA 20 GPIO_ACTIVE_HIGH /* sda */
&pioA 21 GPIO_ACTIVE_HIGH /* scl */