brcm2708: add linux 4.1 support
[openwrt.git] / target / linux / brcm2708 / patches-4.1 / 0096-bcm2708-i2s-Don-t-use-static-pin-configuration-with-.patch
1 From 699c056af380b45856086c0b33a65acc3d2ad3d8 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Mon, 15 Jun 2015 10:10:59 +0100
4 Subject: [PATCH 096/121] bcm2708-i2s: Don't use static pin configuration with
5  DT
6
7 ---
8  sound/soc/bcm/bcm2708-i2s.c | 4 ++--
9  1 file changed, 2 insertions(+), 2 deletions(-)
10
11 --- a/sound/soc/bcm/bcm2708-i2s.c
12 +++ b/sound/soc/bcm/bcm2708-i2s.c
13 @@ -409,8 +409,8 @@ static int bcm2708_i2s_hw_params(struct
14         if (csreg & (BCM2708_I2S_TXON | BCM2708_I2S_RXON))
15                 return 0;
16  
17 -
18 -       bcm2708_i2s_setup_gpio();
19 +       if (!dev->dev->of_node)
20 +               bcm2708_i2s_setup_gpio();
21  
22         /*
23          * Adjust the data length according to the format.