Merge tag 'pinctrl-v4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull Pin control fixes from Linus Walleij: "Pin control fixes for the v4.5 series, all are individual driver fixes: - Fix the PXA2xx driver to export its init function so we do not break modular compiles. - Hide unused functions in the Nomadik driver. - Fix up direction control in the Mediatek driver. - Toggle the sunxi GPIO lines to input when you read them on the H3 GPIO controller, lest you only get garbage. - Fix up the number of settings in the MVEBU driver. - Fix a serious SMP race condition in the Samsung driver" * tag 'pinctrl-v4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: samsung: fix SMP race condition pinctrl: mvebu: fix num_settings in mpp group assignment pinctrl: sunxi: H3 requires irq_read_needs_mux pinctrl: mediatek: fix direction control issue pinctrl: nomadik: hide unused functions pinctrl: pxa: export pxa2xx_pinctrl_init()

Linus Torvalds committed 10 years ago

Commit 409ee132 parents 9001b8e d9ff0eb6 files · +48 −18Browse files

Unified · Split

6 files

drivers/pinctrl/mediatek/pinctrl-mtk-common.c +2 −0
drivers/pinctrl/mvebu/pinctrl-mvebu.c +6 −3
drivers/pinctrl/nomadik/pinctrl-abx500.c +3 −2
drivers/pinctrl/pxa/pinctrl-pxa2xx.c +1 −0
drivers/pinctrl/samsung/pinctrl-samsung.c +35 −13
drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c +1 −0

drivers/pinctrl/mediatek/pinctrl-mtk-common.c+2−0

 		ret = mtk_pconf_set_pull_select(pctl, pin, true, false, arg);
 		break;
 	case PIN_CONFIG_INPUT_ENABLE:
+		mtk_pmx_gpio_set_direction(pctldev, NULL, pin, true);
 		ret = mtk_pconf_set_ies_smt(pctl, pin, arg, param);
 		break;
 	case PIN_CONFIG_OUTPUT:
 		ret = mtk_pmx_gpio_set_direction(pctldev, NULL, pin, false);
 		break;
 	case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
+		mtk_pmx_gpio_set_direction(pctldev, NULL, pin, true);
 		ret = mtk_pconf_set_ies_smt(pctl, pin, arg, param);
 		break;
 	case PIN_CONFIG_DRIVE_STRENGTH:

drivers/pinctrl/mvebu/pinctrl-mvebu.c+6−3

 		struct mvebu_mpp_ctrl_setting *set = &mode->settings[0];
 		struct mvebu_pinctrl_group *grp;
 		unsigned num_settings;
+		unsigned supp_settings;
-		for (num_settings = 0; ; set++) {
+		for (num_settings = 0, supp_settings = 0; ; set++) {
 			if (!set->name)
 				break;
+			num_settings++;
 			/* skip unsupported settings for this variant */
 			if (pctl->variant && !(pctl->variant & set->variant))
 				continue;
-			num_settings++;
+			supp_settings++;
 			/* find gpio/gpo/gpi settings */
 			if (strcmp(set->name, "gpio") == 0)
 		}
 		/* skip modes with no settings for this variant */
-		if (!num_settings)
+		if (!supp_settings)
 			continue;
 		grp = mvebu_pinctrl_find_group_by_pid(pctl, mode->pid);

drivers/pinctrl/nomadik/pinctrl-abx500.c+3−2

 		dev_err(pct->dev, "%s write failed (%d)\n", __func__, ret);
 }
+#ifdef CONFIG_DEBUG_FS
 static int abx500_get_pull_updown(struct abx500_pinctrl *pct, int offset,
 				  enum abx500_gpio_pull_updown *pull_updown)
 {
 	return ret;
 }
+#endif
 static int abx500_set_pull_updown(struct abx500_pinctrl *pct,
 				  int offset, enum abx500_gpio_pull_updown val)
 	return ret;
 }
+#ifdef CONFIG_DEBUG_FS
 static int abx500_get_mode(struct pinctrl_dev *pctldev, struct gpio_chip *chip,
 			  unsigned gpio)
 {
 	return ret;
 }
-#ifdef CONFIG_DEBUG_FS
 #include <linux/seq_file.h>
 static void abx500_gpio_dbg_show_one(struct seq_file *s,

drivers/pinctrl/pxa/pinctrl-pxa2xx.c+1−0

@@ -426,6 +426,7 @@ int pxa2xx_pinctrl_init(struct platform_device *pdev, · 425 unmodified lines
426		426
427	return 0;	427	return 0;
428	}	428	}
		429	EXPORT_SYMBOL(pxa2xx_pinctrl_init);
429		430
430	int pxa2xx_pinctrl_exit(struct platform_device *pdev)	431	int pxa2xx_pinctrl_exit(struct platform_device *pdev)
431	{	432	{

drivers/pinctrl/samsung/pinctrl-samsung.c+35−13

 	.pin_config_group_set	= samsung_pinconf_group_set,
 };
-/* gpiolib gpio_set callback function */
+/*
-static void samsung_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
+ * The samsung_gpio_set_vlaue() should be called with "bank->slock" held
+ * to avoid race condition.
+ */
+static void samsung_gpio_set_value(struct gpio_chip *gc,
+					  unsigned offset, int value)
 {
 	struct samsung_pin_bank *bank = gpiochip_get_data(gc);
 	const struct samsung_pin_bank_type *type = bank->type;
-	unsigned long flags;
 	void __iomem *reg;
 	u32 data;
 	reg = bank->drvdata->virt_base + bank->pctl_offset;
-	spin_lock_irqsave(&bank->slock, flags);
 	data = readl(reg + type->reg_offset[PINCFG_TYPE_DAT]);
 	data &= ~(1 << offset);
 	if (value)
 		data |= 1 << offset;
 	writel(data, reg + type->reg_offset[PINCFG_TYPE_DAT]);
+}
+/* gpiolib gpio_set callback function */
+static void samsung_gpio_set(struct gpio_chip *gc, unsigned offset, int value)
+{
+	struct samsung_pin_bank *bank = gpiochip_get_data(gc);
+	unsigned long flags;
+	spin_lock_irqsave(&bank->slock, flags);
+	samsung_gpio_set_value(gc, offset, value);
 	spin_unlock_irqrestore(&bank->slock, flags);
 }
 }
 /*
+ * The samsung_gpio_set_direction() should be called with "bank->slock" held
+ * to avoid race condition.
  * The calls to gpio_direction_output() and gpio_direction_input()
  * leads to this function call.
  */
 	struct samsung_pinctrl_drv_data *drvdata;
 	void __iomem *reg;
 	u32 data, mask, shift;
-	unsigned long flags;
 	bank = gpiochip_get_data(gc);
 	type = bank->type;
 		reg += 4;
 	}
-	spin_lock_irqsave(&bank->slock, flags);
 	data = readl(reg);
 	data &= ~(mask << shift);
 	if (!input)
 		data |= FUNC_OUTPUT << shift;
 	writel(data, reg);
-	spin_unlock_irqrestore(&bank->slock, flags);
 	return 0;
 }
 /* gpiolib gpio_direction_input callback function. */
 static int samsung_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
 {
-	return samsung_gpio_set_direction(gc, offset, true);
+	struct samsung_pin_bank *bank = gpiochip_get_data(gc);
+	unsigned long flags;
+	int ret;
+	spin_lock_irqsave(&bank->slock, flags);
+	ret = samsung_gpio_set_direction(gc, offset, true);
+	spin_unlock_irqrestore(&bank->slock, flags);
+	return ret;
 }
 /* gpiolib gpio_direction_output callback function. */
 static int samsung_gpio_direction_output(struct gpio_chip *gc, unsigned offset,
 							int value)
 {
-	samsung_gpio_set(gc, offset, value);
+	struct samsung_pin_bank *bank = gpiochip_get_data(gc);
-	return samsung_gpio_set_direction(gc, offset, false);
+	unsigned long flags;
+	int ret;
+	spin_lock_irqsave(&bank->slock, flags);
+	samsung_gpio_set_value(gc, offset, value);
+	ret = samsung_gpio_set_direction(gc, offset, false);
+	spin_unlock_irqrestore(&bank->slock, flags);
+	return ret;
 }
 /*

drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c+1−0

@@ -492,6 +492,7 @@ static const struct sunxi_pinctrl_desc sun8i_h3_pinctrl_data = { · 491 unmodified lines
492	.pins = sun8i_h3_pins,	492	.pins = sun8i_h3_pins,
493	.npins = ARRAY_SIZE(sun8i_h3_pins),	493	.npins = ARRAY_SIZE(sun8i_h3_pins),
494	.irq_banks = 2,	494	.irq_banks = 2,
		495	.irq_read_needs_mux = true
495	};	496	};
496		497
497	static int sun8i_h3_pinctrl_probe(struct platform_device *pdev)	498	static int sun8i_h3_pinctrl_probe(struct platform_device *pdev)

Merge tag 'pinctrl-v4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code