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
a352fe37
Commit
a352fe37
authored
Jun 16, 2020
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'omap-for-v5.8/fixes-rc1' into fixes
parents
07c7b547
80bf7259
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
4 deletions
+3
-4
arch/arm/boot/dts/am335x-pocketbeagle.dts
arch/arm/boot/dts/am335x-pocketbeagle.dts
+0
-1
arch/arm/boot/dts/am5729-beagleboneai.dts
arch/arm/boot/dts/am5729-beagleboneai.dts
+1
-1
arch/arm/boot/dts/omap4-duovero-parlor.dts
arch/arm/boot/dts/omap4-duovero-parlor.dts
+1
-1
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap4.dtsi
+1
-1
No files found.
arch/arm/boot/dts/am335x-pocketbeagle.dts
View file @
a352fe37
...
@@ -88,7 +88,6 @@ AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
...
@@ -88,7 +88,6 @@ AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF
(
AM335X_PIN_MMC0_DAT3
,
PIN_INPUT_PULLUP
,
MUX_MODE0
)
AM33XX_PADCONF
(
AM335X_PIN_MMC0_DAT3
,
PIN_INPUT_PULLUP
,
MUX_MODE0
)
AM33XX_PADCONF
(
AM335X_PIN_MMC0_CMD
,
PIN_INPUT_PULLUP
,
MUX_MODE0
)
AM33XX_PADCONF
(
AM335X_PIN_MMC0_CMD
,
PIN_INPUT_PULLUP
,
MUX_MODE0
)
AM33XX_PADCONF
(
AM335X_PIN_MMC0_CLK
,
PIN_INPUT_PULLUP
,
MUX_MODE0
)
AM33XX_PADCONF
(
AM335X_PIN_MMC0_CLK
,
PIN_INPUT_PULLUP
,
MUX_MODE0
)
AM33XX_PADCONF
(
AM335X_PIN_MCASP0_ACLKR
,
PIN_INPUT
,
MUX_MODE4
)
/*
(
B12
)
mcasp0_aclkr
.
mmc0_sdwp
*/
>;
>;
};
};
...
...
arch/arm/boot/dts/am5729-beagleboneai.dts
View file @
a352fe37
...
@@ -505,7 +505,7 @@ &mac {
...
@@ -505,7 +505,7 @@ &mac {
&
cpsw_emac0
{
&
cpsw_emac0
{
phy
-
handle
=
<&
phy0
>;
phy
-
handle
=
<&
phy0
>;
phy
-
mode
=
"rgmii"
;
phy
-
mode
=
"rgmii
-rxid
"
;
};
};
&
ocp
{
&
ocp
{
...
...
arch/arm/boot/dts/omap4-duovero-parlor.dts
View file @
a352fe37
...
@@ -139,7 +139,7 @@ &gpmc {
...
@@ -139,7 +139,7 @@ &gpmc {
ethernet
@
gpmc
{
ethernet
@
gpmc
{
reg
=
<
5
0
0xff
>;
reg
=
<
5
0
0xff
>;
interrupt
-
parent
=
<&
gpio2
>;
interrupt
-
parent
=
<&
gpio2
>;
interrupts
=
<
12
IRQ_TYPE_
EDGE_FALLING
>;
/*
gpio_44
*/
interrupts
=
<
12
IRQ_TYPE_
LEVEL_LOW
>;
/*
gpio_44
*/
phy
-
mode
=
"mii"
;
phy
-
mode
=
"mii"
;
...
...
arch/arm/boot/dts/omap4.dtsi
View file @
a352fe37
...
@@ -662,6 +662,6 @@ &timer1_target {
...
@@ -662,6 +662,6 @@ &timer1_target {
ti,no-idle;
ti,no-idle;
timer@0 {
timer@0 {
assigned-clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>;
assigned-clocks = <&l4_wkup_clkctrl OMAP4_TIMER1_CLKCTRL 24>;
assigned-clock-parents = <&sys_
clkin
_ck>;
assigned-clock-parents = <&sys_
32k
_ck>;
};
};
};
};
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