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
f6192c66
Commit
f6192c66
authored
Jun 12, 2019
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
79499bb1
' into fixes
parents
8a0098c0
79499bb1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
arch/arm/boot/dts/am335x-baltos-ir2110.dts
arch/arm/boot/dts/am335x-baltos-ir2110.dts
+1
-1
arch/arm/boot/dts/am335x-baltos-ir3220.dts
arch/arm/boot/dts/am335x-baltos-ir3220.dts
+1
-1
arch/arm/boot/dts/am335x-baltos-ir5221.dts
arch/arm/boot/dts/am335x-baltos-ir5221.dts
+1
-1
No files found.
arch/arm/boot/dts/am335x-baltos-ir2110.dts
View file @
f6192c66
...
@@ -68,7 +68,7 @@ &cpsw_emac0 {
...
@@ -68,7 +68,7 @@ &cpsw_emac0 {
};
};
&
cpsw_emac1
{
&
cpsw_emac1
{
phy
-
mode
=
"rgmii-
tx
id"
;
phy
-
mode
=
"rgmii-id"
;
dual_emac_res_vlan
=
<
2
>;
dual_emac_res_vlan
=
<
2
>;
phy
-
handle
=
<&
phy1
>;
phy
-
handle
=
<&
phy1
>;
};
};
arch/arm/boot/dts/am335x-baltos-ir3220.dts
View file @
f6192c66
...
@@ -110,7 +110,7 @@ fixed-link {
...
@@ -110,7 +110,7 @@ fixed-link {
};
};
&
cpsw_emac1
{
&
cpsw_emac1
{
phy
-
mode
=
"rgmii-
tx
id"
;
phy
-
mode
=
"rgmii-id"
;
dual_emac_res_vlan
=
<
2
>;
dual_emac_res_vlan
=
<
2
>;
phy
-
handle
=
<&
phy1
>;
phy
-
handle
=
<&
phy1
>;
};
};
arch/arm/boot/dts/am335x-baltos-ir5221.dts
View file @
f6192c66
...
@@ -128,7 +128,7 @@ fixed-link {
...
@@ -128,7 +128,7 @@ fixed-link {
};
};
&
cpsw_emac1
{
&
cpsw_emac1
{
phy
-
mode
=
"rgmii-
tx
id"
;
phy
-
mode
=
"rgmii-id"
;
dual_emac_res_vlan
=
<
2
>;
dual_emac_res_vlan
=
<
2
>;
phy
-
handle
=
<&
phy1
>;
phy
-
handle
=
<&
phy1
>;
};
};
...
...
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