Skip to contentSkip to conversation

Allow registration of default inversed polarity PWMs

PATCH In review Tim Kryger 3 participants 5 messages Jan 5, 2015 – Jan 13, 2015

Subsystems (2)
lore
Share & tools
lore

Tim Kryger

author
#0 lore raw

cover Allow registration of default inversed polarity PWMs

This series alters the PWM core to allow the registration of controllers that begin with inversed polarity output. It also modifies the Broadcom Kona driver to take advantage of this new call.

Arun Ramamurthy (1):
drivers: pwm: bcm-kona: Dont set polarity in probe

Tim Kryger (1):
drivers: pwm: core: Add pwmchip_add_inversed

 drivers/pwm/core.c         | 36 ++++++++++++++++++++++++++++--------
 drivers/pwm/pwm-bcm-kona.c |  9 +++------
 include/linux/pwm.h        |  6 ++++++
 3 files changed, 37 insertions(+), 14 deletions(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/2 drivers: pwm: core: Add pwmchip_add_inversed

Add a new function to register a PWM chip with channels that have their initial polarity as inversed. This benefits drivers of controllers that by default operate with inversed polarity by removing the need to modify the polarity during initialization.

---
 drivers/pwm/core.c  | 36 ++++++++++++++++++++++++++++--------
 include/linux/pwm.h |  6 ++++++
 2 files changed, 34 insertions(+), 8 deletions(-)
drivers/pwm/core.c +28 -8
index 966497d..f28c4ce 100644
@@ -222,14 +222,8 @@ void *pwm_get_chip_data(struct pwm_device *pwm)
 }
 EXPORT_SYMBOL_GPL(pwm_get_chip_data);
 
-/**
- * pwmchip_add() - register a new PWM chip
- * @chip: the PWM chip to add
- *
- * Register a new PWM chip. If chip->base < 0 then a dynamically assigned base
- * will be used.
- */
-int pwmchip_add(struct pwm_chip *chip)
+static int pwmchip_add_with_polarity(struct pwm_chip *chip,
+				     enum pwm_polarity polarity)
 {
 	struct pwm_device *pwm;
 	unsigned int i;
@@ -259,6 +253,7 @@ int pwmchip_add(struct pwm_chip *chip)
 		pwm->chip = chip;
 		pwm->pwm = chip->base + i;
 		pwm->hwpwm = i;
+		pwm->polarity = polarity;
 
 		radix_tree_insert(&pwm_tree, pwm->pwm, pwm);
 	}
@@ -279,9 +274,34 @@ out:
 	mutex_unlock(&pwm_lock);
 	return ret;
 }
+
+/**
+ * pwmchip_add() - register a new PWM chip
+ * @chip: the PWM chip to add
+ *
+ * Register a new PWM chip. If chip->base < 0 then a dynamically assigned base
+ * will be used.  The initial polarity for all channels is normal.
+ */
+int pwmchip_add(struct pwm_chip *chip)
+{
+	return pwmchip_add_with_polarity(chip, PWM_POLARITY_NORMAL);
+}
 EXPORT_SYMBOL_GPL(pwmchip_add);
 
 /**
+ * pwmchip_add_inversed() - register a new PWM chip
+ * @chip: the PWM chip to add
+ *
+ * Register a new PWM chip. If chip->base < 0 then a dynamically assigned base
+ * will be used.  The initial polarity for all channels is inversed.
+ */
+int pwmchip_add_inversed(struct pwm_chip *chip)
+{
+	return pwmchip_add_with_polarity(chip, PWM_POLARITY_INVERSED);
+}
+EXPORT_SYMBOL_GPL(pwmchip_add_inversed);
+
+/**
  * pwmchip_remove() - remove a PWM chip
  * @chip: the PWM chip to remove
  *
include/linux/pwm.h +6 -0
index e90628c..358547f 100644
@@ -183,6 +183,7 @@ int pwm_set_chip_data(struct pwm_device *pwm, void *data);
 void *pwm_get_chip_data(struct pwm_device *pwm);
 
 int pwmchip_add(struct pwm_chip *chip);
+int pwmchip_add_inversed(struct pwm_chip *chip);
 int pwmchip_remove(struct pwm_chip *chip);
 struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,
 					 unsigned int index,
@@ -217,6 +218,11 @@ static inline int pwmchip_add(struct pwm_chip *chip)
 	return -EINVAL;
 }
 
+static inline int pwmchip_add_inversed(struct pwm_chip *chip)
+{
+	return -EINVAL;
+}
+
 static inline int pwmchip_remove(struct pwm_chip *chip)
 {
 	return -EINVAL;
Signature · 1 line
1.9.1
#2 lore raw

Re: [PATCH 1/2] drivers: pwm: core: Add pwmchip_add_inversed

I'm fine with the changes. I'll remove patch 2 (polarity) from my patches and send them out again based on these. Hopefully we can move forward with this.

Quoted 100 lines · Tim Kryger

Add a new function to register a PWM chip with channels that have their initial polarity as inversed. This benefits drivers of controllers that by default operate with inversed polarity by removing the need to modify the polarity during initialization.

---
 drivers/pwm/core.c  | 36 ++++++++++++++++++++++++++++--------
 include/linux/pwm.h |  6 ++++++
 2 files changed, 34 insertions(+), 8 deletions(-)
drivers/pwm/core.c +28 -8
index 966497d..f28c4ce 100644
@@ -222,14 +222,8 @@ void *pwm_get_chip_data(struct pwm_device *pwm)
 }
 EXPORT_SYMBOL_GPL(pwm_get_chip_data);
 
-/**
- * pwmchip_add() - register a new PWM chip
- * @chip: the PWM chip to add
- *
- * Register a new PWM chip. If chip->base < 0 then a dynamically assigned base
- * will be used.
- */
-int pwmchip_add(struct pwm_chip *chip)
+static int pwmchip_add_with_polarity(struct pwm_chip *chip,
+				     enum pwm_polarity polarity)
 {
 	struct pwm_device *pwm;
 	unsigned int i;
@@ -259,6 +253,7 @@ int pwmchip_add(struct pwm_chip *chip)
 		pwm->chip = chip;
 		pwm->pwm = chip->base + i;
 		pwm->hwpwm = i;
+		pwm->polarity = polarity;
 
 		radix_tree_insert(&pwm_tree, pwm->pwm, pwm);
 	}
