Commit 5870b2c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 642ba5ed 45f034ef

drivers/pinctrl/Kconfig

+7 −15
Original line number Diff line number Diff line
@@ -2,23 +2,17 @@ 
# PINCTRL infrastructure and drivers

#



menuconfig PINCTRL

	bool "PINCTRL Support"

config PINCTRL

	bool

	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



menu "Pin controllers"

	depends on PINCTRL



config PINMUX

	bool "Support pinmux controllers"

	help

	  Say Y here if you want the pincontrol subsystem to handle pin

	  multiplexing drivers.



config DEBUG_PINCTRL

	bool "Debug PINCTRL calls"
@@ -30,14 +24,12 @@ config PINMUX_SIRF 
	bool "CSR SiRFprimaII pinmux driver"

	depends on ARCH_PRIMA2

	select PINMUX

	help

	  Say Y here to enable the SiRFprimaII pinmux driver



config PINMUX_U300

	bool "U300 pinmux driver"

	depends on ARCH_U300

	select PINMUX

	help

	  Say Y here to enable the U300 pinmux driver



endmenu



endif

include/linux/pinctrl/pinctrl.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

#else



struct pinctrl_dev;



/* Sufficiently stupid default function when pinctrl is not in use */

static inline bool pin_is_valid(struct pinctrl_dev *pctldev, int pin)