kernel: update kernel 4.4 to 4.4.59

[openwrt/staging/dedeckeh.git] / target / linux / brcm2708 / patches-4.4 / 0571-Revert-bcm2835-i2s-Changes-for-allowing-asymmetric-s.patch

diff --git a/target/linux/brcm2708/patches-4.4/0571-Revert-bcm2835-i2s-Changes-for-allowing-asymmetric-s.patch b/target/linux/brcm2708/patches-4.4/0571-Revert-bcm2835-i2s-Changes-for-allowing-asymmetric-s.patch
index 3904abbaa345f399c9f8cfa47ecbd6675e5f66ed..5fc687455f958c6fe89da03af2b54db9f580fdb9 100644 (file)
--- a/target/linux/brcm2708/patches-4.4/0571-Revert-bcm2835-i2s-Changes-for-allowing-asymmetric-s.patch
+++ b/target/linux/brcm2708/patches-4.4/0571-Revert-bcm2835-i2s-Changes-for-allowing-asymmetric-s.patch
@@ -13,11 +13,9 @@ See: https://github.com/raspberrypi/linux/issues/1799
  sound/soc/bcm/bcm2835-i2s.c | 54 ++++++++++++++-------------------------------
  1 file changed, 16 insertions(+), 38 deletions(-)
 
-diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
-index d2b0801..aedb01f 100644
 --- a/sound/soc/bcm/bcm2835-i2s.c
 +++ b/sound/soc/bcm/bcm2835-i2s.c
-@@ -310,7 +310,6 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
+@@ -310,7 +310,6 @@ static int bcm2835_i2s_hw_params(struct
        unsigned int sampling_rate = params_rate(params);
        unsigned int data_length, data_delay, bclk_ratio;
        unsigned int ch1pos, ch2pos, mode, format;
@@ -25,7 +23,7 @@ index d2b0801..aedb01f 100644
        unsigned int mash = BCM2835_CLK_MASH_1;
        unsigned int divi, divf, target_frequency;
        int clk_src = -1;
-@@ -321,7 +320,6 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
+@@ -321,7 +320,6 @@ static int bcm2835_i2s_hw_params(struct
        bool frame_master =     (master == SND_SOC_DAIFMT_CBS_CFS
                                        || master == SND_SOC_DAIFMT_CBM_CFS);
        uint32_t csreg;
@@ -33,7 +31,7 @@ index d2b0801..aedb01f 100644
  
        /*
         * If a stream is already enabled,
-@@ -467,46 +465,26 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream,
+@@ -467,46 +465,26 @@ static int bcm2835_i2s_hw_params(struct
                return -EINVAL;
        }
  
@@ -96,6 +94,3 @@ index d2b0801..aedb01f 100644
        }
  
        mode |= BCM2835_I2S_FLEN(bclk_ratio - 1);
--- 
-2.1.4
-