pinctrl: introduce PINCTRL_STATE_DEFAULT, define hogs as that state
This provides a single centralized name for the default state. Update PIN_MAP_* macros to use this state name, instead of requiring the user to pass a state name in. With this change, hog entries in the mapping table are defined as those with state name PINCTRL_STATE_DEFAULT, i.e. all entries have the same name. This interacts badly with the nested iteration over mapping table entries in pinctrl_hog_maps() and pinctrl_hog_map() which would now attempt to claim each hog mapping table entry multiple times. Replacing the custom hog code with a simple pinctrl_get()/pinctrl_enable(). Update documentation and mapping tables to use this. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Dong Aisheng <dong.aisheng@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
committed by
Linus Walleij
parent
d4e3198736
commit
46919ae63d
@@ -12,6 +12,8 @@
|
||||
#ifndef __LINUX_PINCTRL_MACHINE_H
|
||||
#define __LINUX_PINCTRL_MACHINE_H
|
||||
|
||||
#include "pinctrl.h"
|
||||
|
||||
/**
|
||||
* struct pinctrl_map - boards/machines shall provide this map for devices
|
||||
* @dev_name: the name of the device using this specific mapping, the name
|
||||
@@ -49,17 +51,18 @@ struct pinctrl_map {
|
||||
* Convenience macro to map a system function onto a certain pinctrl device,
|
||||
* to be hogged by the pin control core until the system shuts down.
|
||||
*/
|
||||
#define PIN_MAP_SYS_HOG(a, b, c) \
|
||||
{ .name = a, .ctrl_dev_name = b, .dev_name = b, .function = c, }
|
||||
#define PIN_MAP_SYS_HOG(a, b) \
|
||||
{ .name = PINCTRL_STATE_DEFAULT, .ctrl_dev_name = a, .dev_name = a, \
|
||||
.function = b, }
|
||||
|
||||
/*
|
||||
* Convenience macro to map a system function onto a certain pinctrl device
|
||||
* using a specified group, to be hogged by the pin control core until the
|
||||
* system shuts down.
|
||||
*/
|
||||
#define PIN_MAP_SYS_HOG_GROUP(a, b, c, d) \
|
||||
{ .name = a, .ctrl_dev_name = b, .dev_name = b, .function = c, \
|
||||
.group = d, }
|
||||
#define PIN_MAP_SYS_HOG_GROUP(a, b, c) \
|
||||
{ .name = PINCTRL_STATE_DEFAULT, .ctrl_dev_name = a, .dev_name = a, \
|
||||
.function = b, .group = c, }
|
||||
|
||||
#ifdef CONFIG_PINMUX
|
||||
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
#include <linux/list.h>
|
||||
#include <linux/seq_file.h>
|
||||
|
||||
#define PINCTRL_STATE_DEFAULT "default"
|
||||
|
||||
struct pinctrl_dev;
|
||||
struct pinmux_ops;
|
||||
struct pinconf_ops;
|
||||
|
||||
Reference in New Issue
Block a user