@@ -279,9 +274,34 @@ out:
 	mutex_unlock(&pwm_lock);
 	return ret;
 }
+
+/**
+ * pwmchip_add() - register a new PWM chip
+ * @chip: the PWM chip to add
+ *
+ * Register a new PWM chip. If chip->base < 0 then a dynamically assigned base
+ * will be used.  The initial polarity for all channels is normal.
+ */
+int pwmchip_add(struct pwm_chip *chip)
+{
+	return pwmchip_add_with_polarity(chip, PWM_POLARITY_NORMAL);
+}
 EXPORT_SYMBOL_GPL(pwmchip_add);
 
 /**
+ * pwmchip_add_inversed() - register a new PWM chip
+ * @chip: the PWM chip to add
+ *
+ * Register a new PWM chip. If chip->base < 0 then a dynamically assigned base
+ * will be used.  The initial polarity for all channels is inversed.
+ */
+int pwmchip_add_inversed(struct pwm_chip *chip)
+{
+	return pwmchip_add_with_polarity(chip, PWM_POLARITY_INVERSED);
+}
+EXPORT_SYMBOL_GPL(pwmchip_add_inversed);
+
+/**
  * pwmchip_remove() - remove a PWM chip
  * @chip: the PWM chip to remove
  *
include/linux/pwm.h +6 -0
index e90628c..358547f 100644
@@ -183,6 +183,7 @@ int pwm_set_chip_data(struct pwm_device *pwm, void *data);
 void *pwm_get_chip_data(struct pwm_device *pwm);
 
 int pwmchip_add(struct pwm_chip *chip);
+int pwmchip_add_inversed(struct pwm_chip *chip);
 int pwmchip_remove(struct pwm_chip *chip);
 struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,
 					 unsigned int index,
@@ -217,6 +218,11 @@ static inline int pwmchip_add(struct pwm_chip *chip)
 	return -EINVAL;
 }
 
+static inline int pwmchip_add_inversed(struct pwm_chip *chip)
+{
+	return -EINVAL;
+}
+
 static inline int pwmchip_remove(struct pwm_chip *chip)
 {
 	return -EINVAL;
maintainer Acked-by on v1 1/2
#3 lore raw

Re: [PATCH 1/2] drivers: pwm: core: Add pwmchip_add_inversed

In reply to Tim Kryger

Patchset looks good.

Quoted 6 lines · Tim Kryger

Add a new function to register a PWM chip with channels that have their initial polarity as inversed. This benefits drivers of controllers that by default operate with inversed polarity by removing the need to modify the polarity during initialization.

Quoted 94 lines
---
  drivers/pwm/core.c  | 36 ++++++++++++++++++++++++++++--------
  include/linux/pwm.h |  6 ++++++
  2 files changed, 34 insertions(+), 8 deletions(-)
drivers/pwm/core.c +28 -8
index 966497d..f28c4ce 100644
@@ -222,14 +222,8 @@ void *pwm_get_chip_data(struct pwm_device *pwm)
  }
  EXPORT_SYMBOL_GPL(pwm_get_chip_data);
 
-/**
- * pwmchip_add() - register a new PWM chip
- * @chip: the PWM chip to add
- *
- * Register a new PWM chip. If chip->base < 0 then a dynamically assigned base
- * will be used.
- */
-int pwmchip_add(struct pwm_chip *chip)
+static int pwmchip_add_with_polarity(struct pwm_chip *chip,
+				     enum pwm_polarity polarity)
  {
  	struct pwm_device *pwm;
  	unsigned int i;
@@ -259,6 +253,7 @@ int pwmchip_add(struct pwm_chip *chip)
  		pwm->chip = chip;
  		pwm->pwm = chip->base + i;
  		pwm->hwpwm = i;
+		pwm->polarity = polarity;
 
  		radix_tree_insert(&pwm_tree, pwm->pwm, pwm);
  	}
