2016-03-08 18:11:49 +00:00
|
|
|
From be4e718cccf6909072eeab1032b1d9fb6dd92b43 Mon Sep 17 00:00:00 2001
|
2016-02-25 10:14:01 +00:00
|
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
|
|
|
Date: Tue, 9 Feb 2016 09:52:13 +0000
|
2016-03-08 18:11:49 +00:00
|
|
|
Subject: [PATCH 147/170] pinctrl-bcm2835: Fix cut-and-paste error in "pull"
|
2016-02-25 10:14:01 +00:00
|
|
|
parsing
|
|
|
|
|
|
|
|
|
|
The DT bindings for pinctrl-bcm2835 allow both the function and pull
|
|
|
|
|
to contain either one entry or one per pin. However, an error in the
|
|
|
|
|
DT parsing can cause failures if the number of pulls differs from the
|
|
|
|
|
number of functions.
|
|
|
|
|
---
|
|
|
|
|
drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
|
|
|
|
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
|
|
|
|
@@ -802,7 +802,7 @@ static int bcm2835_pctl_dt_node_to_map(s
|
|
|
|
|
}
|
|
|
|
|
if (num_pulls) {
|
|
|
|
|
err = of_property_read_u32_index(np, "brcm,pull",
|
|
|
|
|
- (num_funcs > 1) ? i : 0, &pull);
|
|
|
|
|
+ (num_pulls > 1) ? i : 0, &pull);
|
|
|
|
|
if (err)
|
|
|
|
|
goto out;
|
|
|
|
|
err = bcm2835_pctl_dt_node_to_map_pull(pc, np, pin,
|
