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
77307051
Commit
77307051
authored
Mar 19, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nv50/gpio: fixup reset for gpios >= 16
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
5cfd48b2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c
drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c
+3
-2
No files found.
drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c
View file @
77307051
...
@@ -46,7 +46,8 @@ nv50_gpio_reset(struct nouveau_gpio *gpio, u8 match)
...
@@ -46,7 +46,8 @@ nv50_gpio_reset(struct nouveau_gpio *gpio, u8 match)
u8
unk0
=
!!
(
data
&
0x02000000
);
u8
unk0
=
!!
(
data
&
0x02000000
);
u8
unk1
=
!!
(
data
&
0x04000000
);
u8
unk1
=
!!
(
data
&
0x04000000
);
u32
val
=
(
unk1
<<
16
)
|
unk0
;
u32
val
=
(
unk1
<<
16
)
|
unk0
;
u32
reg
=
regs
[
line
>>
4
];
line
&=
0x0f
;
u32
reg
=
regs
[
line
>>
4
];
u32
lsh
=
line
&
0x0f
;
if
(
func
==
DCB_GPIO_UNUSED
||
if
(
func
==
DCB_GPIO_UNUSED
||
(
match
!=
DCB_GPIO_UNUSED
&&
match
!=
func
))
(
match
!=
DCB_GPIO_UNUSED
&&
match
!=
func
))
...
@@ -54,7 +55,7 @@ nv50_gpio_reset(struct nouveau_gpio *gpio, u8 match)
...
@@ -54,7 +55,7 @@ nv50_gpio_reset(struct nouveau_gpio *gpio, u8 match)
gpio
->
set
(
gpio
,
0
,
func
,
line
,
defs
);
gpio
->
set
(
gpio
,
0
,
func
,
line
,
defs
);
nv_mask
(
priv
,
reg
,
0x00010001
<<
l
ine
,
val
<<
line
);
nv_mask
(
priv
,
reg
,
0x00010001
<<
l
sh
,
val
<<
lsh
);
}
}
}
}
...
...
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