mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
Merge branch 'fixes' of git://git.linaro.org/people/triad/linux-pinctrl
* 'fixes' of git://git.linaro.org/people/triad/linux-pinctrl: pinctrl: hide subsystem from the populace pinctrl: fix "warning: 'struct pinctrl_dev' declared inside parameter list"
This commit is contained in:
commit
5870b2c719
2 changed files with 8 additions and 15 deletions
|
@ -2,23 +2,17 @@
|
||||||
# PINCTRL infrastructure and drivers
|
# PINCTRL infrastructure and drivers
|
||||||
#
|
#
|
||||||
|
|
||||||
menuconfig PINCTRL
|
config PINCTRL
|
||||||
bool "PINCTRL Support"
|
bool
|
||||||
depends on EXPERIMENTAL
|
depends on EXPERIMENTAL
|
||||||
help
|
|
||||||
This enables the PINCTRL subsystem for controlling pins
|
|
||||||
on chip packages, for example multiplexing pins on primarily
|
|
||||||
PGA and BGA packages for systems on chip.
|
|
||||||
|
|
||||||
If unsure, say N.
|
|
||||||
|
|
||||||
if PINCTRL
|
if PINCTRL
|
||||||
|
|
||||||
|
menu "Pin controllers"
|
||||||
|
depends on PINCTRL
|
||||||
|
|
||||||
config PINMUX
|
config PINMUX
|
||||||
bool "Support pinmux controllers"
|
bool "Support pinmux controllers"
|
||||||
help
|
|
||||||
Say Y here if you want the pincontrol subsystem to handle pin
|
|
||||||
multiplexing drivers.
|
|
||||||
|
|
||||||
config DEBUG_PINCTRL
|
config DEBUG_PINCTRL
|
||||||
bool "Debug PINCTRL calls"
|
bool "Debug PINCTRL calls"
|
||||||
|
@ -30,14 +24,12 @@ config PINMUX_SIRF
|
||||||
bool "CSR SiRFprimaII pinmux driver"
|
bool "CSR SiRFprimaII pinmux driver"
|
||||||
depends on ARCH_PRIMA2
|
depends on ARCH_PRIMA2
|
||||||
select PINMUX
|
select PINMUX
|
||||||
help
|
|
||||||
Say Y here to enable the SiRFprimaII pinmux driver
|
|
||||||
|
|
||||||
config PINMUX_U300
|
config PINMUX_U300
|
||||||
bool "U300 pinmux driver"
|
bool "U300 pinmux driver"
|
||||||
depends on ARCH_U300
|
depends on ARCH_U300
|
||||||
select PINMUX
|
select PINMUX
|
||||||
help
|
|
||||||
Say Y here to enable the U300 pinmux driver
|
endmenu
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -121,6 +121,7 @@ extern const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev);
|
||||||
extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev);
|
extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev);
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
struct pinctrl_dev;
|
||||||
|
|
||||||
/* Sufficiently stupid default function when pinctrl is not in use */
|
/* Sufficiently stupid default function when pinctrl is not in use */
|
||||||
static inline bool pin_is_valid(struct pinctrl_dev *pctldev, int pin)
|
static inline bool pin_is_valid(struct pinctrl_dev *pctldev, int pin)
|
||||||
|
|
Loading…
Reference in a new issue