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
3519acb3
Commit
3519acb3
authored
May 06, 2014
by
Greg Kroah-Hartman
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'imx-drm-fixes-urgent' of
git://ftp.arm.linux.org.uk/~rmk/linux-arm
into staging-linus
imx drm fixes from Russell
parents
86281966
a3fe9641
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
arch/arm/boot/dts/imx53-mba53.dts
arch/arm/boot/dts/imx53-mba53.dts
+1
-1
drivers/staging/imx-drm/imx-drm-core.c
drivers/staging/imx-drm/imx-drm-core.c
+6
-1
drivers/staging/imx-drm/imx-tve.c
drivers/staging/imx-drm/imx-tve.c
+1
-1
No files found.
arch/arm/boot/dts/imx53-mba53.dts
View file @
3519acb3
...
@@ -244,7 +244,7 @@ &i2c3 {
...
@@ -244,7 +244,7 @@ &i2c3 {
&
tve
{
&
tve
{
pinctrl
-
names
=
"default"
;
pinctrl
-
names
=
"default"
;
pinctrl
-
0
=
<&
pinctrl_vga_sync_1
>;
pinctrl
-
0
=
<&
pinctrl_vga_sync_1
>;
i2c
-
dd
c
-
bus
=
<&
i2c3
>;
ddc
-
i2
c
-
bus
=
<&
i2c3
>;
fsl
,
tve
-
mode
=
"vga"
;
fsl
,
tve
-
mode
=
"vga"
;
fsl
,
hsync
-
pin
=
<
4
>;
fsl
,
hsync
-
pin
=
<
4
>;
fsl
,
vsync
-
pin
=
<
6
>;
fsl
,
vsync
-
pin
=
<
6
>;
...
...
drivers/staging/imx-drm/imx-drm-core.c
View file @
3519acb3
...
@@ -517,7 +517,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node,
...
@@ -517,7 +517,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node,
of_node_put
(
port
);
of_node_put
(
port
);
if
(
port
==
imx_crtc
->
port
)
{
if
(
port
==
imx_crtc
->
port
)
{
ret
=
of_graph_parse_endpoint
(
ep
,
&
endpoint
);
ret
=
of_graph_parse_endpoint
(
ep
,
&
endpoint
);
return
ret
?
ret
:
endpoint
.
id
;
return
ret
?
ret
:
endpoint
.
port
;
}
}
}
while
(
ep
);
}
while
(
ep
);
...
@@ -675,6 +675,11 @@ static int imx_drm_platform_probe(struct platform_device *pdev)
...
@@ -675,6 +675,11 @@ static int imx_drm_platform_probe(struct platform_device *pdev)
if
(
!
remote
||
!
of_device_is_available
(
remote
))
{
if
(
!
remote
||
!
of_device_is_available
(
remote
))
{
of_node_put
(
remote
);
of_node_put
(
remote
);
continue
;
continue
;
}
else
if
(
!
of_device_is_available
(
remote
->
parent
))
{
dev_warn
(
&
pdev
->
dev
,
"parent device of %s is not available
\n
"
,
remote
->
full_name
);
of_node_put
(
remote
);
continue
;
}
}
ret
=
imx_drm_add_component
(
&
pdev
->
dev
,
remote
);
ret
=
imx_drm_add_component
(
&
pdev
->
dev
,
remote
);
...
...
drivers/staging/imx-drm/imx-tve.c
View file @
3519acb3
...
@@ -582,7 +582,7 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data)
...
@@ -582,7 +582,7 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data)
tve
->
dev
=
dev
;
tve
->
dev
=
dev
;
spin_lock_init
(
&
tve
->
lock
);
spin_lock_init
(
&
tve
->
lock
);
ddc_node
=
of_parse_phandle
(
np
,
"
i2c-dd
c-bus"
,
0
);
ddc_node
=
of_parse_phandle
(
np
,
"
ddc-i2
c-bus"
,
0
);
if
(
ddc_node
)
{
if
(
ddc_node
)
{
tve
->
ddc
=
of_find_i2c_adapter_by_node
(
ddc_node
);
tve
->
ddc
=
of_find_i2c_adapter_by_node
(
ddc_node
);
of_node_put
(
ddc_node
);
of_node_put
(
ddc_node
);
...
...
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