Merge commit '06763c7' into orion/dt2 (ec65aed9) · Commits · 戴 / test

Documentation/pinctrl.txt

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1193,4 +1193,6 @@ foo_switch()
	...		...
	}		}

	The above has to be done from process context.		The above has to be done from process context. The reservation of the pins
			will be done when the state is activated, so in effect one specific pin
			can be used by different functions at different times on a running system.

+1 −21

Original line number	Original line	Diff line number	Diff line
	@@ -188,27 +188,7 @@ config PINCTRL_EXYNOS4
	depends on OF && GPIOLIB		depends on OF && GPIOLIB
	select PINCTRL_SAMSUNG		select PINCTRL_SAMSUNG

	config PINCTRL_MVEBU		source "drivers/pinctrl/mvebu/Kconfig"
	bool
	depends on ARCH_MVEBU
	select PINMUX
	select PINCONF

	config PINCTRL_DOVE
	bool
	select PINCTRL_MVEBU

	config PINCTRL_KIRKWOOD
	bool
	select PINCTRL_MVEBU

	config PINCTRL_ARMADA_370
	bool
	select PINCTRL_MVEBU

	config PINCTRL_ARMADA_XP
	bool
	select PINCTRL_MVEBU

	source "drivers/pinctrl/spear/Kconfig"		source "drivers/pinctrl/spear/Kconfig"

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -36,12 +36,8 @@ obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o
	obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o		obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o
	obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o		obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o
	obj-$(CONFIG_PINCTRL_EXYNOS4) += pinctrl-exynos.o		obj-$(CONFIG_PINCTRL_EXYNOS4) += pinctrl-exynos.o
	obj-$(CONFIG_PINCTRL_MVEBU) += pinctrl-mvebu.o
	obj-$(CONFIG_PINCTRL_DOVE) += pinctrl-dove.o
	obj-$(CONFIG_PINCTRL_KIRKWOOD) += pinctrl-kirkwood.o
	obj-$(CONFIG_PINCTRL_ARMADA_370) += pinctrl-armada-370.o
	obj-$(CONFIG_PINCTRL_ARMADA_XP) += pinctrl-armada-xp.o
	obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o		obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o
	obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o		obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o

			obj-$(CONFIG_PLAT_ORION) += mvebu/
	obj-$(CONFIG_PLAT_SPEAR) += spear/		obj-$(CONFIG_PLAT_SPEAR) += spear/

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -563,6 +563,8 @@ static int add_setting(struct pinctrl p, struct pinctrl_map const map)
	return -EPROBE_DEFER;		return -EPROBE_DEFER;
	}		}

			setting->dev_name = map->dev_name;

	switch (map->type) {		switch (map->type) {
	case PIN_MAP_TYPE_MUX_GROUP:		case PIN_MAP_TYPE_MUX_GROUP:
	ret = pinmux_map_to_setting(map, setting);		ret = pinmux_map_to_setting(map, setting);

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -105,12 +105,14 @@ struct pinctrl_setting_configs {
	* @type: the type of setting		* @type: the type of setting
	* @pctldev: pin control device handling to be programmed. Not used for		* @pctldev: pin control device handling to be programmed. Not used for
	* PIN_MAP_TYPE_DUMMY_STATE.		* PIN_MAP_TYPE_DUMMY_STATE.
			* @dev_name: the name of the device using this state
	* @data: Data specific to the setting type		* @data: Data specific to the setting type
	*/		*/
	struct pinctrl_setting {		struct pinctrl_setting {
	struct list_head node;		struct list_head node;
	enum pinctrl_map_type type;		enum pinctrl_map_type type;
	struct pinctrl_dev *pctldev;		struct pinctrl_dev *pctldev;
			const char *dev_name;
	union {		union {
	struct pinctrl_setting_mux mux;		struct pinctrl_setting_mux mux;
	struct pinctrl_setting_configs configs;		struct pinctrl_setting_configs configs;