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
792f9867
Commit
792f9867
authored
Jul 11, 2018
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
949bdcc8
' into omap-for-v4.19/dt
parents
ab9a1366
949bdcc8
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/dra7.dtsi
arch/arm/boot/dts/dra7.dtsi
+2
-2
No files found.
arch/arm/boot/dts/dra7.dtsi
View file @
792f9867
...
...
@@ -1893,7 +1893,7 @@ phy_sel: cpsw-phy-sel@4a002554 {
};
};
dcan1: can@4
81c
c000 {
dcan1: can@4
ae3
c000 {
compatible = "ti,dra7-d_can";
ti,hwmods = "dcan1";
reg = <0x4ae3c000 0x2000>;
...
...
@@ -1903,7 +1903,7 @@ dcan1: can@481cc000 {
status = "disabled";
};
dcan2: can@48
1d
0000 {
dcan2: can@48
48
0000 {
compatible = "ti,dra7-d_can";
ti,hwmods = "dcan2";
reg = <0x48480000 0x2000>;
...
...
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