diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index cc33dec..3605201 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -181,12 +181,13 @@
 }
 EXPORT_SYMBOL_GPL(pwm_request);
 
-static struct pwm_device *of_node_to_pwm_device(struct device_node *np)
+static struct pwm_device *of_node_to_pwm_device(struct device_node *np, int id)
 {
 	struct pwm_device *pwm;
 
 	list_for_each_entry(pwm, &pwm_list, node) {
-		if (pwm->hwdev && pwm->hwdev->device_node == np)
+		if (pwm->hwdev && pwm->hwdev->device_node == np &&
+				pwm->chip->id == id)
 			return pwm;
 	}
 
@@ -210,7 +211,7 @@
 		return ERR_PTR(ret);
 	}
 
-	pwm = of_node_to_pwm_device(args.np);
+	pwm = of_node_to_pwm_device(args.np, args.args[0]);
 	if (IS_ERR(pwm)) {
 		pr_debug("%s(): PWM chip not found\n", __func__);
 		return pwm;
diff --git a/include/pwm.h b/include/pwm.h
index 59d86d4..911c760 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -57,12 +57,14 @@
 
 /**
  * struct pwm_chip - abstract a PWM
+ * @id: The id of this pwm
  * @devname: unique identifier for this pwm
  * @ops: The callbacks for this PWM
  * @duty_ns: The duty cycle of the PWM, in nano-seconds
  * @period_ns: The period of the PWM, in nano-seconds
  */
 struct pwm_chip {
+	int			id;
 	const char		*devname;
 	struct pwm_ops		*ops;
 	int			duty_ns;