main/linux-rpi: upgrade to 4.4.10

2 files changed, 40 insertions, 39 deletions

diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index 0a0a070f5f..1b5e8fbbc8 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
 pkgname=linux-rpi
-pkgver=4.4.8
+pkgver=4.4.10
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=1
+pkgrel=0
 pkgdesc="Linux kernel with Raspberry Pi patches"
 url=https://github.com/raspberrypi/linux
 depends="mkinitfs linux-firmware"
@@ -15,8 +15,8 @@ options="!strip"
 install=
 source="http://ftp.kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz
 	http://ftp.kernel.org/pub/linux/kernel/v4.x/patch-$pkgver.xz
-	http://dev.alpinelinux.org/~tteras/rpi/linux-4.4.y-rpi-20160502.patch
-	rpi-cirrus-4.4.y-20160327.patch
+	http://dev.alpinelinux.org/~tteras/rpi/linux-4.4.y-rpi-20160514.patch
+	rpi-cirrus-4.4.y-20160514.patch
 	gpio-mcp23s08-pullups.patch
 	rotary-encoder-fix.patch
 	issue-4973.patch
@@ -196,9 +196,9 @@ for _f in $_flavors; do
 done
 
 md5sums="9a78fa2eb6c68ca5a40ed5af08142599  linux-4.4.tar.xz
-c1d8f46e5b2ee7c925fc38f20a3726d3  patch-4.4.8.xz
-2453468309cf01ebaab17130b754e6a6  linux-4.4.y-rpi-20160502.patch
-f3bc8a24dab2ad72e3f61ad47c30469d  rpi-cirrus-4.4.y-20160327.patch
+1b9a296c0d0b778e8173299618f2d84f  patch-4.4.10.xz
+1d08efb60aaa1a161aaa128807fcd8ce  linux-4.4.y-rpi-20160514.patch
+1ac525e064919fd4ffec5d40b910cae1  rpi-cirrus-4.4.y-20160514.patch
 b66e8aa4991ca5c2ccd61559ed7e6491  gpio-mcp23s08-pullups.patch
 5508d2b3e5967bd57f92f551d90b3e54  rotary-encoder-fix.patch
 29281b74d2cef6965fa4ab6d826a2aa4  issue-4973.patch
@@ -206,9 +206,9 @@ b66e8aa4991ca5c2ccd61559ed7e6491  gpio-mcp23s08-pullups.patch
 c91c9be0820bdaaeb4861d26fba7588c  config-rpi2.armhf
 e587cae1dca2f5992555d9bcf53deecf  markdt"
 sha256sums="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2  linux-4.4.tar.xz
-11ec99ae0600bd831ff8d71b77e64592f4b6918b7857fd9ff0284ea4cf267b4e  patch-4.4.8.xz
-c97673952b8ad37146aef628373e4b549bd5f8c1172f10310b760b18877df5f0  linux-4.4.y-rpi-20160502.patch
-0b6b1cd22459bf52350fb8952256870642bfeedfa91ee7cda5349d7118b4af77  rpi-cirrus-4.4.y-20160327.patch
+df66bd2532cac85dfb85d6ca9b750689e02278442652a0b047304e3322947d17  patch-4.4.10.xz
+68b19c4c589afa869d6278d775a34bb30bc83b3e09c703d9df3163f144a9d36e  linux-4.4.y-rpi-20160514.patch
+651845267ee7ee815cc5e78cad9dad87d3de388ce07f911f68b20880ca1e3292  rpi-cirrus-4.4.y-20160514.patch
 b389a556bbd98053881b43deef1adf20640f980557c5f37cfd7ece2daeecbda9  gpio-mcp23s08-pullups.patch
 ab6740577fe8c1d71d2c716720ebbbf9a750985963d6938093b4ca9194b6e871  rotary-encoder-fix.patch
 3a16e927ce53a8c56e7f1dd86fe8ad08b1c06466f5206c521a7e2de1e4796d6c  issue-4973.patch
@@ -216,9 +216,9 @@ ab6740577fe8c1d71d2c716720ebbbf9a750985963d6938093b4ca9194b6e871  rotary-encoder
 f8a8a950db8961dd01f30fd242d58be5dc2a5eb45963db83e311c4b745a3e7db  config-rpi2.armhf
 0f6681fc5c3590e1dbe13a2bde796403bd1529cf0fe19720899eaa0db79bcb49  markdt"
 sha512sums="13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e  linux-4.4.tar.xz
