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 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
sama5d2.dtsi
diff --git
a/arch/arm/boot/dts/sama5d2.dtsi
b/arch/arm/boot/dts/sama5d2.dtsi
index
2827e7a
..
353d0e5
100644
(file)
--- a/
arch/arm/boot/dts/sama5d2.dtsi
+++ b/
arch/arm/boot/dts/sama5d2.dtsi
@@
-72,6
+72,11
@@
};
};
};
};
+ pmu {
+ compatible = "arm,cortex-a5-pmu";
+ interrupts = <2 IRQ_TYPE_LEVEL_HIGH 0>;
+ };
+
memory {
reg = <0x20000000 0x20000000>;
};
memory {
reg = <0x20000000 0x20000000>;
};
@@
-112,13
+117,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 = <3>;
reg = <1>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
@@
-126,7
+131,7
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep2 {
+ ep
@
2 {
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
reg = <2>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <3>;
@@
-134,7
+139,7
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep3 {
+ ep
@
3 {
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
reg = <3>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
@@
-142,7
+147,7
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep4 {
+ ep
@
4 {
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
reg = <4>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
@@
-150,7
+155,7
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep5 {
+ ep
@
5 {
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
reg = <5>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
@@
-158,7
+163,7
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep6 {
+ ep
@
6 {
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
reg = <6>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
@@
-166,7
+171,7
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep7 {
+ ep
@
7 {
reg = <7>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
reg = <7>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
@@
-174,56
+179,56
@@
atmel,can-isoc;
};
atmel,can-isoc;
};
- ep8 {
+ ep
@
8 {
reg = <8>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
reg = <8>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
- ep9 {
+ ep
@
9 {
reg = <9>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
reg = <9>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
- ep10 {
+ ep
@
10 {
reg = <10>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
reg = <10>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
- ep11 {
+ ep
@
11 {
reg = <11>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
reg = <11>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
- ep12 {
+ ep
@
12 {
reg = <12>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
reg = <12>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
- ep13 {
+ ep
@
13 {
reg = <13>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
reg = <13>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
- ep14 {
+ ep
@
14 {
reg = <14>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
reg = <14>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
atmel,can-isoc;
};
- ep15 {
+ ep
@
15 {
reg = <15>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
reg = <15>;
atmel,fifo-size = <1024>;
atmel,nb-banks = <2>;
@@
-232,7
+237,7
@@
};
usb1: ohci@00400000 {
};
usb1: ohci@00400000 {
- compatible = "atmel,
at91rm9200
-ohci", "usb-ohci";
+ compatible = "atmel,
sama5d2
-ohci", "usb-ohci";
reg = <0x00400000 0x100000>;
interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
reg = <0x00400000 0x100000>;
interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;