Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
92b2e81d
Commit
92b2e81d
authored
Dec 15, 2012
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
parents
82441fff
315656bc
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9260.dtsi
+1
-1
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
+2
-2
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
+2
-2
arch/arm/boot/dts/at91sam9x5.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
+1
-1
No files found.
arch/arm/boot/dts/at91sam9260.dtsi
View file @
92b2e81d
...
...
@@ -217,7 +217,7 @@ ssc0: ssc@fffbc000 {
compatible
=
"atmel,at91rm9200-ssc"
;
reg
=
<
0xfffbc000
0x4000
>;
interrupts
=
<
14
4
5
>;
status
=
"disable"
;
status
=
"disable
d
"
;
};
adc0
:
adc
@
fffe0000
{
...
...
arch/arm/boot/dts/at91sam9263.dtsi
View file @
92b2e81d
...
...
@@ -179,14 +179,14 @@ ssc0: ssc@fff98000 {
compatible
=
"atmel,at91rm9200-ssc"
;
reg
=
<
0xfff98000
0x4000
>;
interrupts
=
<
16
4
5
>;
status
=
"disable"
;
status
=
"disable
d
"
;
};
ssc1
:
ssc
@
fff9c000
{
compatible
=
"atmel,at91rm9200-ssc"
;
reg
=
<
0xfff9c000
0x4000
>;
interrupts
=
<
17
4
5
>;
status
=
"disable"
;
status
=
"disable
d
"
;
};
macb0
:
ethernet
@
fffbc000
{
...
...
arch/arm/boot/dts/at91sam9g45.dtsi
View file @
92b2e81d
...
...
@@ -232,14 +232,14 @@ ssc0: ssc@fff9c000 {
compatible
=
"atmel,at91sam9g45-ssc"
;
reg
=
<
0xfff9c000
0x4000
>;
interrupts
=
<
16
4
5
>;
status
=
"disable"
;
status
=
"disable
d
"
;
};
ssc1
:
ssc
@
fffa0000
{
compatible
=
"atmel,at91sam9g45-ssc"
;
reg
=
<
0xfffa0000
0x4000
>;
interrupts
=
<
17
4
5
>;
status
=
"disable"
;
status
=
"disable
d
"
;
};
adc0
:
adc
@
fffb0000
{
...
...
arch/arm/boot/dts/at91sam9x5.dtsi
View file @
92b2e81d
...
...
@@ -92,7 +92,7 @@ ssc0: ssc@f0010000 {
compatible
=
"atmel,at91sam9g45-ssc"
;
reg
=
<
0xf0010000
0x4000
>;
interrupts
=
<
28
4
5
>;
status
=
"disable"
;
status
=
"disable
d
"
;
};
tcb0
:
timer
@
f8008000
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment