History

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

Linus Torvalds committed 14 years ago

Commit 8f6c1ca2 parents 4459f39 4c391046 files · +13 −16Browse files

Unified · Split

6 files
  1. Documentation/pinctrl.txt +3 −3
  2. drivers/pinctrl/core.c +3 −10
  3. drivers/pinctrl/pinctrl-imx51.c +1 −1
  4. drivers/pinctrl/pinctrl-nomadik-db8500.c +4 −1
  5. drivers/pinctrl/pinctrl-nomadik.c +1 −1
  6. include/linux/pinctrl/consumer.h +1 −0
Documentation/pinctrl.txt+3−3
@@ -840,9 +840,9 @@ static unsigned long i2c_pin_configs[] = { · 839 unmodified lines
840840
841841 static struct pinctrl_map __initdata mapping[] = {
842842 PIN_MAP_MUX_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", "i2c0"),
843− PIN_MAP_MUX_CONFIGS_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", i2c_grp_configs),
844− PIN_MAP_MUX_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0scl", i2c_pin_configs),
845− PIN_MAP_MUX_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0sda", i2c_pin_configs),
843+ PIN_MAP_CONFIGS_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", i2c_grp_configs),
844+ PIN_MAP_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0scl", i2c_pin_configs),
845+ PIN_MAP_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0sda", i2c_pin_configs),
846846 };
847847
848848 Finally, some devices expect the mapping table to contain certain specific
drivers/pinctrl/core.c+3−10
@@ -657,11 +657,7 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev) · 656 unmodified lines
657657 if (p != NULL)
658658 return ERR_PTR(-EBUSY);
659659
660− p = create_pinctrl(dev);
661− if (IS_ERR(p))
662− return p;
663−
664− return p;
660+ return create_pinctrl(dev);
665661 }
666662
667663 /**
@@ -738,11 +734,8 @@ static struct pinctrl_state *pinctrl_lookup_state_locked(struct pinctrl *p, · 70 unmodified lines
738734 dev_dbg(p->dev, "using pinctrl dummy state (%s)\n",
739735 name);
740736 state = create_state(p, name);
741− if (IS_ERR(state))
742− return state;
743− } else {
744− return ERR_PTR(-ENODEV);
745− }
737+ } else
738+ state = ERR_PTR(-ENODEV);
746739 }
747740
748741 return state;
drivers/pinctrl/pinctrl-imx51.c+1−1
@@ -974,7 +974,7 @@ static struct imx_pin_reg imx51_pin_regs[] = { · 973 unmodified lines
974974 IMX_PIN_REG(MX51_PAD_EIM_DA13, NO_PAD, 0x050, 0, 0x000, 0), /* MX51_PAD_EIM_DA13__EIM_DA13 */
975975 IMX_PIN_REG(MX51_PAD_EIM_DA14, NO_PAD, 0x054, 0, 0x000, 0), /* MX51_PAD_EIM_DA14__EIM_DA14 */
976976 IMX_PIN_REG(MX51_PAD_EIM_DA15, NO_PAD, 0x058, 0, 0x000, 0), /* MX51_PAD_EIM_DA15__EIM_DA15 */
977− IMX_PIN_REG(MX51_PAD_SD2_CMD, NO_PAD, 0x3b4, 2, 0x91c, 3), /* MX51_PAD_SD2_CMD__CSPI_MOSI */
977+ IMX_PIN_REG(MX51_PAD_SD2_CMD, 0x7bc, 0x3b4, 2, 0x91c, 3), /* MX51_PAD_SD2_CMD__CSPI_MOSI */
978978 IMX_PIN_REG(MX51_PAD_SD2_CMD, 0x7bc, 0x3b4, 1, 0x9b0, 2), /* MX51_PAD_SD2_CMD__I2C1_SCL */
979979 IMX_PIN_REG(MX51_PAD_SD2_CMD, 0x7bc, 0x3b4, 0, 0x000, 0), /* MX51_PAD_SD2_CMD__SD2_CMD */
980980 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
@@ -505,6 +505,8 @@ static const unsigned kp_b_1_pins[] = { DB8500_PIN_F3, DB8500_PIN_F1, · 504 unmodified lines
505505 DB8500_PIN_J3, DB8500_PIN_H2, DB8500_PIN_J2, DB8500_PIN_H1,
506506 DB8500_PIN_F4, DB8500_PIN_E3, DB8500_PIN_E4, DB8500_PIN_D2,
507507 DB8500_PIN_C1, DB8500_PIN_D3, DB8500_PIN_C2, DB8500_PIN_D5 };
508+static const unsigned kp_b_2_pins[] = { DB8500_PIN_F3, DB8500_PIN_F1,
509+ DB8500_PIN_G3, DB8500_PIN_G2, DB8500_PIN_F4, DB8500_PIN_E3};
508510 static const unsigned sm_b_1_pins[] = { DB8500_PIN_C6, DB8500_PIN_B3,
509511 DB8500_PIN_C4, DB8500_PIN_E6, DB8500_PIN_A3, DB8500_PIN_B6,
510512 DB8500_PIN_D6, DB8500_PIN_B7, DB8500_PIN_D7, DB8500_PIN_D8,
@@ -662,6 +664,7 @@ static const struct nmk_pingroup nmk_db8500_groups[] = { · 151 unmodified lines
662664 DB8500_PIN_GROUP(spi3_b_1, NMK_GPIO_ALT_B),
663665 DB8500_PIN_GROUP(msp1txrx_b_1, NMK_GPIO_ALT_B),
664666 DB8500_PIN_GROUP(kp_b_1, NMK_GPIO_ALT_B),
667+ DB8500_PIN_GROUP(kp_b_2, NMK_GPIO_ALT_B),
665668 DB8500_PIN_GROUP(sm_b_1, NMK_GPIO_ALT_B),
666669 DB8500_PIN_GROUP(smcs0_b_1, NMK_GPIO_ALT_B),
667670 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"); · 83 unmodified lines
751754 DB8500_FUNC_GROUPS(lcdb, "lcdb_a_1");
752755 DB8500_FUNC_GROUPS(lcd, "lcdvsi0_a_1", "lcdvsi1_a_1", "lcd_d0_d7_a_1",
753756 "lcd_d8_d11_a_1", "lcd_d12_d23_a_1", "lcd_b_1");
754−DB8500_FUNC_GROUPS(kp, "kp_a_1", "kp_b_1", "kp_c_1", "kp_oc1_1");
757+DB8500_FUNC_GROUPS(kp, "kp_a_1", "kp_b_1", "kp_b_2", "kp_c_1", "kp_oc1_1");
755758 DB8500_FUNC_GROUPS(mc2, "mc2_a_1", "mc2rstn_c_1");
756759 DB8500_FUNC_GROUPS(ssp1, "ssp1_a_1");
757760 DB8500_FUNC_GROUPS(ssp0, "ssp0_a_1");
drivers/pinctrl/pinctrl-nomadik.c+1−1
@@ -1292,7 +1292,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev) · 1291 unmodified lines
12921292 NOMADIK_GPIO_TO_IRQ(pdata->first_gpio),
12931293 0, &nmk_gpio_irq_simple_ops, nmk_chip);
12941294 if (!nmk_chip->domain) {
1295− pr_err("%s: Failed to create irqdomain\n", np->full_name);
1295+ dev_err(&dev->dev, "failed to create irqdomain\n");
12961296 ret = -ENOSYS;
12971297 goto out;
12981298 }
include/linux/pinctrl/consumer.h+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 /* This struct is private to the core and should be regarded as a cookie */
2121 struct pinctrl;
2222 struct pinctrl_state;
23+struct device;
2324
2425 #ifdef CONFIG_PINCTRL
2526

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t