Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 282152
b: refs/heads/master
c: 43699de
h: refs/heads/master
v: v3
  • Loading branch information
Stephen Warren authored and Linus Walleij committed Jan 3, 2012
1 parent 5def186 commit 89b1e83
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 63fd5984a9b2214cba7dd7dd7b5a75cf40dde39f
refs/heads/master: 43699dea1ea21a0d5786317a794cb2ba27a6f4fe
2 changes: 1 addition & 1 deletion trunk/Documentation/pinctrl.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ unconnected.

For example, a platform may do this:

ret = pin_config_set(dev, "FOO_GPIO_PIN", PLATFORM_X_PULL_UP);
ret = pin_config_set("foo-dev", "FOO_GPIO_PIN", PLATFORM_X_PULL_UP);

To pull up a pin to VDD. The pin configuration driver implements callbacks for
changing pin configuration in the pin controller ops like this:
Expand Down
41 changes: 32 additions & 9 deletions trunk/drivers/pinctrl/pinconf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,22 @@ int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,

/**
* pin_config_get() - get the configuration of a single pin parameter
* @pctldev: pin controller device for this pin
* @dev_name: name of the pin controller device for this pin
* @name: name of the pin to get the config for
* @config: the config pointed to by this argument will be filled in with the
* current pin state, it can be used directly by drivers as a numeral, or
* it can be dereferenced to any struct.
*/
int pin_config_get(struct pinctrl_dev *pctldev, const char *name,
int pin_config_get(const char *dev_name, const char *name,
unsigned long *config)
{
struct pinctrl_dev *pctldev;
int pin;

pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);
if (!pctldev)
return -EINVAL;

pin = pin_get_from_name(pctldev, name);
if (pin < 0)
return pin;
Expand Down Expand Up @@ -82,17 +87,22 @@ int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,

/**
* pin_config_set() - set the configuration of a single pin parameter
* @pctldev: pin controller device for this pin
* @dev_name: name of pin controller device for this pin
* @name: name of the pin to set the config for
* @config: the config in this argument will contain the desired pin state, it
* can be used directly by drivers as a numeral, or it can be dereferenced
* to any struct.
*/
int pin_config_set(struct pinctrl_dev *pctldev, const char *name,
int pin_config_set(const char *dev_name, const char *name,
unsigned long config)
{
struct pinctrl_dev *pctldev;
int pin;

pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);
if (!pctldev)
return -EINVAL;

pin = pin_get_from_name(pctldev, name);
if (pin < 0)
return pin;
Expand All @@ -101,12 +111,18 @@ int pin_config_set(struct pinctrl_dev *pctldev, const char *name,
}
EXPORT_SYMBOL(pin_config_set);

int pin_config_group_get(struct pinctrl_dev *pctldev, const char *pin_group,
int pin_config_group_get(const char *dev_name, const char *pin_group,
unsigned long *config)
{
const struct pinconf_ops *ops = pctldev->desc->confops;
struct pinctrl_dev *pctldev;
const struct pinconf_ops *ops;
int selector;

pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);
if (!pctldev)
return -EINVAL;
ops = pctldev->desc->confops;

if (!ops || !ops->pin_config_group_get) {
dev_err(pctldev->dev, "cannot get configuration for pin "
"group, missing group config get function in "
Expand All @@ -123,17 +139,24 @@ int pin_config_group_get(struct pinctrl_dev *pctldev, const char *pin_group,
EXPORT_SYMBOL(pin_config_group_get);


int pin_config_group_set(struct pinctrl_dev *pctldev, const char *pin_group,
int pin_config_group_set(const char *dev_name, const char *pin_group,
unsigned long config)
{
const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;
const struct pinconf_ops *ops = pctldev->desc->confops;
struct pinctrl_dev *pctldev;
const struct pinconf_ops *ops;
const struct pinctrl_ops *pctlops;
int selector;
const unsigned *pins;
unsigned num_pins;
int ret;
int i;

pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);
if (!pctldev)
return -EINVAL;
ops = pctldev->desc->confops;
pctlops = pctldev->desc->pctlops;

if (!ops || (!ops->pin_config_group_set && !ops->pin_config_set)) {
dev_err(pctldev->dev, "cannot configure pin group, missing "
"config function in driver\n");
Expand Down
16 changes: 8 additions & 8 deletions trunk/include/linux/pinctrl/pinconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,39 +53,39 @@ struct pinconf_ops {
unsigned selector);
};

extern int pin_config_get(struct pinctrl_dev *pctldev, const char *name,
extern int pin_config_get(const char *dev_name, const char *name,
unsigned long *config);
extern int pin_config_set(struct pinctrl_dev *pctldev, const char *name,
extern int pin_config_set(const char *dev_name, const char *name,
unsigned long config);
extern int pin_config_group_get(struct pinctrl_dev *pctldev,
extern int pin_config_group_get(const char *dev_name,
const char *pin_group,
unsigned long *config);
extern int pin_config_group_set(struct pinctrl_dev *pctldev,
extern int pin_config_group_set(const char *dev_name,
const char *pin_group,
unsigned long config);

#else

static inline int pin_config_get(struct pinctrl_dev *pctldev, const char *name,
static inline int pin_config_get(const char *dev_name, const char *name,
unsigned long *config)
{
return 0;
}

static inline int pin_config_set(struct pinctrl_dev *pctldev, const char *name,
static inline int pin_config_set(const char *dev_name, const char *name,
unsigned long config)
{
return 0;
}

static inline int pin_config_group_get(struct pinctrl_dev *pctldev,
static inline int pin_config_group_get(const char *dev_name,
const char *pin_group,
unsigned long *config)
{
return 0;
}

static inline int pin_config_group_set(struct pinctrl_dev *pctldev,
static inline int pin_config_group_set(const char *dev_name,
const char *pin_group,
unsigned long config)
{
Expand Down

0 comments on commit 89b1e83

Please sign in to comment.