firmware: di_adv: Move to new scheme where qpu code handles top/botto…

…m edges See: #463 firmware: di_adv: Add config setting to add nop delays to shader See: http://forum.kodi.tv/showthread.php?tid=231092&pid=2150605#pid2150605 firmware: vcilcs: Avoid a potential deadlock when very threaded See: #449 firmware: vrf: Add spinlock around vrf acquire/release calls to avoid restoring an invalid p10 from ISR context firmware: rpi_display: only ratelimit if the backlight is actually changed See: raspberrypi/linux#1179 firmware: di_adv: Support multiple instances of qpu deinterlace at SD resolution See: popcornmix/omxplayer#386 linux: rpi-ft5406: Use interruptible sleep to avoid high load reported See: https://www.raspberrypi.org/forums/viewtopic.php?f=28&t=125034 linux: dts: Added overlay for Adafruit PiTFT 2.8 capacitive touch screen See: raspberrypi/linux#1192 linux: config: Add MCP320X See: raspberrypi/linux#1189 linux: Build i2c_gpio module and add a device tree overlay to configure it See: raspberrypi/linux#1183
raspberrypi · Nov 6, 2015 · 591b25a · 591b25a
1 parent af9b357
commit 591b25a
Show file tree

Hide file tree

Showing 131 changed files with 109 additions and 14 deletions.
diff --git a/boot/fixup.dat b/boot/fixup.dat
diff --git a/boot/fixup_cd.dat b/boot/fixup_cd.dat
diff --git a/boot/fixup_db.dat b/boot/fixup_db.dat
diff --git a/boot/fixup_x.dat b/boot/fixup_x.dat
diff --git a/boot/kernel.img b/boot/kernel.img
diff --git a/boot/kernel7.img b/boot/kernel7.img
diff --git a/boot/overlays/README b/boot/overlays/README
@@ -284,6 +284,17 @@ Params: speed                    Display SPI bus speed
         ledgpio                  GPIO used to control backlight
 
 
+Name:   i2c-gpio
+Info:   Adds support for software i2c controller on gpio pins
+Load:   dtoverlay=i2c-gpio,<param>
+Params: i2c_gpio_sda             GPIO used for I2C data (default "23")
+
+        i2c_gpio_scl             GPIO used for I2C clock (default "24")
+
+        i2c_gpio_delay_us        Clock delay in microseconds
+                                 (default "2" = ~100kHz)
+
+
 Name:   i2c-rtc
 Info:   Adds support for a number of I2C Real Time Clock devices
 Load:   dtoverlay=i2c-rtc,<param>
@@ -425,6 +436,28 @@ Params: speed                    Display SPI bus speed
         xohms                    Touchpanel sensitivity (X-plate resistance)
 
 
+Name:   pitft28-capacitive
+Info:   Adafruit PiTFT 2.8" capacitive touch screen
+Load:   dtoverlay=pitft28-capacitive,<param>=<val>
+Params: speed                    Display SPI bus speed
+
+        rotate                   Display rotation {0,90,180,270}
+
+        fps                      Delay between frame updates
+
+        debug                    Debug output level {0-7}
+
+        touch-sizex              Touchscreen size x (default 240)
+
+        touch-sizey              Touchscreen size y (default 320)
+
+        touch-invx               Touchscreen inverted x axis
+
+        touch-invy               Touchscreen inverted y axis
+
+        touch-swapxy             Touchscreen swapped x y axis
+
+
 Name:   pitft28-resistive
 Info:   Adafruit PiTFT 2.8" resistive touch screen
 Load:   dtoverlay=pitft28-resistive,<param>=<val>

diff --git a/boot/overlays/i2c-gpio-overlay.dtb b/boot/overlays/i2c-gpio-overlay.dtb
diff --git a/boot/overlays/pitft28-capacitive-overlay.dtb b/boot/overlays/pitft28-capacitive-overlay.dtb
diff --git a/boot/start.elf b/boot/start.elf
diff --git a/boot/start_cd.elf b/boot/start_cd.elf
diff --git a/boot/start_db.elf b/boot/start_db.elf
diff --git a/boot/start_x.elf b/boot/start_x.elf
diff --git a/extra/Module.symvers b/extra/Module.symvers
@@ -517,7 +517,7 @@
 0x5fc4b749	rhashtable_destroy	vmlinux	EXPORT_SYMBOL_GPL
 0x149c7752	param_ops_uint	vmlinux	EXPORT_SYMBOL
 0xb674df57	udp_push_pending_frames	vmlinux	EXPORT_SYMBOL
-0x6a246690	hidinput_connect	vmlinux	EXPORT_SYMBOL_GPL
+0x00000000	hidinput_connect	vmlinux	EXPORT_SYMBOL_GPL
 0x30966ca8	nfs_access_zap_cache	vmlinux	EXPORT_SYMBOL_GPL
 0x68012ace	__platform_driver_probe	vmlinux	EXPORT_SYMBOL_GPL
 0xd7442057	bt_info	net/bluetooth/bluetooth	EXPORT_SYMBOL
@@ -974,7 +974,7 @@
 0xf9a482f9	msleep	vmlinux	EXPORT_SYMBOL
 0xf63688bc	uart_get_divisor	vmlinux	EXPORT_SYMBOL
 0x8064ca11	pinctrl_utils_add_map_mux	vmlinux	EXPORT_SYMBOL_GPL
-0xa21acf07	hidinput_calc_abs_res	vmlinux	EXPORT_SYMBOL_GPL
+0x00000000	hidinput_calc_abs_res	vmlinux	EXPORT_SYMBOL_GPL
 0x6fe3d8cf	ktime_add_safe	vmlinux	EXPORT_SYMBOL_GPL
 0xb3d6f131	v4l2_event_subdev_unsubscribe	drivers/media/v4l2-core/videodev	EXPORT_SYMBOL_GPL
 0x33f93f07	param_set_ullong	vmlinux	EXPORT_SYMBOL
@@ -2062,7 +2062,7 @@
 0xcd63cd50	usb_serial_suspend	drivers/usb/serial/usbserial	EXPORT_SYMBOL
 0xcfce8937	videobuf_queue_vmalloc_init	drivers/media/v4l2-core/videobuf-vmalloc	EXPORT_SYMBOL_GPL
 0x2b90cdaa	mempool_create	vmlinux	EXPORT_SYMBOL
-0x86d670f8	hidinput_find_field	vmlinux	EXPORT_SYMBOL_GPL
+0x00000000	hidinput_find_field	vmlinux	EXPORT_SYMBOL_GPL
 0x57231f45	ring_buffer_record_on	vmlinux	EXPORT_SYMBOL_GPL
 0xb0db3f94	scsi_remove_target	vmlinux	EXPORT_SYMBOL
 0x6ab4ec85	page_cache_async_readahead	vmlinux	EXPORT_SYMBOL_GPL
@@ -2606,7 +2606,7 @@
 0xce45a6f1	raid6_gfexi	lib/raid6/raid6_pq	EXPORT_SYMBOL
 0xa916750c	qtree_entry_unused	fs/quota/quota_tree	EXPORT_SYMBOL
 0x5c8bde7a	pinctrl_utils_add_map_configs	vmlinux	EXPORT_SYMBOL_GPL
-0x2bf978c9	hidinput_disconnect	vmlinux	EXPORT_SYMBOL_GPL
+0x00000000	hidinput_disconnect	vmlinux	EXPORT_SYMBOL_GPL
 0x9ade4f3b	__sb_start_write	vmlinux	EXPORT_SYMBOL
 0x386b89ba	cfg80211_cqm_txe_notify	net/wireless/cfg80211	EXPORT_SYMBOL
 0xcc1fb551	baswap	net/bluetooth/bluetooth	EXPORT_SYMBOL
@@ -7594,7 +7594,7 @@
 0xb077e70a	clk_unprepare	vmlinux	EXPORT_SYMBOL_GPL
 0x347682ce	snmp_fold_field64	vmlinux	EXPORT_SYMBOL_GPL
 0x7eafd3e6	spi_register_master	vmlinux	EXPORT_SYMBOL_GPL
-0x563a5f99	hidinput_get_led_field	vmlinux	EXPORT_SYMBOL_GPL
+0x00000000	hidinput_get_led_field	vmlinux	EXPORT_SYMBOL_GPL
 0x87925ca6	kstrtoint_from_user	vmlinux	EXPORT_SYMBOL
 0x149b0a72	percpu_ida_for_each_free	vmlinux	EXPORT_SYMBOL_GPL
 0x44d17954	sdio_f0_readb	vmlinux	EXPORT_SYMBOL_GPL
@@ -8312,7 +8312,7 @@
 0x6f952308	skb_dequeue_tail	vmlinux	EXPORT_SYMBOL
 0x91014e00	nfs_do_submount	vmlinux	EXPORT_SYMBOL_GPL
 0xd9aa5963	reservation_object_test_signaled_rcu	vmlinux	EXPORT_SYMBOL_GPL
-0xafaca701	hidinput_count_leds	vmlinux	EXPORT_SYMBOL_GPL
+0x00000000	hidinput_count_leds	vmlinux	EXPORT_SYMBOL_GPL
 0x630671aa	gro_find_complete_by_type	vmlinux	EXPORT_SYMBOL
 0x8f7de48c	input_ff_erase	vmlinux	EXPORT_SYMBOL_GPL
 0x18c7cc6d	pwm_config	vmlinux	EXPORT_SYMBOL_GPL
@@ -9167,7 +9167,7 @@
 0x94e1afe8	__getblk_gfp	vmlinux	EXPORT_SYMBOL
 0x89f7c91e	inet_sendmsg	vmlinux	EXPORT_SYMBOL
 0x8628fe6c	__tcf_hash_release	vmlinux	EXPORT_SYMBOL
-0x37fe36f3	hidinput_report_event	vmlinux	EXPORT_SYMBOL_GPL
+0x00000000	hidinput_report_event	vmlinux	EXPORT_SYMBOL_GPL
 0x8a991884	crypto_alg_sem	vmlinux	EXPORT_SYMBOL_GPL
 0x2e6bb3c7	elevator_alloc	vmlinux	EXPORT_SYMBOL
 0x37e0cee8	bcm2708_i2s_set_gpio	sound/soc/bcm/snd-soc-bcm2708-i2s	EXPORT_SYMBOL

diff --git a/extra/System.map b/extra/System.map
@@ -49152,7 +49152,7 @@ c081902c T __initramfs_start
 c081902c t __irf_start
 c081902c T __security_initcall_end
 c081902c T __security_initcall_start
-c08190b2 t __irf_end
+c08190b1 t __irf_end
 c08190b8 T __initramfs_size
 c081a000 D __data_loc
 c081a000 D __init_end

diff --git a/extra/System7.map b/extra/System7.map
@@ -50028,7 +50028,7 @@
 807d6438 t __irf_start
 807d6438 T __security_initcall_end
 807d6438 T __security_initcall_start
-807d64be t __irf_end
+807d64bd t __irf_end
 807d64c0 T __initramfs_size
 807d7000 D __per_cpu_load
 807d7000 D __per_cpu_start

diff --git a/extra/git_hash b/extra/git_hash
@@ -1 +1 @@
-3782f2ad42c08f4d32f64138f8be7341afc380f5
+0aa6fa69a7874060590c8cb4fabdb9a222501a08
diff --git a/extra/uname_string b/extra/uname_string
@@ -1 +1 @@
-Linux version 4.1.12+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #824 PREEMPT Wed Oct 28 16:39:49 GMT 2015
+Linux version 4.1.12+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #825 PREEMPT Fri Nov 6 17:53:21 GMT 2015
diff --git a/extra/uname_string7 b/extra/uname_string7
@@ -1 +1 @@
-Linux version 4.1.12-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #824 SMP PREEMPT Wed Oct 28 16:46:35 GMT 2015
+Linux version 4.1.12-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #825 SMP PREEMPT Fri Nov 6 18:36:38 GMT 2015
diff --git a/hardfp/opt/vc/bin/containers_check_frame_int b/hardfp/opt/vc/bin/containers_check_frame_int
diff --git a/hardfp/opt/vc/bin/containers_datagram_receiver b/hardfp/opt/vc/bin/containers_datagram_receiver
diff --git a/hardfp/opt/vc/bin/containers_datagram_sender b/hardfp/opt/vc/bin/containers_datagram_sender
diff --git a/hardfp/opt/vc/bin/containers_dump_pktfile b/hardfp/opt/vc/bin/containers_dump_pktfile
diff --git a/hardfp/opt/vc/bin/containers_rtp_decoder b/hardfp/opt/vc/bin/containers_rtp_decoder
diff --git a/hardfp/opt/vc/bin/containers_stream_client b/hardfp/opt/vc/bin/containers_stream_client
diff --git a/hardfp/opt/vc/bin/containers_stream_server b/hardfp/opt/vc/bin/containers_stream_server
diff --git a/hardfp/opt/vc/bin/containers_test b/hardfp/opt/vc/bin/containers_test
diff --git a/hardfp/opt/vc/bin/containers_test_bits b/hardfp/opt/vc/bin/containers_test_bits
diff --git a/hardfp/opt/vc/bin/containers_test_uri b/hardfp/opt/vc/bin/containers_test_uri
diff --git a/hardfp/opt/vc/bin/containers_uri_pipe b/hardfp/opt/vc/bin/containers_uri_pipe
diff --git a/hardfp/opt/vc/bin/mmal_vc_diag b/hardfp/opt/vc/bin/mmal_vc_diag
diff --git a/hardfp/opt/vc/bin/raspistill b/hardfp/opt/vc/bin/raspistill
diff --git a/hardfp/opt/vc/bin/raspivid b/hardfp/opt/vc/bin/raspivid
diff --git a/hardfp/opt/vc/bin/raspividyuv b/hardfp/opt/vc/bin/raspividyuv
diff --git a/hardfp/opt/vc/bin/raspiyuv b/hardfp/opt/vc/bin/raspiyuv
diff --git a/hardfp/opt/vc/bin/tvservice b/hardfp/opt/vc/bin/tvservice
diff --git a/hardfp/opt/vc/bin/vcgencmd b/hardfp/opt/vc/bin/vcgencmd
diff --git a/hardfp/opt/vc/bin/vchiq_test b/hardfp/opt/vc/bin/vchiq_test
diff --git a/hardfp/opt/vc/bin/vcsmem b/hardfp/opt/vc/bin/vcsmem
diff --git a/hardfp/opt/vc/include/interface/vmcs_host/vc_vchi_audioserv_defs.h b/hardfp/opt/vc/include/interface/vmcs_host/vc_vchi_audioserv_defs.h
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define _VC_AUDIO_DEFS_H_
 
 #define VC_AUDIOSERV_MIN_VER 1
-#define VC_AUDIOSERV_VER 2
+#define VC_AUDIOSERV_VER 3
 
 // FourCC code used for VCHI connection
 #define VC_AUDIO_SERVER_NAME  MAKE_FOURCC("AUDS")
@@ -50,6 +50,7 @@ typedef enum
    VC_AUDIO_MSG_TYPE_START,                 // start output (i.e. resume)
    VC_AUDIO_MSG_TYPE_STOP,                 // stop output (i.e. pause)
    VC_AUDIO_MSG_TYPE_WRITE,                 // write samples
+   VC_AUDIO_MSG_TYPE_LATENCY,               // request latency in cycles
    VC_AUDIO_MSG_TYPE_MAX
 
 } VC_AUDIO_MSG_TYPE;
@@ -73,6 +74,7 @@ typedef struct
    uint32_t channels;
    uint32_t samplerate;
    uint32_t bps;
+   uint32_t channelmap;
 
 } VC_AUDIO_CONFIG_T;
 
@@ -108,6 +110,12 @@ typedef struct
    uint32_t draining;
 
 } VC_AUDIO_STOP_T;
+// audio
+typedef struct
+{
+   uint32_t dummy;
+
+} VC_AUDIO_LATENCY_T;
 
 // configure the write audio samples
 typedef struct
@@ -147,6 +155,7 @@ typedef struct
 	VC_AUDIO_START_T  start;
 	VC_AUDIO_STOP_T  stop;
 	VC_AUDIO_WRITE_T  write;
+	VC_AUDIO_LATENCY_T  latency;
 	VC_AUDIO_RESULT_T result;
 	VC_AUDIO_COMPLETE_T complete;
    } u;

diff --git a/hardfp/opt/vc/lib/libEGL.so b/hardfp/opt/vc/lib/libEGL.so
diff --git a/hardfp/opt/vc/lib/libEGL_static.a b/hardfp/opt/vc/lib/libEGL_static.a
diff --git a/hardfp/opt/vc/lib/libGLESv2.so b/hardfp/opt/vc/lib/libGLESv2.so
diff --git a/hardfp/opt/vc/lib/libGLESv2_static.a b/hardfp/opt/vc/lib/libGLESv2_static.a
diff --git a/hardfp/opt/vc/lib/libbcm_host.so b/hardfp/opt/vc/lib/libbcm_host.so
diff --git a/hardfp/opt/vc/lib/libcontainers.so b/hardfp/opt/vc/lib/libcontainers.so
diff --git a/hardfp/opt/vc/lib/libdebug_sym_static.a b/hardfp/opt/vc/lib/libdebug_sym_static.a
diff --git a/hardfp/opt/vc/lib/libkhrn_client.a b/hardfp/opt/vc/lib/libkhrn_client.a
diff --git a/hardfp/opt/vc/lib/libkhrn_static.a b/hardfp/opt/vc/lib/libkhrn_static.a
diff --git a/hardfp/opt/vc/lib/libmmal.so b/hardfp/opt/vc/lib/libmmal.so
diff --git a/hardfp/opt/vc/lib/libmmal_vc_client.so b/hardfp/opt/vc/lib/libmmal_vc_client.so
diff --git a/hardfp/opt/vc/lib/libopenmaxil.so b/hardfp/opt/vc/lib/libopenmaxil.so
diff --git a/hardfp/opt/vc/lib/libvcfiled_check.a b/hardfp/opt/vc/lib/libvcfiled_check.a
diff --git a/hardfp/opt/vc/lib/libvchiq_arm.so b/hardfp/opt/vc/lib/libvchiq_arm.so
diff --git a/hardfp/opt/vc/lib/libvchostif.a b/hardfp/opt/vc/lib/libvchostif.a
diff --git a/hardfp/opt/vc/lib/libvcilcs.a b/hardfp/opt/vc/lib/libvcilcs.a
diff --git a/hardfp/opt/vc/lib/libvcos.so b/hardfp/opt/vc/lib/libvcos.so
diff --git a/hardfp/opt/vc/lib/libvmcs_rpc_client.a b/hardfp/opt/vc/lib/libvmcs_rpc_client.a
diff --git a/hardfp/opt/vc/lib/plugins/reader_asf.so b/hardfp/opt/vc/lib/plugins/reader_asf.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_avi.so b/hardfp/opt/vc/lib/plugins/reader_avi.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_binary.so b/hardfp/opt/vc/lib/plugins/reader_binary.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_flv.so b/hardfp/opt/vc/lib/plugins/reader_flv.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_metadata_id3.so b/hardfp/opt/vc/lib/plugins/reader_metadata_id3.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_mkv.so b/hardfp/opt/vc/lib/plugins/reader_mkv.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_mp4.so b/hardfp/opt/vc/lib/plugins/reader_mp4.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_mpga.so b/hardfp/opt/vc/lib/plugins/reader_mpga.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_ps.so b/hardfp/opt/vc/lib/plugins/reader_ps.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_qsynth.so b/hardfp/opt/vc/lib/plugins/reader_qsynth.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_raw_video.so b/hardfp/opt/vc/lib/plugins/reader_raw_video.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_rcv.so b/hardfp/opt/vc/lib/plugins/reader_rcv.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_rtp.so b/hardfp/opt/vc/lib/plugins/reader_rtp.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_rtsp.so b/hardfp/opt/vc/lib/plugins/reader_rtsp.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_rv9.so b/hardfp/opt/vc/lib/plugins/reader_rv9.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_simple.so b/hardfp/opt/vc/lib/plugins/reader_simple.so
diff --git a/hardfp/opt/vc/lib/plugins/reader_wav.so b/hardfp/opt/vc/lib/plugins/reader_wav.so
diff --git a/hardfp/opt/vc/lib/plugins/writer_avi.so b/hardfp/opt/vc/lib/plugins/writer_avi.so
diff --git a/hardfp/opt/vc/lib/plugins/writer_binary.so b/hardfp/opt/vc/lib/plugins/writer_binary.so
diff --git a/hardfp/opt/vc/lib/plugins/writer_dummy.so b/hardfp/opt/vc/lib/plugins/writer_dummy.so
diff --git a/hardfp/opt/vc/lib/plugins/writer_mp4.so b/hardfp/opt/vc/lib/plugins/writer_mp4.so
diff --git a/hardfp/opt/vc/lib/plugins/writer_raw_video.so b/hardfp/opt/vc/lib/plugins/writer_raw_video.so
diff --git a/hardfp/opt/vc/lib/plugins/writer_simple.so b/hardfp/opt/vc/lib/plugins/writer_simple.so
diff --git a/hardfp/opt/vc/sbin/vcfiled b/hardfp/opt/vc/sbin/vcfiled
diff --git a/modules/4.1.12+/kernel/drivers/hid/hid-multitouch.ko b/modules/4.1.12+/kernel/drivers/hid/hid-multitouch.ko
diff --git a/modules/4.1.12+/kernel/drivers/hid/wacom.ko b/modules/4.1.12+/kernel/drivers/hid/wacom.ko
diff --git a/modules/4.1.12+/kernel/drivers/i2c/busses/i2c-gpio.ko b/modules/4.1.12+/kernel/drivers/i2c/busses/i2c-gpio.ko
diff --git a/modules/4.1.12+/kernel/drivers/iio/adc/mcp320x.ko b/modules/4.1.12+/kernel/drivers/iio/adc/mcp320x.ko
diff --git a/modules/4.1.12+/kernel/drivers/input/touchscreen/rpi-ft5406.ko b/modules/4.1.12+/kernel/drivers/input/touchscreen/rpi-ft5406.ko
diff --git a/modules/4.1.12+/kernel/kernel/configs.ko b/modules/4.1.12+/kernel/kernel/configs.ko
diff --git a/modules/4.1.12+/modules.alias b/modules/4.1.12+/modules.alias
@@ -5299,6 +5299,8 @@ alias i2c:s35390a rtc_s35390a
 alias i2c:x1205 rtc_x1205
 alias platform:bcm2708_i2c i2c_bcm2708
 alias of:N*T*Cbrcm,bcm2708-i2c* i2c_bcm2708
+alias platform:i2c-gpio i2c_gpio
+alias of:N*T*Ci2c-gpio* i2c_gpio
 alias i2c:msp3400 msp3400
 alias i2c:cx25840 cx25840
 alias i2c:gm7113c saa7115
@@ -7604,6 +7606,22 @@ alias sdio:c*v02DFd911B* btmrvl_sdio
 alias sdio:c*v02DFd911A* btmrvl_sdio
 alias sdio:c*v02DFd9105* btmrvl_sdio
 alias platform:extcon-arizona extcon_arizona
+alias of:N*T*Cmcp3208* mcp320x
+alias of:N*T*Cmcp3204* mcp320x
+alias of:N*T*Cmcp3202* mcp320x
+alias of:N*T*Cmcp3201* mcp320x
+alias of:N*T*Cmcp3008* mcp320x
+alias of:N*T*Cmcp3004* mcp320x
+alias of:N*T*Cmcp3002* mcp320x
+alias of:N*T*Cmcp3001* mcp320x
+alias spi:mcp3208 mcp320x
+alias spi:mcp3204 mcp320x
+alias spi:mcp3202 mcp320x
+alias spi:mcp3201 mcp320x
+alias spi:mcp3008 mcp320x
+alias spi:mcp3004 mcp320x
+alias spi:mcp3002 mcp320x
+alias spi:mcp3001 mcp320x
 alias of:N*T*Cdht11* dht11
 alias sound-service-?-0 snd_mixer_oss
 alias sound-service-?-12 snd_pcm_oss

diff --git a/modules/4.1.12+/modules.alias.bin b/modules/4.1.12+/modules.alias.bin
diff --git a/modules/4.1.12+/modules.dep b/modules/4.1.12+/modules.dep
@@ -423,6 +423,7 @@ kernel/drivers/rtc/rtc-s35390a.ko:
 kernel/drivers/rtc/rtc-x1205.ko:
 kernel/drivers/i2c/algos/i2c-algo-bit.ko:
 kernel/drivers/i2c/busses/i2c-bcm2708.ko:
+kernel/drivers/i2c/busses/i2c-gpio.ko: kernel/drivers/i2c/algos/i2c-algo-bit.ko
 kernel/drivers/i2c/i2c-dev.ko:
 kernel/drivers/i2c/i2c-mux.ko:
 kernel/drivers/media/i2c/msp3400.ko: kernel/drivers/media/v4l2-core/v4l2-common.ko kernel/drivers/media/v4l2-core/videodev.ko kernel/drivers/media/media.ko
@@ -1044,6 +1045,7 @@ kernel/drivers/ssb/ssb.ko:
 kernel/drivers/bcma/bcma.ko:
 kernel/drivers/extcon/extcon.ko:
 kernel/drivers/extcon/extcon-arizona.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/drivers/extcon/extcon.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
+kernel/drivers/iio/adc/mcp320x.ko: kernel/drivers/iio/industrialio.ko
 kernel/drivers/iio/humidity/dht11.ko: kernel/drivers/iio/industrialio.ko
 kernel/drivers/iio/industrialio.ko:
 kernel/drivers/iio/kfifo_buf.ko: kernel/drivers/iio/industrialio.ko

diff --git a/modules/4.1.12+/modules.dep.bin b/modules/4.1.12+/modules.dep.bin
diff --git a/modules/4.1.12+/modules.order b/modules/4.1.12+/modules.order
@@ -423,6 +423,7 @@ kernel/drivers/rtc/rtc-s35390a.ko
 kernel/drivers/rtc/rtc-x1205.ko
 kernel/drivers/i2c/algos/i2c-algo-bit.ko
 kernel/drivers/i2c/busses/i2c-bcm2708.ko
+kernel/drivers/i2c/busses/i2c-gpio.ko
 kernel/drivers/i2c/i2c-dev.ko
 kernel/drivers/i2c/i2c-mux.ko
 kernel/drivers/media/i2c/msp3400.ko
@@ -1044,6 +1045,7 @@ kernel/drivers/ssb/ssb.ko
 kernel/drivers/bcma/bcma.ko
 kernel/drivers/extcon/extcon.ko
 kernel/drivers/extcon/extcon-arizona.ko
+kernel/drivers/iio/adc/mcp320x.ko
 kernel/drivers/iio/humidity/dht11.ko
 kernel/drivers/iio/industrialio.ko
 kernel/drivers/iio/kfifo_buf.ko

diff --git a/modules/4.1.12+/modules.symbols.bin b/modules/4.1.12+/modules.symbols.bin
diff --git a/modules/4.1.12-v7+/kernel/drivers/i2c/busses/i2c-gpio.ko b/modules/4.1.12-v7+/kernel/drivers/i2c/busses/i2c-gpio.ko
diff --git a/modules/4.1.12-v7+/kernel/drivers/iio/adc/mcp320x.ko b/modules/4.1.12-v7+/kernel/drivers/iio/adc/mcp320x.ko
diff --git a/modules/4.1.12-v7+/kernel/drivers/input/touchscreen/rpi-ft5406.ko b/modules/4.1.12-v7+/kernel/drivers/input/touchscreen/rpi-ft5406.ko
diff --git a/modules/4.1.12-v7+/kernel/kernel/configs.ko b/modules/4.1.12-v7+/kernel/kernel/configs.ko
diff --git a/modules/4.1.12-v7+/modules.alias b/modules/4.1.12-v7+/modules.alias
@@ -5305,6 +5305,8 @@ alias i2c:s35390a rtc_s35390a
 alias i2c:x1205 rtc_x1205
 alias platform:bcm2708_i2c i2c_bcm2708
 alias of:N*T*Cbrcm,bcm2708-i2c* i2c_bcm2708
+alias platform:i2c-gpio i2c_gpio
+alias of:N*T*Ci2c-gpio* i2c_gpio
 alias i2c:msp3400 msp3400
 alias i2c:cx25840 cx25840
 alias i2c:gm7113c saa7115
@@ -7610,6 +7612,22 @@ alias sdio:c*v02DFd911B* btmrvl_sdio
 alias sdio:c*v02DFd911A* btmrvl_sdio
 alias sdio:c*v02DFd9105* btmrvl_sdio
 alias platform:extcon-arizona extcon_arizona
+alias of:N*T*Cmcp3208* mcp320x
+alias of:N*T*Cmcp3204* mcp320x
+alias of:N*T*Cmcp3202* mcp320x
+alias of:N*T*Cmcp3201* mcp320x
+alias of:N*T*Cmcp3008* mcp320x
+alias of:N*T*Cmcp3004* mcp320x
+alias of:N*T*Cmcp3002* mcp320x
+alias of:N*T*Cmcp3001* mcp320x
+alias spi:mcp3208 mcp320x
+alias spi:mcp3204 mcp320x
+alias spi:mcp3202 mcp320x
+alias spi:mcp3201 mcp320x
+alias spi:mcp3008 mcp320x
+alias spi:mcp3004 mcp320x
+alias spi:mcp3002 mcp320x
+alias spi:mcp3001 mcp320x
 alias of:N*T*Cdht11* dht11
 alias sound-service-?-0 snd_mixer_oss
 alias sound-service-?-12 snd_pcm_oss

diff --git a/modules/4.1.12-v7+/modules.alias.bin b/modules/4.1.12-v7+/modules.alias.bin
diff --git a/modules/4.1.12-v7+/modules.dep b/modules/4.1.12-v7+/modules.dep
@@ -427,6 +427,7 @@ kernel/drivers/rtc/rtc-s35390a.ko:
 kernel/drivers/rtc/rtc-x1205.ko:
 kernel/drivers/i2c/algos/i2c-algo-bit.ko:
 kernel/drivers/i2c/busses/i2c-bcm2708.ko:
+kernel/drivers/i2c/busses/i2c-gpio.ko: kernel/drivers/i2c/algos/i2c-algo-bit.ko
 kernel/drivers/i2c/i2c-dev.ko:
 kernel/drivers/i2c/i2c-mux.ko:
 kernel/drivers/media/i2c/msp3400.ko: kernel/drivers/media/v4l2-core/v4l2-common.ko kernel/drivers/media/v4l2-core/videodev.ko kernel/drivers/media/media.ko
@@ -1048,6 +1049,7 @@ kernel/drivers/ssb/ssb.ko:
 kernel/drivers/bcma/bcma.ko:
 kernel/drivers/extcon/extcon.ko:
 kernel/drivers/extcon/extcon-arizona.ko: kernel/sound/soc/snd-soc-core.ko kernel/sound/core/snd-compress.ko kernel/sound/core/snd-pcm-dmaengine.ko kernel/drivers/extcon/extcon.ko kernel/sound/core/snd-pcm.ko kernel/sound/core/snd-timer.ko kernel/sound/core/snd.ko
+kernel/drivers/iio/adc/mcp320x.ko: kernel/drivers/iio/industrialio.ko
 kernel/drivers/iio/humidity/dht11.ko: kernel/drivers/iio/industrialio.ko
 kernel/drivers/iio/industrialio.ko:
 kernel/drivers/iio/kfifo_buf.ko: kernel/drivers/iio/industrialio.ko

diff --git a/modules/4.1.12-v7+/modules.dep.bin b/modules/4.1.12-v7+/modules.dep.bin
diff --git a/modules/4.1.12-v7+/modules.order b/modules/4.1.12-v7+/modules.order
@@ -427,6 +427,7 @@ kernel/drivers/rtc/rtc-s35390a.ko
 kernel/drivers/rtc/rtc-x1205.ko
 kernel/drivers/i2c/algos/i2c-algo-bit.ko
 kernel/drivers/i2c/busses/i2c-bcm2708.ko
+kernel/drivers/i2c/busses/i2c-gpio.ko
 kernel/drivers/i2c/i2c-dev.ko
 kernel/drivers/i2c/i2c-mux.ko
 kernel/drivers/media/i2c/msp3400.ko
@@ -1048,6 +1049,7 @@ kernel/drivers/ssb/ssb.ko
 kernel/drivers/bcma/bcma.ko
 kernel/drivers/extcon/extcon.ko
 kernel/drivers/extcon/extcon-arizona.ko
+kernel/drivers/iio/adc/mcp320x.ko
 kernel/drivers/iio/humidity/dht11.ko
 kernel/drivers/iio/industrialio.ko
 kernel/drivers/iio/kfifo_buf.ko

diff --git a/modules/4.1.12-v7+/modules.symbols.bin b/modules/4.1.12-v7+/modules.symbols.bin
diff --git a/opt/vc/bin/mmal_vc_diag b/opt/vc/bin/mmal_vc_diag
diff --git a/opt/vc/bin/raspistill b/opt/vc/bin/raspistill
diff --git a/opt/vc/bin/raspivid b/opt/vc/bin/raspivid
diff --git a/opt/vc/bin/raspividyuv b/opt/vc/bin/raspividyuv
diff --git a/opt/vc/bin/raspiyuv b/opt/vc/bin/raspiyuv
diff --git a/opt/vc/bin/tvservice b/opt/vc/bin/tvservice
diff --git a/opt/vc/bin/vcgencmd b/opt/vc/bin/vcgencmd
diff --git a/opt/vc/bin/vchiq_test b/opt/vc/bin/vchiq_test
diff --git a/opt/vc/bin/vcsmem b/opt/vc/bin/vcsmem
diff --git a/opt/vc/include/interface/vmcs_host/vc_vchi_audioserv_defs.h b/opt/vc/include/interface/vmcs_host/vc_vchi_audioserv_defs.h
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define _VC_AUDIO_DEFS_H_
 
 #define VC_AUDIOSERV_MIN_VER 1
-#define VC_AUDIOSERV_VER 2
+#define VC_AUDIOSERV_VER 3
 
 // FourCC code used for VCHI connection
 #define VC_AUDIO_SERVER_NAME  MAKE_FOURCC("AUDS")
@@ -50,6 +50,7 @@ typedef enum
    VC_AUDIO_MSG_TYPE_START,                 // start output (i.e. resume)
    VC_AUDIO_MSG_TYPE_STOP,                 // stop output (i.e. pause)
    VC_AUDIO_MSG_TYPE_WRITE,                 // write samples
+   VC_AUDIO_MSG_TYPE_LATENCY,               // request latency in cycles
    VC_AUDIO_MSG_TYPE_MAX
 
 } VC_AUDIO_MSG_TYPE;
@@ -73,6 +74,7 @@ typedef struct
    uint32_t channels;
    uint32_t samplerate;
    uint32_t bps;
+   uint32_t channelmap;
 
 } VC_AUDIO_CONFIG_T;
 
@@ -108,6 +110,12 @@ typedef struct
    uint32_t draining;
 
 } VC_AUDIO_STOP_T;
+// audio
+typedef struct
+{
+   uint32_t dummy;
+
+} VC_AUDIO_LATENCY_T;
 
 // configure the write audio samples
 typedef struct
@@ -147,6 +155,7 @@ typedef struct
 	VC_AUDIO_START_T  start;
 	VC_AUDIO_STOP_T  stop;
 	VC_AUDIO_WRITE_T  write;
+	VC_AUDIO_LATENCY_T  latency;
 	VC_AUDIO_RESULT_T result;
 	VC_AUDIO_COMPLETE_T complete;
    } u;

diff --git a/opt/vc/lib/libEGL.so b/opt/vc/lib/libEGL.so
diff --git a/opt/vc/lib/libEGL_static.a b/opt/vc/lib/libEGL_static.a
diff --git a/opt/vc/lib/libGLESv2.so b/opt/vc/lib/libGLESv2.so
diff --git a/opt/vc/lib/libGLESv2_static.a b/opt/vc/lib/libGLESv2_static.a
diff --git a/opt/vc/lib/libbcm_host.so b/opt/vc/lib/libbcm_host.so
diff --git a/opt/vc/lib/libdebug_sym_static.a b/opt/vc/lib/libdebug_sym_static.a
diff --git a/opt/vc/lib/libkhrn_client.a b/opt/vc/lib/libkhrn_client.a
diff --git a/opt/vc/lib/libkhrn_static.a b/opt/vc/lib/libkhrn_static.a
diff --git a/opt/vc/lib/libmmal.so b/opt/vc/lib/libmmal.so
diff --git a/opt/vc/lib/libmmal_vc_client.so b/opt/vc/lib/libmmal_vc_client.so
diff --git a/opt/vc/lib/libopenmaxil.so b/opt/vc/lib/libopenmaxil.so
diff --git a/opt/vc/lib/libvcfiled_check.a b/opt/vc/lib/libvcfiled_check.a
diff --git a/opt/vc/lib/libvchiq_arm.so b/opt/vc/lib/libvchiq_arm.so
diff --git a/opt/vc/lib/libvchostif.a b/opt/vc/lib/libvchostif.a
diff --git a/opt/vc/lib/libvcilcs.a b/opt/vc/lib/libvcilcs.a
diff --git a/opt/vc/lib/libvmcs_rpc_client.a b/opt/vc/lib/libvmcs_rpc_client.a
diff --git a/opt/vc/sbin/vcfiled b/opt/vc/sbin/vcfiled