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
c503ca52
Commit
c503ca52
authored
Feb 05, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus
parents
b2dde2f9
fddcd300
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos4.dtsi
+2
-2
No files found.
arch/arm/boot/dts/exynos4.dtsi
View file @
c503ca52
...
...
@@ -368,7 +368,7 @@ port@0 {
};
i2s1: i2s@13960000 {
compatible = "samsung,s
5pv2
10-i2s";
compatible = "samsung,s
3c64
10-i2s";
reg = <0x13960000 0x100>;
clocks = <&clock CLK_I2S1>;
clock-names = "iis";
...
...
@@ -378,7 +378,7 @@ i2s1: i2s@13960000 {
};
i2s2: i2s@13970000 {
compatible = "samsung,s
5pv2
10-i2s";
compatible = "samsung,s
3c64
10-i2s";
reg = <0x13970000 0x100>;
clocks = <&clock CLK_I2S2>;
clock-names = "iis";
...
...
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