-d53d6950bc121107fecec91b4cd33473b0b18e7188bd387cd02f3ab4ece0f7dc6f1530ad9b7a44655afb7d823fb94ad8d8710902367c9b12911eb2247a12f2c7  patch-4.4.8.xz
-ff2da3a36159abc8144fbc593561eadd78798297d9bb8d5398f944271624e2a42199d562969bd2bb31702b8fccb6224fb74ed84cb9ebce0c096693ec4901ba4e  linux-4.4.y-rpi-20160502.patch
-7b7c2bd82ab32581ebd0382539fece6e9e7789d76b0f6bcc4a132dd9c4374a17175df1482e2ffabe1e9c27a170c179b26b52d4698f7b8f45afb07297b640221c  rpi-cirrus-4.4.y-20160327.patch
+05277847fb0cd1ae2c488031935979964706f76fd44b2f0790ecc4c8a785e6c3e43af45213f09f07e26ab74f43b5569f6bf87fd15ef9721cf3163abfa49dda7c  patch-4.4.10.xz
+77818e23a9ae1854589da425377f8ea96581166597a18f5fd70f1cfca2a7049d42aea239c25836e91702436b079369f0aa427c4eee58e43d1e4d5dcf7d62488d  linux-4.4.y-rpi-20160514.patch
+abe4d482a98450335eb935cf49be468accc8955a464553c45280f15d4114a87e96b158800536c2f6c09be07474386bef952d1f96e58eaac5a4f6d6bd47e845c1  rpi-cirrus-4.4.y-20160514.patch
 36724ba56cb8fdf3a3d347cffb67ae1cc3d7b1052d526b6b5134ebf6baae9f9724b586c97833453dc7697ab24699426f0749af78b6a80be36967a80033a0cf40  gpio-mcp23s08-pullups.patch
 3a711e2cdb6c0ecaceb3755437d38626dec8403e8aa167a6e16f64d8a8b7cc5bdc7e04aa7c05938719ebc90e319ec4124ee2151a7855e7838ee143b62d140ad0  rotary-encoder-fix.patch
 501c91bf2538a18102da59bbccc3097f9c3c90079acc0e946ff075074160c09b8a66934e5ce5470e170f0e4f93d114709a95230367426d0bb7ea02c4bdf4cc9b  issue-4973.patch
diff --git a/main/linux-rpi/rpi-cirrus-4.4.y-20160327.patch b/main/linux-rpi/rpi-cirrus-4.4.y-20160514.patch
index d430efa34d..26c41b867d 100644
--- a/main/linux-rpi/rpi-cirrus-4.4.y-20160327.patch
+++ b/main/linux-rpi/rpi-cirrus-4.4.y-20160514.patch
@@ -65,10 +65,10 @@ index 18be0cb..4b3510a 100644
 +	wlf,dmic-ref = <0 0 1 0>;
  };
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 4c3db73..b38e598 100644
+index 3d8de47..156c29d 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -52,6 +52,7 @@ dtbo-$(RPI_DT_OVERLAYS) += pwm-2chan.dtbo
+@@ -61,6 +61,7 @@ dtbo-$(RPI_DT_OVERLAYS) += pwm-2chan.dtbo
  dtbo-$(RPI_DT_OVERLAYS) += qca7000.dtbo
  dtbo-$(RPI_DT_OVERLAYS) += raspidac3.dtbo
  dtbo-$(RPI_DT_OVERLAYS) += rpi-backlight.dtbo
@@ -221,10 +221,10 @@ index 0000000..3cb63a5
 +	};
 +};
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index b63632d..ee84684 100644
+index 0bdc631..4de55c8 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
-@@ -645,6 +645,9 @@ CONFIG_STMPE_SPI=y
+@@ -650,6 +650,9 @@ CONFIG_STMPE_SPI=y
  CONFIG_MFD_ARIZONA_I2C=m
  CONFIG_MFD_ARIZONA_SPI=m
  CONFIG_MFD_WM5102=y
@@ -234,19 +234,19 @@ index b63632d..ee84684 100644
  CONFIG_MEDIA_SUPPORT=m
  CONFIG_MEDIA_CAMERA_SUPPORT=y
  CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-@@ -853,6 +856,7 @@ CONFIG_SND_BCM2708_SOC_RPI_DAC=m
- CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
+@@ -863,6 +866,7 @@ CONFIG_SND_BCM2708_SOC_BOOMBERRY_DIGI=m
  CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
  CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
+ CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
 +CONFIG_SND_BCM2708_SOC_RPI_CODEC_WSP=m
  CONFIG_SND_SOC_ADAU1701=m
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index e720c74..b7d8ad8 100644
+index 57393b5..55ef0a5 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -637,6 +637,9 @@ CONFIG_STMPE_SPI=y
+@@ -642,6 +642,9 @@ CONFIG_STMPE_SPI=y
  CONFIG_MFD_ARIZONA_I2C=m
  CONFIG_MFD_ARIZONA_SPI=m
  CONFIG_MFD_WM5102=y
@@ -256,16 +256,16 @@ index e720c74..b7d8ad8 100644
  CONFIG_MEDIA_SUPPORT=m
  CONFIG_MEDIA_CAMERA_SUPPORT=y
  CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
-@@ -845,6 +848,7 @@ CONFIG_SND_BCM2708_SOC_RPI_DAC=m
- CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
+@@ -855,6 +858,7 @@ CONFIG_SND_BCM2708_SOC_BOOMBERRY_DIGI=m
  CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
  CONFIG_SND_BCM2708_SOC_RASPIDAC3=m
+ CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
 +CONFIG_SND_BCM2708_SOC_RPI_CODEC_WSP=m
  CONFIG_SND_SOC_ADAU1701=m
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 985019b..77be442 100644
+index d26b6bd..dad4f48 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -144,12 +144,6 @@ struct bcm2835_desc {
@@ -680,13 +680,13 @@ index fb955e6..bbdc05d 100644
  
  	unsigned int dai_fmt;           /* format to set on init */
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 1a3f826..020cfb1 100644
+index c05e656..0fb2384 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
-@@ -64,3 +64,11 @@ config SND_BCM2708_SOC_RASPIDAC3
- 	select SND_SOC_TPA6130A2
+@@ -85,3 +85,12 @@ config SND_BCM2708_SOC_ADAU1977_ADC
+ 	select SND_SOC_ADAU1977_I2C
  	help
- 	  Say Y or M if you want to add support for RaspiDAC Rev.3x.
+ 	  Say Y or M if you want to add support for ADAU1977 ADC.
 +
 +config SND_BCM2708_SOC_RPI_CODEC_WSP
 +	tristate "Support for Cirrus sound pi"
@@ -695,28 +695,29 @@ index 1a3f826..020cfb1 100644
 +	select SND_SOC_WM8804
 +	help
 +	  Say Y or M if you want to add support for Cirrus sound pi
++
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index b21e11e..4cb717f 100644
+index 7de2ef1..4d6c910 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
-@@ -12,6 +12,7 @@ snd-soc-rpi-dac-objs := rpi-dac.o
+@@ -15,6 +15,7 @@ snd-soc-rpi-dac-objs := rpi-dac.o
  snd-soc-rpi-proto-objs := rpi-proto.o
  snd-soc-iqaudio-dac-objs := iqaudio-dac.o
  snd-soc-raspidac3-objs := raspidac3.o
 +snd-soc-rpi-wsp-objs := rpi-cirrus-sound-pi.o
  
+ obj-$(CONFIG_SND_BCM2708_SOC_ADAU1977_ADC) += snd-soc-adau1977-adc.o
  obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
- obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
-@@ -21,3 +22,4 @@ obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
+@@ -27,3 +28,4 @@ obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
  obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
  obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
  obj-$(CONFIG_SND_BCM2708_SOC_RASPIDAC3) += snd-soc-raspidac3.o
 +obj-$(CONFIG_SND_BCM2708_SOC_RPI_CODEC_WSP) += snd-soc-rpi-wsp.o
 diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
-index 04c1d13..815509b 100644
+index aedb01f..c413973 100644
 --- a/sound/soc/bcm/bcm2835-i2s.c
 +++ b/sound/soc/bcm/bcm2835-i2s.c
-@@ -806,16 +806,16 @@ static struct snd_pcm_hardware bcm2835_pcm_hardware = {
+@@ -813,16 +813,16 @@ static struct snd_pcm_hardware bcm2835_pcm_hardware = {
  				  SNDRV_PCM_FMTBIT_S24_LE |
  				  SNDRV_PCM_FMTBIT_S32_LE,
  	.period_bytes_min	= 32,
@@ -1474,10 +1475,10 @@ index a1305f8..31f36e6 100644
  			dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
  				play_w->name, capture_w->name, ret);
 diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
-index 416514f..92832eb 100644
+index afb70a5..104888d 100644
 --- a/sound/soc/soc-dapm.c
 +++ b/sound/soc/soc-dapm.c
-@@ -3443,11 +3443,12 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
+@@ -3450,11 +3450,12 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
  {
  	struct snd_soc_dapm_path *source_p, *sink_p;
  	struct snd_soc_dai *source, *sink;
@@ -1492,7 +1493,7 @@ index 416514f..92832eb 100644
  
  	if (WARN_ON(!config) ||
  	    WARN_ON(list_empty(&w->edges[SND_SOC_DAPM_DIR_OUT]) ||
-@@ -3465,6 +3466,16 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
+@@ -3472,6 +3473,16 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
  	source = source_p->source->priv;
  	sink = sink_p->sink->priv;
  
@@ -1509,7 +1510,7 @@ index 416514f..92832eb 100644
  	/* Be a little careful as we don't want to overflow the mask array */
  	if (config->formats) {
  		fmt = ffs(config->formats) - 1;
-@@ -3594,10 +3605,11 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol,
+@@ -3601,10 +3612,11 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol,
  }
  
  int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
@@ -1523,7 +1524,7 @@ index 416514f..92832eb 100644
  {
  	struct snd_soc_dapm_widget template;
  	struct snd_soc_dapm_widget *w;
-@@ -3699,6 +3711,7 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
+@@ -3706,6 +3718,7 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
  
  	w->params = params;
  	w->num_params = num_params;