diff options
| author | John Crispin <john@openwrt.org> | 2015-07-17 12:48:39 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-07-17 12:48:39 +0000 |
| commit | 208ab54e3e9516dd9fcf1ce197950044e0bebd90 (patch) | |
| tree | 425580d694235f06661dd2d6763925a1f69279c6 /target/linux/brcm2708/patches-4.1/0096-bcm2708-i2s-Don-t-use-static-pin-configuration-with-.patch | |
| parent | 03b56c9350057ee77cfe2b8bb8f8d7146917fb79 (diff) | |
| download | upstream-208ab54e3e9516dd9fcf1ce197950044e0bebd90.tar.gz upstream-208ab54e3e9516dd9fcf1ce197950044e0bebd90.tar.bz2 upstream-208ab54e3e9516dd9fcf1ce197950044e0bebd90.zip | |
brcm2708: add linux 4.1 support
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 46399
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0096-bcm2708-i2s-Don-t-use-static-pin-configuration-with-.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.1/0096-bcm2708-i2s-Don-t-use-static-pin-configuration-with-.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0096-bcm2708-i2s-Don-t-use-static-pin-configuration-with-.patch b/target/linux/brcm2708/patches-4.1/0096-bcm2708-i2s-Don-t-use-static-pin-configuration-with-.patch new file mode 100644 index 0000000000..a0b767278a --- /dev/null +++ b/target/linux/brcm2708/patches-4.1/0096-bcm2708-i2s-Don-t-use-static-pin-configuration-with-.patch @@ -0,0 +1,23 @@ +From 699c056af380b45856086c0b33a65acc3d2ad3d8 Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.org> +Date: Mon, 15 Jun 2015 10:10:59 +0100 +Subject: [PATCH 096/121] bcm2708-i2s: Don't use static pin configuration with + DT + +--- + sound/soc/bcm/bcm2708-i2s.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/sound/soc/bcm/bcm2708-i2s.c ++++ b/sound/soc/bcm/bcm2708-i2s.c +@@ -409,8 +409,8 @@ static int bcm2708_i2s_hw_params(struct + if (csreg & (BCM2708_I2S_TXON | BCM2708_I2S_RXON)) + return 0; + +- +- bcm2708_i2s_setup_gpio(); ++ if (!dev->dev->of_node) ++ bcm2708_i2s_setup_gpio(); + + /* + * Adjust the data length according to the format. |