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

Commit 8f6c1ca9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-fixes-v3.6-rc3' of... 

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

Pull pin control fixes from Linus Walleij:
 - Fixed Nomadik errorpath
 - Fixed documentation spelling errors
 - Forward-declare struct device in a header file
 - Remove some extraneous code lines when getting pinctrl states
 - Correct the i.MX51 configure register number
 - Fix the Nomadik keypad function group list

* tag 'pinctrl-fixes-v3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl/nomadik: add kp_b_2 keyboard function group list
  pinctrl: imx51: fix .conf_reg of MX51_PAD_SD2_CMD__CSPI_MOSI
  trivial: pinctrl core: remove extraneous code lines
  pinctrl: header: trivial: declare struct device
  Documentation/pinctrl.txt: Fix some misspelled macros
  pinctrl/nomadik: fix null in irqdomain errorpath
parents 4459f397 4c39104d

Documentation/pinctrl.txt

+3 −3
Original line number Diff line number Diff line
@@ -840,9 +840,9 @@ static unsigned long i2c_pin_configs[] = { 


static struct pinctrl_map __initdata mapping[] = {

	PIN_MAP_MUX_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", "i2c0"),

	PIN_MAP_MUX_CONFIGS_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", i2c_grp_configs),

	PIN_MAP_MUX_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0scl", i2c_pin_configs),

	PIN_MAP_MUX_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0sda", i2c_pin_configs),

	PIN_MAP_CONFIGS_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", i2c_grp_configs),

	PIN_MAP_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0scl", i2c_pin_configs),

	PIN_MAP_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0sda", i2c_pin_configs),

};



Finally, some devices expect the mapping table to contain certain specific

drivers/pinctrl/core.c

+3 −10
Original line number Diff line number Diff line
@@ -657,11 +657,7 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev) 
	if (p != NULL)

		return ERR_PTR(-EBUSY);



	p = create_pinctrl(dev);

	if (IS_ERR(p))

		return p;



	return p;

	return create_pinctrl(dev);

}



/**
@@ -738,11 +734,8 @@ static struct pinctrl_state *pinctrl_lookup_state_locked(struct pinctrl *p, 
			dev_dbg(p->dev, "using pinctrl dummy state (%s)\n",

				name);

			state = create_state(p, name);

			if (IS_ERR(state))

				return state;

		} else {

			return ERR_PTR(-ENODEV);

		}

		} else

			state = ERR_PTR(-ENODEV);

	}



	return state;

drivers/pinctrl/pinctrl-imx51.c

+1 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ static struct imx_pin_reg imx51_pin_regs[] = { 
	IMX_PIN_REG(MX51_PAD_EIM_DA13, NO_PAD, 0x050, 0, 0x000, 0), /* MX51_PAD_EIM_DA13__EIM_DA13 */

	IMX_PIN_REG(MX51_PAD_EIM_DA14, NO_PAD, 0x054, 0, 0x000, 0), /* MX51_PAD_EIM_DA14__EIM_DA14 */

	IMX_PIN_REG(MX51_PAD_EIM_DA15, NO_PAD, 0x058, 0, 0x000, 0), /* MX51_PAD_EIM_DA15__EIM_DA15 */

	IMX_PIN_REG(MX51_PAD_SD2_CMD, NO_PAD, 0x3b4, 2, 0x91c, 3), /* MX51_PAD_SD2_CMD__CSPI_MOSI */

	IMX_PIN_REG(MX51_PAD_SD2_CMD, 0x7bc, 0x3b4, 2, 0x91c, 3), /* MX51_PAD_SD2_CMD__CSPI_MOSI */

	IMX_PIN_REG(MX51_PAD_SD2_CMD, 0x7bc, 0x3b4, 1, 0x9b0, 2), /* MX51_PAD_SD2_CMD__I2C1_SCL */

	IMX_PIN_REG(MX51_PAD_SD2_CMD, 0x7bc, 0x3b4, 0, 0x000, 0), /* MX51_PAD_SD2_CMD__SD2_CMD */

	IMX_PIN_REG(MX51_PAD_SD2_CLK, 0x7c0, 0x3b8, 2, 0x914, 3), /* MX51_PAD_SD2_CLK__CSPI_SCLK */

drivers/pinctrl/pinctrl-nomadik-db8500.c

+4 −1
Original line number Diff line number Diff line
@@ -505,6 +505,8 @@ static const unsigned kp_b_1_pins[] = { DB8500_PIN_F3, DB8500_PIN_F1, 
	DB8500_PIN_J3, DB8500_PIN_H2, DB8500_PIN_J2, DB8500_PIN_H1,

	DB8500_PIN_F4, DB8500_PIN_E3, DB8500_PIN_E4, DB8500_PIN_D2,

	DB8500_PIN_C1, DB8500_PIN_D3, DB8500_PIN_C2, DB8500_PIN_D5 };

static const unsigned kp_b_2_pins[] = { DB8500_PIN_F3, DB8500_PIN_F1,

	DB8500_PIN_G3, DB8500_PIN_G2, DB8500_PIN_F4, DB8500_PIN_E3};

static const unsigned sm_b_1_pins[] = { DB8500_PIN_C6, DB8500_PIN_B3,

	DB8500_PIN_C4, DB8500_PIN_E6, DB8500_PIN_A3, DB8500_PIN_B6,

	DB8500_PIN_D6, DB8500_PIN_B7, DB8500_PIN_D7, DB8500_PIN_D8,
@@ -662,6 +664,7 @@ static const struct nmk_pingroup nmk_db8500_groups[] = { 
	DB8500_PIN_GROUP(spi3_b_1, NMK_GPIO_ALT_B),

	DB8500_PIN_GROUP(msp1txrx_b_1, NMK_GPIO_ALT_B),

	DB8500_PIN_GROUP(kp_b_1, NMK_GPIO_ALT_B),

	DB8500_PIN_GROUP(kp_b_2, NMK_GPIO_ALT_B),

	DB8500_PIN_GROUP(sm_b_1, NMK_GPIO_ALT_B),

	DB8500_PIN_GROUP(smcs0_b_1, NMK_GPIO_ALT_B),

	DB8500_PIN_GROUP(smcs1_b_1, NMK_GPIO_ALT_B),
@@ -751,7 +754,7 @@ DB8500_FUNC_GROUPS(msp1, "msp1txrx_a_1", "msp1_a_1", "msp1txrx_b_1"); 
DB8500_FUNC_GROUPS(lcdb, "lcdb_a_1");

DB8500_FUNC_GROUPS(lcd, "lcdvsi0_a_1", "lcdvsi1_a_1", "lcd_d0_d7_a_1",

	"lcd_d8_d11_a_1", "lcd_d12_d23_a_1", "lcd_b_1");

DB8500_FUNC_GROUPS(kp, "kp_a_1", "kp_b_1", "kp_c_1", "kp_oc1_1");

DB8500_FUNC_GROUPS(kp, "kp_a_1", "kp_b_1", "kp_b_2", "kp_c_1", "kp_oc1_1");

DB8500_FUNC_GROUPS(mc2, "mc2_a_1", "mc2rstn_c_1");

DB8500_FUNC_GROUPS(ssp1, "ssp1_a_1");

DB8500_FUNC_GROUPS(ssp0, "ssp0_a_1");

drivers/pinctrl/pinctrl-nomadik.c

+1 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev) 
						NOMADIK_GPIO_TO_IRQ(pdata->first_gpio),

						0, &nmk_gpio_irq_simple_ops, nmk_chip);

	if (!nmk_chip->domain) {

		pr_err("%s: Failed to create irqdomain\n", np->full_name);

		dev_err(&dev->dev, "failed to create irqdomain\n");

		ret = -ENOSYS;

		goto out;

	}