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
Kirill Smelkov
linux
Commits
81717283
Commit
81717283
authored
Apr 01, 2019
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
7d56bedb
' into omap-for-v5.1/fixes
parents
66913706
7d56bedb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
arch/arm/boot/dts/am33xx-l4.dtsi
arch/arm/boot/dts/am33xx-l4.dtsi
+2
-2
No files found.
arch/arm/boot/dts/am33xx-l4.dtsi
View file @
81717283
...
@@ -1762,7 +1762,7 @@ target-module@cc000 { /* 0x481cc000, ap 60 46.0 */
...
@@ -1762,7 +1762,7 @@ target-module@cc000 { /* 0x481cc000, ap 60 46.0 */
reg = <0xcc000 0x4>;
reg = <0xcc000 0x4>;
reg-names = "rev";
reg-names = "rev";
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>;
clocks = <&l4ls_clkctrl AM3_
L4LS_
D_CAN0_CLKCTRL 0>;
clock-names = "fck";
clock-names = "fck";
#address-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
#size-cells = <1>;
...
@@ -1785,7 +1785,7 @@ target-module@d0000 { /* 0x481d0000, ap 62 42.0 */
...
@@ -1785,7 +1785,7 @@ target-module@d0000 { /* 0x481d0000, ap 62 42.0 */
reg = <0xd0000 0x4>;
reg = <0xd0000 0x4>;
reg-names = "rev";
reg-names = "rev";
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>;
clocks = <&l4ls_clkctrl AM3_
L4LS_
D_CAN1_CLKCTRL 0>;
clock-names = "fck";
clock-names = "fck";
#address-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
#size-cells = <1>;
...
...
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