Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6a3bf93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pinctrl fixes from Linus Walleij:
 "This is a late pinctrl fix pull request, we had to revert out the
  pinctrl-single GPIO backend, because of, well, design issues.  We're
  cooking a better thing for the next cycle.

   - Revert gpio request/free backend, new patch set in the works, will
     be for v3.9.  Get this old cruft out before anyone hurts himself on
     it.
   - Kconfig buzz
   - Various compile warnings
   - MPP6 value for the Kirkwood"

* tag 'pinctrl-fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: nomadik: nmk_prcm_gpiocr_get_mode may be unused
  pinctrl: exynos: don't mark probing functions as __init
  Revert "pinctrl: single: support gpio request and free"
  pinctrl: mvebu: fix MPP6 value for kirkwood driver
  pinctrl: mvebu: Fix compiler warnings
  pinctrl: pinctrl-mxs: Fix variables' definition type
  pinctrl: samsung: removing duplicated condition for PINCTRL_SAMSUNG
parents 6abb7c25 0fafd50e

drivers/pinctrl/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ config PINCTRL_COH901 


config PINCTRL_SAMSUNG

	bool

	depends on OF && GPIOLIB

	select PINMUX

	select PINCONF

drivers/pinctrl/mvebu/pinctrl-dove.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev) 
{

	const struct of_device_id *match =

		of_match_device(dove_pinctrl_of_match, &pdev->dev);

	pdev->dev.platform_data = match->data;

	pdev->dev.platform_data = (void *)match->data;



	/*

	 * General MPP Configuration Register is part of pdma registers.

drivers/pinctrl/mvebu/pinctrl-kirkwood.c

+4 −4
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ static struct mvebu_mpp_mode mv88f6xxx_mpp_modes[] = { 
		MPP_VAR_FUNCTION(0x5, "sata0", "act",    V(0, 1, 1, 1, 1, 0)),

		MPP_VAR_FUNCTION(0xb, "lcd", "vsync",    V(0, 0, 0, 0, 1, 0))),

	MPP_MODE(6,

		MPP_VAR_FUNCTION(0x0, "sysrst", "out",   V(1, 1, 1, 1, 1, 1)),

		MPP_VAR_FUNCTION(0x1, "spi", "mosi",     V(1, 1, 1, 1, 1, 1)),

		MPP_VAR_FUNCTION(0x2, "ptp", "trig",     V(1, 1, 1, 1, 0, 0))),

		MPP_VAR_FUNCTION(0x1, "sysrst", "out",   V(1, 1, 1, 1, 1, 1)),

		MPP_VAR_FUNCTION(0x2, "spi", "mosi",     V(1, 1, 1, 1, 1, 1)),

		MPP_VAR_FUNCTION(0x3, "ptp", "trig",     V(1, 1, 1, 1, 0, 0))),

	MPP_MODE(7,

		MPP_VAR_FUNCTION(0x0, "gpo", NULL,       V(1, 1, 1, 1, 1, 1)),

		MPP_VAR_FUNCTION(0x1, "pex", "rsto",     V(1, 1, 1, 1, 0, 1)),
@@ -458,7 +458,7 @@ static int kirkwood_pinctrl_probe(struct platform_device *pdev) 
{

	const struct of_device_id *match =

		of_match_device(kirkwood_pinctrl_of_match, &pdev->dev);

	pdev->dev.platform_data = match->data;

	pdev->dev.platform_data = (void *)match->data;

	return mvebu_pinctrl_probe(pdev);

}

drivers/pinctrl/pinctrl-exynos5440.c

+5 −5
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static int exynos5440_gpio_direction_output(struct gpio_chip *gc, unsigned offse 
}



/* parse the pin numbers listed in the 'samsung,exynos5440-pins' property */

static int __init exynos5440_pinctrl_parse_dt_pins(struct platform_device *pdev,

static int exynos5440_pinctrl_parse_dt_pins(struct platform_device *pdev,

			struct device_node *cfg_np, unsigned int **pin_list,

			unsigned int *npins)

{
@@ -630,7 +630,7 @@ static int __init exynos5440_pinctrl_parse_dt_pins(struct platform_device *pdev, 
 * Parse the information about all the available pin groups and pin functions

 * from device node of the pin-controller.

 */

static int __init exynos5440_pinctrl_parse_dt(struct platform_device *pdev,

static int exynos5440_pinctrl_parse_dt(struct platform_device *pdev,

				struct exynos5440_pinctrl_priv_data *priv)

{

	struct device *dev = &pdev->dev;
@@ -723,7 +723,7 @@ static int __init exynos5440_pinctrl_parse_dt(struct platform_device *pdev, 
}



/* register the pinctrl interface with the pinctrl subsystem */

static int __init exynos5440_pinctrl_register(struct platform_device *pdev,

static int exynos5440_pinctrl_register(struct platform_device *pdev,

				struct exynos5440_pinctrl_priv_data *priv)

{

	struct device *dev = &pdev->dev;
@@ -798,7 +798,7 @@ static int __init exynos5440_pinctrl_register(struct platform_device *pdev, 
}



/* register the gpiolib interface with the gpiolib subsystem */

static int __init exynos5440_gpiolib_register(struct platform_device *pdev,

static int exynos5440_gpiolib_register(struct platform_device *pdev,

				struct exynos5440_pinctrl_priv_data *priv)

{

	struct gpio_chip *gc;
@@ -831,7 +831,7 @@ static int __init exynos5440_gpiolib_register(struct platform_device *pdev, 
}



/* unregister the gpiolib interface with the gpiolib subsystem */

static int __init exynos5440_gpiolib_unregister(struct platform_device *pdev,

static int exynos5440_gpiolib_unregister(struct platform_device *pdev,

				struct exynos5440_pinctrl_priv_data *priv)

{

	int ret = gpiochip_remove(priv->gc);

drivers/pinctrl/pinctrl-mxs.c

+4 −5
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev, 
static void mxs_dt_free_map(struct pinctrl_dev *pctldev,

			    struct pinctrl_map *map, unsigned num_maps)

{

	int i;

	u32 i;



	for (i = 0; i < num_maps; i++) {

		if (map[i].type == PIN_MAP_TYPE_MUX_GROUP)
@@ -203,7 +203,7 @@ static int mxs_pinctrl_enable(struct pinctrl_dev *pctldev, unsigned selector, 
	void __iomem *reg;

	u8 bank, shift;

	u16 pin;

	int i;

	u32 i;



	for (i = 0; i < g->npins; i++) {

		bank = PINID_TO_BANK(g->pins[i]);
@@ -256,7 +256,7 @@ static int mxs_pinconf_group_set(struct pinctrl_dev *pctldev, 
	void __iomem *reg;

	u8 ma, vol, pull, bank, shift;

	u16 pin;

	int i;

	u32 i;



	ma = CONFIG_TO_MA(config);

	vol = CONFIG_TO_VOL(config);
@@ -345,8 +345,7 @@ static int mxs_pinctrl_parse_group(struct platform_device *pdev, 
	const char *propname = "fsl,pinmux-ids";

	char *group;

	int length = strlen(np->name) + SUFFIX_LEN;

	int i;

	u32 val;

	u32 val, i;



	group = devm_kzalloc(&pdev->dev, length, GFP_KERNEL);

	if (!group)