diff options
| author | John Crispin <john@openwrt.org> | 2016-02-25 10:14:01 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2016-02-25 10:14:01 +0000 |
| commit | b3dc9566a46efa67951ff6ae28e4397da9db92af (patch) | |
| tree | 708022d9254ba347bfcf279d9ad1151cb3c4c2aa /target/linux/brcm2708/patches-4.4/0147-pinctrl-bcm2835-Fix-cut-and-paste-error-in-pull-pars.patch | |
| parent | dac55e665efa29510abf0cb5f70a43036727c539 (diff) | |
| download | upstream-b3dc9566a46efa67951ff6ae28e4397da9db92af.tar.gz upstream-b3dc9566a46efa67951ff6ae28e4397da9db92af.tar.bz2 upstream-b3dc9566a46efa67951ff6ae28e4397da9db92af.zip | |
brcm2708: switch to linux 4.4 and update patches
As usual these patches were extracted from:
https://github.com/raspberrypi/linux/commits/rpi-4.4.y
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 48765
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0147-pinctrl-bcm2835-Fix-cut-and-paste-error-in-pull-pars.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.4/0147-pinctrl-bcm2835-Fix-cut-and-paste-error-in-pull-pars.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0147-pinctrl-bcm2835-Fix-cut-and-paste-error-in-pull-pars.patch b/target/linux/brcm2708/patches-4.4/0147-pinctrl-bcm2835-Fix-cut-and-paste-error-in-pull-pars.patch new file mode 100644 index 0000000000..405499bfd6 --- /dev/null +++ b/target/linux/brcm2708/patches-4.4/0147-pinctrl-bcm2835-Fix-cut-and-paste-error-in-pull-pars.patch @@ -0,0 +1,25 @@ +From adebf09ba85b5844c24fa3bde1c78d836454209c Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.org> +Date: Tue, 9 Feb 2016 09:52:13 +0000 +Subject: [PATCH 147/156] pinctrl-bcm2835: Fix cut-and-paste error in "pull" + 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, |