@@ -279,9 +274,34 @@ out:
  	mutex_unlock(&pwm_lock);
  	return ret;
  }
+
+/**
+ * pwmchip_add() - register a new PWM chip
+ * @chip: the PWM chip to add
+ *
+ * Register a new PWM chip. If chip->base < 0 then a dynamically assigned base
+ * will be used.  The initial polarity for all channels is normal.
+ */
+int pwmchip_add(struct pwm_chip *chip)
+{
+	return pwmchip_add_with_polarity(chip, PWM_POLARITY_NORMAL);
+}
  EXPORT_SYMBOL_GPL(pwmchip_add);
 
  /**
+ * pwmchip_add_inversed() - register a new PWM chip
+ * @chip: the PWM chip to add
+ *
+ * Register a new PWM chip. If chip->base < 0 then a dynamically assigned base
+ * will be used.  The initial polarity for all channels is inversed.
+ */
+int pwmchip_add_inversed(struct pwm_chip *chip)
+{
+	return pwmchip_add_with_polarity(chip, PWM_POLARITY_INVERSED);
+}
+EXPORT_SYMBOL_GPL(pwmchip_add_inversed);
+
+/**
   * pwmchip_remove() - remove a PWM chip
   * @chip: the PWM chip to remove
   *
include/linux/pwm.h +6 -0
index e90628c..358547f 100644
@@ -183,6 +183,7 @@ int pwm_set_chip_data(struct pwm_device *pwm, void *data);
  void *pwm_get_chip_data(struct pwm_device *pwm);
 
  int pwmchip_add(struct pwm_chip *chip);
+int pwmchip_add_inversed(struct pwm_chip *chip);
  int pwmchip_remove(struct pwm_chip *chip);
  struct pwm_device *pwm_request_from_chip(struct pwm_chip *chip,
  					 unsigned int index,
@@ -217,6 +218,11 @@ static inline int pwmchip_add(struct pwm_chip *chip)
  	return -EINVAL;
  }
 
+static inline int pwmchip_add_inversed(struct pwm_chip *chip)
+{
+	return -EINVAL;
+}
+
  static inline int pwmchip_remove(struct pwm_chip *chip)
  {
  	return -EINVAL;
author
#4 lore raw

PATCH 2/2 drivers: pwm: bcm-kona: Dont set polarity in probe

In reply to Tim Kryger

From: Arun Ramamurthy <[email protected]>

Omit setting the polarity to normal during probe and instead use the new pwmchip_add_inversed function to register a PWM chip with default polarity of inversed for all channels as this is the actual hardware default.

---

This is based on Arun's patch (originally posted by Scott)

https://lkml.org/lkml/2014/11/25/1019

I modified it to use the pwmchip_add_inversed function so the polarity could be safely left at the power on default and updated the commit message accordingly.

 drivers/pwm/pwm-bcm-kona.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/pwm/pwm-bcm-kona.c +3 -6
index 02bc048..32b3ec6 100644
@@ -266,18 +266,15 @@ static int kona_pwmc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	/* Set smooth mode, push/pull, and normal polarity for all channels */
-	for (chan = 0; chan < kp->chip.npwm; chan++) {
-		value |= (1 << PWM_CONTROL_SMOOTH_SHIFT(chan));
+	/* Set push/pull for all channels */
+	for (chan = 0; chan < kp->chip.npwm; chan++)
 		value |= (1 << PWM_CONTROL_TYPE_SHIFT(chan));
-		value |= (1 << PWM_CONTROL_POLARITY_SHIFT(chan));
-	}
 
 	writel(value, kp->base + PWM_CONTROL_OFFSET);
 
 	clk_disable_unprepare(kp->clk);
 
-	ret = pwmchip_add(&kp->chip);
+	ret = pwmchip_add_inversed(&kp->chip);
 	if (ret < 0)
 		dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);
 
Signature · 1 line
1.9.1