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
70aba44b
Commit
70aba44b
authored
Mar 09, 2016
by
Linus Walleij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "gpio: lp3943: Drop pin_used and lp3943_gpio_request/lp3943_gpio_free"
This reverts commit
3fab91ea
.
parent
7b1e5dc8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
0 deletions
+28
-0
drivers/gpio/gpio-lp3943.c
drivers/gpio/gpio-lp3943.c
+22
-0
include/linux/mfd/lp3943.h
include/linux/mfd/lp3943.h
+6
-0
No files found.
drivers/gpio/gpio-lp3943.c
View file @
70aba44b
...
@@ -45,6 +45,26 @@ struct lp3943_gpio {
...
@@ -45,6 +45,26 @@ struct lp3943_gpio {
u16
input_mask
;
/* 1 = GPIO is input direction, 0 = output */
u16
input_mask
;
/* 1 = GPIO is input direction, 0 = output */
};
};
static
int
lp3943_gpio_request
(
struct
gpio_chip
*
chip
,
unsigned
offset
)
{
struct
lp3943_gpio
*
lp3943_gpio
=
gpiochip_get_data
(
chip
);
struct
lp3943
*
lp3943
=
lp3943_gpio
->
lp3943
;
/* Return an error if the pin is already assigned */
if
(
test_and_set_bit
(
offset
,
&
lp3943
->
pin_used
))
return
-
EBUSY
;
return
0
;
}
static
void
lp3943_gpio_free
(
struct
gpio_chip
*
chip
,
unsigned
offset
)
{
struct
lp3943_gpio
*
lp3943_gpio
=
gpiochip_get_data
(
chip
);
struct
lp3943
*
lp3943
=
lp3943_gpio
->
lp3943
;
clear_bit
(
offset
,
&
lp3943
->
pin_used
);
}
static
int
lp3943_gpio_set_mode
(
struct
lp3943_gpio
*
lp3943_gpio
,
u8
offset
,
static
int
lp3943_gpio_set_mode
(
struct
lp3943_gpio
*
lp3943_gpio
,
u8
offset
,
u8
val
)
u8
val
)
{
{
...
@@ -157,6 +177,8 @@ static int lp3943_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
...
@@ -157,6 +177,8 @@ static int lp3943_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
static
const
struct
gpio_chip
lp3943_gpio_chip
=
{
static
const
struct
gpio_chip
lp3943_gpio_chip
=
{
.
label
=
"lp3943"
,
.
label
=
"lp3943"
,
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
.
request
=
lp3943_gpio_request
,
.
free
=
lp3943_gpio_free
,
.
direction_input
=
lp3943_gpio_direction_input
,
.
direction_input
=
lp3943_gpio_direction_input
,
.
get
=
lp3943_gpio_get
,
.
get
=
lp3943_gpio_get
,
.
direction_output
=
lp3943_gpio_direction_output
,
.
direction_output
=
lp3943_gpio_direction_output
,
...
...
include/linux/mfd/lp3943.h
View file @
70aba44b
...
@@ -94,12 +94,18 @@ struct lp3943_reg_cfg {
...
@@ -94,12 +94,18 @@ struct lp3943_reg_cfg {
* @regmap: Used for I2C communication on accessing registers
* @regmap: Used for I2C communication on accessing registers
* @pdata: LP3943 platform specific data
* @pdata: LP3943 platform specific data
* @mux_cfg: Register configuration for pin MUX
* @mux_cfg: Register configuration for pin MUX
* @pin_used: Bit mask for output pin used.
* This bitmask is used for pin assignment management.
* 1 = pin used, 0 = available.
* Only LSB 16 bits are used, but it is unsigned long type
* for atomic bitwise operations.
*/
*/
struct
lp3943
{
struct
lp3943
{
struct
device
*
dev
;
struct
device
*
dev
;
struct
regmap
*
regmap
;
struct
regmap
*
regmap
;
struct
lp3943_platform_data
*
pdata
;
struct
lp3943_platform_data
*
pdata
;
const
struct
lp3943_reg_cfg
*
mux_cfg
;
const
struct
lp3943_reg_cfg
*
mux_cfg
;
unsigned
long
pin_used
;
};
};
int
lp3943_read_byte
(
struct
lp3943
*
lp3943
,
u8
reg
,
u8
*
read
);
int
lp3943_read_byte
(
struct
lp3943
*
lp3943
,
u8
reg
,
u8
*
read
);
...
...
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