Skip to content

Instantly share code, notes, and snippets.

@MilhouseVH

MilhouseVH/0107->0108.diff

Created September 5, 2017 12:18
Show Gist options
  • Save MilhouseVH/121724136901412802c43768bbdf49c3 to your computer and use it in GitHub Desktop.
Save MilhouseVH/121724136901412802c43768bbdf49c3 to your computer and use it in GitHub Desktop.
Download ZIP
Detailed diff between #0107 (---) and #0108 (+++)
Raw
0107->0108.diff
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 3411dbd..40a7d7c 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -56,7 +56,7 @@ case "$LINUX" in
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
;;
*)
- PKG_VERSION="4.9"
+ PKG_VERSION="4.9.1"
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_PATCH_DIRS="default"
;;
diff --git a/packages/linux/patches/default/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/default/linux-203-stb0899_enable_low_symbol_rate.patch
deleted file mode 100644
index f302b6c..0000000
--- a/packages/linux/patches/default/linux-203-stb0899_enable_low_symbol_rate.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c
---- linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-11 18:19:28.000000000 +0100
-+++ linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-16 10:25:43.479645317 +0100
-@@ -1581,7 +1581,7 @@
- .frequency_max = 2150000,
- .frequency_stepsize = 0,
- .frequency_tolerance = 0,
-- .symbol_rate_min = 5000000,
-+ .symbol_rate_min = 1000000,
- .symbol_rate_max = 45000000,
-
- .caps = FE_CAN_INVERSION_AUTO |
diff --git a/packages/linux/patches/default/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/default/linux-212-mantis_stb0899_faster_lock.patch
deleted file mode 100644
index eef4e1e..0000000
--- a/packages/linux/patches/default/linux-212-mantis_stb0899_faster_lock.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_algo.c linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_algo.c
---- linux-3.7.2/drivers/media/dvb-frontends/stb0899_algo.c 2013-01-11 18:19:28.000000000 +0100
-+++ linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_algo.c 2013-01-16 10:28:33.633409961 +0100
-@@ -206,7 +206,6 @@
- static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state)
- {
- struct stb0899_internal *internal = &state->internal;
-- struct stb0899_params *params = &state->params;
-
- short int derot_step, derot_freq = 0, derot_limit, next_loop = 3;
- int index = 0;
-@@ -216,10 +215,9 @@
-
- /* timing loop computation & symbol rate optimisation */
- derot_limit = (internal->sub_range / 2L) / internal->mclk;
-- derot_step = (params->srate / 2L) / internal->mclk;
-+ derot_step = internal->derot_step * 4; /* dertot_step = decreasing delta */
-
- while ((stb0899_check_tmg(state) != TIMINGOK) && next_loop) {
-- index++;
- derot_freq += index * internal->direction * derot_step; /* next derot zig zag position */
-
- if (abs(derot_freq) > derot_limit)
-@@ -230,6 +228,7 @@
- STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq));
- stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */
- }
-+ index++;
- internal->direction = -internal->direction; /* Change zigzag direction */
- }
-
-@@ -278,14 +277,18 @@
- {
- struct stb0899_internal *internal = &state->internal;
-
-- short int derot_freq = 0, last_derot_freq = 0, derot_limit, next_loop = 3;
-+ short int derot_freq = 0, last_derot_freq = 0, derot_limit, derot_step, next_loop = 3;
- int index = 0;
-+ int base_freq;
- u8 cfr[2];
- u8 reg;
-
- internal->status = NOCARRIER;
- derot_limit = (internal->sub_range / 2L) / internal->mclk;
- derot_freq = internal->derot_freq;
-+ derot_step = internal->derot_step * 2;
-+ last_derot_freq = internal->derot_freq;
-+ base_freq = internal->derot_freq;
-
- reg = stb0899_read_reg(state, STB0899_CFD);
- STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
-@@ -294,11 +297,10 @@
- do {
- dprintk(state->verbose, FE_DEBUG, 1, "Derot Freq=%d, mclk=%d", derot_freq, internal->mclk);
- if (stb0899_check_carrier(state) == NOCARRIER) {
-- index++;
- last_derot_freq = derot_freq;
-- derot_freq += index * internal->direction * internal->derot_step; /* next zig zag derotator position */
-+ derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */
-
-- if(abs(derot_freq) > derot_limit)
-+ if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit)
- next_loop--;
-
- if (next_loop) {
-@@ -310,9 +312,10 @@
- STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq));
- stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */
- }
-+ index++;
-+ internal->direction = -internal->direction; /* Change zigzag direction */
- }
-
-- internal->direction = -internal->direction; /* Change zigzag direction */
- } while ((internal->status != CARRIEROK) && next_loop);
-
- if (internal->status == CARRIEROK) {
-@@ -338,6 +341,7 @@
- int lock = 0, index = 0, dataTime = 500, loop;
- u8 reg;
-
-+ msleep(1);
- internal->status = NODATA;
-
- /* RESET FEC */
-@@ -348,6 +352,7 @@
- reg = stb0899_read_reg(state, STB0899_TSTRES);
- STB0899_SETFIELD_VAL(FRESACS, reg, 0);
- stb0899_write_reg(state, STB0899_TSTRES, reg);
-+ msleep(1);
-
- if (params->srate <= 2000000)
- dataTime = 2000;
-@@ -363,6 +368,7 @@
-
- stb0899_write_reg(state, STB0899_DSTATUS2, 0x00); /* force search loop */
- while (1) {
-+ msleep(1); // Alex: added 1 mSec
- /* WARNING! VIT LOCKED has to be tested before VIT_END_LOOOP */
- reg = stb0899_read_reg(state, STB0899_VSTATUS);
- lock = STB0899_GETFIELD(VSTATUS_LOCKEDVIT, reg);
-@@ -390,20 +396,21 @@
- short int derot_freq, derot_step, derot_limit, next_loop = 3;
- u8 cfr[2];
- u8 reg;
-- int index = 1;
-+ int index = 0;
-+ int base_freq;
-
- struct stb0899_internal *internal = &state->internal;
-- struct stb0899_params *params = &state->params;
-
-- derot_step = (params->srate / 4L) / internal->mclk;
-+ derot_step = internal->derot_step;
- derot_limit = (internal->sub_range / 2L) / internal->mclk;
- derot_freq = internal->derot_freq;
-+ base_freq = internal->derot_freq;
-
- do {
- if ((internal->status != CARRIEROK) || (stb0899_check_data(state) != DATAOK)) {
-
- derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */
-- if (abs(derot_freq) > derot_limit)
-+ if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit)
- next_loop--;
-
- if (next_loop) {
-@@ -417,9 +424,9 @@
- stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */
-
- stb0899_check_carrier(state);
-- index++;
- }
- }
-+ index++;
- internal->direction = -internal->direction; /* change zig zag direction */
- } while ((internal->status != DATAOK) && next_loop);
-
diff --git a/packages/linux/patches/default/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/default/linux-222-stb0899_signal_quality.patch
deleted file mode 100644
index fd6539d..0000000
--- a/packages/linux/patches/default/linux-222-stb0899_signal_quality.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c
---- linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-11 18:19:28.000000000 +0100
-+++ linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-16 10:33:10.323380937 +0100
-@@ -971,6 +971,16 @@
-
- *strength = stb0899_table_lookup(stb0899_dvbsrf_tab, ARRAY_SIZE(stb0899_dvbsrf_tab) - 1, val);
- *strength += 750;
-+
-+ const int MIN_STRENGTH_DVBS = 0;
-+ const int MAX_STRENGTH_DVBS = 680;
-+ if (*strength < MIN_STRENGTH_DVBS)
-+ *strength = 0;
-+ else if(*strength > MAX_STRENGTH_DVBS)
-+ *strength = 0xFFFF;
-+ else
-+ *strength = (*strength - MIN_STRENGTH_DVBS) * 0xFFFF / (MAX_STRENGTH_DVBS - MIN_STRENGTH_DVBS);
-+
- dprintk(state->verbose, FE_DEBUG, 1, "AGCIQVALUE = 0x%02x, C = %d * 0.1 dBm",
- val & 0xff, *strength);
- }
-@@ -983,6 +993,7 @@
-
- *strength = stb0899_table_lookup(stb0899_dvbs2rf_tab, ARRAY_SIZE(stb0899_dvbs2rf_tab) - 1, val);
- *strength += 950;
-+ *strength = *strength << 4;
- dprintk(state->verbose, FE_DEBUG, 1, "IF_AGC_GAIN = 0x%04x, C = %d * 0.1 dBm",
- val & 0x3fff, *strength);
- }
-@@ -1016,6 +1027,16 @@
- val = MAKEWORD16(buf[0], buf[1]);
-
- *snr = stb0899_table_lookup(stb0899_cn_tab, ARRAY_SIZE(stb0899_cn_tab) - 1, val);
-+
-+ const int MIN_SNR_DVBS = 0;
-+ const int MAX_SNR_DVBS = 200;
-+ if (*snr < MIN_SNR_DVBS)
-+ *snr = 0;
-+ else if(*snr > MAX_SNR_DVBS)
-+ *snr = 0xFFFF;
-+ else
-+ *snr = (*snr - MIN_SNR_DVBS) * 0xFFFF / (MAX_SNR_DVBS - MIN_SNR_DVBS);
-+
- dprintk(state->verbose, FE_DEBUG, 1, "NIR = 0x%02x%02x = %u, C/N = %d * 0.1 dBm\n",
- buf[0], buf[1], val, *snr);
- }
-@@ -1040,6 +1061,16 @@
- val = (quantn - estn) / 10;
- }
- *snr = val;
-+
-+ const int MIN_SNR_DVBS2 = 10;
-+ const int MAX_SNR_DVBS2 = 70;
-+ if (*snr < MIN_SNR_DVBS2)
-+ *snr = 0;
-+ else if(*snr > MAX_SNR_DVBS2)
-+ *snr = 0xFFFF;
-+ else
-+ *snr = (*snr - MIN_SNR_DVBS2) * 0xFFFF / (MAX_SNR_DVBS2 - MIN_SNR_DVBS2);
-+
- dprintk(state->verbose, FE_DEBUG, 1, "Es/N0 quant = %d (%d) estimate = %u (%d), C/N = %d * 0.1 dBm",
- quant, quantn, est, estn, val);
- }
diff --git a/packages/linux/patches/default/linux-227-ds3000-invalid-symbol-rate.patch b/packages/linux/patches/default/linux-227-ds3000-invalid-symbol-rate.patch
deleted file mode 100644
index 79e04f2..0000000
--- a/packages/linux/patches/default/linux-227-ds3000-invalid-symbol-rate.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -rupN a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c
---- a/drivers/media/dvb-frontends/ds3000.c 2015-01-28 23:24:59.000000000 +0100
-+++ b/drivers/media/dvb-frontends/ds3000.c 2015-01-29 21:57:56.000000000 +0100
-@@ -958,6 +958,14 @@ static int ds3000_set_frontend(struct dv
- /* enable ac coupling */
- ds3000_writereg(state, 0x25, 0x8a);
-
-+ dprintk("%s() frequency:%u symbol_rate:%u\n", __func__, c->frequency, c->symbol_rate);
-+
-+ if (c->symbol_rate < ds3000_ops.info.symbol_rate_min || c->symbol_rate > ds3000_ops.info.symbol_rate_max ) {
-+ dprintk("%s() symbol_rate %u out of range (%u ... %u)\n", __func__, c->symbol_rate,
-+ ds3000_ops.info.symbol_rate_min, ds3000_ops.info.symbol_rate_max);
-+ return 1;
-+ }
-+
- /* enhance symbol rate performance */
- if ((c->symbol_rate / 1000) <= 5000) {
- value = 29777 / (c->symbol_rate / 1000) + 1;
\ No newline at end of file
diff --git a/packages/x11/driver/xf86-video-ati/config/xorg-radeon.conf b/packages/x11/driver/xf86-video-ati/config/xorg-radeon.conf
index 6b6b034..b5de54a 100644
--- a/packages/x11/driver/xf86-video-ati/config/xorg-radeon.conf
+++ b/packages/x11/driver/xf86-video-ati/config/xorg-radeon.conf
@@ -1,6 +1,8 @@
Section "Device"
Identifier "AMD Graphics"
Driver "radeon"
- Option "DRI3" "1"
- Option "AccelMethod" "glamor"
+
+ # uncomment the following options to use DRI3 and glamor, otherwise DRI2 and exa
+ # Option "DRI3" "1"
+ # Option "AccelMethod" "glamor"
Endsection
diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk
index ba01e41..1b595aa 100644
--- a/packages/x11/driver/xf86-video-intel/package.mk
+++ b/packages/x11/driver/xf86-video-intel/package.mk
@@ -51,7 +51,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-backlight \
--disable-tear-free \
--disable-create2 \
--disable-async-swap \
- --with-default-dri=3 \
+ --with-default-dri=2 \
--with-xorg-module-dir=$XORG_PATH_MODULES"
pre_configure_target() {
diff --git a/packages/x11/other/fluxbox/config/apps b/packages/x11/other/fluxbox/config/apps
new file mode 100644
index 0000000..fac0e6d
--- /dev/null
+++ b/packages/x11/other/fluxbox/config/apps
@@ -0,0 +1,3 @@
+[app] (name=.*)
+ [maximized] {yes}
+[end]
diff --git a/packages/x11/other/fluxbox/package.mk b/packages/x11/other/fluxbox/package.mk
index b4669b9..08811c8 100644
--- a/packages/x11/other/fluxbox/package.mk
+++ b/packages/x11/other/fluxbox/package.mk
@@ -41,8 +41,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
--disable-xpm \
--disable-xft \
--disable-fribidi \
- --disable-remember \
- --disable-regexp \
--disable-debug \
--disable-test \
--disable-nls \
@@ -60,9 +58,8 @@ post_makeinstall_target() {
rm -rf $INSTALL/usr/bin/startfluxbox
rm -rf $INSTALL/usr/share/fluxbox/styles
- rm -rf $INSTALL/usr/share/fluxbox/init
- rm -rf $INSTALL/usr/share/fluxbox/keys
+ cp $PKG_DIR/config/apps $INSTALL/usr/share/fluxbox/
cp $PKG_DIR/config/init $INSTALL/usr/share/fluxbox/
cp $PKG_DIR/config/keys $INSTALL/usr/share/fluxbox/
}
diff --git a/projects/Generic/options b/projects/Generic/options
index 3618bc2f..82dc262 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -85,4 +85,4 @@
# for a list of additinoal drivers see packages/linux-drivers
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
- ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta"
+ ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta media_build"
diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf
index b19dbff..848ca68 100644
--- a/projects/RPi/linux/linux.arm.conf
+++ b/projects/RPi/linux/linux.arm.conf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.0 Kernel Configuration
+# Linux/arm 4.9.1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2614,15 +2614,16 @@ CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_TILEBLITTING is not set
#
diff --git a/projects/RPi/options b/projects/RPi/options
index 6570a08..97b38d5 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -140,4 +140,4 @@
# for a list of additinoal drivers see packages/linux-drivers
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
- ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS"
+ ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS media_build"
diff --git a/projects/RPi/patches/linux/linux-01-RPi_support.patch b/projects/RPi/patches/linux/linux-01-RPi_support.patch
index 4369261..11b24f5 100644
--- a/projects/RPi/patches/linux/linux-01-RPi_support.patch
+++ b/projects/RPi/patches/linux/linux-01-RPi_support.patch
@@ -1,7 +1,7 @@
-From 187d14c75091ecf91914e7273ea75a94649f5715 Mon Sep 17 00:00:00 2001
+From 0f5c3a9e8916c5274cb9f4984b1d658a6783ff23 Mon Sep 17 00:00:00 2001
From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Thu, 19 Feb 2015 18:47:12 +0000
-Subject: [PATCH 001/111] smsx95xx: fix crimes against truesize
+Subject: [PATCH 001/115] smsx95xx: fix crimes against truesize
smsc95xx is adjusting truesize when it shouldn't, and following a recent patch from Eric this is now triggering warnings.
@@ -48,10 +48,10 @@ index 831aa33d078ae7d2dd57fdded5de71d1eb915f99..b77935bded8c0ff7808b00f170ff10e5
usbnet_skb_return(dev, ax_skb);
}
-From 584529ad0dc510e6e870aa9141ed889edf2dbbbd Mon Sep 17 00:00:00 2001
+From 9f72a1ead6869c804c7366133459c9c819847543 Mon Sep 17 00:00:00 2001
From: Sam Nazarko <email@samnazarko.co.uk>
Date: Fri, 1 Apr 2016 17:27:21 +0100
-Subject: [PATCH 002/111] smsc95xx: Experimental: Enable turbo_mode and
+Subject: [PATCH 002/115] smsc95xx: Experimental: Enable turbo_mode and
packetsize=2560 by default
See: http://forum.kodi.tv/showthread.php?tid=285288
@@ -94,10 +94,10 @@ index b77935bded8c0ff7808b00f170ff10e594300ad0..693f163684de921404738e33244881e0
netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n",
-From 2bf8ca86c5944a4f05a715a9a6b137bce58e7a59 Mon Sep 17 00:00:00 2001
+From c2ad68ad758883a9f1972ade64a28780167d9933 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 26 Mar 2013 17:26:38 +0000
-Subject: [PATCH 003/111] Allow mac address to be set in smsc95xx
+Subject: [PATCH 003/115] Allow mac address to be set in smsc95xx
Signed-off-by: popcornmix <popcornmix@gmail.com>
---
@@ -193,10 +193,10 @@ index 693f163684de921404738e33244881e0aab92ec9..df60c989fc229bf0aab3c27e95ccd453
eth_hw_addr_random(dev->net);
netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
-From 481e18fc6c63b56179f93596c5393e5638fab295 Mon Sep 17 00:00:00 2001
+From e2e84770092cf9ea489ee882317dde91c854dd4a Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 13 Mar 2015 12:43:36 +0000
-Subject: [PATCH 004/111] Protect __release_resource against resources without
+Subject: [PATCH 004/115] Protect __release_resource against resources without
parents
Without this patch, removing a device tree overlay can crash here.
@@ -224,10 +224,10 @@ index 9b5f04404152c296af3a96132f27cfc80ffa9af9..f8a9af6e6b915812be2ba2c1c2b40106
for (;;) {
tmp = *p;
-From 1b2be2671cee28c79160329883028029c2b0c857 Mon Sep 17 00:00:00 2001
+From 8040c1c5883e7f06621c3d18c29a51aeabc7c98a Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 18 Dec 2014 16:07:15 -0800
-Subject: [PATCH 005/111] mm: Remove the PFN busy warning
+Subject: [PATCH 005/115] mm: Remove the PFN busy warning
See commit dae803e165a11bc88ca8dbc07a11077caf97bbcb -- the warning is
expected sometimes when using CMA. However, that commit still spams
@@ -239,10 +239,10 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
1 file changed, 2 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 6de9440e3ae2d995b28577dc4a000fc23f4182c0..bea7204c14a5e24e018218b3d3eaef7c1ac5fd4f 100644
+index 34ada718ef47c4b27730214d584f9350fefb9883..3fa01a5280db96075798e4cbd58d5520ddf36d88 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -7289,8 +7289,6 @@ int alloc_contig_range(unsigned long start, unsigned long end,
+@@ -7297,8 +7297,6 @@ int alloc_contig_range(unsigned long start, unsigned long end,
/* Make sure the range is really isolated. */
if (test_pages_isolated(outer_start, end, false)) {
@@ -252,10 +252,10 @@ index 6de9440e3ae2d995b28577dc4a000fc23f4182c0..bea7204c14a5e24e018218b3d3eaef7c
goto done;
}
-From 5d1f384994be88b18a6dfb189687c32204c5b827 Mon Sep 17 00:00:00 2001
+From 6c99bcf32b3edc693cf045bf71a37f2703d3ccaa Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 4 Dec 2015 17:41:50 +0000
-Subject: [PATCH 006/111] irq-bcm2836: Prevent spurious interrupts, and trap
+Subject: [PATCH 006/115] irq-bcm2836: Prevent spurious interrupts, and trap
them early
The old arch-specific IRQ macros included a dsb to ensure the
@@ -282,10 +282,10 @@ index d96b2c947e74e3edab3917551c64fbd1ced0f34c..93e3f7660c4230c9f1dd3b195958cb49
#endif
} else if (stat) {
-From 62120b5cc0bcdf3a2d243ae8d32dc6033eb0a616 Mon Sep 17 00:00:00 2001
+From 9ac715e2bb2c7b4e0e9cdfb08e9a2ba6bf648e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 12 Jun 2015 19:01:05 +0200
-Subject: [PATCH 007/111] irqchip: bcm2835: Add FIQ support
+Subject: [PATCH 007/115] irqchip: bcm2835: Add FIQ support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -414,10 +414,10 @@ index 44d7c38dde479d771f3552e914bf8c1c1f5019f7..42ff5e6a8e0d532f5b60a1e7af7cc4d9
}
-From 2a1701f404bdbf47c8864d62551626d60d022d46 Mon Sep 17 00:00:00 2001
+From dd4547cf48b5a8deaee72dda65f60d7d54828164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 23 Oct 2015 16:26:55 +0200
-Subject: [PATCH 008/111] irqchip: irq-bcm2835: Add 2836 FIQ support
+Subject: [PATCH 008/115] irqchip: irq-bcm2835: Add 2836 FIQ support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -516,10 +516,10 @@ index 42ff5e6a8e0d532f5b60a1e7af7cc4d941bd5008..eccf6ed025299cb480884f5bcbe77abf
for (b = 0; b < NR_BANKS; b++) {
for (i = 0; i < bank_irqs[b]; i++) {
-From 573c26f692a511b5850d94ce07a7ae8d27aeb87b Mon Sep 17 00:00:00 2001
+From 0e31c4a839a47944137a7f011e9ae2c83e356e8a Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 14 Jul 2015 10:26:09 +0100
-Subject: [PATCH 009/111] spidev: Add "spidev" compatible string to silence
+Subject: [PATCH 009/115] spidev: Add "spidev" compatible string to silence
warning
See: https://github.com/raspberrypi/linux/issues/1054
@@ -540,10 +540,10 @@ index 2e05046f866bd01bf87edcdeff0d5b76d4d0aea7..d780491b8013a4e97fa843958964454e
};
MODULE_DEVICE_TABLE(of, spidev_dt_ids);
-From 49007260438ac25b031a5f426336b4a3c2f79164 Mon Sep 17 00:00:00 2001
+From d48949ae8236945df38224bb99e78126ed1de4d6 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 30 Jun 2015 14:12:42 +0100
-Subject: [PATCH 010/111] serial: 8250: Don't crash when nr_uarts is 0
+Subject: [PATCH 010/115] serial: 8250: Don't crash when nr_uarts is 0
---
drivers/tty/serial/8250/8250_core.c | 2 ++
@@ -563,10 +563,10 @@ index 240a361b674fe72ce657067e5303156b7add6a6f..14f6cdfd744209482056d206dc476d94
for (i = 0; i < nr_uarts; i++) {
struct uart_8250_port *up = &serial8250_ports[i];
-From 8dd1e9defb5253e50db90363693595d980b9f89e Mon Sep 17 00:00:00 2001
+From 864f41ce25ef52b0070e912dacaa4d03c8410add Mon Sep 17 00:00:00 2001
From: notro <notro@tronnes.org>
Date: Thu, 10 Jul 2014 13:59:47 +0200
-Subject: [PATCH 011/111] pinctrl-bcm2835: Set base to 0 give expected gpio
+Subject: [PATCH 011/115] pinctrl-bcm2835: Set base to 0 give expected gpio
numbering
Signed-off-by: Noralf Tronnes <notro@tronnes.org>
@@ -588,10 +588,10 @@ index fa77165fab2c1348163979da507df17e7168c49b..d11e2e4ea189466e686d762cb6c6fef9
.can_sleep = false,
};
-From 1ea344b8d6146e5ddb11d0b8cef5d9c5f1fc76c9 Mon Sep 17 00:00:00 2001
+From e7a6f4ed5a62c85cccf2dd3565e42db05f474fbb Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 24 Feb 2015 13:40:50 +0000
-Subject: [PATCH 012/111] pinctrl-bcm2835: Fix interrupt handling for GPIOs
+Subject: [PATCH 012/115] pinctrl-bcm2835: Fix interrupt handling for GPIOs
28-31 and 46-53
Contrary to the documentation, the BCM2835 GPIO controller actually has
@@ -737,10 +737,10 @@ index d11e2e4ea189466e686d762cb6c6fef9111ecf8e..107ad7d58de8f8a7f55e09c9cdcf7d66
},
};
-From 1a70bcb135aba08029a4a527d94611eea7b14fbe Mon Sep 17 00:00:00 2001
+From c4175cc718b15617ce1e7d6eb4dc9d4fa60d4fa8 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 26 Feb 2015 09:58:22 +0000
-Subject: [PATCH 013/111] pinctrl-bcm2835: Only request the interrupts listed
+Subject: [PATCH 013/115] pinctrl-bcm2835: Only request the interrupts listed
in the DTB
Although the GPIO controller can generate three interrupts (four counting
@@ -767,10 +767,10 @@ index 107ad7d58de8f8a7f55e09c9cdcf7d66fa7ab66b..644bdecbcfcb79d3b84a33769265fca5
pc->irq_data[i].irqgroup = i;
-From 7198cc8ee9b058e09ea92f672ed183abd622aa9b Mon Sep 17 00:00:00 2001
+From a1d3b1b8f4b5fb273ae1a1782c10bebe9f2ec390 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 6 May 2016 12:32:47 +0100
-Subject: [PATCH 014/111] pinctrl-bcm2835: Return pins to inputs when freed
+Subject: [PATCH 014/115] pinctrl-bcm2835: Return pins to inputs when freed
When dynamically unloading overlays, it is important that freed pins are
restored to being inputs to prevent functions from being enabled in
@@ -811,10 +811,10 @@ index 644bdecbcfcb79d3b84a33769265fca5d3d0c9e5..81a66cba2ab0f7e3ae179de7edd10122
.get_function_name = bcm2835_pmx_get_function_name,
.get_function_groups = bcm2835_pmx_get_function_groups,
-From 2f3c0a3e933104ad100b1c28e957c72d7d083de6 Mon Sep 17 00:00:00 2001
+From fb5e309e3a776b24d2828299f7fc3e64d7004a1b Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 24 Jun 2015 14:10:44 +0100
-Subject: [PATCH 015/111] spi-bcm2835: Support pin groups other than 7-11
+Subject: [PATCH 015/115] spi-bcm2835: Support pin groups other than 7-11
The spi-bcm2835 driver automatically uses GPIO chip-selects due to
some unreliability of the native ones. In doing so it chooses the
@@ -895,10 +895,10 @@ index f35cc10772f6670397ea923ad30158270dd68578..5dfe20ffc2866fa6789825016c585175
/* and set up the "mode" and level */
dev_info(&spi->dev, "setting up native-CS%i as GPIO %i\n",
-From 2f97bbd1ddafb4209b88897b2f6cc1267bc1f247 Mon Sep 17 00:00:00 2001
+From 411a3971d039e5e0af4bbf0452f2677efe046157 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 1 Jul 2016 22:09:24 +0100
-Subject: [PATCH 016/111] spi-bcm2835: Disable forced software CS
+Subject: [PATCH 016/115] spi-bcm2835: Disable forced software CS
Select software CS in bcm2708_common.dtsi, and disable the automatic
conversion in the driver to allow hardware CS to be re-enabled with an
@@ -932,10 +932,10 @@ index 5dfe20ffc2866fa6789825016c585175a29705b6..8493474d286f7a1ac6454a22c61c8c2c
return 0;
}
-From 4a119ff4ae732e4220dba5262ad4d800d1af7dde Mon Sep 17 00:00:00 2001
+From 33e78476ef56aefd55b116c4dd7e1476bb658ea1 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 8 Nov 2016 21:35:38 +0000
-Subject: [PATCH 017/111] spi-bcm2835: Remove unused code
+Subject: [PATCH 017/115] spi-bcm2835: Remove unused code
---
drivers/spi/spi-bcm2835.c | 61 -----------------------------------------------
@@ -1023,10 +1023,10 @@ index 8493474d286f7a1ac6454a22c61c8c2cef9121bf..33d75ad38a7f77d085321ace9101900a
}
-From de1125b3a2d6229dc168c35ad82f6ef8a202c459 Mon Sep 17 00:00:00 2001
+From 3a41fcfcb5de93d9665b7f92a78e3dd3ec708afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Wed, 3 Jun 2015 12:26:13 +0200
-Subject: [PATCH 018/111] ARM: bcm2835: Set Serial number and Revision
+Subject: [PATCH 018/115] ARM: bcm2835: Set Serial number and Revision
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -1079,10 +1079,10 @@ index 0c1edfc98696da0e0bb7f4a18cdfbcdd27a9795d..8f152266ba9b470df2eaaed9ebcf158e
static const char * const bcm2835_compat[] = {
-From 64d21030cae9fb9718296e2657c9881cd74e18fc Mon Sep 17 00:00:00 2001
+From 1de44ea2a0505cbb479b53b570d81053172d2757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Sat, 3 Oct 2015 22:22:55 +0200
-Subject: [PATCH 019/111] dmaengine: bcm2835: Load driver early and support
+Subject: [PATCH 019/115] dmaengine: bcm2835: Load driver early and support
legacy API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -1185,10 +1185,10 @@ index e18dc596cf2447fa9ef7e41b62d9396e29043426..80d35f760b4a4a51e60c355a84d538ba
MODULE_ALIAS("platform:bcm2835-dma");
MODULE_DESCRIPTION("BCM2835 DMA engine driver");
-From 9300f525a49182536af3efc15a3a274962504e47 Mon Sep 17 00:00:00 2001
+From 8e68d7e8e9531a08943661d414170f20a7a8adf1 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 25 Jan 2016 17:25:12 +0000
-Subject: [PATCH 020/111] firmware: Updated mailbox header
+Subject: [PATCH 020/115] firmware: Updated mailbox header
---
include/soc/bcm2835/raspberrypi-firmware.h | 11 +++++++++++
@@ -1251,10 +1251,10 @@ index 3fb357193f09914fe21f8555a4b8613f74f22bc3..227a107214a02deadcca3db202da265e
RPI_FIRMWARE_GET_COMMAND_LINE = 0x00050001,
RPI_FIRMWARE_GET_DMA_CHANNELS = 0x00060001,
-From 9de63dc57340cb047969dedcfdfd8b51c3779083 Mon Sep 17 00:00:00 2001
+From 2b4ba7a666ea183ee12d7fb50eca5eb9182c62d2 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 9 May 2016 17:28:18 -0700
-Subject: [PATCH 021/111] clk: bcm2835: Mark GPIO clocks enabled at boot as
+Subject: [PATCH 021/115] clk: bcm2835: Mark GPIO clocks enabled at boot as
critical.
These divide off of PLLD_PER and are used for the ethernet and wifi
@@ -1292,10 +1292,10 @@ index 8c7763fd9efc52b30f02d9ebcd4fdb10d2876465..a73f0873b7b8f78bc4a70f01e17eb287
init.ops = &bcm2835_vpu_clock_clk_ops;
} else {
-From 448de2edc0f549ce252e0a0dc8089100c80184c3 Mon Sep 17 00:00:00 2001
+From 1f08bbd0e3146406742102c155068e4ef929f800 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 15 Jun 2016 16:48:41 +0100
-Subject: [PATCH 022/111] rtc: Add SPI alias for pcf2123 driver
+Subject: [PATCH 022/115] rtc: Add SPI alias for pcf2123 driver
Without this alias, Device Tree won't cause the driver
to be loaded.
@@ -1315,10 +1315,10 @@ index 8895f77726e8da5444afcd602dceff8f25a9b3fd..1833b8853ceb0e6147cceb93a00e558c
MODULE_LICENSE("GPL");
+MODULE_ALIAS("spi:rtc-pcf2123");
-From 2e36db73f1fa2356e1561d09305294e4cf91e3bd Mon Sep 17 00:00:00 2001
+From 999a0a1939166af1617ef2d320a658af942e7785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 7 Oct 2016 16:50:59 +0200
-Subject: [PATCH 023/111] watchdog: bcm2835: Support setting reboot partition
+Subject: [PATCH 023/115] watchdog: bcm2835: Support setting reboot partition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -1442,10 +1442,10 @@ index 4dddd8298a227d64862f2e92954a465f2e44b3f6..1f545e024422f59280932713e6a1b051
register_restart_handler(&wdt->restart_handler);
if (pm_power_off == NULL)
-From 126d1c9c30b84709d3df1c9ee6951925ef86e561 Mon Sep 17 00:00:00 2001
+From 1356c426a196233a758cb8600a65c12f4d28fee2 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 5 Apr 2016 19:40:12 +0100
-Subject: [PATCH 024/111] reboot: Use power off rather than busy spinning when
+Subject: [PATCH 024/115] reboot: Use power off rather than busy spinning when
halt is requested
---
@@ -1468,10 +1468,10 @@ index 3fa867a2aae672755c6ce6448f4148c989dbf964..80dca8dcd6709034b643c6a3f35729e0
/*
-From 369132293cbf3404c2f12567f36c72745442d1a7 Mon Sep 17 00:00:00 2001
+From e52cf56957fa81e15358b8f9be2ffbcf73c8d9a3 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 9 Nov 2016 13:02:52 +0000
-Subject: [PATCH 025/111] bcm: Make RASPBERRYPI_POWER depend on PM
+Subject: [PATCH 025/115] bcm: Make RASPBERRYPI_POWER depend on PM
---
drivers/soc/bcm/Kconfig | 1 +
@@ -1490,10 +1490,10 @@ index a39b0d58ddd0fdf0ac1cc7295f8aafb12546e226..e037a6dd79d1881a09e3ca9115782709
help
This enables support for the RPi power domains which can be enabled
-From 4f1f33c99707022e920996b81d2394e8a67d72cc Mon Sep 17 00:00:00 2001
+From 506d83ebc14a82fc4012066009847c4809528ea1 Mon Sep 17 00:00:00 2001
From: Martin Sperl <kernel@martin.sperl.org>
Date: Fri, 2 Sep 2016 16:45:27 +0100
-Subject: [PATCH 026/111] Register the clocks early during the boot process, so
+Subject: [PATCH 026/115] Register the clocks early during the boot process, so
that special/critical clocks can get enabled early on in the boot process
avoiding the risk of disabling a clock, pll_divider or pll when a claiming
driver fails to install propperly - maybe it needs to defer.
@@ -1538,10 +1538,10 @@ index a73f0873b7b8f78bc4a70f01e17eb287eec1d9e3..56fd47891e50dddcf83e687f1d53aeb4
MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
MODULE_DESCRIPTION("BCM2835 clock driver");
-From 007bca50057b289594959c0b3a40f697042de092 Mon Sep 17 00:00:00 2001
+From abc0233dfad657481294905031fae06d95ed1504 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 6 Dec 2016 17:05:39 +0000
-Subject: [PATCH 027/111] bcm2835-rng: Avoid initialising if already enabled
+Subject: [PATCH 027/115] bcm2835-rng: Avoid initialising if already enabled
Avoids the 0x40000 cycles of warmup again if firmware has already used it
---
@@ -1567,10 +1567,10 @@ index 574211a495491d9d6021dcaefe4274a63ed02055..e66c0fca8c6090e32f72796c0877a1cf
err = hwrng_register(&bcm2835_rng_ops);
if (err) {
-From ea730ebfa6c5a592f2085c3ed4b5ba73b65344e0 Mon Sep 17 00:00:00 2001
+From c9be73a0b68dee2d1b534d0ccdefa08607f8eeb3 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 24 Aug 2016 16:28:44 +0100
-Subject: [PATCH 028/111] kbuild: Ignore dtco targets when filtering symbols
+Subject: [PATCH 028/115] kbuild: Ignore dtco targets when filtering symbols
---
scripts/Kbuild.include | 2 +-
@@ -1590,10 +1590,10 @@ index 179219845dfcdfbeb586d12c5ec1296095d9fbf4..e0743e44f84188667a0c322e8c3d36f1
esac | tr ";" "\n" | sed -rn 's/^.*=== __KSYM_(.*) ===.*$$/KSYM_\1/p'
-From bacce62ef301d1ac7882ecdfeaa3289a597c65cc Mon Sep 17 00:00:00 2001
+From 21f52f8fcc6530bbc3b7f3391a579f2401b4c8b5 Mon Sep 17 00:00:00 2001
From: Robert Tiemann <rtie@gmx.de>
Date: Mon, 20 Jul 2015 11:01:25 +0200
-Subject: [PATCH 029/111] BCM2835_DT: Fix I2S register map
+Subject: [PATCH 029/115] BCM2835_DT: Fix I2S register map
---
Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt | 4 ++--
@@ -1631,10 +1631,10 @@ index 65783de0aedf3da79adc36fd077b7a89954ddb6b..a89fe4220fdc3f26f75ee66daf187554
dmas = <&dma 2>,
<&dma 3>;
-From 83e431a4170b965b12737d9fd9828b224f0b5dc3 Mon Sep 17 00:00:00 2001
+From 0e3afb9fafa9e1629d896456b2eb8c1a3a7dacf7 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Sun, 12 May 2013 12:24:19 +0100
-Subject: [PATCH 030/111] Main bcm2708/bcm2709 linux port
+Subject: [PATCH 030/115] Main bcm2708/bcm2709 linux port
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -1841,10 +1841,10 @@ index cfb4b4496dd9f61362dea012176c146120fada07..d9c6c217c4d6a2408abe2665bf7f2700
MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>");
MODULE_DESCRIPTION("BCM2835 mailbox IPC driver");
-From 4c8bdb873c0c0b35a8dfbff881bf15d64df34ddc Mon Sep 17 00:00:00 2001
+From dec2b6ff2e66f67b140513340bb94ec363979395 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 1 May 2013 19:46:17 +0100
-Subject: [PATCH 031/111] Add dwc_otg driver
+Subject: [PATCH 031/115] Add dwc_otg driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -2546,10 +2546,10 @@ index 358ca8dd784fe43700ae070764fa783500a792fe..abaac7c7142d8887c1516957fc52162c
return i;
}
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index cbb146736f577da8a060d49b17052af78881adfa..7b07ce5dbdc5cffa36fb7e8dda07dd2a4102e1c5 100644
+index 0d81436c94bdaf6cea0f6a3b2063401c2caf1d3d..0248f67611a245505cfea708428536e28242f3e1 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5039,7 +5039,7 @@ static void port_event(struct usb_hub *hub, int port1)
+@@ -5010,7 +5010,7 @@ static void port_event(struct usb_hub *hub, int port1)
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
u16 status = 0, unused;
@@ -62901,10 +62901,10 @@ index 0000000000000000000000000000000000000000..cdc9963176e5a4a0d5250613b61e26c5
+test_main();
+0;
-From 37fd2725a8d6b6f18331ba65f01ef63aa9fa3f7c Mon Sep 17 00:00:00 2001
+From 5bf3ea4c4f421176371587b3a229bb4ed34f4e5f Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 17 Jun 2015 17:06:34 +0100
-Subject: [PATCH 032/111] bcm2708 framebuffer driver
+Subject: [PATCH 032/115] bcm2708 framebuffer driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -66363,10 +66363,10 @@ index 3c14e43b82fefe1d32f591d1b2f61d2cd28d0fa8..7626beb6a5bb8df601ddf0f6e6909d1f
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0
-From 9a807a8f74d42575774841b923e278774777f81a Mon Sep 17 00:00:00 2001
+From 4b0bb52b1462df2e112a1f9c4997abf6bba209ae Mon Sep 17 00:00:00 2001
From: Florian Meier <florian.meier@koalo.de>
Date: Fri, 22 Nov 2013 14:22:53 +0100
-Subject: [PATCH 033/111] dmaengine: Add support for BCM2708
+Subject: [PATCH 033/115] dmaengine: Add support for BCM2708
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -66997,10 +66997,10 @@ index 0000000000000000000000000000000000000000..c5bfff2765be4606077e6c8af73040ec
+
+#endif /* _PLAT_BCM2708_DMA_H */
-From 74ba2b578d504eaed03b226d2945433cc1e2999b Mon Sep 17 00:00:00 2001
+From ad35f3a2ff8355dd259c8434f5f161f7e4d6ec67 Mon Sep 17 00:00:00 2001
From: gellert <gellert@raspberrypi.org>
Date: Fri, 15 Aug 2014 16:35:06 +0100
-Subject: [PATCH 034/111] MMC: added alternative MMC driver
+Subject: [PATCH 034/115] MMC: added alternative MMC driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -68750,10 +68750,10 @@ index 0000000000000000000000000000000000000000..4fe8d1fe44578fbefcd48f8c327ba3d0
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Gellert Weisz");
-From d8a2f68ba20a9bed7751795dda754f7861c71073 Mon Sep 17 00:00:00 2001
+From 827ed14e23517744847b9a436520fcce8563eda9 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 25 Mar 2015 17:49:47 +0000
-Subject: [PATCH 035/111] Adding bcm2835-sdhost driver, and an overlay to
+Subject: [PATCH 035/115] Adding bcm2835-sdhost driver, and an overlay to
enable it
BCM2835 has two SD card interfaces. This driver uses the other one.
@@ -71158,10 +71158,10 @@ index 0000000000000000000000000000000000000000..a9bc79bfdbb71807819dfe2d8f165144
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Phil Elwell");
-From 89171c41359e357f80ccc5b5c463f8bd3ee0b001 Mon Sep 17 00:00:00 2001
+From d9b052ba96138eca16bc0592a1d4d04668126d25 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 11 May 2016 12:50:33 +0100
-Subject: [PATCH 036/111] mmc: Add MMC_QUIRK_ERASE_BROKEN for some cards
+Subject: [PATCH 036/115] mmc: Add MMC_QUIRK_ERASE_BROKEN for some cards
Some SD cards have been found that corrupt data when small blocks
are erased. Add a quirk to indicate that ERASE should not be used,
@@ -71297,10 +71297,10 @@ index 73fad83acbcb6a157587180516f9ffe7c61eb7d7..e7c9d3098ac06e3c6554fa3373a311f9
unsigned int erase_shift; /* if erase unit is power 2 */
unsigned int pref_erase; /* in sectors */
-From 9fdd0d7cfa05e00b524b177adabf050922e57afb Mon Sep 17 00:00:00 2001
+From ec63a15095c98f76f46b77eaf0c5c4a2be16c4f9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 3 Jul 2013 00:31:47 +0100
-Subject: [PATCH 037/111] cma: Add vc_cma driver to enable use of CMA
+Subject: [PATCH 037/115] cma: Add vc_cma driver to enable use of CMA
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -72636,10 +72636,10 @@ index 0000000000000000000000000000000000000000..be2819d5d41f9d5ed65daf8eedb94c9e
+
+#endif /* VC_CMA_H */
-From 193d82ddc048edea6b73997a51324a5078d17206 Mon Sep 17 00:00:00 2001
+From b298dc2b546a6de8ac3aef42e5ae2ed5464e1c83 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 26 Mar 2012 22:15:50 +0100
-Subject: [PATCH 038/111] bcm2708: alsa sound driver
+Subject: [PATCH 038/115] bcm2708: alsa sound driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -75374,10 +75374,10 @@ index 0000000000000000000000000000000000000000..af3e6eb690113fc32ce9e06bd2f0f294
+
+#endif // _VC_AUDIO_DEFS_H_
-From 28996ccfaf3ff7a0873b2d895cab663cce800fdd Mon Sep 17 00:00:00 2001
+From f7b479da6fc4c829121d0c8a8604f74600e6145c Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Fri, 28 Oct 2016 15:36:43 +0100
-Subject: [PATCH 039/111] vc_mem: Add vc_mem driver for querying firmware
+Subject: [PATCH 039/115] vc_mem: Add vc_mem driver for querying firmware
memory addresses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -75901,10 +75901,10 @@ index 0000000000000000000000000000000000000000..20a475377eb3078ea1ecaef2b24efc35
+
+#endif /* _VC_MEM_H */
-From 81ba2928873a89c6233776e594f2a001d87cc11b Mon Sep 17 00:00:00 2001
+From eb1da72bb0bd3dcaa5c9e673b445e85152945c0d Mon Sep 17 00:00:00 2001
From: Tim Gover <tgover@broadcom.com>
Date: Tue, 22 Jul 2014 15:41:04 +0100
-Subject: [PATCH 040/111] vcsm: VideoCore shared memory service for BCM2835
+Subject: [PATCH 040/115] vcsm: VideoCore shared memory service for BCM2835
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -80311,10 +80311,10 @@ index 0000000000000000000000000000000000000000..334f36d0d697b047df2922b5f2db67f3
+
+#endif /* __VMCS_SM_IOCTL_H__INCLUDED__ */
-From c79d4c54a6a03c79b998430d2d08afbc63c6d110 Mon Sep 17 00:00:00 2001
+From a1ea0495e7a63034c1a36b7d7ac979d4b426b7c0 Mon Sep 17 00:00:00 2001
From: Luke Wren <luke@raspberrypi.org>
Date: Fri, 21 Aug 2015 23:14:48 +0100
-Subject: [PATCH 041/111] Add /dev/gpiomem device for rootless user GPIO access
+Subject: [PATCH 041/115] Add /dev/gpiomem device for rootless user GPIO access
Signed-off-by: Luke Wren <luke@raspberrypi.org>
@@ -80625,10 +80625,10 @@ index 0000000000000000000000000000000000000000..911f5b7393ed48ceed8751f06967ae64
+MODULE_DESCRIPTION("gpiomem driver for accessing GPIO from userspace");
+MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
-From d89f74a85fef14e7b1661b2252fa2b08a859eb94 Mon Sep 17 00:00:00 2001
+From ab0bcd94ddec170d2b008e44c194d68f0ab7dc4e Mon Sep 17 00:00:00 2001
From: Luke Wren <wren6991@gmail.com>
Date: Sat, 5 Sep 2015 01:14:45 +0100
-Subject: [PATCH 042/111] Add SMI driver
+Subject: [PATCH 042/115] Add SMI driver
Signed-off-by: Luke Wren <wren6991@gmail.com>
---
@@ -82579,10 +82579,10 @@ index 0000000000000000000000000000000000000000..ee3a75edfc033eeb0d90a687ffb68b10
+
+#endif /* BCM2835_SMI_H */
-From 5c4de9dbae5990f716e77e360a6367588597c2d6 Mon Sep 17 00:00:00 2001
+From 67184cc70701d3762d8bb431f5f7f71c608d1705 Mon Sep 17 00:00:00 2001
From: Martin Sperl <kernel@martin.sperl.org>
Date: Tue, 26 Apr 2016 14:59:21 +0000
-Subject: [PATCH 043/111] MISC: bcm2835: smi: use clock manager and fix reload
+Subject: [PATCH 043/115] MISC: bcm2835: smi: use clock manager and fix reload
issues
Use clock manager instead of self-made clockmanager.
@@ -82752,10 +82752,10 @@ index 63a4ea08b9930a3a31a985f0a1d969b488ed49ec..1261540703127d1d63b9f3c87042c6e5
return 0;
}
-From 0b8fd06e2579f9d9fca4c995c99567e29d4f9ffe Mon Sep 17 00:00:00 2001
+From 4e7e326f6fa7ee68d4503bff246ceaa8544b038e Mon Sep 17 00:00:00 2001
From: Luke Wren <wren6991@gmail.com>
Date: Sat, 5 Sep 2015 01:16:10 +0100
-Subject: [PATCH 044/111] Add SMI NAND driver
+Subject: [PATCH 044/115] Add SMI NAND driver
Signed-off-by: Luke Wren <wren6991@gmail.com>
---
@@ -83120,10 +83120,10 @@ index 0000000000000000000000000000000000000000..02adda6da18bd0ba9ab19a104975b79d
+ ("Driver for NAND chips using Broadcom Secondary Memory Interface");
+MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
-From 81a230faec239611f15b7854b0536575b4fec75d Mon Sep 17 00:00:00 2001
+From 460d2fe85c66690b0171e83d9b8c644ae380cbe2 Mon Sep 17 00:00:00 2001
From: Aron Szabo <aron@aron.ws>
Date: Sat, 16 Jun 2012 12:15:55 +0200
-Subject: [PATCH 045/111] lirc: added support for RaspberryPi GPIO
+Subject: [PATCH 045/115] lirc: added support for RaspberryPi GPIO
lirc_rpi: Use read_current_timer to determine transmitter delay. Thanks to jjmz and others
See: https://github.com/raspberrypi/linux/issues/525
@@ -83986,10 +83986,10 @@ index 0000000000000000000000000000000000000000..fb69624ccef00ddbdccf8256d6baf1b1
+
+#endif
-From f983fc96a1764f6e1de49aa0190ec988bf9ae29d Mon Sep 17 00:00:00 2001
+From edf71e993bab4fb6a6f5258e1f30b25e83b9771e Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 3 Jul 2013 00:49:20 +0100
-Subject: [PATCH 046/111] Add cpufreq driver
+Subject: [PATCH 046/115] Add cpufreq driver
Signed-off-by: popcornmix <popcornmix@gmail.com>
---
@@ -84256,10 +84256,10 @@ index 0000000000000000000000000000000000000000..414fbdc10dfbfc6e4bb47870a7af3fd5
+module_init(bcm2835_cpufreq_module_init);
+module_exit(bcm2835_cpufreq_module_exit);
-From e15412c1981d5de69b4d6e4b4eae8b99c2f4980d Mon Sep 17 00:00:00 2001
+From 3d13606d584bd16d9ac897cffe9deac24468c4f4 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 26 Mar 2013 19:24:24 +0000
-Subject: [PATCH 047/111] Added hwmon/thermal driver for reporting core
+Subject: [PATCH 047/115] Added hwmon/thermal driver for reporting core
temperature. Thanks Dorian
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -84425,10 +84425,10 @@ index 0000000000000000000000000000000000000000..c63fb9f9d143e19612a18fe530c7b2b3
+MODULE_DESCRIPTION("Thermal driver for bcm2835 chip");
+MODULE_LICENSE("GPL");
-From 38c98a91730d6c9d0fb64287a0094611e80b74ee Mon Sep 17 00:00:00 2001
+From 39d15ad323ddb65c473bb3225bb16b3928b65d44 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 17 Jun 2015 15:44:08 +0100
-Subject: [PATCH 048/111] Add Chris Boot's i2c driver
+Subject: [PATCH 048/115] Add Chris Boot's i2c driver
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -85093,10 +85093,10 @@ index 0000000000000000000000000000000000000000..962f2e5c7455d91bf32925d785f5f16b
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
-From 2580b23fea5c030382c691631a510744f7b9e839 Mon Sep 17 00:00:00 2001
+From 2570a2a3cf115f29fedec989294b9f6dbe2f3f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 26 Jun 2015 14:27:06 +0200
-Subject: [PATCH 049/111] char: broadcom: Add vcio module
+Subject: [PATCH 049/115] char: broadcom: Add vcio module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -85322,10 +85322,10 @@ index 0000000000000000000000000000000000000000..c19bc2075c77879563ef5e59038b5a14
+MODULE_DESCRIPTION("Mailbox userspace access");
+MODULE_LICENSE("GPL");
-From 3802654fe78a70cf73b7b50064ae12b3ad7352a4 Mon Sep 17 00:00:00 2001
+From c8496b489a9b844b092ede93253cadcf0cef5246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 26 Jun 2015 14:25:01 +0200
-Subject: [PATCH 050/111] firmware: bcm2835: Support ARCH_BCM270x
+Subject: [PATCH 050/115] firmware: bcm2835: Support ARCH_BCM270x
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -85408,10 +85408,10 @@ index dd506cd3a5b874f9e1acd07efb8cd151bb6145d1..3f070bd38a91511c986e3fb114b15bd4
MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
MODULE_DESCRIPTION("Raspberry Pi firmware driver");
-From 722c4b9747c8488a8e9b037948b44085646e874a Mon Sep 17 00:00:00 2001
+From f494e1215f199fd5b333527df53d051a7847339b Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vincent.sanders@collabora.co.uk>
Date: Wed, 30 Jan 2013 12:45:18 +0000
-Subject: [PATCH 051/111] bcm2835: add v4l2 camera device
+Subject: [PATCH 051/115] bcm2835: add v4l2 camera device
- Supports raw YUV capture, preview, JPEG and H264.
- Uses videobuf2 for data transfer, using dma_buf.
@@ -93153,10 +93153,10 @@ index 0000000000000000000000000000000000000000..9d1d11e4a53e510c04a416d92d195a7d
+
+#endif /* MMAL_VCHIQ_H */
-From badabbef8c2ed82582e881b667ff7fe28f7180e0 Mon Sep 17 00:00:00 2001
+From 467383faec292eff5dc92ef4ec075b03ff372be4 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 11 May 2015 09:00:42 +0100
-Subject: [PATCH 052/111] scripts: Add mkknlimg and knlinfo scripts from tools
+Subject: [PATCH 052/115] scripts: Add mkknlimg and knlinfo scripts from tools
repo
The Raspberry Pi firmware looks for a trailer on the kernel image to
@@ -93676,10 +93676,10 @@ index 0000000000000000000000000000000000000000..60206de7fa9a49bd027c635306674a29
+ return $trailer;
+}
-From 5588e71a027a865ad341fe3d30dd47c2c1772d57 Mon Sep 17 00:00:00 2001
+From 5729bf4fe7a0802eaa4a26248b7af49291e1186d Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 10 Aug 2015 09:49:15 +0100
-Subject: [PATCH 053/111] scripts/dtc: Update to upstream version 1.4.1
+Subject: [PATCH 053/115] scripts/dtc: Update to upstream version 1.4.1
Includes the new localfixups format.
@@ -96530,10 +96530,10 @@ index ad9b05ae698b0495ecbda42ffcf4743555313a27..2595dfda020fd9e03f0beff5006f229d
-#define DTC_VERSION "DTC 1.4.1-g53bf130b"
+#define DTC_VERSION "DTC 1.4.1-g25efc119"
-From c5c6e46a51b163e9a3faf7422693f14b7bdb94d8 Mon Sep 17 00:00:00 2001
+From df6dc22cb2e5dafa0c5f3910e7e83f738b2791ed Mon Sep 17 00:00:00 2001
From: notro <notro@tronnes.org>
Date: Wed, 9 Jul 2014 14:46:08 +0200
-Subject: [PATCH 054/111] BCM2708: Add core Device Tree support
+Subject: [PATCH 054/115] BCM2708: Add core Device Tree support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -106661,10 +106661,10 @@ index 0a07f9014944ed92a8e2e42983ae43be60b3e471..1967878a843461c3ff1f473b9a030eb0
# Bzip2
-From 26a743327cb9976306f0f31d8badd36f6636a3d4 Mon Sep 17 00:00:00 2001
+From fdb1b0aec3ed223d102edb56214ba732bf838fd3 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Fri, 6 Feb 2015 13:50:57 +0000
-Subject: [PATCH 055/111] BCM270x_DT: Add pwr_led, and the required "input"
+Subject: [PATCH 055/115] BCM270x_DT: Add pwr_led, and the required "input"
trigger
The "input" trigger makes the associated GPIO an input. This is to support
@@ -106840,10 +106840,10 @@ index ddfcb2df3656cf0ab6aebd1fa3d624a6ec2e94e9..271563eb835f9018712e2076a88f341d
/* Set LED brightness level
* Must not sleep. Use brightness_set_blocking for drivers
-From 1cca88ce52ad46a1096fea51c07a9842c06466f2 Mon Sep 17 00:00:00 2001
+From 975dcfa3356a4ad5cd7a86540931fba9a6fc0cd6 Mon Sep 17 00:00:00 2001
From: Siarhei Siamashka <siarhei.siamashka@gmail.com>
Date: Mon, 17 Jun 2013 13:32:11 +0300
-Subject: [PATCH 056/111] fbdev: add FBIOCOPYAREA ioctl
+Subject: [PATCH 056/115] fbdev: add FBIOCOPYAREA ioctl
Based on the patch authored by Ali Gholami Rudi at
https://lkml.org/lkml/2009/7/13/153
@@ -107095,10 +107095,10 @@ index fb795c3b3c178ad3cd7c9e9e4547ffd492bac181..703fa8a70574323abe2fb32599254582
__u32 dx; /* screen-relative */
__u32 dy;
-From 8bccd20de5c5a27255761c7b4393f6fdd9730571 Mon Sep 17 00:00:00 2001
+From b7861fb612f0779a296eda7b88ddb78cf7ef6720 Mon Sep 17 00:00:00 2001
From: Harm Hanemaaijer <fgenfb@yahoo.com>
Date: Thu, 20 Jun 2013 20:21:39 +0200
-Subject: [PATCH 057/111] Speed up console framebuffer imageblit function
+Subject: [PATCH 057/115] Speed up console framebuffer imageblit function
Especially on platforms with a slower CPU but a relatively high
framebuffer fill bandwidth, like current ARM devices, the existing
@@ -107307,10 +107307,10 @@ index a2bb276a8b2463eee98eb237c4647bc00cd93601..436494fba15abecb400ef28688466faf
start_index, pitch_index);
} else
-From 10bc9c9562b39ebd10858de412b6336668171a39 Mon Sep 17 00:00:00 2001
+From a72848506ff0da1a377fbb45fcbc4d244a594079 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 8 May 2013 11:46:50 +0100
-Subject: [PATCH 058/111] enabling the realtime clock 1-wire chip DS1307 and
+Subject: [PATCH 058/115] enabling the realtime clock 1-wire chip DS1307 and
1-wire on GPIO4 (as a module)
1-wire: Add support for configuring pin for w1-gpio kernel module
@@ -107560,10 +107560,10 @@ index d58594a3232492e33f1dd4babd3798b03e0f0203..feae94256256316fd9d850c3d83325af
unsigned int ext_pullup_enable_pin;
unsigned int pullup_duration;
-From b5f0005bf497b78d9b6a40f364f8a6dba5676bbc Mon Sep 17 00:00:00 2001
+From 19503dbe6e9b1c4465fc9700e55d2ab6ac32c6b3 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Wed, 18 Dec 2013 22:16:19 +0000
-Subject: [PATCH 059/111] config: Enable CONFIG_MEMCG, but leave it disabled
+Subject: [PATCH 059/115] config: Enable CONFIG_MEMCG, but leave it disabled
(due to memory cost). Enable with cgroup_enable=memory.
---
@@ -107613,10 +107613,10 @@ index 85bc9beb046d9a6deda2e3564f4d5bd01d6fc27b..4acdbef46a8f0556469b5580a39c18ce
* css_tryget_online_from_dir - get corresponding css from a cgroup dentry
* @dentry: directory dentry of interest
-From f64e7d0ea8c5f3aba4fdc4833493403bcdf10557 Mon Sep 17 00:00:00 2001
+From 0c796f83db9cd7c63ddba8b0778c364673cdacb9 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 14 Jul 2014 22:02:09 +0100
-Subject: [PATCH 060/111] hid: Reduce default mouse polling interval to 60Hz
+Subject: [PATCH 060/115] hid: Reduce default mouse polling interval to 60Hz
Reduces overhead when using X
---
@@ -107652,10 +107652,10 @@ index ae83af649a607f67239f1a64bf45dd4b5770cc7d..4a7af9d0b910f59d17421ce14138400d
ret = -ENOMEM;
if (usb_endpoint_dir_in(endpoint)) {
-From 06547c09139ecfe3ee97ca218f8fb7b0373a672b Mon Sep 17 00:00:00 2001
+From 87848b0770820505a17bd544ec1372af81f06728 Mon Sep 17 00:00:00 2001
From: Gordon Hollingworth <gordon@raspberrypi.org>
Date: Tue, 12 May 2015 14:47:56 +0100
-Subject: [PATCH 061/111] rpi-ft5406: Add touchscreen driver for pi LCD display
+Subject: [PATCH 061/115] rpi-ft5406: Add touchscreen driver for pi LCD display
Fix driver detection failure Check that the buffer response is non-zero meaning the touchscreen was detected
@@ -108013,10 +108013,10 @@ index 227a107214a02deadcca3db202da265eba1fdd21..b0f6e33bd30c35664ceee057f4c3ad32
RPI_FIRMWARE_FRAMEBUFFER_SET_BACKLIGHT = 0x0004800f,
-From c4de14efbb23ff522c321d5a9220b04560c559a7 Mon Sep 17 00:00:00 2001
+From 84fa0a9f69c25430d60cece5153c1dc77873c189 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 28 Nov 2016 16:50:04 +0000
-Subject: [PATCH 062/111] Improve __copy_to_user and __copy_from_user
+Subject: [PATCH 062/115] Improve __copy_to_user and __copy_from_user
performance
Provide a __copy_from_user that uses memcpy. On BCM2708, use
@@ -109591,10 +109591,10 @@ index 333dc3c2e5ffbb2c5ab8fcfb6115b6162643cf20..46b787a6474ffa857da9b663948863ec
bool "Broadcom BCM63xx DSL SoC"
depends on ARCH_MULTI_V7
-From 1e9511001925124be9b1d3461e87605255c58310 Mon Sep 17 00:00:00 2001
+From 134f0e5d7e108298d7e4a4421fc4ab10da99be64 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 25 Jun 2015 12:16:11 +0100
-Subject: [PATCH 063/111] gpio-poweroff: Allow it to work on Raspberry Pi
+Subject: [PATCH 063/115] gpio-poweroff: Allow it to work on Raspberry Pi
The Raspberry Pi firmware manages the power-down and reboot
process. To do this it installs a pm_power_off handler, causing
@@ -109629,10 +109629,10 @@ index be3d81ff51cc3f510d85e4eed7a52960e51e7bc1..a030ae9fb1fca325061c093696e82186
"%s: pm_power_off function already registered",
__func__);
-From da2deb13c51f74edf4a4851bf01f03503a208b2a Mon Sep 17 00:00:00 2001
+From ddc263a1ac6b99fd18998830270bda783f3f6117 Mon Sep 17 00:00:00 2001
From: Phil Elwell <pelwell@users.noreply.github.com>
Date: Tue, 14 Jul 2015 14:32:47 +0100
-Subject: [PATCH 064/111] mfd: Add Raspberry Pi Sense HAT core driver
+Subject: [PATCH 064/115] mfd: Add Raspberry Pi Sense HAT core driver
---
drivers/input/joystick/Kconfig | 8 +
@@ -110497,10 +110497,10 @@ index 0000000000000000000000000000000000000000..56196dc2af10e464a1e3f98b028dca1c
+
+#endif
-From 63fe5b59d57d2cd54bbe96dc5e0743e977b404f5 Mon Sep 17 00:00:00 2001
+From 9bb903c1eee696ed86a95ca58adfaffd17600cad Mon Sep 17 00:00:00 2001
From: Florian Meier <florian.meier@koalo.de>
Date: Fri, 22 Nov 2013 19:19:08 +0100
-Subject: [PATCH 065/111] ASoC: Add support for HifiBerry DAC
+Subject: [PATCH 065/115] ASoC: Add support for HifiBerry DAC
This adds a machine driver for the HifiBerry DAC.
It is a sound card that can
@@ -110675,10 +110675,10 @@ index 0000000000000000000000000000000000000000..45f2b770ad9e67728ca599a7445d6ae9
+MODULE_DESCRIPTION("ASoC Driver for HifiBerry DAC");
+MODULE_LICENSE("GPL v2");
-From e7c31478dde01383847f0150428a449b46893a77 Mon Sep 17 00:00:00 2001
+From 755d2b8ee3962d4709a1fb7084bbc61ddd3e5bef Mon Sep 17 00:00:00 2001
From: Florian Meier <florian.meier@koalo.de>
Date: Mon, 25 Jan 2016 15:48:59 +0000
-Subject: [PATCH 066/111] ASoC: Add support for Rpi-DAC
+Subject: [PATCH 066/115] ASoC: Add support for Rpi-DAC
---
sound/soc/bcm/Kconfig | 7 +++
@@ -110962,10 +110962,10 @@ index 0000000000000000000000000000000000000000..afe1b419582aa40c4b2729d242bb13cd
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-From e55d838e108b015dba7611659f3fd9926e45aac5 Mon Sep 17 00:00:00 2001
+From 481e62a9c50e91e10ed057baf3833e161ff6ead2 Mon Sep 17 00:00:00 2001
From: Daniel Matuschek <info@crazy-audio.com>
Date: Wed, 15 Jan 2014 21:41:23 +0100
-Subject: [PATCH 067/111] ASoC: wm8804: Implement MCLK configuration options,
+Subject: [PATCH 067/115] ASoC: wm8804: Implement MCLK configuration options,
add 32bit support WM8804 can run with PLL frequencies of 256xfs and 128xfs
for most sample rates. At 192kHz only 128xfs is supported. The existing
driver selects 128xfs automatically for some lower samples rates. By using an
@@ -111014,10 +111014,10 @@ index af95d648265b3e92e345101542b332aee35191d4..513f56ba132929662802d15cdc653af3
.component_driver = {
.dapm_widgets = wm8804_dapm_widgets,
-From 556c9e016c3bdf1c62e3360d52638560bda63501 Mon Sep 17 00:00:00 2001
+From d0dc20660f2e8114e2b15a3c2a2a1f6e9da78693 Mon Sep 17 00:00:00 2001
From: Daniel Matuschek <info@crazy-audio.com>
Date: Wed, 15 Jan 2014 21:42:08 +0100
-Subject: [PATCH 068/111] ASoC: BCM:Add support for HiFiBerry Digi. Driver is
+Subject: [PATCH 068/115] ASoC: BCM:Add support for HiFiBerry Digi. Driver is
based on the patched WM8804 driver.
Signed-off-by: Daniel Matuschek <daniel@matuschek.net>
@@ -111361,10 +111361,10 @@ index 0000000000000000000000000000000000000000..19dc953b7227ba86123fc7a2ba654499
+MODULE_DESCRIPTION("ASoC Driver for HifiBerry Digi");
+MODULE_LICENSE("GPL v2");
-From 2cffe8450f73abcb7ccdcef2b0f62e4ac7e064e6 Mon Sep 17 00:00:00 2001
+From 35f763f44c627c363d79b04a050bc733a4114fde Mon Sep 17 00:00:00 2001
From: Gordon Garrity <gordon@iqaudio.com>
Date: Sat, 8 Mar 2014 16:56:57 +0000
-Subject: [PATCH 069/111] Add IQaudIO Sound Card support for Raspberry Pi
+Subject: [PATCH 069/115] Add IQaudIO Sound Card support for Raspberry Pi
Set a limit of 0dB on Digital Volume Control
@@ -111694,10 +111694,10 @@ index 0000000000000000000000000000000000000000..4e8e6dec14bcf4a1ff286c43742d4097
+MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC");
+MODULE_LICENSE("GPL v2");
-From 375717ae06cb32b14e2c615798b51d4bc384c0b0 Mon Sep 17 00:00:00 2001
+From 9444adfef1810995fc81386fca0e3e500d864882 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 25 Jul 2016 17:06:50 +0100
-Subject: [PATCH 070/111] iqaudio-dac: Compile fix - untested
+Subject: [PATCH 070/115] iqaudio-dac: Compile fix - untested
---
sound/soc/bcm/iqaudio-dac.c | 6 +++++-
@@ -111721,10 +111721,10 @@ index 4e8e6dec14bcf4a1ff286c43742d4097249d6777..aa15bc4b49ca95edec905fddd8fd0a6d
if (dapm->dev != codec_dai->dev)
return 0;
-From 8c1655f7ed054fab977e814fa775ba3d0132a71e Mon Sep 17 00:00:00 2001
+From 02a7fb4d5300bfd6dfd55742b30c810f28c4bd4e Mon Sep 17 00:00:00 2001
From: Daniel Matuschek <info@crazy-audio.com>
Date: Mon, 4 Aug 2014 10:06:56 +0200
-Subject: [PATCH 071/111] Added support for HiFiBerry DAC+
+Subject: [PATCH 071/115] Added support for HiFiBerry DAC+
The driver is based on the HiFiBerry DAC driver. However HiFiBerry DAC+ uses
a different codec chip (PCM5122), therefore a new driver is necessary.
@@ -112354,10 +112354,10 @@ index 72b19e62f6267698aea45d2410d616d91c1825cb..c6839ef6e16754ed9de2698507b8986a
dev_err(dev, "No LRCLK?\n");
return -EINVAL;
-From 1f802ccf0a9e67907572ea2f881975a904ec3bf5 Mon Sep 17 00:00:00 2001
+From c2dfa5296c826ddb6430c746bb46aef4d35e1f36 Mon Sep 17 00:00:00 2001
From: Daniel Matuschek <info@crazy-audio.com>
Date: Mon, 4 Aug 2014 11:09:58 +0200
-Subject: [PATCH 072/111] Added driver for HiFiBerry Amp amplifier add-on board
+Subject: [PATCH 072/115] Added driver for HiFiBerry Amp amplifier add-on board
The driver contains a low-level hardware driver for the TAS5713 and the
drivers for the Raspberry Pi I2S subsystem.
@@ -113190,10 +113190,10 @@ index 0000000000000000000000000000000000000000..8f019e04898754d2f87e9630137be9e8
+
+#endif /* _TAS5713_H */
-From 7c0248b02d38aeb82181a3d86d999cc1e8b4e5b3 Mon Sep 17 00:00:00 2001
+From 04ac08684325948cb4476b20fa8b273268d1c4b1 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 12 Dec 2016 16:26:54 +0000
-Subject: [PATCH 073/111] Revert "Added driver for HiFiBerry Amp amplifier
+Subject: [PATCH 073/115] Revert "Added driver for HiFiBerry Amp amplifier
add-on board"
This reverts commit 3e6b00833d92a50cbcc9922deb6e1bc8fcdbb587.
@@ -114015,10 +114015,10 @@ index 8f019e04898754d2f87e9630137be9e8f612a342..00000000000000000000000000000000
-
-#endif /* _TAS5713_H */
-From 3696c3507465b578e9db9edcf2567f9cc4f50ea9 Mon Sep 17 00:00:00 2001
+From 50fa871deddba6c69e10849e132e6d956e42e23a Mon Sep 17 00:00:00 2001
From: Ryan Coe <bluemrp9@gmail.com>
Date: Sat, 31 Jan 2015 18:25:49 -0700
-Subject: [PATCH 074/111] Update ds1307 driver for device-tree support
+Subject: [PATCH 074/115] Update ds1307 driver for device-tree support
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
---
@@ -114045,10 +114045,10 @@ index 4e31036ee2596dec93accd26f627c5b95591ae9f..b92044cf03e750afa521a93519500e9d
.driver = {
.name = "rtc-ds1307",
-From f4ce7691f7e0dd6c047041d87e29876365e6ee27 Mon Sep 17 00:00:00 2001
+From d917888009147491f248aa715581c72c208246ec Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbrodkorb@conet.de>
Date: Wed, 25 Mar 2015 09:26:17 +0100
-Subject: [PATCH 075/111] Add driver for rpi-proto
+Subject: [PATCH 075/115] Add driver for rpi-proto
Forward port of 3.10.x driver from https://github.com/koalo
We are using a custom board and would like to use rpi 3.18.x
@@ -114263,10 +114263,10 @@ index 0000000000000000000000000000000000000000..9db678e885efd63d84d60a098a84ed67
+MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)");
+MODULE_LICENSE("GPL");
-From 3eaf5ac6549cc9b659ae23f1b02960801ae2b2ca Mon Sep 17 00:00:00 2001
+From 0050fb8352563921ad7733f044f4edd063a022f2 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jan@grulich.eu>
Date: Mon, 24 Aug 2015 16:03:47 +0100
-Subject: [PATCH 076/111] RaspiDAC3 support
+Subject: [PATCH 076/115] RaspiDAC3 support
Signed-off-by: Jan Grulich <jan@grulich.eu>
@@ -114509,10 +114509,10 @@ index 0000000000000000000000000000000000000000..dd9eeea2af0382307f437e6db09d1546
+MODULE_DESCRIPTION("ASoC Driver for RaspiDAC Rev.3x");
+MODULE_LICENSE("GPL v2");
-From a86f56673950aa0eafca22c4d2c393744d49032d Mon Sep 17 00:00:00 2001
+From e980cd4fd6947e2f5dca2d543dc4a835746aa53f Mon Sep 17 00:00:00 2001
From: Aaron Shaw <shawaj@gmail.com>
Date: Thu, 7 Apr 2016 21:26:21 +0100
-Subject: [PATCH 077/111] Add Support for JustBoom Audio boards
+Subject: [PATCH 077/115] Add Support for JustBoom Audio boards
justboom-dac: Adjust for ALSA API change
@@ -114966,10 +114966,10 @@ index 0000000000000000000000000000000000000000..91acb666380faa3c0deb2230f8a0f8bb
+MODULE_DESCRIPTION("ASoC Driver for JustBoom PI Digi HAT Sound Card");
+MODULE_LICENSE("GPL v2");
-From 14fbb06425bbc30d2d42de634942532006313b58 Mon Sep 17 00:00:00 2001
+From 1ca9d13a1a48c2aab70c325765fc2079080dbc17 Mon Sep 17 00:00:00 2001
From: Andrey Grodzovsky <andrey2805@gmail.com>
Date: Tue, 3 May 2016 22:10:59 -0400
-Subject: [PATCH 078/111] ARM: adau1977-adc: Add basic machine driver for
+Subject: [PATCH 078/115] ARM: adau1977-adc: Add basic machine driver for
adau1977 codec driver.
This commit adds basic support for the codec usage including: Device tree overlay,
@@ -115151,10 +115151,10 @@ index 0000000000000000000000000000000000000000..6e2ee027926ee63c89222f75ceb89e3d
+MODULE_DESCRIPTION("ASoC Driver for ADAU1977 ADC");
+MODULE_LICENSE("GPL v2");
-From e1215eff5db9d0e68052f3a3e9f87c2d8f5bae1c Mon Sep 17 00:00:00 2001
+From 0ea3467c8134be24f914f5dccb8fa6df640848e5 Mon Sep 17 00:00:00 2001
From: Matt Flax <flatmax@flatmax.org>
Date: Mon, 16 May 2016 21:36:31 +1000
-Subject: [PATCH 079/111] New AudioInjector.net Pi soundcard with low jitter
+Subject: [PATCH 079/115] New AudioInjector.net Pi soundcard with low jitter
audio in and out.
Contains the sound/soc/bcm ALSA machine driver and necessary alterations to the Kconfig and Makefile.
@@ -115405,10 +115405,10 @@ index 0000000000000000000000000000000000000000..ef54e0f07ea03f59e9957b5d98f3e7fd
+MODULE_ALIAS("platform:audioinjector-pi-soundcard");
+
-From 3abc67377cca7ff4e63ad2496a53a4454b9d1555 Mon Sep 17 00:00:00 2001
+From 41035ac8d13b7a8924913ef73d5d4990cce08e71 Mon Sep 17 00:00:00 2001
From: DigitalDreamtime <clive.messer@digitaldreamtime.co.uk>
Date: Thu, 30 Jun 2016 18:38:42 +0100
-Subject: [PATCH 080/111] Add IQAudIO Digi WM8804 board support
+Subject: [PATCH 080/115] Add IQAudIO Digi WM8804 board support
Support IQAudIO Digi board with iqaudio_digi machine driver and
iqaudio-digi-wm8804-audio overlay.
@@ -115708,10 +115708,10 @@ index 0000000000000000000000000000000000000000..9b6e829bcb5b1762a853775e78163196
+MODULE_DESCRIPTION("ASoC Driver for IQAudIO WM8804 Digi");
+MODULE_LICENSE("GPL v2");
-From 8d49dfc240c29fc3296d25559303f72a521f0141 Mon Sep 17 00:00:00 2001
+From df7b1645d6ff9501d9ceceb48fa4d6eb92367fe0 Mon Sep 17 00:00:00 2001
From: escalator2015 <jmtasende@gmail.com>
Date: Tue, 24 May 2016 16:20:09 +0100
-Subject: [PATCH 081/111] New driver for RRA DigiDAC1 soundcard using WM8741 +
+Subject: [PATCH 081/115] New driver for RRA DigiDAC1 soundcard using WM8741 +
WM8804
---
@@ -116184,10 +116184,10 @@ index 0000000000000000000000000000000000000000..446796e7e4c14a7d95b2f2a01211d9a0
+MODULE_DESCRIPTION("ASoC Driver for RRA DigiDAC1");
+MODULE_LICENSE("GPL v2");
-From 9a617cde3a19d6e794a531fc97056d3712acc6d0 Mon Sep 17 00:00:00 2001
+From 31630c7cb37dd822fcdcdf46a452664336853157 Mon Sep 17 00:00:00 2001
From: DigitalDreamtime <clive.messer@digitaldreamtime.co.uk>
Date: Sat, 2 Jul 2016 16:26:19 +0100
-Subject: [PATCH 082/111] Add support for Dion Audio LOCO DAC-AMP HAT
+Subject: [PATCH 082/115] Add support for Dion Audio LOCO DAC-AMP HAT
Using dedicated machine driver and pcm5102a codec driver.
@@ -116360,10 +116360,10 @@ index 0000000000000000000000000000000000000000..89e65317512bc774453ac8d0d5b0ff98
+MODULE_DESCRIPTION("ASoC Driver for DionAudio LOCO");
+MODULE_LICENSE("GPL v2");
-From 3dcce9c448e2c55b6613864b70a105c7194a6c04 Mon Sep 17 00:00:00 2001
+From e128b5a7037e7c6812f7b975047224795a1aca45 Mon Sep 17 00:00:00 2001
From: Clive Messer <clive.m.messer@gmail.com>
Date: Mon, 19 Sep 2016 14:01:04 +0100
-Subject: [PATCH 083/111] Allo Piano DAC boards: Initial 2 channel (stereo)
+Subject: [PATCH 083/115] Allo Piano DAC boards: Initial 2 channel (stereo)
support (#1645)
Add initial 2 channel (stereo) support for Allo Piano DAC (2.0/2.1) boards,
@@ -116570,10 +116570,10 @@ index 0000000000000000000000000000000000000000..8e8e62e5a36a279b425ed4655cfbac99
+MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Piano DAC");
+MODULE_LICENSE("GPL v2");
-From 6e56deb3cec1e3680db7ca2e00d3566fc981c194 Mon Sep 17 00:00:00 2001
+From 973001abcc83c6814de745effeb8e6684224a7c7 Mon Sep 17 00:00:00 2001
From: gtrainavicius <gtrainavicius@users.noreply.github.com>
Date: Sun, 23 Oct 2016 12:06:53 +0300
-Subject: [PATCH 084/111] Support for Blokas Labs pisound board
+Subject: [PATCH 084/115] Support for Blokas Labs pisound board
Pisound dynamic overlay (#1760)
@@ -117750,10 +117750,10 @@ index 0000000000000000000000000000000000000000..4b8545487d06e4ea70073a5d063fb231
+MODULE_DESCRIPTION("ASoC Driver for pisound, http://blokas.io/pisound");
+MODULE_LICENSE("GPL v2");
-From 98377297665ab6bf02efbf28cc1f1d0821d840c9 Mon Sep 17 00:00:00 2001
+From 9764248fa58a0edf41da8d581ddeaeb4244d59d2 Mon Sep 17 00:00:00 2001
From: P33M <P33M@github.com>
Date: Wed, 21 Oct 2015 14:55:21 +0100
-Subject: [PATCH 085/111] rpi_display: add backlight driver and overlay
+Subject: [PATCH 085/115] rpi_display: add backlight driver and overlay
Add a mailbox-driven backlight controller for the Raspberry Pi DSI
touchscreen display. Requires updated GPU firmware to recognise the
@@ -117922,10 +117922,10 @@ index 0000000000000000000000000000000000000000..14a0d9b037395497c1fdae2961feccd5
+MODULE_DESCRIPTION("Raspberry Pi mailbox based Backlight Driver");
+MODULE_LICENSE("GPL");
-From 0d43b57dd46045cd251343c1ad168de2db528c01 Mon Sep 17 00:00:00 2001
+From bc981832957cccf74f758afad05b501d66b894c8 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 23 Feb 2016 19:56:04 +0000
-Subject: [PATCH 086/111] bcm2835-virtgpio: Virtual GPIO driver
+Subject: [PATCH 086/115] bcm2835-virtgpio: Virtual GPIO driver
Add a virtual GPIO driver that uses the firmware mailbox interface to
request that the VPU toggles LEDs.
@@ -118199,10 +118199,10 @@ index b0f6e33bd30c35664ceee057f4c3ad32b914291d..e92278968b2b979db2a1f855f70e7aaf
RPI_FIRMWARE_FRAMEBUFFER_SET_BACKLIGHT = 0x0004800f,
-From 6e12f2b19d43ee028bfa2a9118585e65bec5c450 Mon Sep 17 00:00:00 2001
+From 899dcbdc1f39d22a22b06d8c7854d2c0e9d2a974 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Tue, 23 Feb 2016 17:26:48 +0000
-Subject: [PATCH 087/111] amba_pl011: Don't use DT aliases for numbering
+Subject: [PATCH 087/115] amba_pl011: Don't use DT aliases for numbering
The pl011 driver looks for DT aliases of the form "serial<n>",
and if found uses <n> as the device ID. This can cause
@@ -118231,10 +118231,10 @@ index e2c33b9528d82ed7a2c27d083d7b1d222da68178..5a11ff833e1fd112ba04df3a427cd94b
uap->old_cr = 0;
uap->port.dev = dev;
-From 71ead171a2d5a1c560884f919ff0c81f2dd07f0c Mon Sep 17 00:00:00 2001
+From 1814288b3d1f6b38badd2e428c32400d3add11b4 Mon Sep 17 00:00:00 2001
From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Date: Wed, 3 Dec 2014 13:23:28 +0200
-Subject: [PATCH 088/111] OF: DT-Overlay configfs interface
+Subject: [PATCH 088/115] OF: DT-Overlay configfs interface
This is a port of Pantelis Antoniou's v3 port that makes use of the
new upstreamed configfs support for binary attributes.
@@ -118666,10 +118666,10 @@ index 0000000000000000000000000000000000000000..0037e6868a6cda8706c88194c6a4454b
+}
+late_initcall(of_cfs_init);
-From 2d043fc762bf4cc4aa2595adaad26496dfeb6eb8 Mon Sep 17 00:00:00 2001
+From 4a55c87142685a4fe2120b957fac40e92afdc752 Mon Sep 17 00:00:00 2001
From: Cheong2K <cheong@redbear.cc>
Date: Fri, 26 Feb 2016 18:20:10 +0800
-Subject: [PATCH 089/111] brcm: adds support for BCM43341 wifi
+Subject: [PATCH 089/115] brcm: adds support for BCM43341 wifi
brcmfmac: Disable power management
@@ -118832,10 +118832,10 @@ index d0407d9ad7827cd756b6311410ffe2d9a7cacc78..f1fb8a3c7a3211e8429585861f2f42e0
#define BRCM_CC_4335_CHIP_ID 0x4335
#define BRCM_CC_4339_CHIP_ID 0x4339
-From e8bc1c301166d8273a8ae9f55cc5c41b970c6e53 Mon Sep 17 00:00:00 2001
+From 7ba445806db31a38eba5aeb270edf80bc3e7e56e Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 17 Dec 2015 13:37:07 +0000
-Subject: [PATCH 090/111] hci_h5: Don't send conf_req when ACTIVE
+Subject: [PATCH 090/115] hci_h5: Don't send conf_req when ACTIVE
Without this patch, a modem and kernel can continuously bombard each
other with conf_req and conf_rsp messages, in a demented game of tag.
@@ -118858,10 +118858,10 @@ index 0879d64b1caf58afb6e5d494c07d9ab7e7cdf983..5161ab30fd533d50f516bb93d5b9f402
if (H5_HDR_LEN(hdr) > 2)
h5->tx_win = (data[2] & 0x07);
-From 472db8146235a2a4e9109b9ffe9c80b815b24809 Mon Sep 17 00:00:00 2001
+From 10aec4494df5c905f9f605691a0f474df2ef7c5a Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Mon, 13 Apr 2015 17:16:29 +0100
-Subject: [PATCH 091/111] config: Add default configs
+Subject: [PATCH 091/115] config: Add default configs
---
arch/arm/configs/bcm2709_defconfig | 1297 +++++++++++++++++++++++++++++++++++
@@ -121488,10 +121488,10 @@ index 0000000000000000000000000000000000000000..8acee9f31202ec14f2933d92dd70831c
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-From f48b75a44a3a1b2fac53aa9e17c8bbb859799b17 Mon Sep 17 00:00:00 2001
+From fa434973b4a32844166d399d398127c0d5e711ff Mon Sep 17 00:00:00 2001
From: Michael Zoran <mzoran@crowfest.net>
Date: Wed, 24 Aug 2016 03:35:56 -0700
-Subject: [PATCH 092/111] Add arm64 configuration and device tree differences.
+Subject: [PATCH 092/115] Add arm64 configuration and device tree differences.
Disable MMC_BCM2835_SDHOST and MMC_BCM2835 since these drivers are crashing
at the moment.
@@ -122906,10 +122906,10 @@ index 0000000000000000000000000000000000000000..d7406f5a4620151044b8f716b4d10bb8
+CONFIG_LIBCRC32C=y
+CONFIG_BCM2708_VCHIQ=n
-From 219a6fccb0da0e2e3533110a8871a6a64e11d8bf Mon Sep 17 00:00:00 2001
+From 6b7facf4ae8fbe50a7a6aac59bb2c6eb19d90e78 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 7 Mar 2016 15:05:11 +0000
-Subject: [PATCH 093/111] vchiq_arm: Tweak the logging output
+Subject: [PATCH 093/115] vchiq_arm: Tweak the logging output
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
---
@@ -122984,10 +122984,10 @@ index 2c98da4307dff994a00dc246574ef0aaee05d5da..160db24aeea33a8296923501009c1f02
switch (type) {
-From 2ee990fac882706993ff1e41954e3f66329cf902 Mon Sep 17 00:00:00 2001
+From 3db78a0e53bb9bfa930b56dea7ceb1dd83e88854 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 23 Mar 2016 14:16:25 +0000
-Subject: [PATCH 094/111] vchiq_arm: Access the dequeue_pending flag locked
+Subject: [PATCH 094/115] vchiq_arm: Access the dequeue_pending flag locked
Reading through this code looking for another problem (now found in userland)
the use of dequeue_pending outside a lock didn't seem safe.
@@ -123045,10 +123045,10 @@ index 7b6cd4d80621e38ff6d47fcd87b45fbe9cd4259b..d8669fa7f39b077877eca1829ba9538b
return add_completion(instance, reason, header, user_service,
-From 3116aabedfc03a28116a5d3c5e60bf5ca036b81a Mon Sep 17 00:00:00 2001
+From 227e042a6eb6060d2d5c9b4a03505c9d75666eca Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Wed, 23 Mar 2016 20:53:47 +0000
-Subject: [PATCH 095/111] vchiq_arm: Service callbacks must not fail
+Subject: [PATCH 095/115] vchiq_arm: Service callbacks must not fail
Service callbacks are not allowed to return an error. The internal callback
that delivers events and messages to user tasks does not enqueue them if
@@ -123074,10 +123074,10 @@ index d8669fa7f39b077877eca1829ba9538bf2e21a82..54552c6ce54f413c9781ba279b936f98
DEBUG_TRACE(SERVICE_CALLBACK_LINE);
}
-From e14cabb05cf8aa75df960f82198ed6125c3e4b89 Mon Sep 17 00:00:00 2001
+From 45169c40cf00030cfc688f1f2b2c80ab32b0d266 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 21 Apr 2016 13:49:32 +0100
-Subject: [PATCH 096/111] vchiq_arm: Add completion records under the mutex
+Subject: [PATCH 096/115] vchiq_arm: Add completion records under the mutex
An issue was observed when flushing openmax components
which generate a large number of messages returning
@@ -123140,10 +123140,10 @@ index 54552c6ce54f413c9781ba279b936f98be4f47b0..bde8955b7d8505d73579b77b5b392154
return VCHIQ_SUCCESS;
-From 720c0f193217c59539e4bd3cbf4c2315caa7fcb2 Mon Sep 17 00:00:00 2001
+From 06b323e840238209473af5d80784a2368cb5d4a3 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 20 Jun 2016 13:51:44 +0100
-Subject: [PATCH 097/111] vchiq_arm: Avoid use of mutex in add_completion
+Subject: [PATCH 097/115] vchiq_arm: Avoid use of mutex in add_completion
Claiming the completion_mutex within add_completion did prevent some
messages appearing twice, but provokes a deadlock caused by vcsm using
@@ -123337,10 +123337,10 @@ index 160db24aeea33a8296923501009c1f02bc41e599..71a3bedc55314f3b22dbff40c05dedf0
up(&state->slot_available_event);
}
-From 27d47d64fcc3c859c0aa4e586260fe18a4d93ea0 Mon Sep 17 00:00:00 2001
+From 4016656bd013577f46a9d2906758204fc4f95263 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 3 Oct 2016 10:14:10 -0700
-Subject: [PATCH 098/111] staging/vchi: Convert to current get_user_pages()
+Subject: [PATCH 098/115] staging/vchi: Convert to current get_user_pages()
arguments.
Signed-off-by: Eric Anholt <eric@anholt.net>
@@ -123377,10 +123377,10 @@ index e5cdda12c7e5c35c69eb96991cfdb8326def167f..085d37588c59198b4e5f00b9249bb842
num_pages, /* len */
0, /* gup_flags */
-From e1c06a16857ef82b23542476ae90c19f8116759e Mon Sep 17 00:00:00 2001
+From e4d6916c744b90732711c746ac8e819d5d9a7a99 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 3 Oct 2016 10:16:03 -0700
-Subject: [PATCH 099/111] staging/vchi: Update for rename of
+Subject: [PATCH 099/115] staging/vchi: Update for rename of
page_cache_release() to put_page().
Signed-off-by: Eric Anholt <eric@anholt.net>
@@ -123425,10 +123425,10 @@ index 085d37588c59198b4e5f00b9249bb8421695854f..5a2b8fb459ebe086ec229f37b6381bdb
kfree(pages);
}
-From d4b6d1d96c30d9d162a96845fb9f6f1da82749d8 Mon Sep 17 00:00:00 2001
+From d92f8513e18d01f4ff70e518ea6136034e523fa0 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 3 Oct 2016 10:21:17 -0700
-Subject: [PATCH 100/111] drivers/vchi: Remove dependency on CONFIG_BROKEN.
+Subject: [PATCH 100/115] drivers/vchi: Remove dependency on CONFIG_BROKEN.
The driver builds now.
@@ -123450,10 +123450,10 @@ index 9676fb29075a457109e4d4235f086987aec74868..db8e1beb89f9f8c48ea5964016c8285e
help
Kernel to VideoCore communication interface for the
-From c6b2cd816480eb17449290d989909b8ba892e9a6 Mon Sep 17 00:00:00 2001
+From 2d08ef943532e066a4e87d97ce11ec2981cc387c Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 14 Sep 2016 09:16:19 +0100
-Subject: [PATCH 101/111] raspberrypi-firmware: Export the general transaction
+Subject: [PATCH 101/115] raspberrypi-firmware: Export the general transaction
function.
The vc4-firmware-kms module is going to be doing the MBOX FB call.
@@ -123497,10 +123497,10 @@ index e92278968b2b979db2a1f855f70e7aafb224fa98..09e3d871d110eb0762ebdb5ea3293537
#endif /* __SOC_RASPBERRY_FIRMWARE_H__ */
-From b3704dd955494e84e7ec6d7d07c8cdad72927139 Mon Sep 17 00:00:00 2001
+From a5ac1e86dc31181ce22cff34ec8900f66199ad6e Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 14 Sep 2016 09:18:09 +0100
-Subject: [PATCH 102/111] raspberrypi-firmware: Define the MBOX channel in the
+Subject: [PATCH 102/115] raspberrypi-firmware: Define the MBOX channel in the
header.
Signed-off-by: Eric Anholt <eric@anholt.net>
@@ -123522,10 +123522,10 @@ index 09e3d871d110eb0762ebdb5ea329353738d58661..2859db09e25bb945251e85edb39bc434
enum rpi_firmware_property_status {
-From ea0597439af226851168bcee2b9e122c17e22567 Mon Sep 17 00:00:00 2001
+From 29207a47f48bc9572a4661fd009a1963e1111d2a Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 14 Sep 2016 08:39:33 +0100
-Subject: [PATCH 103/111] drm/vc4: Add a mode for using the closed firmware for
+Subject: [PATCH 103/115] drm/vc4: Add a mode for using the closed firmware for
display.
Signed-off-by: Eric Anholt <eric@anholt.net>
@@ -124292,10 +124292,10 @@ index 0000000000000000000000000000000000000000..d18a1dae51a2275846c9826b5bf1ba57
+ },
+};
-From d9f0d5cad9768b3b249cf0e45d45f31c0e941f26 Mon Sep 17 00:00:00 2001
+From aff82e1d3c88024d93b499b6b2e5834c5b0335b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Sat, 17 Sep 2016 15:07:10 +0200
-Subject: [PATCH 104/111] i2c: bcm2835: Fix hang for writing messages larger
+Subject: [PATCH 104/115] i2c: bcm2835: Fix hang for writing messages larger
than 16 bytes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -124385,10 +124385,10 @@ index d4f3239b56865919e1b781b20a7c5ebcd76b4eb9..f283b714aa79e2e4685ed95b04b6b289
i2c_dev->msg_buf_remaining = msg->len;
reinit_completion(&i2c_dev->completion);
-From ee341c5b195116a5edb761bfeba927f926b888cb Mon Sep 17 00:00:00 2001
+From 7086a6dae5d3fefb10d7c7e072ea8fc2f6eed165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 23 Sep 2016 18:24:38 +0200
-Subject: [PATCH 105/111] i2c: bcm2835: Protect against unexpected TXW/RXR
+Subject: [PATCH 105/115] i2c: bcm2835: Protect against unexpected TXW/RXR
interrupts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -124513,10 +124513,10 @@ index f283b714aa79e2e4685ed95b04b6b289f7e9eee7..d2ba1a4de36af512e8e3c97251bd3537
return -ETIMEDOUT;
}
-From 8cf47e3091e11ac5db049059d99c6358365eeafb Mon Sep 17 00:00:00 2001
+From 33c44069645cf5481ecd222c9cb54c560cd19b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Mon, 19 Sep 2016 17:19:41 +0200
-Subject: [PATCH 106/111] i2c: bcm2835: Use dev_dbg logging on transfer errors
+Subject: [PATCH 106/115] i2c: bcm2835: Use dev_dbg logging on transfer errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -124548,10 +124548,10 @@ index d2ba1a4de36af512e8e3c97251bd3537ae61591a..54d510abd46a117c9238fc6d7edec840
if (i2c_dev->msg_err & BCM2835_I2C_S_ERR)
return -EREMOTEIO;
-From ddda57262c214495254890c94e598b8fca25dfc9 Mon Sep 17 00:00:00 2001
+From 8229b659d8c8366951d4c06ca014e00beff0d2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Thu, 22 Sep 2016 22:05:50 +0200
-Subject: [PATCH 107/111] i2c: bcm2835: Can't support I2C_M_IGNORE_NAK
+Subject: [PATCH 107/115] i2c: bcm2835: Can't support I2C_M_IGNORE_NAK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -124595,10 +124595,10 @@ index 54d510abd46a117c9238fc6d7edec84019d1f60d..565ef69ce61423544dc0558c85ef318b
if (i2c_dev->msg_err & BCM2835_I2C_S_ERR)
-From eaf51d9298d9dde20bded52c63eda7f4e536b992 Mon Sep 17 00:00:00 2001
+From cd59c218e06308344f6f1b16a4691ba39db9c015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 23 Sep 2016 04:54:27 +0200
-Subject: [PATCH 108/111] i2c: bcm2835: Add support for Repeated Start
+Subject: [PATCH 108/115] i2c: bcm2835: Add support for Repeated Start
Condition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -124780,10 +124780,10 @@ index 565ef69ce61423544dc0558c85ef318b0ae9c324..241e08ae7c27cec23fad3c1bf3ebad3a
static u32 bcm2835_i2c_func(struct i2c_adapter *adap)
-From f7b9050bbbf5e15b9f4c5af03d9a9bd9edc39049 Mon Sep 17 00:00:00 2001
+From b10e9908008c3cd1dbaa414ab5900cd8fb5abe34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 23 Sep 2016 04:57:17 +0200
-Subject: [PATCH 109/111] i2c: bcm2835: Support i2c-dev ioctl I2C_TIMEOUT
+Subject: [PATCH 109/115] i2c: bcm2835: Support i2c-dev ioctl I2C_TIMEOUT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -124820,10 +124820,10 @@ index 241e08ae7c27cec23fad3c1bf3ebad3a4d2a8e6f..d2085dd3742eabebc537621968088261
bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C,
BCM2835_I2C_C_CLEAR);
-From 8b97b2301e5e691828b2ea1210cabd55fa930b5e Mon Sep 17 00:00:00 2001
+From 64e07ce5f477887023a5c335520dd68ae0900d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Tue, 27 Sep 2016 01:00:08 +0200
-Subject: [PATCH 110/111] i2c: bcm2835: Add support for dynamic clock
+Subject: [PATCH 110/115] i2c: bcm2835: Add support for dynamic clock
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -124939,10 +124939,10 @@ index d2085dd3742eabebc537621968088261f8dc7ea8..c3436f627028477f7e21b47e079fd5ab
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!irq) {
-From 5c14442e251ac2c6f434c914beb3f09ed6573821 Mon Sep 17 00:00:00 2001
+From 0c3a7a7ccec119b8879036b5377ed27c34e94ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Tue, 1 Nov 2016 15:15:41 +0100
-Subject: [PATCH 111/111] i2c: bcm2835: Add debug support
+Subject: [PATCH 111/115] i2c: bcm2835: Add debug support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -125130,3 +125130,421 @@ index c3436f627028477f7e21b47e079fd5ab06ec188a..8642f580ce41803bd22c76a0fa80d083
if (i2c_dev->msg_err & BCM2835_I2C_S_ERR)
return -EREMOTEIO;
+
+From a53d004be5cb68a6bb3cf8861c0d00f1113ae47a Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Sat, 31 Dec 2016 14:15:50 +0000
+Subject: [PATCH 112/115] arm64: Add CONFIG_ARCH_BCM2835
+
+---
+ arch/arm64/configs/bcmrpi3_defconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
+index d7406f5a4620151044b8f716b4d10bb818648e06..53da5c7a33e5898a66e549fb0c39fe3da555ca87 100644
+--- a/arch/arm64/configs/bcmrpi3_defconfig
++++ b/arch/arm64/configs/bcmrpi3_defconfig
+@@ -1332,3 +1332,4 @@ CONFIG_ARM64_CRYPTO=y
+ CONFIG_CRC_ITU_T=y
+ CONFIG_LIBCRC32C=y
+ CONFIG_BCM2708_VCHIQ=n
++CONFIG_ARCH_BCM2835=y
+
+From ac38758357ec71ec5acd49829b5d0bf34b53f146 Mon Sep 17 00:00:00 2001
+From: Alex Tucker <alex@floop.org.uk>
+Date: Tue, 13 Dec 2016 19:50:18 +0000
+Subject: [PATCH 113/115] Add support for Silicon Labs Si7013/20/21
+ humidity/temperature sensor.
+
+---
+ arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts | 49 +++++++++++++----------
+ 1 file changed, 28 insertions(+), 21 deletions(-)
+
+diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
+index f6d134c095af2398fc55ae7d2b0e86456c30627c..31bda8da4cb6a56bfe493a81b918900995fb0589 100644
+--- a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
++++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
+@@ -1,34 +1,41 @@
+-// Definitions for a few digital barometric pressure and temperature sensors
++// Definitions for I2C based sensors using the Industrial IO interface.
+ /dts-v1/;
+ /plugin/;
+
+ / {
+- compatible = "brcm,bcm2708";
++ compatible = "brcm,bcm2708";
+
+- fragment@0 {
+- target = <&i2c_arm>;
+- __overlay__ {
+- #address-cells = <1>;
+- #size-cells = <0>;
+- status = "okay";
++ fragment@0 {
++ target = <&i2c_arm>;
++ __overlay__ {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ status = "okay";
+
+- bmp085: bmp085@77 {
+- compatible = "bosch,bmp085";
+- reg = <0x77>;
+- default-oversampling = <3>;
+- status = "disable";
+- };
++ bmp085: bmp085@77 {
++ compatible = "bosch,bmp085";
++ reg = <0x77>;
++ default-oversampling = <3>;
++ status = "disable";
++ };
+
+- bmp280: bmp280@76 {
+- compatible = "bosch,bmp280";
+- reg = <0x76>;
+- status = "disable";
+- };
+- };
+- };
++ bmp280: bmp280@76 {
++ compatible = "bosch,bmp280";
++ reg = <0x76>;
++ status = "disable";
++ };
++
++ si7020: si7020@40 {
++ compatible = "si7020";
++ reg = <0x40>;
++ status = "disable";
++ };
++ };
++ };
+
+ __overrides__ {
+ bmp085 = <&bmp085>,"status";
+ bmp280 = <&bmp280>,"status";
++ si7020 = <&si7020>,"status";
+ };
+ };
+
+From 1cc48e2a09ebab7b9a47f172be9e5549f10d0bcb Mon Sep 17 00:00:00 2001
+From: Phil Elwell <pelwell@users.noreply.github.com>
+Date: Tue, 3 Jan 2017 21:27:46 +0000
+Subject: [PATCH 114/115] Document the si7020 option
+
+---
+ arch/arm/boot/dts/overlays/README | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
+index 81d991803be335e5a1bc3bb0a8c7a2c9f5c392bd..e8fa4ccb44c34a20485c4e6155467af99179153a 100644
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -549,6 +549,9 @@ Params: bmp085 Select the Bosch sensortronic BMP085
+
+ bmp280 Select the Bosch sensortronic BMP280
+
++ si7020 Select the Silicon Labs Si7013/20/21 humidity/
++ temperature sensor
++
+
+ Name: i2c0-bcm2708
+ Info: Enable the i2c_bcm2708 driver for the i2c0 bus. Not all pin combinations
+
+From 2497616f059f1d8a3145b313d2630aaa276fbcc9 Mon Sep 17 00:00:00 2001
+From: Giedrius Trainavicius <giedrius@blokas.io>
+Date: Thu, 5 Jan 2017 02:38:16 +0200
+Subject: [PATCH 115/115] pisound improvements:
+
+* Added a writable sysfs object to enable scripts / user space software
+to blink MIDI activity LEDs for variable duration.
+* Improved hw_param constraints setting.
+* Added compatibility with S16_LE sample format.
+* Exposed some simple placeholder volume controls, so the card appears
+in volumealsa widget.
+
+Signed-off-by: Giedrius Trainavicius <giedrius@blokas.io>
+---
+ sound/soc/bcm/pisound.c | 175 ++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 154 insertions(+), 21 deletions(-)
+
+diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c
+index 4b8545487d06e4ea70073a5d063fb2310b3b94d0..ba70734b89e61a11201657406223f0b37d54f74a 100644
+--- a/sound/soc/bcm/pisound.c
++++ b/sound/soc/bcm/pisound.c
+@@ -36,6 +36,7 @@
+ #include <sound/jack.h>
+ #include <sound/rawmidi.h>
+ #include <sound/asequencer.h>
++#include <sound/control.h>
+
+ static int pisnd_spi_init(struct device *dev);
+ static void pisnd_spi_uninit(void);
+@@ -214,6 +215,9 @@ static char g_serial_num[11];
+ static char g_id[25];
+ static char g_version[5];
+
++static uint8_t g_ledFlashDuration;
++static bool g_ledFlashDurationChanged;
++
+ DEFINE_KFIFO(spi_fifo_in, uint8_t, FIFO_SIZE);
+ DEFINE_KFIFO(spi_fifo_out, uint8_t, FIFO_SIZE);
+
+@@ -396,8 +400,13 @@ static void pisnd_work_handler(struct work_struct *work)
+ val = 0;
+ tx = 0;
+
+- if (kfifo_get(&spi_fifo_out, &val))
++ if (g_ledFlashDurationChanged) {
++ tx = 0xf000 | g_ledFlashDuration;
++ g_ledFlashDuration = 0;
++ g_ledFlashDurationChanged = false;
++ } else if (kfifo_get(&spi_fifo_out, &val)) {
+ tx = 0x0f00 | val;
++ }
+
+ rx = spi_transfer16(tx);
+
+@@ -410,6 +419,7 @@ static void pisnd_work_handler(struct work_struct *work)
+ } while (rx != 0
+ || !kfifo_is_empty(&spi_fifo_out)
+ || pisnd_spi_has_more()
++ || g_ledFlashDurationChanged
+ );
+
+ if (!kfifo_is_empty(&spi_fifo_in) && g_recvCallback)
+@@ -569,7 +579,7 @@ static int pisnd_spi_init(struct device *dev)
+ }
+
+ /* Flash the LEDs. */
+- spi_transfer16(0xf000);
++ spi_transfer16(0xf008);
+
+ ret = pisnd_spi_gpio_irq_init(dev);
+ if (ret < 0) {
+@@ -610,6 +620,14 @@ static void pisnd_spi_uninit(void)
+ pisnd_spi_gpio_uninit();
+ }
+
++static void pisnd_spi_flash_leds(uint8_t duration)
++{
++ g_ledFlashDuration = duration;
++ g_ledFlashDurationChanged = true;
++ printd("schedule from spi_flash_leds\n");
++ pisnd_schedule_process(TASK_PROCESS);
++}
++
+ static void pisnd_spi_send(uint8_t val)
+ {
+ kfifo_put(&spi_fifo_out, val);
+@@ -658,6 +676,83 @@ static const struct of_device_id pisound_of_match[] = {
+ {},
+ };
+
++enum {
++ SWITCH = 0,
++ VOLUME = 1,
++};
++
++static int pisnd_ctl_info(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_info *uinfo)
++{
++ if (kcontrol->private_value == SWITCH) {
++ uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
++ uinfo->count = 1;
++ uinfo->value.integer.min = 0;
++ uinfo->value.integer.max = 1;
++ return 0;
++ } else if (kcontrol->private_value == VOLUME) {
++ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
++ uinfo->count = 1;
++ uinfo->value.integer.min = 0;
++ uinfo->value.integer.max = 100;
++ return 0;
++ }
++ return -EINVAL;
++}
++
++static int pisnd_ctl_get(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ if (kcontrol->private_value == SWITCH) {
++ ucontrol->value.integer.value[0] = 1;
++ return 0;
++ } else if (kcontrol->private_value == VOLUME) {
++ ucontrol->value.integer.value[0] = 100;
++ return 0;
++ }
++
++ return -EINVAL;
++}
++
++static struct snd_kcontrol_new pisnd_ctl[] = {
++ {
++ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
++ .name = "PCM Playback Switch",
++ .index = 0,
++ .private_value = SWITCH,
++ .access = SNDRV_CTL_ELEM_ACCESS_READ,
++ .info = pisnd_ctl_info,
++ .get = pisnd_ctl_get,
++ },
++ {
++ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
++ .name = "PCM Playback Volume",
++ .index = 0,
++ .private_value = VOLUME,
++ .access = SNDRV_CTL_ELEM_ACCESS_READ,
++ .info = pisnd_ctl_info,
++ .get = pisnd_ctl_get,
++ },
++};
++
++static int pisnd_ctl_init(struct snd_card *card)
++{
++ int err, i;
++
++ for (i = 0; i < ARRAY_SIZE(pisnd_ctl); ++i) {
++ err = snd_ctl_add(card, snd_ctl_new1(&pisnd_ctl[i], NULL));
++ if (err < 0)
++ return err;
++ }
++
++ return 0;
++}
++
++static int pisnd_ctl_uninit(void)
++{
++ return 0;
++}
++
+ static struct gpio_desc *osr0, *osr1, *osr2;
+ static struct gpio_desc *reset;
+ static struct gpio_desc *button;
+@@ -667,6 +762,14 @@ static int pisnd_hw_params(
+ struct snd_pcm_hw_params *params
+ )
+ {
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
++
++ /* pisound runs on fixed 32 clock counts per channel,
++ * as generated by the master ADC.
++ */
++ snd_soc_dai_set_bclk_ratio(cpu_dai, 32*2);
++
+ printd("rate = %d\n", params_rate(params));
+ printd("ch = %d\n", params_channels(params));
+ printd("bits = %u\n",
+@@ -711,16 +814,6 @@ static struct snd_pcm_hw_constraint_list constraints_rates = {
+ .mask = 0,
+ };
+
+-static unsigned int sample_bits[] = {
+- 24, 32
+-};
+-
+-static struct snd_pcm_hw_constraint_list constraints_sample_bits = {
+- .count = ARRAY_SIZE(sample_bits),
+- .list = sample_bits,
+- .mask = 0,
+-};
+-
+ static int pisnd_startup(struct snd_pcm_substream *substream)
+ {
+ int err = snd_pcm_hw_constraint_list(
+@@ -733,11 +826,21 @@ static int pisnd_startup(struct snd_pcm_substream *substream)
+ if (err < 0)
+ return err;
+
+- err = snd_pcm_hw_constraint_list(
++ err = snd_pcm_hw_constraint_single(
+ substream->runtime,
+- 0,
+- SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
+- &constraints_sample_bits
++ SNDRV_PCM_HW_PARAM_CHANNELS,
++ 2
++ );
++
++ if (err < 0)
++ return err;
++
++ err = snd_pcm_hw_constraint_mask64(
++ substream->runtime,
++ SNDRV_PCM_HW_PARAM_FORMAT,
++ SNDRV_PCM_FMTBIT_S16_LE |
++ SNDRV_PCM_FMTBIT_S24_LE |
++ SNDRV_PCM_FMTBIT_S32_LE
+ );
+
+ if (err < 0)
+@@ -771,14 +874,23 @@ static int pisnd_card_probe(struct snd_soc_card *card)
+ {
+ int err = pisnd_midi_init(card->snd_card);
+
+- if (err < 0)
++ if (err < 0) {
+ printe("pisnd_midi_init failed: %d\n", err);
++ return err;
++ }
+
+- return err;
++ err = pisnd_ctl_init(card->snd_card);
++ if (err < 0) {
++ printe("pisnd_ctl_init failed: %d\n", err);
++ return err;
++ }
++
++ return 0;
+ }
+
+ static int pisnd_card_remove(struct snd_soc_card *card)
+ {
++ pisnd_ctl_uninit();
+ pisnd_midi_uninit();
+ return 0;
+ }
+@@ -870,17 +982,38 @@ static ssize_t pisnd_version_show(
+ return sprintf(buf, "%s\n", pisnd_spi_get_version());
+ }
+
++static ssize_t pisnd_led_store(
++ struct kobject *kobj,
++ struct kobj_attribute *attr,
++ const char *buf,
++ size_t length
++ )
++{
++ uint32_t timeout;
++ int err;
++
++ err = kstrtou32(buf, 10, &timeout);
++
++ if (err == 0 && timeout <= 255)
++ pisnd_spi_flash_leds(timeout);
++
++ return length;
++}
++
+ static struct kobj_attribute pisnd_serial_attribute =
+- __ATTR(serial, 0644, pisnd_serial_show, NULL);
++ __ATTR(serial, 0444, pisnd_serial_show, NULL);
+ static struct kobj_attribute pisnd_id_attribute =
+- __ATTR(id, 0644, pisnd_id_show, NULL);
++ __ATTR(id, 0444, pisnd_id_show, NULL);
+ static struct kobj_attribute pisnd_version_attribute =
+- __ATTR(version, 0644, pisnd_version_show, NULL);
++ __ATTR(version, 0444, pisnd_version_show, NULL);
++static struct kobj_attribute pisnd_led_attribute =
++ __ATTR(led, 0644, NULL, pisnd_led_store);
+
+ static struct attribute *attrs[] = {
+ &pisnd_serial_attribute.attr,
+ &pisnd_id_attribute.attr,
+ &pisnd_version_attribute.attr,
++ &pisnd_led_attribute.attr,
+ NULL
+ };
+
diff --git a/projects/RPi2/options b/projects/RPi2/options
index 3a6b6b2..c95ed90 100644
--- a/projects/RPi2/options
+++ b/projects/RPi2/options
@@ -136,7 +136,7 @@
# for a list of additinoal drivers see packages/linux-drivers
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
- ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS"
+ ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS media_build"
ADDITIONAL_DRIVERS="${ADDITIONAL_DRIVERS//RTL8192CU/}" # Drop this driver
# milhouse fix
diff --git a/projects/Virtual/options b/projects/Virtual/options
index ae5acf2..8b70855 100644
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -85,7 +85,7 @@
# for a list of additinoal drivers see packages/linux-drivers
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
- ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta"
+ ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta media_build"
# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia,nouveau,vmware,virtualbox)
# Space separated list is supported,
diff --git a/scripts/create_addon b/scripts/create_addon
index 0764efa..eac3bb5 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -63,7 +63,8 @@ pack_addon() {
echo "*** ERROR: $ADDON has addon.xml shipped, you need 'xmlstarlet' ***"
exit 255
fi
- ADDONVER=$(xmlstarlet sel -t -v "/addon/@version" $ADDON_BUILD/$PKG_ADDON_ID/addon.xml)
+ ADDONVER="$(xmlstarlet sel -t -v "/addon/@version" $ADDON_BUILD/$PKG_ADDON_ID/addon.xml).$PKG_REV"
+ xmlstarlet ed --inplace -u "/addon[@version]/@version" -v "$ADDONVER" $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
fi
if [ -d $PKG_DIR/source ]; then
diff --git a/tools/mkpkg/mkpkg_media_build b/tools/mkpkg/mkpkg_media_build
index 0509358..719750b 100755
--- a/tools/mkpkg/mkpkg_media_build
+++ b/tools/mkpkg/mkpkg_media_build
@@ -1,41 +1,98 @@
#!/bin/sh
################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# This file is part of LibreELEC - https://libreelec.tv
+# Copyright (C) 2016 Team LibreELEC
#
-# OpenELEC is free software: you can redistribute it and/or modify
+# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
-# OpenELEC is distributed in the hope that it will be useful,
+# LibreELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
+# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
-echo "getting sources..."
+# name of the package
+DVB_MKPKG_NAME="media_build"
+DVB_MKPKG_FOLDER="$(pwd)"
+
+# remove old files
+echo "removing old sources ..."
+rm -rf ${DVB_MKPKG_NAME}
+rm -rf ${DVB_MKPKG_NAME}-*
+
+################################################################################
+
+# media_build dl
+echo "getting media_build sources ..."
if [ ! -d media_build.git ]; then
- git clone git://linuxtv.org/media_build.git media_build.git
+ git clone --depth=1 https://bitbucket.org/CrazyCat/media_build.git ${DVB_MKPKG_NAME}/media_build
fi
- cd media_build.git
- git pull
- GIT_REV=`git log -n1 --format=%h`
- cd ..
+echo "cleaning media_build sources ..."
+ rm -rf ${DVB_MKPKG_NAME}/media_build/.git
+
+# media_tree dl
+echo "getting sources ..."
+ if [ ! -d linux_media.git ]; then
+ git clone --depth=1 https://github.com/crazycat69/linux_media.git -b latest ${DVB_MKPKG_NAME}/media_tree
+ fi
+
+cd ${DVB_MKPKG_NAME}/media_tree
+ git pull
+ GIT_REV=`git log -n1 --pretty=format:"%ad" --date=short`
+
+cd $DVB_MKPKG_FOLDER/
+
+# final folder
+mkdir ${DVB_MKPKG_NAME}/media/
+
+################################################################################
-echo "copying sources..."
- rm -rf media_build-$GIT_REV
- cp -R media_build.git media_build-$GIT_REV
+# modify the media_build buildscript
+cd ${DVB_MKPKG_NAME}/media_build/linux/
-echo "cleaning sources..."
- rm -rf media_build-$GIT_REV/.git
+# backup Makefile
+cp Makefile Makefile.org
+
+# workaround for crazycat media_build to create a proper named file
+sed -i -E "s/TODAY_TAR\ \:\=\ linux\-media\-LATEST\.tar/TODAY_TAR\ \:\=\ linux\-media.tar/g" Makefile
+
+# normal media build
+sed -i -E 's/TODAY_TAR\ \:\=\ linux\-media\-\$\{DATE\}\.tar/TODAY_TAR\ \:\=\ linux\-media.tar/g' Makefile
+
+# remove the creation of the archive
+sed -i -E 's/bzip2\ \$\(PWD\)\/\$\(TODAY_TAR\)/ /g' Makefile
+
+# collecting files from media_tree
+echo "collect source files ..."
+make todaytar DIR="../../media_tree/"
+
+# extract resulting tar into media folder
+tar xf linux-media.tar -C "../../media/"
+
+# cleanup
+rm linux-media.tar
+rm Makefile && mv Makefile.org Makefile
+
+cd $DVB_MKPKG_FOLDER
+rm -rf ${DVB_MKPKG_NAME}/media_tree/
+rm -rf ${DVB_MKPKG_NAME}/media_build/.git/
+
+# rename buildfolder
+mv ${DVB_MKPKG_NAME}/ ${DVB_MKPKG_NAME}-$GIT_REV/
+
+################################################################################
-echo "packing sources..."
- tar cvJf media_build-$GIT_REV.tar.xz media_build-$GIT_REV
+# pack sources
+echo "packing sources ..."
+tar cvJf ${DVB_MKPKG_NAME}-$GIT_REV.tar.xz ${DVB_MKPKG_NAME}-$GIT_REV
-echo "remove temporary sourcedir..."
- rm -rf media_build-$GIT_REV
+echo "remove temporary sourcedir ..."
+rm -rf ${DVB_MKPKG_NAME}-$GIT_REV
+rm -rf ${DVB_MKPKG_NAME}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment