From e1a6c836605a0c33f1eb590bb384dd0a151a81bd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 29 Apr 2016 18:29:25 +0200 Subject: linux: fix rejects for bcm28xx patch --- .../patches/4.1.22/0001-raspberry-pi-github.patch | 4251 ++++++++++---------- 1 file changed, 2121 insertions(+), 2130 deletions(-) (limited to 'target/arm') diff --git a/target/arm/bcm28xx/patches/4.1.22/0001-raspberry-pi-github.patch b/target/arm/bcm28xx/patches/4.1.22/0001-raspberry-pi-github.patch index a10e4d39b..05ca0e043 100644 --- a/target/arm/bcm28xx/patches/4.1.22/0001-raspberry-pi-github.patch +++ b/target/arm/bcm28xx/patches/4.1.22/0001-raspberry-pi-github.patch @@ -1,6 +1,6 @@ -diff -Nur linux-4.1.20/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 linux-rpi/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 ---- linux-4.1.20/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 2016-03-16 19:53:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 linux-4.1.22/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 +--- linux-4.1.22.orig/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,6 @@ +What: /sys/bus/w1/devices/.../w1_seq +Date: Apr 2015 @@ -8,9 +8,9 @@ diff -Nur linux-4.1.20/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00 linux-r +Description: Support for the DS28EA00 chain sequence function + see Documentation/w1/slaves/w1_therm for detailed information +Users: any user space application which wants to communicate with DS28EA00 -diff -Nur linux-4.1.20/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt linux-rpi/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt ---- linux-4.1.20/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt 2016-03-16 19:53:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt linux-4.1.22/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt +--- linux-4.1.22.orig/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,45 @@ +Broadcom BCM2835 CPRMAN clocks + @@ -57,9 +57,9 @@ diff -Nur linux-4.1.20/Documentation/devicetree/bindings/clock/brcm,bcm2835-cprm + #address-cells = <1>; + #size-cells = <0>; + }; -diff -Nur linux-4.1.20/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt linux-rpi/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt ---- linux-4.1.20/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt 2016-03-16 19:53:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt linux-4.1.22/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt +--- linux-4.1.22.orig/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt 2016-04-29 18:02:45.000000000 +0200 @@ -48,8 +48,8 @@ bcm2835_i2s: i2s@7e203000 { @@ -71,9 +71,9 @@ diff -Nur linux-4.1.20/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.tx dmas = <&dma 2>, <&dma 3>; -diff -Nur linux-4.1.20/Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt linux-rpi/Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt ---- linux-4.1.20/Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt 2016-03-16 19:53:35.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt linux-4.1.22/Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt +--- linux-4.1.22.orig/Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,35 @@ +* FocalTech FT6236 I2C touchscreen controller + @@ -110,9 +110,9 @@ diff -Nur linux-4.1.20/Documentation/devicetree/bindings/input/touchscreen/focal + touchscreen-inverted-x; + touchscreen-swapped-x-y; + }; -diff -Nur linux-4.1.20/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt linux-rpi/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt ---- linux-4.1.20/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt 2016-03-16 19:53:35.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt linux-4.1.22/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt +--- linux-4.1.22.orig/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,17 @@ +* Broadcom BCM2835 SMI character device driver. + @@ -131,9 +131,9 @@ diff -Nur linux-4.1.20/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-d +- None. + + -diff -Nur linux-4.1.20/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt linux-rpi/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt ---- linux-4.1.20/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt 2016-03-16 19:53:35.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt linux-4.1.22/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt +--- linux-4.1.22.orig/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,48 @@ +* Broadcom BCM2835 SMI driver. + @@ -183,9 +183,9 @@ diff -Nur linux-4.1.20/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.t + brcm,pull = <2 2 2 2 2 2 0 0 0 0 0 0 0 0>; +}; + -diff -Nur linux-4.1.20/Documentation/devicetree/bindings/mtd/brcm,bcm2835-smi-nand.txt linux-rpi/Documentation/devicetree/bindings/mtd/brcm,bcm2835-smi-nand.txt ---- linux-4.1.20/Documentation/devicetree/bindings/mtd/brcm,bcm2835-smi-nand.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/Documentation/devicetree/bindings/mtd/brcm,bcm2835-smi-nand.txt 2016-03-16 19:53:35.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/devicetree/bindings/mtd/brcm,bcm2835-smi-nand.txt linux-4.1.22/Documentation/devicetree/bindings/mtd/brcm,bcm2835-smi-nand.txt +--- linux-4.1.22.orig/Documentation/devicetree/bindings/mtd/brcm,bcm2835-smi-nand.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/Documentation/devicetree/bindings/mtd/brcm,bcm2835-smi-nand.txt 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,42 @@ +* BCM2835 SMI NAND flash + @@ -230,9 +230,9 @@ diff -Nur linux-4.1.20/Documentation/devicetree/bindings/mtd/brcm,bcm2835-smi-na + }; +}; \ No newline at end of file -diff -Nur linux-4.1.20/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt linux-rpi/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt ---- linux-4.1.20/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt 2016-03-16 19:53:35.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt linux-4.1.22/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt +--- linux-4.1.22.orig/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt 2016-04-29 18:02:45.000000000 +0200 @@ -16,8 +16,8 @@ bcm2835_i2s: i2s@7e203000 { @@ -244,9 +244,9 @@ diff -Nur linux-4.1.20/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s. dmas = <&dma 2>, <&dma 3>; -diff -Nur linux-4.1.20/Documentation/devicetree/bindings/vendor-prefixes.txt linux-rpi/Documentation/devicetree/bindings/vendor-prefixes.txt ---- linux-4.1.20/Documentation/devicetree/bindings/vendor-prefixes.txt 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/Documentation/devicetree/bindings/vendor-prefixes.txt 2016-03-16 19:53:35.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/devicetree/bindings/vendor-prefixes.txt linux-4.1.22/Documentation/devicetree/bindings/vendor-prefixes.txt +--- linux-4.1.22.orig/Documentation/devicetree/bindings/vendor-prefixes.txt 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/Documentation/devicetree/bindings/vendor-prefixes.txt 2016-04-29 18:02:45.000000000 +0200 @@ -76,6 +76,7 @@ excito Excito fcs Fairchild Semiconductor @@ -255,9 +255,9 @@ diff -Nur linux-4.1.20/Documentation/devicetree/bindings/vendor-prefixes.txt lin fsl Freescale Semiconductor GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. -diff -Nur linux-4.1.20/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt ---- linux-4.1.20/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt 2016-03-16 19:53:36.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-4.1.22/Documentation/video4linux/bcm2835-v4l2.txt +--- linux-4.1.22.orig/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/Documentation/video4linux/bcm2835-v4l2.txt 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,60 @@ + +BCM2835 (aka Raspberry Pi) V4L2 driver @@ -319,9 +319,9 @@ diff -Nur linux-4.1.20/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Docu +List of available formats: + +$ v4l2-ctl --list-formats -diff -Nur linux-4.1.20/Documentation/w1/slaves/w1_therm linux-rpi/Documentation/w1/slaves/w1_therm ---- linux-4.1.20/Documentation/w1/slaves/w1_therm 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/Documentation/w1/slaves/w1_therm 2016-03-16 19:53:36.000000000 +0100 +diff -Nur linux-4.1.22.orig/Documentation/w1/slaves/w1_therm linux-4.1.22/Documentation/w1/slaves/w1_therm +--- linux-4.1.22.orig/Documentation/w1/slaves/w1_therm 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/Documentation/w1/slaves/w1_therm 2016-04-29 18:02:45.000000000 +0200 @@ -11,12 +11,14 @@ Description ----------- @@ -349,9 +349,9 @@ diff -Nur linux-4.1.20/Documentation/w1/slaves/w1_therm linux-rpi/Documentation/ +knowledge of the bus ordering. Support is provided through the sysfs +w1_seq file. The file will contain a single line with an integer value +representing the device index in the bus starting at 0. -diff -Nur linux-4.1.20/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig ---- linux-4.1.20/arch/arm/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/Kconfig 2016-03-16 19:53:39.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/Kconfig linux-4.1.22/arch/arm/Kconfig +--- linux-4.1.22.orig/arch/arm/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/Kconfig 2016-04-29 18:02:45.000000000 +0200 @@ -314,6 +314,42 @@ default ARCH_VERSATILE if !MMU default ARCH_MULTIPLATFORM if MMU @@ -405,9 +405,9 @@ diff -Nur linux-4.1.20/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig source "arch/arm/mach-mvebu/Kconfig" source "arch/arm/mach-alpine/Kconfig" -diff -Nur linux-4.1.20/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug ---- linux-4.1.20/arch/arm/Kconfig.debug 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/Kconfig.debug 2016-03-16 19:53:39.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/Kconfig.debug linux-4.1.22/arch/arm/Kconfig.debug +--- linux-4.1.22.orig/arch/arm/Kconfig.debug 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/Kconfig.debug 2016-04-29 18:02:45.000000000 +0200 @@ -1196,6 +1196,14 @@ options; the platform specific options are deprecated and will be soon removed. @@ -423,9 +423,9 @@ diff -Nur linux-4.1.20/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug endchoice config DEBUG_AT91_UART -diff -Nur linux-4.1.20/arch/arm/Makefile linux-rpi/arch/arm/Makefile ---- linux-4.1.20/arch/arm/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/Makefile 2016-03-16 19:53:39.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/Makefile linux-4.1.22/arch/arm/Makefile +--- linux-4.1.22.orig/arch/arm/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/Makefile 2016-04-29 18:02:45.000000000 +0200 @@ -150,6 +150,8 @@ # Machine directory name. This list is sorted alphanumerically @@ -435,9 +435,9 @@ diff -Nur linux-4.1.20/arch/arm/Makefile linux-rpi/arch/arm/Makefile machine-$(CONFIG_ARCH_ALPINE) += alpine machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_AXXIA) += axxia -diff -Nur linux-4.1.20/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Makefile ---- linux-4.1.20/arch/arm/boot/dts/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/Makefile 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/Makefile linux-4.1.22/arch/arm/boot/dts/Makefile +--- linux-4.1.22.orig/arch/arm/boot/dts/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/boot/dts/Makefile 2016-04-29 18:02:45.000000000 +0200 @@ -1,5 +1,25 @@ ifeq ($(CONFIG_OF),y) @@ -482,9 +482,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Ma +ifeq ($(RPI_DT_OVERLAYS),y) + DTC_FLAGS ?= -@ +endif -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts ---- linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-4.1.22/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,144 @@ +/dts-v1/; + @@ -630,9 +630,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/a + sd_debug = <&sdhost>,"brcm,debug"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts ---- linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-b.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-4.1.22/arch/arm/boot/dts/bcm2708-rpi-b.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2708-rpi-b.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,134 @@ +/dts-v1/; + @@ -768,9 +768,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/bo + sd_debug = <&sdhost>,"brcm,debug"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-cm.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-cm.dts ---- linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-cm.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-cm.dts 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2708-rpi-cm.dts linux-4.1.22/arch/arm/boot/dts/bcm2708-rpi-cm.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2708-rpi-cm.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2708-rpi-cm.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,96 @@ +/dts-v1/; + @@ -868,9 +868,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-cm.dts linux-rpi/arch/arm/b + i2c2_baudrate = <&i2c2>,"clock-frequency:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi linux-rpi/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi ---- linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi 2016-03-20 23:54:36.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi linux-4.1.22/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,45 @@ +/include/ "bcm2708.dtsi" + @@ -917,9 +917,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi linux-rpi/arch/arm/ + sd_overclock = <&mmc>,"brcm,overclock-50:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dts/bcm2708.dtsi ---- linux-4.1.20/arch/arm/boot/dts/bcm2708.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2708.dtsi 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2708.dtsi linux-4.1.22/arch/arm/boot/dts/bcm2708.dtsi +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2708.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2708.dtsi 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,25 @@ +/include/ "bcm2708_common.dtsi" + @@ -946,9 +946,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dt + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708_common.dtsi linux-rpi/arch/arm/boot/dts/bcm2708_common.dtsi ---- linux-4.1.20/arch/arm/boot/dts/bcm2708_common.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2708_common.dtsi 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2708_common.dtsi linux-4.1.22/arch/arm/boot/dts/bcm2708_common.dtsi +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2708_common.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2708_common.dtsi 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,347 @@ +/include/ "skeleton.dtsi" + @@ -1297,9 +1297,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2708_common.dtsi linux-rpi/arch/arm/ + cache_line_size = <&vchiq>, "cache-line-size:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-rpi/arch/arm/boot/dts/bcm2709-rpi-2-b.dts ---- linux-4.1.20/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-4.1.22/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,144 @@ +/dts-v1/; + @@ -1445,9 +1445,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-rpi/arch/arm/ + sd_debug = <&sdhost>,"brcm,debug"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2709.dtsi linux-rpi/arch/arm/boot/dts/bcm2709.dtsi ---- linux-4.1.20/arch/arm/boot/dts/bcm2709.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2709.dtsi 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2709.dtsi linux-4.1.22/arch/arm/boot/dts/bcm2709.dtsi +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2709.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2709.dtsi 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,76 @@ +/include/ "bcm2708_common.dtsi" + @@ -1525,9 +1525,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2709.dtsi linux-rpi/arch/arm/boot/dt + <&v7_cpu3>, "clock-frequency:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2710-rpi-3-b.dts linux-rpi/arch/arm/boot/dts/bcm2710-rpi-3-b.dts ---- linux-4.1.20/arch/arm/boot/dts/bcm2710-rpi-3-b.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2710-rpi-3-b.dts 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2710-rpi-3-b.dts linux-4.1.22/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2710-rpi-3-b.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2710-rpi-3-b.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,191 @@ +/dts-v1/; + @@ -1720,9 +1720,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2710-rpi-3-b.dts linux-rpi/arch/arm/ + sd_debug = <&sdhost>,"brcm,debug"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2710.dtsi linux-rpi/arch/arm/boot/dts/bcm2710.dtsi ---- linux-4.1.20/arch/arm/boot/dts/bcm2710.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2710.dtsi 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2710.dtsi linux-4.1.22/arch/arm/boot/dts/bcm2710.dtsi +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2710.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2710.dtsi 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,76 @@ +/include/ "bcm2708_common.dtsi" + @@ -1800,9 +1800,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2710.dtsi linux-rpi/arch/arm/boot/dt + <&v7_cpu3>, "clock-frequency:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts linux-rpi/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts ---- linux-4.1.20/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts linux-4.1.22/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts 2016-04-29 18:02:45.000000000 +0200 @@ -4,27 +4,40 @@ / { compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; @@ -1861,9 +1861,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts linux-rpi/arch/a + pwr_led_trigger = <&pwr_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2835-rpi-b.dts linux-rpi/arch/arm/boot/dts/bcm2835-rpi-b.dts ---- linux-4.1.20/arch/arm/boot/dts/bcm2835-rpi-b.dts 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2835-rpi-b.dts 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2835-rpi-b.dts linux-4.1.22/arch/arm/boot/dts/bcm2835-rpi-b.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2835-rpi-b.dts 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2835-rpi-b.dts 2016-04-29 18:02:45.000000000 +0200 @@ -5,19 +5,28 @@ compatible = "raspberrypi,model-b", "brcm,bcm2835"; model = "Raspberry Pi Model B"; @@ -1903,9 +1903,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2835-rpi-b.dts linux-rpi/arch/arm/bo + act_led_activelow = <&act_led>,"gpios:8"; }; }; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2835-rpi.dtsi linux-rpi/arch/arm/boot/dts/bcm2835-rpi.dtsi ---- linux-4.1.20/arch/arm/boot/dts/bcm2835-rpi.dtsi 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2835-rpi.dtsi 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2835-rpi.dtsi linux-4.1.22/arch/arm/boot/dts/bcm2835-rpi.dtsi +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2835-rpi.dtsi 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2835-rpi.dtsi 2016-04-29 18:02:45.000000000 +0200 @@ -1,51 +1,133 @@ /include/ "bcm2835.dtsi" @@ -2058,9 +2058,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2835-rpi.dtsi linux-rpi/arch/arm/boo + audio = <&audio>,"status"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2835.dtsi linux-rpi/arch/arm/boot/dts/bcm2835.dtsi ---- linux-4.1.20/arch/arm/boot/dts/bcm2835.dtsi 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/bcm2835.dtsi 2016-03-16 19:53:40.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/bcm2835.dtsi linux-4.1.22/arch/arm/boot/dts/bcm2835.dtsi +--- linux-4.1.22.orig/arch/arm/boot/dts/bcm2835.dtsi 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/boot/dts/bcm2835.dtsi 2016-04-29 18:02:45.000000000 +0200 @@ -6,14 +6,15 @@ interrupt-parent = <&intc>; @@ -2177,9 +2177,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/bcm2835.dtsi linux-rpi/arch/arm/boot/dt }; clk_i2c: clock@1 { -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/Makefile linux-rpi/arch/arm/boot/dts/overlays/Makefile ---- linux-4.1.20/arch/arm/boot/dts/overlays/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/Makefile 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/Makefile linux-4.1.22/arch/arm/boot/dts/overlays/Makefile +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/Makefile 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,84 @@ +ifeq ($(CONFIG_OF),y) + @@ -2265,9 +2265,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/Makefile linux-rpi/arch/arm/bo +ifeq ($(RPI_DT_OVERLAYS),y) + DTC_FLAGS ?= -@ +endif -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/README linux-rpi/arch/arm/boot/dts/overlays/README ---- linux-4.1.20/arch/arm/boot/dts/overlays/README 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/README 2016-03-20 23:54:36.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/README linux-4.1.22/arch/arm/boot/dts/overlays/README +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/README 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/README 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,863 @@ +Introduction +============ @@ -3132,9 +3132,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/README linux-rpi/arch/arm/boot +Raspberry Pi. There is a more complete explanation here: + +http://www.raspberrypi.org/documentation/configuration/device-tree.md -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/ads7846-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/ads7846-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/ads7846-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/ads7846-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/ads7846-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/ads7846-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/ads7846-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/ads7846-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,83 @@ +/* + * Generic Device Tree overlay for the ADS7846 touch controller @@ -3219,9 +3219,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/ads7846-overlay.dts linux-rpi/ + xohms = <&ads7846>,"ti,x-plate-ohms;0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/at86rf233-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/at86rf233-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/at86rf233-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/at86rf233-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/at86rf233-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/at86rf233-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/at86rf233-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/at86rf233-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,54 @@ +/dts-v1/; +/plugin/; @@ -3277,9 +3277,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/at86rf233-overlay.dts linux-rp + trim = <&lowpan0>, "xtal-trim.0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,23 @@ +// Definitions for BMP085/BMP180 digital barometric pressure and temperature sensors from Bosch Sensortec +/dts-v1/; @@ -3304,9 +3304,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/dht11-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/dht11-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/dht11-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/dht11-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/dht11-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/dht11-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/dht11-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/dht11-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,39 @@ +/* + * Overlay for the DHT11/21/22 humidity/temperature sensor modules. @@ -3347,9 +3347,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/dht11-overlay.dts linux-rpi/ar + <&dht11>,"gpios:4"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/enc28j60-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/enc28j60-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/enc28j60-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/enc28j60-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/enc28j60-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/enc28j60-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/enc28j60-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/enc28j60-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,50 @@ +// Overlay for the Microchip ENC28J60 Ethernet Controller +/dts-v1/; @@ -3401,9 +3401,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/enc28j60-overlay.dts linux-rpi + speed = <ð1>, "spi-max-frequency:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,45 @@ +// Definitions for ir-gpio module +/dts-v1/; @@ -3450,9 +3450,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts linux-rpi/ + rc-map-name = <&gpio_ir>,"linux,rc-map-name"; // default rc map + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,34 @@ +// Definitions for gpio-poweroff module +/dts-v1/; @@ -3488,9 +3488,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts linu + active_low = <&power_ctrl>,"gpios:8"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry Amp/Amp+ +/dts-v1/; @@ -3531,9 +3531,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts linu + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,34 @@ +// Definitions for HiFiBerry DAC +/dts-v1/; @@ -3569,9 +3569,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts linu + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,54 @@ +// Definitions for HiFiBerry DAC+ +/dts-v1/; @@ -3627,9 +3627,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts + 24db_digital_gain = <&frag1>,"hifiberry,24db_digital_gain?"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry Digi +/dts-v1/; @@ -3670,9 +3670,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts lin + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hy28a-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/hy28a-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/hy28a-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/hy28a-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/hy28a-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/hy28a-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/hy28a-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/hy28a-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,87 @@ +/* + * Device Tree overlay for HY28A display @@ -3761,9 +3761,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hy28a-overlay.dts linux-rpi/ar + <&hy28a_pins>, "brcm,pins:2"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hy28b-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/hy28b-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/hy28b-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/hy28b-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/hy28b-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/hy28b-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/hy28b-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/hy28b-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,142 @@ +/* + * Device Tree overlay for HY28b display shield by Texy @@ -3907,9 +3907,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/hy28b-overlay.dts linux-rpi/ar + <&hy28b_pins>, "brcm,pins:2"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,28 @@ +// Overlay for i2c_gpio bitbanging host bus. +/dts-v1/; @@ -3939,9 +3939,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts linux-rpi + }; +}; + -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,55 @@ +// Definitions for several I2C based Real Time Clocks +/dts-v1/; @@ -3998,9 +3998,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts linux-rpi/ + pcf8563 = <&pcf8563>,"status"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,36 @@ +/* + * Device tree overlay for i2c_bcm2708, i2c0 bus @@ -4038,9 +4038,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts linux + scl0_pin = <&i2c0_pins>,"brcm,pins:4"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,37 @@ +/* + * Device tree overlay for i2c_bcm2708, i2c1 bus @@ -4079,9 +4079,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts linux + pin_func = <&i2c1_pins>,"brcm,function:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2s-mmap-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/i2s-mmap-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/i2s-mmap-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/i2s-mmap-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2s-mmap-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/i2s-mmap-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/i2s-mmap-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/i2s-mmap-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; @@ -4096,9 +4096,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/i2s-mmap-overlay.dts linux-rpi + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,39 @@ +// Definitions for IQaudIO DAC +/dts-v1/; @@ -4139,9 +4139,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts linux- + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,43 @@ +// Definitions for IQaudIO DAC+ +/dts-v1/; @@ -4186,9 +4186,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts li + 24db_digital_gain = <&frag0>,"iqaudio,24db_digital_gain?"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/lirc-rpi-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/lirc-rpi-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/lirc-rpi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/lirc-rpi-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/lirc-rpi-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/lirc-rpi-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/lirc-rpi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/lirc-rpi-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,57 @@ +// Definitions for lirc-rpi module +/dts-v1/; @@ -4247,9 +4247,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/lirc-rpi-overlay.dts linux-rpi + debug = <&lirc_rpi>,"rpi,debug:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,69 @@ +/* + * Device tree overlay for mcp251x/can0 on spi0.0 @@ -4320,9 +4320,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts linux + interrupt = <&can0_pins>,"brcm,pins:0",<&can0>,"interrupts:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,69 @@ +/* + * Device tree overlay for mcp251x/can1 on spi0.1 edited by petit_miner @@ -4393,9 +4393,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts linux + interrupt = <&can1_pins>,"brcm,pins:0",<&can1>,"interrupts:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/mmc-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/mmc-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/mmc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/mmc-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/mmc-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/mmc-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/mmc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/mmc-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,47 @@ +/dts-v1/; +/plugin/; @@ -4444,9 +4444,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/mmc-overlay.dts linux-rpi/arch + overclock_50 = <&frag0>,"brcm,overclock-50:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/mz61581-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/mz61581-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/mz61581-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/mz61581-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/mz61581-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/mz61581-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/mz61581-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/mz61581-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,111 @@ +/* + * Device Tree overlay for MZ61581-PI-EXT 2014.12.28 by Tontec @@ -4559,9 +4559,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/mz61581-overlay.dts linux-rpi/ + xohms = <&mz61581_ts>,"ti,x-plate-ohms;0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,48 @@ +/dts-v1/; +/plugin/; @@ -4611,9 +4611,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts lin + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts 2016-03-20 23:54:36.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,63 @@ +/dts-v1/; +/plugin/; @@ -4678,9 +4678,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts li + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/piscreen-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/piscreen-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/piscreen-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/piscreen-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/piscreen-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/piscreen-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/piscreen-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/piscreen-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,96 @@ +/* + * Device Tree overlay for PiScreen 3.5" display shield by Ozzmaker @@ -4778,9 +4778,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/piscreen-overlay.dts linux-rpi + xohms = <&piscreen_ts>,"ti,x-plate-ohms;0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,100 @@ + /* + * Device Tree overlay for PiScreen2 3.5" TFT with resistive touch by Ozzmaker.com @@ -4882,9 +4882,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts linux-r + }; +}; + -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,88 @@ +/* + * Device Tree overlay for Adafruit PiTFT 2.8" capacitive touch screen @@ -4974,9 +4974,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts + touch-swapxy = <&ft6236>,"touchscreen-swapped-x-y?"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,115 @@ +/* + * Device Tree overlay for Adafruit PiTFT 2.8" resistive touch screen @@ -5093,9 +5093,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts + debug = <&pitft>,"debug:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,34 @@ +/dts-v1/; +/plugin/; @@ -5131,9 +5131,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts linux-rpi + <&pps_pins>,"brcm,pins:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts 2016-03-20 23:54:36.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,53 @@ +/dts-v1/; +/plugin/; @@ -5188,9 +5188,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts linux-rp + clock = <&frag2>,"clock-frequency:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pwm-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/pwm-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/pwm-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/pwm-overlay.dts 2016-03-20 23:54:36.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/pwm-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/pwm-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/pwm-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/pwm-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,49 @@ +/dts-v1/; +/plugin/; @@ -5241,9 +5241,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/pwm-overlay.dts linux-rpi/arch + clock = <&frag2>,"clock-frequency:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/qca7000-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/qca7000-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/qca7000-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/qca7000-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/qca7000-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/qca7000-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/qca7000-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/qca7000-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,52 @@ +// Overlay for the Qualcomm Atheros QCA7000 on I2SE's PLC Stamp micro EVK +// Visit: https://www.i2se.com/product/plc-stamp-micro-evk for details @@ -5297,9 +5297,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/qca7000-overlay.dts linux-rpi/ + speed = <ð1>, "spi-max-frequency:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/raspidac3-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/raspidac3-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/raspidac3-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/raspidac3-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/raspidac3-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/raspidac3-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/raspidac3-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/raspidac3-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,45 @@ +// Definitions for RaspiDACv3 +/dts-v1/; @@ -5346,9 +5346,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/raspidac3-overlay.dts linux-rp + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,21 @@ +/* + * Devicetree overlay for mailbox-driven Raspberry Pi DSI Display @@ -5371,9 +5371,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts linu + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,34 @@ +// Definitions for RPi DAC +/dts-v1/; @@ -5409,9 +5409,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts linux-rpi/ + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-display-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/rpi-display-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/rpi-display-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/rpi-display-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-display-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/rpi-display-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-display-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/rpi-display-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,83 @@ +/* + * Device Tree overlay for rpi-display by Watterott @@ -5496,9 +5496,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-display-overlay.dts linux- + swapxy = <&rpidisplay_ts>,"ti,swap-xy?"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,17 @@ +/dts-v1/; +/plugin/; @@ -5517,9 +5517,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts linux-r + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,39 @@ +// Definitions for Rpi-Proto +/dts-v1/; @@ -5560,9 +5560,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts linux-rp + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,47 @@ +// rpi-sense HAT +/dts-v1/; @@ -5611,9 +5611,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts linux-rp + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/sdhost-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/sdhost-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/sdhost-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/sdhost-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/sdhost-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/sdhost-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/sdhost-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/sdhost-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,31 @@ +/dts-v1/; +/plugin/; @@ -5646,9 +5646,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/sdhost-overlay.dts linux-rpi/a + debug = <&frag0>,"brcm,debug?"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,36 @@ +/* Enable 1-bit SDIO from MMC interface via GPIOs 22-25. Includes sdhost overlay. */ + @@ -5686,9 +5686,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts linux-rp + sdio_overclock = <&sdio_mmc>,"brcm,overclock-50:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/sdio-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/sdio-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/sdio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/sdio-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/sdio-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/sdio-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/sdio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/sdio-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,37 @@ +/* Enable SDIO from MMC interface via GPIOs 22-27. Includes sdhost overlay. */ + @@ -5727,9 +5727,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/sdio-overlay.dts linux-rpi/arc + sdio_overclock = <&sdio_mmc>,"brcm,overclock-50:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/smi-dev-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/smi-dev-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/smi-dev-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/smi-dev-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/smi-dev-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/smi-dev-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/smi-dev-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/smi-dev-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,18 @@ +// Description: Overlay to enable character device interface for SMI. +// Author: Luke Wren @@ -5749,9 +5749,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/smi-dev-overlay.dts linux-rpi/ + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/smi-nand-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/smi-nand-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/smi-nand-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/smi-nand-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/smi-nand-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/smi-nand-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/smi-nand-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/smi-nand-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,69 @@ +// Description: Overlay to enable NAND flash through +// the secondary memory interface @@ -5822,9 +5822,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/smi-nand-overlay.dts linux-rpi + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/smi-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/smi-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/smi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/smi-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/smi-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/smi-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/smi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/smi-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,37 @@ +// Description: Overlay to enable the secondary memory interface peripheral +// Author: Luke Wren @@ -5863,9 +5863,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/smi-overlay.dts linux-rpi/arch + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/spi-bcm2708-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/spi-bcm2708-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/spi-bcm2708-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/spi-bcm2708-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/spi-bcm2708-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/spi-bcm2708-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/spi-bcm2708-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/spi-bcm2708-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,18 @@ +/* + * Device tree overlay for spi-bcm2835 @@ -5885,9 +5885,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/spi-bcm2708-overlay.dts linux- + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/spi-bcm2835-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/spi-bcm2835-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/spi-bcm2835-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/spi-bcm2835-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/spi-bcm2835-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/spi-bcm2835-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/spi-bcm2835-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/spi-bcm2835-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,18 @@ +/* + * Device tree overlay for spi-bcm2835 @@ -5907,9 +5907,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/spi-bcm2835-overlay.dts linux- + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/spi-dma-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/spi-dma-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/spi-dma-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/spi-dma-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/spi-dma-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/spi-dma-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/spi-dma-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/spi-dma-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,20 @@ +/* + * Device tree overlay for spi-bcm2835 to allow dma @@ -5931,9 +5931,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/spi-dma-overlay.dts linux-rpi/ + }; + }; + }; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,216 @@ +/* + * tinylcd35-overlay.dts @@ -6151,9 +6151,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts linux-rp + keypad = <&keypad>,"status"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/uart1-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/uart1-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/uart1-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/uart1-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/uart1-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/uart1-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/uart1-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/uart1-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,38 @@ +/dts-v1/; +/plugin/; @@ -6193,9 +6193,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/uart1-overlay.dts linux-rpi/ar + rxd1_pin = <&uart1_pins>,"brcm,pins:4"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,95 @@ +/* + * vc4-kms-v3d-overlay.dts @@ -6292,9 +6292,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts linux- + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/vga666-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/vga666-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/vga666-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/vga666-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/vga666-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/vga666-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/vga666-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/vga666-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,30 @@ +/dts-v1/; +/plugin/; @@ -6326,9 +6326,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/vga666-overlay.dts linux-rpi/a + }; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,39 @@ +// Definitions for w1-gpio module (without external pullup) +/dts-v1/; @@ -6369,9 +6369,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts linux-rpi/ + pullup = <&w1>,"rpi,parasitic-power:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,41 @@ +// Definitions for w1-gpio module (with external pullup) +/dts-v1/; @@ -6414,9 +6414,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts lin + pullup = <&w1>,"rpi,parasitic-power:0"; + }; +}; -diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/wittypi-overlay.dts linux-rpi/arch/arm/boot/dts/overlays/wittypi-overlay.dts ---- linux-4.1.20/arch/arm/boot/dts/overlays/wittypi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/boot/dts/overlays/wittypi-overlay.dts 2016-03-16 19:53:42.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/boot/dts/overlays/wittypi-overlay.dts linux-4.1.22/arch/arm/boot/dts/overlays/wittypi-overlay.dts +--- linux-4.1.22.orig/arch/arm/boot/dts/overlays/wittypi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/boot/dts/overlays/wittypi-overlay.dts 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,44 @@ +/* + * Device Tree overlay for Witty Pi extension board by UUGear @@ -6462,9 +6462,9 @@ diff -Nur linux-4.1.20/arch/arm/boot/dts/overlays/wittypi-overlay.dts linux-rpi/ + }; + +}; -diff -Nur linux-4.1.20/arch/arm/configs/bcm2709_defconfig linux-rpi/arch/arm/configs/bcm2709_defconfig ---- linux-4.1.20/arch/arm/configs/bcm2709_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcm2709_defconfig 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/configs/bcm2709_defconfig linux-4.1.22/arch/arm/configs/bcm2709_defconfig +--- linux-4.1.22.orig/arch/arm/configs/bcm2709_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/configs/bcm2709_defconfig 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,1267 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_PHYS_OFFSET=0 @@ -7733,9 +7733,9 @@ diff -Nur linux-4.1.20/arch/arm/configs/bcm2709_defconfig linux-rpi/arch/arm/con +CONFIG_CRYPTO_AES_ARM_BS=m +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-4.1.20/arch/arm/configs/bcm2835_defconfig linux-rpi/arch/arm/configs/bcm2835_defconfig ---- linux-4.1.20/arch/arm/configs/bcm2835_defconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcm2835_defconfig 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/configs/bcm2835_defconfig linux-4.1.22/arch/arm/configs/bcm2835_defconfig +--- linux-4.1.22.orig/arch/arm/configs/bcm2835_defconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/configs/bcm2835_defconfig 2016-04-29 18:02:45.000000000 +0200 @@ -1,105 +1,1075 @@ # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y @@ -8988,9 +8988,9 @@ diff -Nur linux-4.1.20/arch/arm/configs/bcm2835_defconfig linux-rpi/arch/arm/con +CONFIG_LIBCRC32C=y # CONFIG_XZ_DEC_ARM is not set # CONFIG_XZ_DEC_ARMTHUMB is not set -diff -Nur linux-4.1.20/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig ---- linux-4.1.20/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/configs/bcmrpi_defconfig linux-4.1.22/arch/arm/configs/bcmrpi_defconfig +--- linux-4.1.22.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/configs/bcmrpi_defconfig 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,1261 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_PHYS_OFFSET=0 @@ -10253,9 +10253,9 @@ diff -Nur linux-4.1.20/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/conf +CONFIG_CRYPTO_AES_ARM=m +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-4.1.20/arch/arm/include/asm/entry-macro-multi.S linux-rpi/arch/arm/include/asm/entry-macro-multi.S ---- linux-4.1.20/arch/arm/include/asm/entry-macro-multi.S 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/include/asm/entry-macro-multi.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/include/asm/entry-macro-multi.S linux-4.1.22/arch/arm/include/asm/entry-macro-multi.S +--- linux-4.1.22.orig/arch/arm/include/asm/entry-macro-multi.S 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/include/asm/entry-macro-multi.S 2016-04-29 18:02:45.000000000 +0200 @@ -1,5 +1,6 @@ #include @@ -10271,9 +10271,9 @@ diff -Nur linux-4.1.20/arch/arm/include/asm/entry-macro-multi.S linux-rpi/arch/a .macro arch_irq_handler, symbol_name .align 5 -diff -Nur linux-4.1.20/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/include/asm/irqflags.h ---- linux-4.1.20/arch/arm/include/asm/irqflags.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/include/asm/irqflags.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/include/asm/irqflags.h linux-4.1.22/arch/arm/include/asm/irqflags.h +--- linux-4.1.22.orig/arch/arm/include/asm/irqflags.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/include/asm/irqflags.h 2016-04-29 18:02:45.000000000 +0200 @@ -145,12 +145,22 @@ } @@ -10300,9 +10300,9 @@ diff -Nur linux-4.1.20/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/includ : : "r" (flags) : "memory", "cc"); -diff -Nur linux-4.1.20/arch/arm/include/asm/string.h linux-rpi/arch/arm/include/asm/string.h ---- linux-4.1.20/arch/arm/include/asm/string.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/include/asm/string.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/include/asm/string.h linux-4.1.22/arch/arm/include/asm/string.h +--- linux-4.1.22.orig/arch/arm/include/asm/string.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/include/asm/string.h 2016-04-29 18:02:45.000000000 +0200 @@ -24,6 +24,11 @@ #define __HAVE_ARCH_MEMSET extern void * memset(void *, int, __kernel_size_t); @@ -10315,9 +10315,9 @@ diff -Nur linux-4.1.20/arch/arm/include/asm/string.h linux-rpi/arch/arm/include/ extern void __memzero(void *ptr, __kernel_size_t n); #define memset(p,v,n) \ -diff -Nur linux-4.1.20/arch/arm/include/asm/uaccess.h linux-rpi/arch/arm/include/asm/uaccess.h ---- linux-4.1.20/arch/arm/include/asm/uaccess.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/include/asm/uaccess.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/include/asm/uaccess.h linux-4.1.22/arch/arm/include/asm/uaccess.h +--- linux-4.1.22.orig/arch/arm/include/asm/uaccess.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/include/asm/uaccess.h 2016-04-29 18:02:45.000000000 +0200 @@ -475,6 +475,7 @@ #ifdef CONFIG_MMU @@ -10326,9 +10326,9 @@ diff -Nur linux-4.1.20/arch/arm/include/asm/uaccess.h linux-rpi/arch/arm/include extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n); extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n); extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n); -diff -Nur linux-4.1.20/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S ---- linux-4.1.20/arch/arm/kernel/fiqasm.S 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/kernel/fiqasm.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/kernel/fiqasm.S linux-4.1.22/arch/arm/kernel/fiqasm.S +--- linux-4.1.22.orig/arch/arm/kernel/fiqasm.S 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/kernel/fiqasm.S 2016-04-29 18:02:45.000000000 +0200 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 ret lr @@ -10337,9 +10337,9 @@ diff -Nur linux-4.1.20/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-4.1.20/arch/arm/kernel/head.S linux-rpi/arch/arm/kernel/head.S ---- linux-4.1.20/arch/arm/kernel/head.S 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/kernel/head.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/kernel/head.S linux-4.1.22/arch/arm/kernel/head.S +--- linux-4.1.22.orig/arch/arm/kernel/head.S 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/kernel/head.S 2016-04-29 18:02:45.000000000 +0200 @@ -680,6 +680,14 @@ ldrcc r7, [r4], #4 @ use branch for delay slot bcc 1b @@ -10355,9 +10355,9 @@ diff -Nur linux-4.1.20/arch/arm/kernel/head.S linux-rpi/arch/arm/kernel/head.S #endif ENDPROC(__fixup_a_pv_table) -diff -Nur linux-4.1.20/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c ---- linux-4.1.20/arch/arm/kernel/process.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/kernel/process.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/kernel/process.c linux-4.1.22/arch/arm/kernel/process.c +--- linux-4.1.22.orig/arch/arm/kernel/process.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/kernel/process.c 2016-04-29 18:02:45.000000000 +0200 @@ -98,6 +98,16 @@ } #endif @@ -10375,9 +10375,9 @@ diff -Nur linux-4.1.20/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/proce void __show_regs(struct pt_regs *regs) { unsigned long flags; -diff -Nur linux-4.1.20/arch/arm/lib/Makefile linux-rpi/arch/arm/lib/Makefile ---- linux-4.1.20/arch/arm/lib/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/lib/Makefile 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/Makefile linux-4.1.22/arch/arm/lib/Makefile +--- linux-4.1.22.orig/arch/arm/lib/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/lib/Makefile 2016-04-29 18:02:45.000000000 +0200 @@ -6,9 +6,8 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ @@ -10407,9 +10407,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/Makefile linux-rpi/arch/arm/lib/Makefile # using lib_ here won't override already available weak symbols obj-$(CONFIG_UACCESS_WITH_MEMCPY) += uaccess_with_memcpy.o -diff -Nur linux-4.1.20/arch/arm/lib/arm-mem.h linux-rpi/arch/arm/lib/arm-mem.h ---- linux-4.1.20/arch/arm/lib/arm-mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/arm-mem.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/arm-mem.h linux-4.1.22/arch/arm/lib/arm-mem.h +--- linux-4.1.22.orig/arch/arm/lib/arm-mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/lib/arm-mem.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,159 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -10570,9 +10570,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/arm-mem.h linux-rpi/arch/arm/lib/arm-mem.h + .endif +92: +.endm -diff -Nur linux-4.1.20/arch/arm/lib/copy_from_user.S linux-rpi/arch/arm/lib/copy_from_user.S ---- linux-4.1.20/arch/arm/lib/copy_from_user.S 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/lib/copy_from_user.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/copy_from_user.S linux-4.1.22/arch/arm/lib/copy_from_user.S +--- linux-4.1.22.orig/arch/arm/lib/copy_from_user.S 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/lib/copy_from_user.S 2016-04-29 18:02:45.000000000 +0200 @@ -89,11 +89,13 @@ .text @@ -10588,9 +10588,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/copy_from_user.S linux-rpi/arch/arm/lib/copy .pushsection .fixup,"ax" .align 0 -diff -Nur linux-4.1.20/arch/arm/lib/exports_rpi.c linux-rpi/arch/arm/lib/exports_rpi.c ---- linux-4.1.20/arch/arm/lib/exports_rpi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/exports_rpi.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/exports_rpi.c linux-4.1.22/arch/arm/lib/exports_rpi.c +--- linux-4.1.22.orig/arch/arm/lib/exports_rpi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/lib/exports_rpi.c 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2014, Raspberry Pi (Trading) Ltd. @@ -10629,9 +10629,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/exports_rpi.c linux-rpi/arch/arm/lib/exports +#include + +EXPORT_SYMBOL(memcmp); -diff -Nur linux-4.1.20/arch/arm/lib/memcmp_rpi.S linux-rpi/arch/arm/lib/memcmp_rpi.S ---- linux-4.1.20/arch/arm/lib/memcmp_rpi.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memcmp_rpi.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/memcmp_rpi.S linux-4.1.22/arch/arm/lib/memcmp_rpi.S +--- linux-4.1.22.orig/arch/arm/lib/memcmp_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/lib/memcmp_rpi.S 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,285 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -10918,9 +10918,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/memcmp_rpi.S linux-rpi/arch/arm/lib/memcmp_r + .unreq DAT7 + .unreq OFF +ENDPROC(memcmp) -diff -Nur linux-4.1.20/arch/arm/lib/memcpy_rpi.S linux-rpi/arch/arm/lib/memcpy_rpi.S ---- linux-4.1.20/arch/arm/lib/memcpy_rpi.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memcpy_rpi.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/memcpy_rpi.S linux-4.1.22/arch/arm/lib/memcpy_rpi.S +--- linux-4.1.22.orig/arch/arm/lib/memcpy_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/lib/memcpy_rpi.S 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,59 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -10981,9 +10981,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/memcpy_rpi.S linux-rpi/arch/arm/lib/memcpy_r +ENTRY(memcpy) + memcpy 0 +ENDPROC(memcpy) -diff -Nur linux-4.1.20/arch/arm/lib/memcpymove.h linux-rpi/arch/arm/lib/memcpymove.h ---- linux-4.1.20/arch/arm/lib/memcpymove.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memcpymove.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/memcpymove.h linux-4.1.22/arch/arm/lib/memcpymove.h +--- linux-4.1.22.orig/arch/arm/lib/memcpymove.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/lib/memcpymove.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,506 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -11491,9 +11491,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/memcpymove.h linux-rpi/arch/arm/lib/memcpymo + .unreq LAST + .unreq OFF +.endm -diff -Nur linux-4.1.20/arch/arm/lib/memmove_rpi.S linux-rpi/arch/arm/lib/memmove_rpi.S ---- linux-4.1.20/arch/arm/lib/memmove_rpi.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memmove_rpi.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/memmove_rpi.S linux-4.1.22/arch/arm/lib/memmove_rpi.S +--- linux-4.1.22.orig/arch/arm/lib/memmove_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/lib/memmove_rpi.S 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,61 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -11556,9 +11556,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/memmove_rpi.S linux-rpi/arch/arm/lib/memmove + bpl memcpy /* pl works even over -1 - 0 and 0x7fffffff - 0x80000000 boundaries */ + memcpy 1 +ENDPROC(memmove) -diff -Nur linux-4.1.20/arch/arm/lib/memset_rpi.S linux-rpi/arch/arm/lib/memset_rpi.S ---- linux-4.1.20/arch/arm/lib/memset_rpi.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/lib/memset_rpi.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/memset_rpi.S linux-4.1.22/arch/arm/lib/memset_rpi.S +--- linux-4.1.22.orig/arch/arm/lib/memset_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/lib/memset_rpi.S 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,121 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -11681,9 +11681,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/memset_rpi.S linux-rpi/arch/arm/lib/memset_r + .unreq DAT2 + .unreq DAT3 +ENDPROC(memset) -diff -Nur linux-4.1.20/arch/arm/lib/uaccess_with_memcpy.c linux-rpi/arch/arm/lib/uaccess_with_memcpy.c ---- linux-4.1.20/arch/arm/lib/uaccess_with_memcpy.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/lib/uaccess_with_memcpy.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/lib/uaccess_with_memcpy.c linux-4.1.22/arch/arm/lib/uaccess_with_memcpy.c +--- linux-4.1.22.orig/arch/arm/lib/uaccess_with_memcpy.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/lib/uaccess_with_memcpy.c 2016-04-29 18:02:45.000000000 +0200 @@ -22,6 +22,14 @@ #include #include @@ -11827,9 +11827,9 @@ diff -Nur linux-4.1.20/arch/arm/lib/uaccess_with_memcpy.c linux-rpi/arch/arm/lib static unsigned long noinline __clear_user_memset(void __user *addr, unsigned long n) -diff -Nur linux-4.1.20/arch/arm/mach-bcm/Kconfig linux-rpi/arch/arm/mach-bcm/Kconfig ---- linux-4.1.20/arch/arm/mach-bcm/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm/Kconfig 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm/Kconfig linux-4.1.22/arch/arm/mach-bcm/Kconfig +--- linux-4.1.22.orig/arch/arm/mach-bcm/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/mach-bcm/Kconfig 2016-04-29 18:02:45.000000000 +0200 @@ -114,6 +114,7 @@ select ARM_ERRATA_411920 select ARM_TIMER_SP804 @@ -11838,9 +11838,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm/Kconfig linux-rpi/arch/arm/mach-bcm/Kco select PINCTRL select PINCTRL_BCM2835 help -diff -Nur linux-4.1.20/arch/arm/mach-bcm/board_bcm2835.c linux-rpi/arch/arm/mach-bcm/board_bcm2835.c ---- linux-4.1.20/arch/arm/mach-bcm/board_bcm2835.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm/board_bcm2835.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm/board_bcm2835.c linux-4.1.22/arch/arm/mach-bcm/board_bcm2835.c +--- linux-4.1.22.orig/arch/arm/mach-bcm/board_bcm2835.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/mach-bcm/board_bcm2835.c 2016-04-29 18:02:45.000000000 +0200 @@ -18,6 +18,7 @@ #include #include @@ -11871,9 +11871,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm/board_bcm2835.c linux-rpi/arch/arm/mach } static const char * const bcm2835_compat[] = { -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig ---- linux-4.1.20/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Kconfig 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/Kconfig linux-4.1.22/arch/arm/mach-bcm2708/Kconfig +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/Kconfig 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,45 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -11920,9 +11920,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile ---- linux-4.1.20/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/Makefile linux-4.1.22/arch/arm/mach-bcm2708/Makefile +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/Makefile 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,6 @@ +# +# Makefile for the linux kernel. @@ -11930,16 +11930,16 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bc + +obj-$(CONFIG_MACH_BCM2708) += bcm2708.o armctrl.o +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot ---- linux-4.1.20/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile.boot 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/Makefile.boot linux-4.1.22/arch/arm/mach-bcm2708/Makefile.boot +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/Makefile.boot 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c ---- linux-4.1.20/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/armctrl.c linux-4.1.22/arch/arm/mach-bcm2708/armctrl.c +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/armctrl.c 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,315 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -12256,9 +12256,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-b + armctrl_dt_init(); + return 0; +} -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h ---- linux-4.1.20/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/armctrl.h linux-4.1.22/arch/arm/mach-bcm2708/armctrl.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/armctrl.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -12287,9 +12287,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-b + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c ---- linux-4.1.20/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/bcm2708.c linux-4.1.22/arch/arm/mach-bcm2708/bcm2708.c +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/bcm2708.c 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,1162 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -13453,9 +13453,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-b +MODULE_PARM_DESC(vc_i2c_override, "Allow the use of VC's I2C peripheral."); +module_param(pps_gpio_pin, int, 0644); +MODULE_PARM_DESC(pps_gpio_pin, "Set GPIO pin to reserve for PPS"); -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h ---- linux-4.1.20/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/bcm2708.h linux-4.1.22/arch/arm/mach-bcm2708/bcm2708.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/bcm2708.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -13506,9 +13506,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-b +} + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-4.1.20/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-4.1.22/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/bcm2708_gpio.c 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,426 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -13936,9 +13936,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/arm_control.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -14359,9 +14359,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rp +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/clkdev.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -14370,9 +14370,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arc +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-4.1.22/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -14396,9 +14396,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rp + .endm + +#include -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-4.1.22/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -14469,9 +14469,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rp +1020: @ EQ will be set if no irqs pending + + .endm -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/frc.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -14511,9 +14511,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/a +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/gpio.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -14532,9 +14532,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/ +#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/hardware.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -14564,9 +14564,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/a +#include + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/io.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -14595,9 +14595,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/ar +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/irqs.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -14798,9 +14798,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/ +#define NR_IRQS (BCM2708_ALLOC_IRQS+FREE_IRQS) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/memory.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -14859,9 +14859,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arc +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - BCM_PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/platform.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,230 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -15093,9 +15093,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/a +#endif + +/* END */ -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/system.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -15135,9 +15135,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arc +} + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/timex.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -15162,9 +15162,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/uncompress.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -15250,9 +15250,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,181 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -15435,9 +15435,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linux-rpi +} VC_SM_MSG_UNION_T; + +#endif /* __VC_SM_DEFS_H__INCLUDED__ */ -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,55 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -15494,9 +15494,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux-rpi/ + long unsigned int *data); + +#endif /* __VC_SM_KNL_H__INCLUDED__ */ -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,82 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -15580,9 +15580,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linux-rpi + VC_SM_ACTION_CLEAN_T *action_clean); + +#endif /* __VC_VCHI_SM_H__INCLUDED__ */ -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -15604,9 +15604,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/ar + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xe8000000) -diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h ---- linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,248 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -15856,9 +15856,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux- +/* ---- Function Prototypes ---------------------------------------------- */ + +#endif /* __VMCS_SM_IOCTL_H__INCLUDED__ */ -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/Kconfig linux-rpi/arch/arm/mach-bcm2709/Kconfig ---- linux-4.1.20/arch/arm/mach-bcm2709/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/Kconfig 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/Kconfig linux-4.1.22/arch/arm/mach-bcm2709/Kconfig +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/Kconfig 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,42 @@ +menu "Broadcom BCM2709 Implementations" + depends on ARCH_BCM2709 @@ -15902,9 +15902,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/Kconfig linux-rpi/arch/arm/mach-bcm + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/Makefile linux-rpi/arch/arm/mach-bcm2709/Makefile ---- linux-4.1.20/arch/arm/mach-bcm2709/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/Makefile 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/Makefile linux-4.1.22/arch/arm/mach-bcm2709/Makefile +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/Makefile 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,6 @@ +# +# Makefile for the linux kernel. @@ -15912,16 +15912,16 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/Makefile linux-rpi/arch/arm/mach-bc + +obj-$(CONFIG_MACH_BCM2709) += bcm2709.o armctrl.o +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/Makefile.boot linux-rpi/arch/arm/mach-bcm2709/Makefile.boot ---- linux-4.1.20/arch/arm/mach-bcm2709/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/Makefile.boot 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/Makefile.boot linux-4.1.22/arch/arm/mach-bcm2709/Makefile.boot +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/Makefile.boot 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/armctrl.c linux-rpi/arch/arm/mach-bcm2709/armctrl.c ---- linux-4.1.20/arch/arm/mach-bcm2709/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/armctrl.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/armctrl.c linux-4.1.22/arch/arm/mach-bcm2709/armctrl.c +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/armctrl.c 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,384 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -16307,9 +16307,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/armctrl.c linux-rpi/arch/arm/mach-b + armctrl_dt_init(); + return 0; +} -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/armctrl.h linux-rpi/arch/arm/mach-bcm2709/armctrl.h ---- linux-4.1.20/arch/arm/mach-bcm2709/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/armctrl.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/armctrl.h linux-4.1.22/arch/arm/mach-bcm2709/armctrl.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/armctrl.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -16338,9 +16338,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/armctrl.h linux-rpi/arch/arm/mach-b + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2709/bcm2708_gpio.c ---- linux-4.1.20/arch/arm/mach-bcm2709/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/bcm2708_gpio.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/bcm2708_gpio.c linux-4.1.22/arch/arm/mach-bcm2709/bcm2708_gpio.c +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/bcm2708_gpio.c 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,426 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -16768,9 +16768,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/bcm2708_gpio.c linux-rpi/arch/arm/m + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/bcm2709.c linux-rpi/arch/arm/mach-bcm2709/bcm2709.c ---- linux-4.1.20/arch/arm/mach-bcm2709/bcm2709.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/bcm2709.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/bcm2709.c linux-4.1.22/arch/arm/mach-bcm2709/bcm2709.c +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/bcm2709.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/bcm2709.c 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,1332 @@ +/* + * linux/arch/arm/mach-bcm2709/bcm2709.c @@ -18104,9 +18104,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/bcm2709.c linux-rpi/arch/arm/mach-b +MODULE_PARM_DESC(vc_i2c_override, "Allow the use of VC's I2C peripheral."); +module_param(pps_gpio_pin, int, 0644); +MODULE_PARM_DESC(pps_gpio_pin, "Set GPIO pin to reserve for PPS"); -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/bcm2709.h linux-rpi/arch/arm/mach-bcm2709/bcm2709.h ---- linux-4.1.20/arch/arm/mach-bcm2709/bcm2709.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/bcm2709.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/bcm2709.h linux-4.1.22/arch/arm/mach-bcm2709/bcm2709.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/bcm2709.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/bcm2709.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -18157,9 +18157,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/bcm2709.h linux-rpi/arch/arm/mach-b +} + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/delay.S linux-rpi/arch/arm/mach-bcm2709/delay.S ---- linux-4.1.20/arch/arm/mach-bcm2709/delay.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/delay.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/delay.S linux-4.1.22/arch/arm/mach-bcm2709/delay.S +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/delay.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/delay.S 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,21 @@ +/* + * linux/arch/arm/lib/delay.S @@ -18182,9 +18182,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/delay.S linux-rpi/arch/arm/mach-bcm + bhi bcm2708_delay + mov pc, lr +ENDPROC(bcm2708_delay) -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2709/include/mach/arm_control.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/arm_control.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/arm_control.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/arm_control.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/arm_control.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,493 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -18679,16 +18679,16 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/arm_control.h linux-rp +#define ARM_LOCAL_MAILBOX3_CLR3 HW_REGISTER_RW(ARM_LOCAL_BASE+0x0FC) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/barriers.h linux-rpi/arch/arm/mach-bcm2709/include/mach/barriers.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/barriers.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/barriers.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/barriers.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/barriers.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/barriers.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/barriers.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,3 @@ +#define mb() dsb() +#define rmb() dsb() +#define wmb() mb() -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2709/include/mach/clkdev.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/clkdev.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/clkdev.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/clkdev.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/clkdev.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -18697,9 +18697,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/clkdev.h linux-rpi/arc +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2709/include/mach/debug-macro.S ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/debug-macro.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/debug-macro.S linux-4.1.22/arch/arm/mach-bcm2709/include/mach/debug-macro.S +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/debug-macro.S 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -18723,9 +18723,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/debug-macro.S linux-rp + .endm + +#include -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2709/include/mach/entry-macro.S ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/entry-macro.S 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/entry-macro.S linux-4.1.22/arch/arm/mach-bcm2709/include/mach/entry-macro.S +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/entry-macro.S 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,120 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -18847,9 +18847,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/entry-macro.S linux-rp + .macro arch_irq_handler_default +1: get_irqnr_and_base r0, r2, r6, lr + .endm -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2709/include/mach/frc.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/frc.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/frc.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/frc.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/frc.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -18889,9 +18889,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/frc.h linux-rpi/arch/a +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2709/include/mach/gpio.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/gpio.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/gpio.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/gpio.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/gpio.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -18910,9 +18910,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/gpio.h linux-rpi/arch/ +#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2709/include/mach/hardware.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/hardware.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/hardware.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/hardware.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/hardware.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -18942,9 +18942,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/hardware.h linux-rpi/a +#include + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/io.h linux-rpi/arch/arm/mach-bcm2709/include/mach/io.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/io.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/io.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/io.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/io.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -18973,9 +18973,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/io.h linux-rpi/arch/ar +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2709/include/mach/irqs.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/irqs.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/irqs.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/irqs.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/irqs.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,225 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -19202,9 +19202,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/irqs.h linux-rpi/arch/ +#define NR_IRQS (BCM2708_ALLOC_IRQS+FREE_IRQS) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2709/include/mach/memory.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/memory.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/memory.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/memory.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/memory.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -19263,9 +19263,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/memory.h linux-rpi/arc +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - BCM_PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2709/include/mach/platform.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/platform.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/platform.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/platform.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/platform.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,227 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -19494,9 +19494,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/platform.h linux-rpi/a +#endif + +/* END */ -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/system.h linux-rpi/arch/arm/mach-bcm2709/include/mach/system.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/system.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/system.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/system.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/system.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -19536,9 +19536,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/system.h linux-rpi/arc +} + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2709/include/mach/timex.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/timex.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/timex.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/timex.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/timex.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -19563,9 +19563,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/timex.h linux-rpi/arch + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2709/include/mach/uncompress.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/uncompress.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/uncompress.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/uncompress.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/uncompress.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -19651,9 +19651,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/uncompress.h linux-rpi + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/vc_support.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vc_support.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/vc_support.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/vc_support.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/vc_support.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/vc_support.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,69 @@ +#ifndef _VC_SUPPORT_H_ +#define _VC_SUPPORT_H_ @@ -19724,9 +19724,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/vc_support.h linux-rpi + unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5); + +#endif -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vmalloc.h ---- linux-4.1.20/arch/arm/mach-bcm2709/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/include/mach/vmalloc.h 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/vmalloc.h linux-4.1.22/arch/arm/mach-bcm2709/include/mach/vmalloc.h +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/include/mach/vmalloc.h 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -19748,9 +19748,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/include/mach/vmalloc.h linux-rpi/ar + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xff000000) -diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/vc_support.c linux-rpi/arch/arm/mach-bcm2709/vc_support.c ---- linux-4.1.20/arch/arm/mach-bcm2709/vc_support.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2709/vc_support.c 2016-03-16 19:53:43.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mach-bcm2709/vc_support.c linux-4.1.22/arch/arm/mach-bcm2709/vc_support.c +--- linux-4.1.22.orig/arch/arm/mach-bcm2709/vc_support.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/arch/arm/mach-bcm2709/vc_support.c 2016-04-29 18:02:45.000000000 +0200 @@ -0,0 +1,318 @@ +/* + * vc_support.c @@ -20070,9 +20070,9 @@ diff -Nur linux-4.1.20/arch/arm/mach-bcm2709/vc_support.c linux-rpi/arch/arm/mac + return 1; + } +} -diff -Nur linux-4.1.20/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig ---- linux-4.1.20/arch/arm/mm/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/mm/Kconfig 2016-03-16 19:53:46.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mm/Kconfig linux-4.1.22/arch/arm/mm/Kconfig +--- linux-4.1.22.orig/arch/arm/mm/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/mm/Kconfig 2016-04-29 18:02:45.000000000 +0200 @@ -358,7 +358,7 @@ # ARMv6 @@ -20082,9 +20082,9 @@ diff -Nur linux-4.1.20/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6 -diff -Nur linux-4.1.20/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S ---- linux-4.1.20/arch/arm/mm/proc-v6.S 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/mm/proc-v6.S 2016-03-16 19:53:46.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mm/proc-v6.S linux-4.1.22/arch/arm/mm/proc-v6.S +--- linux-4.1.22.orig/arch/arm/mm/proc-v6.S 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/mm/proc-v6.S 2016-04-29 18:02:45.000000000 +0200 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -20108,9 +20108,9 @@ diff -Nur linux-4.1.20/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S ret lr ENTRY(cpu_v6_dcache_clean_area) -diff -Nur linux-4.1.20/arch/arm/mm/proc-v7.S linux-rpi/arch/arm/mm/proc-v7.S ---- linux-4.1.20/arch/arm/mm/proc-v7.S 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/mm/proc-v7.S 2016-03-16 19:53:46.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/mm/proc-v7.S linux-4.1.22/arch/arm/mm/proc-v7.S +--- linux-4.1.22.orig/arch/arm/mm/proc-v7.S 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/mm/proc-v7.S 2016-04-29 18:02:45.000000000 +0200 @@ -460,6 +460,7 @@ orr r0, r0, r6 @ set them THUMB( orr r0, r0, #1 << 30 ) @ Thumb exceptions @@ -20119,9 +20119,9 @@ diff -Nur linux-4.1.20/arch/arm/mm/proc-v7.S linux-rpi/arch/arm/mm/proc-v7.S ENDPROC(__v7_setup) .align 2 -diff -Nur linux-4.1.20/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types ---- linux-4.1.20/arch/arm/tools/mach-types 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/arch/arm/tools/mach-types 2016-03-16 19:53:46.000000000 +0100 +diff -Nur linux-4.1.22.orig/arch/arm/tools/mach-types linux-4.1.22/arch/arm/tools/mach-types +--- linux-4.1.22.orig/arch/arm/tools/mach-types 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/arch/arm/tools/mach-types 2016-04-29 18:02:45.000000000 +0200 @@ -522,6 +522,8 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -20131,9 +20131,9 @@ diff -Nur linux-4.1.20/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-t ag5evm MACH_AG5EVM AG5EVM 3189 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207 -diff -Nur linux-4.1.20/drivers/bluetooth/hci_h5.c linux-rpi/drivers/bluetooth/hci_h5.c ---- linux-4.1.20/drivers/bluetooth/hci_h5.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/bluetooth/hci_h5.c 2016-03-16 19:54:00.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/bluetooth/hci_h5.c linux-4.1.22/drivers/bluetooth/hci_h5.c +--- linux-4.1.22.orig/drivers/bluetooth/hci_h5.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/bluetooth/hci_h5.c 2016-04-29 18:02:46.000000000 +0200 @@ -314,7 +314,8 @@ h5_link_control(hu, conf_req, 3); } else if (memcmp(data, conf_req, 2) == 0) { @@ -20144,9 +20144,9 @@ diff -Nur linux-4.1.20/drivers/bluetooth/hci_h5.c linux-rpi/drivers/bluetooth/hc } else if (memcmp(data, conf_rsp, 2) == 0) { if (H5_HDR_LEN(hdr) > 2) h5->tx_win = (data[2] & 7); -diff -Nur linux-4.1.20/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig ---- linux-4.1.20/drivers/char/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/char/Kconfig 2016-03-16 19:54:00.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/Kconfig linux-4.1.22/drivers/char/Kconfig +--- linux-4.1.22.orig/drivers/char/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/char/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -590,6 +590,8 @@ source "drivers/s390/char/Kconfig" @@ -20156,17 +20156,17 @@ diff -Nur linux-4.1.20/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig config MSM_SMD_PKT bool "Enable device interface for some SMD packet ports" default n -diff -Nur linux-4.1.20/drivers/char/Makefile linux-rpi/drivers/char/Makefile ---- linux-4.1.20/drivers/char/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/char/Makefile 2016-03-16 19:54:00.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/Makefile linux-4.1.22/drivers/char/Makefile +--- linux-4.1.22.orig/drivers/char/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/char/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -62,3 +62,4 @@ obj-$(CONFIG_TILE_SROM) += tile-srom.o obj-$(CONFIG_XILLYBUS) += xillybus/ +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ -diff -Nur linux-4.1.20/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broadcom/Kconfig ---- linux-4.1.20/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/Kconfig 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/Kconfig linux-4.1.22/drivers/char/broadcom/Kconfig +--- linux-4.1.22.orig/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,57 @@ +# +# Broadcom char driver config @@ -20225,9 +20225,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broa + This driver provides a character device interface (ioctl + read/write) to + Broadcom's Secondary Memory interface. The low-level functionality is provided + by the SMI driver itself. -diff -Nur linux-4.1.20/drivers/char/broadcom/Makefile linux-rpi/drivers/char/broadcom/Makefile ---- linux-4.1.20/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/Makefile 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/Makefile linux-4.1.22/drivers/char/broadcom/Makefile +--- linux-4.1.22.orig/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,7 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o @@ -20236,9 +20236,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/Makefile linux-rpi/drivers/char/bro + +obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o +obj-$(CONFIG_BCM2835_SMI_DEV) += bcm2835_smi_dev.o -diff -Nur linux-4.1.20/drivers/char/broadcom/bcm2835-gpiomem.c linux-rpi/drivers/char/broadcom/bcm2835-gpiomem.c ---- linux-4.1.20/drivers/char/broadcom/bcm2835-gpiomem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/bcm2835-gpiomem.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/bcm2835-gpiomem.c linux-4.1.22/drivers/char/broadcom/bcm2835-gpiomem.c +--- linux-4.1.22.orig/drivers/char/broadcom/bcm2835-gpiomem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/bcm2835-gpiomem.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,260 @@ +/** + * GPIO memory device driver @@ -20500,9 +20500,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/bcm2835-gpiomem.c linux-rpi/drivers +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("gpiomem driver for accessing GPIO from userspace"); +MODULE_AUTHOR("Luke Wren "); -diff -Nur linux-4.1.20/drivers/char/broadcom/bcm2835_smi_dev.c linux-rpi/drivers/char/broadcom/bcm2835_smi_dev.c ---- linux-4.1.20/drivers/char/broadcom/bcm2835_smi_dev.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/bcm2835_smi_dev.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/bcm2835_smi_dev.c linux-4.1.22/drivers/char/broadcom/bcm2835_smi_dev.c +--- linux-4.1.22.orig/drivers/char/broadcom/bcm2835_smi_dev.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/bcm2835_smi_dev.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,402 @@ +/** + * Character device driver for Broadcom Secondary Memory Interface @@ -20906,9 +20906,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/bcm2835_smi_dev.c linux-rpi/drivers +MODULE_DESCRIPTION( + "Character device driver for BCM2835's secondary memory interface"); +MODULE_AUTHOR("Luke Wren "); -diff -Nur linux-4.1.20/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/char/broadcom/vc_cma/Makefile ---- linux-4.1.20/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_cma/Makefile 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/vc_cma/Makefile linux-4.1.22/drivers/char/broadcom/vc_cma/Makefile +--- linux-4.1.22.orig/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/vc_cma/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,14 @@ +ccflags-y += -Wall -Wstrict-prototypes -Wno-trigraphs +ccflags-y += -Werror @@ -20924,9 +20924,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/c +obj-$(CONFIG_BCM_VC_CMA) += vc-cma.o + +vc-cma-objs := vc_cma.o -diff -Nur linux-4.1.20/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c ---- linux-4.1.20/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/vc_cma/vc_cma.c linux-4.1.22/drivers/char/broadcom/vc_cma/vc_cma.c +--- linux-4.1.22.orig/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/vc_cma/vc_cma.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,1193 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -22121,9 +22121,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/c +module_exit(vc_cma_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Nur linux-4.1.20/drivers/char/broadcom/vc_mem.c linux-rpi/drivers/char/broadcom/vc_mem.c ---- linux-4.1.20/drivers/char/broadcom/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_mem.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/vc_mem.c linux-4.1.22/drivers/char/broadcom/vc_mem.c +--- linux-4.1.22.orig/drivers/char/broadcom/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/vc_mem.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,422 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -22547,9 +22547,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/vc_mem.c linux-rpi/drivers/char/bro +module_param(phys_addr, uint, 0644); +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); -diff -Nur linux-4.1.20/drivers/char/broadcom/vc_sm/Makefile linux-rpi/drivers/char/broadcom/vc_sm/Makefile ---- linux-4.1.20/drivers/char/broadcom/vc_sm/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_sm/Makefile 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/vc_sm/Makefile linux-4.1.22/drivers/char/broadcom/vc_sm/Makefile +--- linux-4.1.22.orig/drivers/char/broadcom/vc_sm/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/vc_sm/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,21 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs -O2 + @@ -22572,9 +22572,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/vc_sm/Makefile linux-rpi/drivers/ch +vc-sm-objs := \ + vmcs_sm.o \ + vc_vchi_sm.o -diff -Nur linux-4.1.20/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vc_vchi_sm.c ---- linux-4.1.20/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-4.1.22/drivers/char/broadcom/vc_sm/vc_vchi_sm.c +--- linux-4.1.22.orig/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,492 @@ +/***************************************************************************** +* Copyright 2011-2012 Broadcom Corporation. All rights reserved. @@ -23068,9 +23068,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi/driver + return vc_vchi_sm_send_msg(handle, VC_SM_MSG_TYPE_ACTION_CLEAN, + msg, sizeof(*msg), 0, 0, 0, 0); +} -diff -Nur linux-4.1.20/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vmcs_sm.c ---- linux-4.1.20/drivers/char/broadcom/vc_sm/vmcs_sm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vc_sm/vmcs_sm.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-4.1.22/drivers/char/broadcom/vc_sm/vmcs_sm.c +--- linux-4.1.22.orig/drivers/char/broadcom/vc_sm/vmcs_sm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/vc_sm/vmcs_sm.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,3211 @@ +/***************************************************************************** +* Copyright 2011-2012 Broadcom Corporation. All rights reserved. @@ -26283,9 +26283,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi/drivers/c +MODULE_AUTHOR("Broadcom"); +MODULE_DESCRIPTION("VideoCore SharedMemory Driver"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/drivers/char/broadcom/vcio.c linux-rpi/drivers/char/broadcom/vcio.c ---- linux-4.1.20/drivers/char/broadcom/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/broadcom/vcio.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/broadcom/vcio.c linux-4.1.22/drivers/char/broadcom/vcio.c +--- linux-4.1.22.orig/drivers/char/broadcom/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/broadcom/vcio.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2010 Broadcom @@ -26462,9 +26462,9 @@ diff -Nur linux-4.1.20/drivers/char/broadcom/vcio.c linux-rpi/drivers/char/broad +MODULE_AUTHOR("Noralf Trønnes"); +MODULE_DESCRIPTION("Mailbox userspace access"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_random/Kconfig ---- linux-4.1.20/drivers/char/hw_random/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/char/hw_random/Kconfig 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/hw_random/Kconfig linux-4.1.22/drivers/char/hw_random/Kconfig +--- linux-4.1.22.orig/drivers/char/hw_random/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/char/hw_random/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -90,7 +90,7 @@ config HW_RANDOM_BCM2835 @@ -26492,9 +26492,9 @@ diff -Nur linux-4.1.20/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_ config HW_RANDOM_MSM tristate "Qualcomm SoCs Random Number Generator support" depends on HW_RANDOM && ARCH_QCOM -diff -Nur linux-4.1.20/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw_random/Makefile ---- linux-4.1.20/drivers/char/hw_random/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/char/hw_random/Makefile 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/hw_random/Makefile linux-4.1.22/drivers/char/hw_random/Makefile +--- linux-4.1.22.orig/drivers/char/hw_random/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/char/hw_random/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -4,6 +4,7 @@ obj-$(CONFIG_HW_RANDOM) += rng-core.o @@ -26503,9 +26503,9 @@ diff -Nur linux-4.1.20/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw obj-$(CONFIG_HW_RANDOM_TIMERIOMEM) += timeriomem-rng.o obj-$(CONFIG_HW_RANDOM_INTEL) += intel-rng.o obj-$(CONFIG_HW_RANDOM_AMD) += amd-rng.o -diff -Nur linux-4.1.20/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/char/hw_random/bcm2708-rng.c ---- linux-4.1.20/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/char/hw_random/bcm2708-rng.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/char/hw_random/bcm2708-rng.c linux-4.1.22/drivers/char/hw_random/bcm2708-rng.c +--- linux-4.1.22.orig/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/char/hw_random/bcm2708-rng.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,118 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -26625,9 +26625,9 @@ diff -Nur linux-4.1.20/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/ch + +MODULE_DESCRIPTION("BCM2708 H/W Random Number Generator (RNG) driver"); +MODULE_LICENSE("GPL and additional rights"); -diff -Nur linux-4.1.20/drivers/clk/Makefile linux-rpi/drivers/clk/Makefile ---- linux-4.1.20/drivers/clk/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/clk/Makefile 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/clk/Makefile linux-4.1.22/drivers/clk/Makefile +--- linux-4.1.22.orig/drivers/clk/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/clk/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -19,11 +19,11 @@ obj-$(CONFIG_MACH_ASM9260) += clk-asm9260.o obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o @@ -26650,17 +26650,17 @@ diff -Nur linux-4.1.20/drivers/clk/Makefile linux-rpi/drivers/clk/Makefile obj-$(CONFIG_ARCH_BERLIN) += berlin/ obj-$(CONFIG_ARCH_HI3xxx) += hisilicon/ obj-$(CONFIG_ARCH_HIP04) += hisilicon/ -diff -Nur linux-4.1.20/drivers/clk/bcm/Makefile linux-rpi/drivers/clk/bcm/Makefile ---- linux-4.1.20/drivers/clk/bcm/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/clk/bcm/Makefile 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/clk/bcm/Makefile linux-4.1.22/drivers/clk/bcm/Makefile +--- linux-4.1.22.orig/drivers/clk/bcm/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/clk/bcm/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -2,3 +2,4 @@ obj-$(CONFIG_CLK_BCM_KONA) += clk-kona-setup.o obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm281xx.o obj-$(CONFIG_CLK_BCM_KONA) += clk-bcm21664.o +obj-$(CONFIG_ARCH_BCM2835)$(CONFIG_ARCH_BCM2708)$(CONFIG_ARCH_BCM2709) += clk-bcm2835.o -diff -Nur linux-4.1.20/drivers/clk/bcm/clk-bcm2835.c linux-rpi/drivers/clk/bcm/clk-bcm2835.c ---- linux-4.1.20/drivers/clk/bcm/clk-bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/clk/bcm/clk-bcm2835.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/clk/bcm/clk-bcm2835.c linux-4.1.22/drivers/clk/bcm/clk-bcm2835.c +--- linux-4.1.22.orig/drivers/clk/bcm/clk-bcm2835.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/clk/bcm/clk-bcm2835.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,1581 @@ +/* + * Copyright (C) 2010,2015 Broadcom @@ -28243,9 +28243,9 @@ diff -Nur linux-4.1.20/drivers/clk/bcm/clk-bcm2835.c linux-rpi/drivers/clk/bcm/c +MODULE_AUTHOR("Eric Anholt "); +MODULE_DESCRIPTION("BCM2835 clock driver"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/drivers/clk/clk-bcm2835.c linux-rpi/drivers/clk/clk-bcm2835.c ---- linux-4.1.20/drivers/clk/clk-bcm2835.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/clk/clk-bcm2835.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/clk/clk-bcm2835.c linux-4.1.22/drivers/clk/clk-bcm2835.c +--- linux-4.1.22.orig/drivers/clk/clk-bcm2835.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/clk/clk-bcm2835.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2010 Broadcom @@ -28307,9 +28307,9 @@ diff -Nur linux-4.1.20/drivers/clk/clk-bcm2835.c linux-rpi/drivers/clk/clk-bcm28 - if (ret) - pr_err("uart1_pclk alias not registered\n"); -} -diff -Nur linux-4.1.20/drivers/clk/clk-hifiberry-dacpro.c linux-rpi/drivers/clk/clk-hifiberry-dacpro.c ---- linux-4.1.20/drivers/clk/clk-hifiberry-dacpro.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/clk/clk-hifiberry-dacpro.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/clk/clk-hifiberry-dacpro.c linux-4.1.22/drivers/clk/clk-hifiberry-dacpro.c +--- linux-4.1.22.orig/drivers/clk/clk-hifiberry-dacpro.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/clk/clk-hifiberry-dacpro.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,160 @@ +/* + * Clock Driver for HiFiBerry DAC Pro @@ -28471,9 +28471,9 @@ diff -Nur linux-4.1.20/drivers/clk/clk-hifiberry-dacpro.c linux-rpi/drivers/clk/ +MODULE_DESCRIPTION("HiFiBerry DAC Pro clock driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:clk-hifiberry-dacpro"); -diff -Nur linux-4.1.20/drivers/clocksource/arm_arch_timer.c linux-rpi/drivers/clocksource/arm_arch_timer.c ---- linux-4.1.20/drivers/clocksource/arm_arch_timer.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/clocksource/arm_arch_timer.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/clocksource/arm_arch_timer.c linux-4.1.22/drivers/clocksource/arm_arch_timer.c +--- linux-4.1.22.orig/drivers/clocksource/arm_arch_timer.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/clocksource/arm_arch_timer.c 2016-04-29 18:02:46.000000000 +0200 @@ -882,3 +882,39 @@ acpi_table_parse(ACPI_SIG_GTDT, arch_timer_acpi_init); } @@ -28514,9 +28514,9 @@ diff -Nur linux-4.1.20/drivers/clocksource/arm_arch_timer.c linux-rpi/drivers/cl + arch_timer_common_init(); + return 0; +} -diff -Nur linux-4.1.20/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kconfig.arm ---- linux-4.1.20/drivers/cpufreq/Kconfig.arm 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/cpufreq/Kconfig.arm 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/cpufreq/Kconfig.arm linux-4.1.22/drivers/cpufreq/Kconfig.arm +--- linux-4.1.22.orig/drivers/cpufreq/Kconfig.arm 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/cpufreq/Kconfig.arm 2016-04-29 18:02:46.000000000 +0200 @@ -258,6 +258,15 @@ help This adds the CPUFreq driver support for SPEAr SOCs. @@ -28533,9 +28533,9 @@ diff -Nur linux-4.1.20/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kco config ARM_TEGRA_CPUFREQ bool "TEGRA CPUFreq support" depends on ARCH_TEGRA -diff -Nur linux-4.1.20/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefile ---- linux-4.1.20/drivers/cpufreq/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/cpufreq/Makefile 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/cpufreq/Makefile linux-4.1.22/drivers/cpufreq/Makefile +--- linux-4.1.22.orig/drivers/cpufreq/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/cpufreq/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -77,6 +77,7 @@ obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o @@ -28544,9 +28544,9 @@ diff -Nur linux-4.1.20/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefi obj-$(CONFIG_ARM_TEGRA_CPUFREQ) += tegra-cpufreq.o obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ) += vexpress-spc-cpufreq.o -diff -Nur linux-4.1.20/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c ---- linux-4.1.20/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/cpufreq/bcm2835-cpufreq.c linux-4.1.22/drivers/cpufreq/bcm2835-cpufreq.c +--- linux-4.1.22.orig/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/cpufreq/bcm2835-cpufreq.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,213 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -28761,9 +28761,9 @@ diff -Nur linux-4.1.20/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufr + +module_init(bcm2835_cpufreq_module_init); +module_exit(bcm2835_cpufreq_module_exit); -diff -Nur linux-4.1.20/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig ---- linux-4.1.20/drivers/dma/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/dma/Kconfig 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/dma/Kconfig linux-4.1.22/drivers/dma/Kconfig +--- linux-4.1.22.orig/drivers/dma/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/dma/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -337,6 +337,17 @@ select DMA_ENGINE select DMA_VIRTUAL_CHANNELS @@ -28791,9 +28791,9 @@ diff -Nur linux-4.1.20/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig config FSL_EDMA tristate "Freescale eDMA engine support" depends on OF -diff -Nur linux-4.1.20/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile ---- linux-4.1.20/drivers/dma/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/dma/Makefile 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/dma/Makefile linux-4.1.22/drivers/dma/Makefile +--- linux-4.1.22.orig/drivers/dma/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/dma/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -39,6 +39,7 @@ obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o obj-$(CONFIG_DMA_OMAP) += omap-dma.o @@ -28802,9 +28802,9 @@ diff -Nur linux-4.1.20/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o obj-$(CONFIG_DMA_JZ4780) += dma-jz4780.o -diff -Nur linux-4.1.20/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm2708-dmaengine.c ---- linux-4.1.20/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/dma/bcm2708-dmaengine.c 2016-03-16 19:54:01.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/dma/bcm2708-dmaengine.c linux-4.1.22/drivers/dma/bcm2708-dmaengine.c +--- linux-4.1.22.orig/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/dma/bcm2708-dmaengine.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,1314 @@ +/* + * BCM2835 DMA engine support @@ -30120,9 +30120,9 @@ diff -Nur linux-4.1.20/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm +MODULE_AUTHOR("Florian Meier "); +MODULE_AUTHOR("Gellert Weisz "); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/drivers/firmware/Kconfig linux-rpi/drivers/firmware/Kconfig ---- linux-4.1.20/drivers/firmware/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/firmware/Kconfig 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/firmware/Kconfig linux-4.1.22/drivers/firmware/Kconfig +--- linux-4.1.22.orig/drivers/firmware/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/firmware/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -136,6 +136,13 @@ bool depends on ARM || ARM64 @@ -30137,9 +30137,9 @@ diff -Nur linux-4.1.20/drivers/firmware/Kconfig linux-rpi/drivers/firmware/Kconf source "drivers/firmware/google/Kconfig" source "drivers/firmware/efi/Kconfig" -diff -Nur linux-4.1.20/drivers/firmware/Makefile linux-rpi/drivers/firmware/Makefile ---- linux-4.1.20/drivers/firmware/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/firmware/Makefile 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/firmware/Makefile linux-4.1.22/drivers/firmware/Makefile +--- linux-4.1.22.orig/drivers/firmware/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/firmware/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -13,6 +13,7 @@ obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o obj-$(CONFIG_QCOM_SCM) += qcom_scm.o @@ -30148,9 +30148,9 @@ diff -Nur linux-4.1.20/drivers/firmware/Makefile linux-rpi/drivers/firmware/Make obj-$(CONFIG_GOOGLE_FIRMWARE) += google/ obj-$(CONFIG_EFI) += efi/ -diff -Nur linux-4.1.20/drivers/firmware/raspberrypi.c linux-rpi/drivers/firmware/raspberrypi.c ---- linux-4.1.20/drivers/firmware/raspberrypi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/firmware/raspberrypi.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/firmware/raspberrypi.c linux-4.1.22/drivers/firmware/raspberrypi.c +--- linux-4.1.22.orig/drivers/firmware/raspberrypi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/firmware/raspberrypi.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,297 @@ +/* + * Defines interfaces for interacting wtih the Raspberry Pi firmware's @@ -30449,9 +30449,9 @@ diff -Nur linux-4.1.20/drivers/firmware/raspberrypi.c linux-rpi/drivers/firmware +MODULE_AUTHOR("Eric Anholt "); +MODULE_DESCRIPTION("Raspberry Pi firmware driver"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/drivers/gpio/Kconfig linux-rpi/drivers/gpio/Kconfig ---- linux-4.1.20/drivers/gpio/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpio/Kconfig 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpio/Kconfig linux-4.1.22/drivers/gpio/Kconfig +--- linux-4.1.22.orig/drivers/gpio/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpio/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -126,6 +126,12 @@ help Turn on GPIO support for Broadcom "Kona" chips. @@ -30465,9 +30465,9 @@ diff -Nur linux-4.1.20/drivers/gpio/Kconfig linux-rpi/drivers/gpio/Kconfig config GPIO_CLPS711X tristate "CLPS711X GPIO support" depends on ARCH_CLPS711X || COMPILE_TEST -diff -Nur linux-4.1.20/drivers/gpio/Makefile linux-rpi/drivers/gpio/Makefile ---- linux-4.1.20/drivers/gpio/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpio/Makefile 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpio/Makefile linux-4.1.22/drivers/gpio/Makefile +--- linux-4.1.22.orig/drivers/gpio/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpio/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -21,6 +21,7 @@ obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o @@ -30476,9 +30476,9 @@ diff -Nur linux-4.1.20/drivers/gpio/Makefile linux-rpi/drivers/gpio/Makefile obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o -diff -Nur linux-4.1.20/drivers/gpio/gpio-bcm-virt.c linux-rpi/drivers/gpio/gpio-bcm-virt.c ---- linux-4.1.20/drivers/gpio/gpio-bcm-virt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpio/gpio-bcm-virt.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpio/gpio-bcm-virt.c linux-4.1.22/drivers/gpio/gpio-bcm-virt.c +--- linux-4.1.22.orig/drivers/gpio/gpio-bcm-virt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpio/gpio-bcm-virt.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,180 @@ +/* + * brcmvirt GPIO driver @@ -30660,18 +30660,18 @@ diff -Nur linux-4.1.20/drivers/gpio/gpio-bcm-virt.c linux-rpi/drivers/gpio/gpio- +MODULE_AUTHOR("Dom Cobley "); +MODULE_DESCRIPTION("brcmvirt GPIO driver"); +MODULE_ALIAS("platform:brcmvirt-gpio"); -diff -Nur linux-4.1.20/drivers/gpu/drm/Kconfig linux-rpi/drivers/gpu/drm/Kconfig ---- linux-4.1.20/drivers/gpu/drm/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/Kconfig 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/Kconfig linux-4.1.22/drivers/gpu/drm/Kconfig +--- linux-4.1.22.orig/drivers/gpu/drm/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -217,3 +217,5 @@ source "drivers/gpu/drm/amd/amdkfd/Kconfig" source "drivers/gpu/drm/imx/Kconfig" + +source "drivers/gpu/drm/vc4/Kconfig" -diff -Nur linux-4.1.20/drivers/gpu/drm/Makefile linux-rpi/drivers/gpu/drm/Makefile ---- linux-4.1.20/drivers/gpu/drm/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/Makefile 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/Makefile linux-4.1.22/drivers/gpu/drm/Makefile +--- linux-4.1.22.orig/drivers/gpu/drm/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -46,6 +46,7 @@ obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus/ obj-$(CONFIG_DRM_SIS) += sis/ @@ -30680,9 +30680,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/Makefile linux-rpi/drivers/gpu/drm/Makefi obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ obj-$(CONFIG_DRM_VIA) +=via/ obj-$(CONFIG_DRM_VGEM) += vgem/ -diff -Nur linux-4.1.20/drivers/gpu/drm/drm_atomic_helper.c linux-rpi/drivers/gpu/drm/drm_atomic_helper.c ---- linux-4.1.20/drivers/gpu/drm/drm_atomic_helper.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/drm_atomic_helper.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/drm_atomic_helper.c linux-4.1.22/drivers/gpu/drm/drm_atomic_helper.c +--- linux-4.1.22.orig/drivers/gpu/drm/drm_atomic_helper.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/drm_atomic_helper.c 2016-04-29 18:02:46.000000000 +0200 @@ -280,6 +280,8 @@ */ encoder = conn_state->best_encoder; @@ -30711,9 +30711,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/drm_atomic_helper.c linux-rpi/drivers/gpu ret = funcs->mode_fixup(crtc, &crtc_state->mode, &crtc_state->adjusted_mode); if (!ret) { -diff -Nur linux-4.1.20/drivers/gpu/drm/drm_crtc.c linux-rpi/drivers/gpu/drm/drm_crtc.c ---- linux-4.1.20/drivers/gpu/drm/drm_crtc.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/drm_crtc.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/drm_crtc.c linux-4.1.22/drivers/gpu/drm/drm_crtc.c +--- linux-4.1.22.orig/drivers/gpu/drm/drm_crtc.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/drm_crtc.c 2016-04-29 18:02:46.000000000 +0200 @@ -613,7 +613,7 @@ if (atomic_read(&fb->refcount.refcount) > 1) { drm_modeset_lock_all(dev); @@ -30815,9 +30815,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/drm_crtc.c linux-rpi/drivers/gpu/drm/drm_ } EXPORT_SYMBOL(drm_mode_config_reset); -diff -Nur linux-4.1.20/drivers/gpu/drm/drm_crtc_helper.c linux-rpi/drivers/gpu/drm/drm_crtc_helper.c ---- linux-4.1.20/drivers/gpu/drm/drm_crtc_helper.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/drm_crtc_helper.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/drm_crtc_helper.c linux-4.1.22/drivers/gpu/drm/drm_crtc_helper.c +--- linux-4.1.22.orig/drivers/gpu/drm/drm_crtc_helper.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/drm_crtc_helper.c 2016-04-29 18:02:46.000000000 +0200 @@ -182,7 +182,7 @@ drm_warn_on_modeset_not_all_locked(dev); @@ -30961,9 +30961,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/drm_crtc_helper.c linux-rpi/drivers/gpu/d if(encoder->crtc != crtc) continue; -diff -Nur linux-4.1.20/drivers/gpu/drm/drm_fb_cma_helper.c linux-rpi/drivers/gpu/drm/drm_fb_cma_helper.c ---- linux-4.1.20/drivers/gpu/drm/drm_fb_cma_helper.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/drm_fb_cma_helper.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/drm_fb_cma_helper.c linux-4.1.22/drivers/gpu/drm/drm_fb_cma_helper.c +--- linux-4.1.22.orig/drivers/gpu/drm/drm_fb_cma_helper.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/drm_fb_cma_helper.c 2016-04-29 18:02:46.000000000 +0200 @@ -279,7 +279,7 @@ if (!fbi) { dev_err(dev->dev, "Failed to allocate framebuffer info.\n"); @@ -30984,9 +30984,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/drm_fb_cma_helper.c linux-rpi/drivers/gpu return ret; } -diff -Nur linux-4.1.20/drivers/gpu/drm/drm_fb_helper.c linux-rpi/drivers/gpu/drm/drm_fb_helper.c ---- linux-4.1.20/drivers/gpu/drm/drm_fb_helper.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/drm_fb_helper.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/drm_fb_helper.c linux-4.1.22/drivers/gpu/drm/drm_fb_helper.c +--- linux-4.1.22.orig/drivers/gpu/drm/drm_fb_helper.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/drm_fb_helper.c 2016-04-29 18:02:46.000000000 +0200 @@ -98,7 +98,7 @@ struct drm_connector *connector; int i; @@ -31032,9 +31032,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/drm_fb_helper.c linux-rpi/drivers/gpu/drm fb_helper->crtc_info[i].mode_set.crtc = crtc; i++; } -diff -Nur linux-4.1.20/drivers/gpu/drm/drm_gem_cma_helper.c linux-rpi/drivers/gpu/drm/drm_gem_cma_helper.c ---- linux-4.1.20/drivers/gpu/drm/drm_gem_cma_helper.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/drm_gem_cma_helper.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/drm_gem_cma_helper.c linux-4.1.22/drivers/gpu/drm/drm_gem_cma_helper.c +--- linux-4.1.22.orig/drivers/gpu/drm/drm_gem_cma_helper.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/drm_gem_cma_helper.c 2016-04-29 18:02:46.000000000 +0200 @@ -59,11 +59,13 @@ struct drm_gem_object *gem_obj; int ret; @@ -31071,9 +31071,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/drm_gem_cma_helper.c linux-rpi/drivers/gp return ERR_PTR(ret); } -diff -Nur linux-4.1.20/drivers/gpu/drm/drm_of.c linux-rpi/drivers/gpu/drm/drm_of.c ---- linux-4.1.20/drivers/gpu/drm/drm_of.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/drm_of.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/drm_of.c linux-4.1.22/drivers/gpu/drm/drm_of.c +--- linux-4.1.22.orig/drivers/gpu/drm/drm_of.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/drm_of.c 2016-04-29 18:02:46.000000000 +0200 @@ -19,7 +19,7 @@ unsigned int index = 0; struct drm_crtc *tmp; @@ -31083,9 +31083,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/drm_of.c linux-rpi/drivers/gpu/drm/drm_of if (tmp->port == port) return 1 << index; -diff -Nur linux-4.1.20/drivers/gpu/drm/drm_probe_helper.c linux-rpi/drivers/gpu/drm/drm_probe_helper.c ---- linux-4.1.20/drivers/gpu/drm/drm_probe_helper.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/drm_probe_helper.c 2016-03-16 19:54:02.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/drm_probe_helper.c linux-4.1.22/drivers/gpu/drm/drm_probe_helper.c +--- linux-4.1.22.orig/drivers/gpu/drm/drm_probe_helper.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/gpu/drm/drm_probe_helper.c 2016-04-29 18:02:46.000000000 +0200 @@ -313,7 +313,7 @@ goto out; @@ -31113,9 +31113,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/drm_probe_helper.c linux-rpi/drivers/gpu/ /* Only handle HPD capable connectors. */ if (!(connector->polled & DRM_CONNECTOR_POLL_HPD)) -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/Kconfig linux-rpi/drivers/gpu/drm/vc4/Kconfig ---- linux-4.1.20/drivers/gpu/drm/vc4/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/Kconfig 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/Kconfig linux-4.1.22/drivers/gpu/drm/vc4/Kconfig +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,14 @@ +config DRM_VC4 + tristate "Broadcom VC4 Graphics" @@ -31131,9 +31131,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/Kconfig linux-rpi/drivers/gpu/drm/vc4 + This driver requires that "avoid_warnings=2" be present in + the config.txt for the firmware, to keep it from smashing + our display setup. -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/Makefile linux-rpi/drivers/gpu/drm/vc4/Makefile ---- linux-4.1.20/drivers/gpu/drm/vc4/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/Makefile 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/Makefile linux-4.1.22/drivers/gpu/drm/vc4/Makefile +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,26 @@ +ccflags-y := -Iinclude/drm + @@ -31161,9 +31161,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/Makefile linux-rpi/drivers/gpu/drm/vc +obj-$(CONFIG_DRM_VC4) += vc4.o + +CFLAGS_vc4_trace_points.o := -I$(src) -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_bo.c linux-rpi/drivers/gpu/drm/vc4/vc4_bo.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_bo.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_bo.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_bo.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_bo.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_bo.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_bo.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,577 @@ +/* + * Copyright © 2015 Broadcom @@ -31742,9 +31742,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_bo.c linux-rpi/drivers/gpu/drm/vc + vc4_bo_stats_dump(vc4); + } +} -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_crtc.c linux-rpi/drivers/gpu/drm/vc4/vc4_crtc.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_crtc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_crtc.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_crtc.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_crtc.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_crtc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_crtc.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,769 @@ +/* + * Copyright (C) 2015 Broadcom @@ -32515,9 +32515,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_crtc.c linux-rpi/drivers/gpu/drm/ + .of_match_table = vc4_crtc_dt_match, + }, +}; -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_debugfs.c linux-rpi/drivers/gpu/drm/vc4/vc4_debugfs.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_debugfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_debugfs.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_debugfs.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_debugfs.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_debugfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_debugfs.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright © 2014 Broadcom @@ -32562,9 +32562,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_debugfs.c linux-rpi/drivers/gpu/d +{ + drm_debugfs_remove_files(vc4_debugfs_list, VC4_DEBUGFS_ENTRIES, minor); +} -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_drv.c linux-rpi/drivers/gpu/drm/vc4/vc4_drv.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_drv.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_drv.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_drv.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_drv.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_drv.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_drv.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,331 @@ +/* + * Copyright (C) 2014-2015 Broadcom @@ -32897,9 +32897,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_drv.c linux-rpi/drivers/gpu/drm/v +MODULE_DESCRIPTION("Broadcom VC4 DRM Driver"); +MODULE_AUTHOR("Eric Anholt "); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_drv.h linux-rpi/drivers/gpu/drm/vc4/vc4_drv.h ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_drv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_drv.h 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_drv.h linux-4.1.22/drivers/gpu/drm/vc4/vc4_drv.h +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_drv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_drv.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,463 @@ +/* + * Copyright (C) 2015 Broadcom @@ -33364,9 +33364,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_drv.h linux-rpi/drivers/gpu/drm/v +/* vc4_validate_shader.c */ +struct vc4_validated_shader_info * +vc4_validate_shader(struct drm_gem_cma_object *shader_obj); -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_gem.c linux-rpi/drivers/gpu/drm/vc4/vc4_gem.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_gem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_gem.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_gem.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_gem.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_gem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_gem.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,879 @@ +/* + * Copyright © 2014 Broadcom @@ -34247,9 +34247,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_gem.c linux-rpi/drivers/gpu/drm/v + if (vc4->hang_state) + vc4_free_hang_state(dev, vc4->hang_state); +} -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_hdmi.c linux-rpi/drivers/gpu/drm/vc4/vc4_hdmi.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_hdmi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_hdmi.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_hdmi.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_hdmi.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_hdmi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_hdmi.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,592 @@ +/* + * Copyright (C) 2015 Broadcom @@ -34843,9 +34843,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_hdmi.c linux-rpi/drivers/gpu/drm/ + .of_match_table = vc4_hdmi_dt_match, + }, +}; -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_hvs.c linux-rpi/drivers/gpu/drm/vc4/vc4_hvs.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_hvs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_hvs.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_hvs.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_hvs.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_hvs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_hvs.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2015 Broadcom @@ -35010,9 +35010,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_hvs.c linux-rpi/drivers/gpu/drm/v + .of_match_table = vc4_hvs_dt_match, + }, +}; -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_irq.c linux-rpi/drivers/gpu/drm/vc4/vc4_irq.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_irq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_irq.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_irq.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_irq.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_irq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_irq.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,210 @@ +/* + * Copyright © 2014 Broadcom @@ -35224,9 +35224,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_irq.c linux-rpi/drivers/gpu/drm/v + vc4_irq_finish_job(dev); + spin_unlock_irqrestore(&vc4->job_lock, irqflags); +} -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_kms.c linux-rpi/drivers/gpu/drm/vc4/vc4_kms.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_kms.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_kms.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_kms.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_kms.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_kms.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_kms.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,214 @@ +/* + * Copyright (C) 2015 Broadcom @@ -35442,9 +35442,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_kms.c linux-rpi/drivers/gpu/drm/v + + return 0; +} -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_packet.h linux-rpi/drivers/gpu/drm/vc4/vc4_packet.h ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_packet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_packet.h 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_packet.h linux-4.1.22/drivers/gpu/drm/vc4/vc4_packet.h +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_packet.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_packet.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,399 @@ +/* + * Copyright © 2014 Broadcom @@ -35845,9 +35845,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_packet.h linux-rpi/drivers/gpu/dr +#define VC4_TEX_P2_CXOFF_SHIFT 0 + +#endif /* VC4_PACKET_H */ -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_plane.c linux-rpi/drivers/gpu/drm/vc4/vc4_plane.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_plane.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_plane.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_plane.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_plane.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_plane.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_plane.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,386 @@ +/* + * Copyright (C) 2015 Broadcom @@ -36235,9 +36235,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_plane.c linux-rpi/drivers/gpu/drm + + return ERR_PTR(ret); +} -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_qpu_defines.h linux-rpi/drivers/gpu/drm/vc4/vc4_qpu_defines.h ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_qpu_defines.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_qpu_defines.h 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_qpu_defines.h linux-4.1.22/drivers/gpu/drm/vc4/vc4_qpu_defines.h +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_qpu_defines.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_qpu_defines.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,264 @@ +/* + * Copyright © 2014 Broadcom @@ -36503,9 +36503,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_qpu_defines.h linux-rpi/drivers/g +#define QPU_OP_ADD_MASK QPU_MASK(28, 24) + +#endif /* VC4_QPU_DEFINES_H */ -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_regs.h linux-rpi/drivers/gpu/drm/vc4/vc4_regs.h ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_regs.h 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_regs.h linux-4.1.22/drivers/gpu/drm/vc4/vc4_regs.h +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_regs.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,570 @@ +/* + * Copyright © 2014-2015 Broadcom @@ -37077,9 +37077,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_regs.h linux-rpi/drivers/gpu/drm/ +#define SCALER_SRC_PITCH_SHIFT 0 + +#endif /* VC4_REGS_H */ -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_render_cl.c linux-rpi/drivers/gpu/drm/vc4/vc4_render_cl.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_render_cl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_render_cl.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_render_cl.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_render_cl.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_render_cl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_render_cl.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,634 @@ +/* + * Copyright © 2014-2015 Broadcom @@ -37715,9 +37715,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_render_cl.c linux-rpi/drivers/gpu + + return vc4_create_rcl_bo(dev, exec, &setup); +} -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_trace.h linux-rpi/drivers/gpu/drm/vc4/vc4_trace.h ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_trace.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_trace.h 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_trace.h linux-4.1.22/drivers/gpu/drm/vc4/vc4_trace.h +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_trace.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_trace.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2015 Broadcom @@ -37782,9 +37782,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_trace.h linux-rpi/drivers/gpu/drm +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . +#include -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_trace_points.c linux-rpi/drivers/gpu/drm/vc4/vc4_trace_points.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_trace_points.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_trace_points.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_trace_points.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_trace_points.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_trace_points.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_trace_points.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,14 @@ +/* + * Copyright (C) 2015 Broadcom @@ -37800,9 +37800,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_trace_points.c linux-rpi/drivers/ +#define CREATE_TRACE_POINTS +#include "vc4_trace.h" +#endif -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_v3d.c linux-rpi/drivers/gpu/drm/vc4/vc4_v3d.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_v3d.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_v3d.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_v3d.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_v3d.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_v3d.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_v3d.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2014 The Linux Foundation. All rights reserved. @@ -38074,9 +38074,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_v3d.c linux-rpi/drivers/gpu/drm/v + .of_match_table = vc4_v3d_dt_match, + }, +}; -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_validate.c linux-rpi/drivers/gpu/drm/vc4/vc4_validate.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_validate.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_validate.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_validate.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_validate.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_validate.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_validate.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,900 @@ +/* + * Copyright © 2014 Broadcom @@ -38978,9 +38978,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_validate.c linux-rpi/drivers/gpu/ + + return ret; +} -diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_validate_shaders.c linux-rpi/drivers/gpu/drm/vc4/vc4_validate_shaders.c ---- linux-4.1.20/drivers/gpu/drm/vc4/vc4_validate_shaders.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/gpu/drm/vc4/vc4_validate_shaders.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_validate_shaders.c linux-4.1.22/drivers/gpu/drm/vc4/vc4_validate_shaders.c +--- linux-4.1.22.orig/drivers/gpu/drm/vc4/vc4_validate_shaders.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/gpu/drm/vc4/vc4_validate_shaders.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,513 @@ +/* + * Copyright © 2014 Broadcom @@ -39495,9 +39495,9 @@ diff -Nur linux-4.1.20/drivers/gpu/drm/vc4/vc4_validate_shaders.c linux-rpi/driv + } + return NULL; +} -diff -Nur linux-4.1.20/drivers/hid/usbhid/hid-core.c linux-rpi/drivers/hid/usbhid/hid-core.c ---- linux-4.1.20/drivers/hid/usbhid/hid-core.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/hid/usbhid/hid-core.c 2016-03-16 19:54:04.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/hid/usbhid/hid-core.c linux-4.1.22/drivers/hid/usbhid/hid-core.c +--- linux-4.1.22.orig/drivers/hid/usbhid/hid-core.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/hid/usbhid/hid-core.c 2016-04-29 18:02:46.000000000 +0200 @@ -49,7 +49,7 @@ * Module parameters. */ @@ -39522,9 +39522,9 @@ diff -Nur linux-4.1.20/drivers/hid/usbhid/hid-core.c linux-rpi/drivers/hid/usbhi ret = -ENOMEM; if (usb_endpoint_dir_in(endpoint)) { -diff -Nur linux-4.1.20/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/Kconfig ---- linux-4.1.20/drivers/i2c/busses/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/i2c/busses/Kconfig 2016-03-16 19:54:05.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/i2c/busses/Kconfig linux-4.1.22/drivers/i2c/busses/Kconfig +--- linux-4.1.22.orig/drivers/i2c/busses/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/i2c/busses/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -8,6 +8,25 @@ comment "PC SMBus host controller drivers" depends on PCI @@ -39560,9 +39560,9 @@ diff -Nur linux-4.1.20/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/K help If you say yes to this option, support will be included for the BCM2835 I2C controller. -diff -Nur linux-4.1.20/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/Makefile ---- linux-4.1.20/drivers/i2c/busses/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/i2c/busses/Makefile 2016-03-16 19:54:05.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/i2c/busses/Makefile linux-4.1.22/drivers/i2c/busses/Makefile +--- linux-4.1.22.orig/drivers/i2c/busses/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/i2c/busses/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -2,6 +2,8 @@ # Makefile for the i2c bus drivers. # @@ -39572,9 +39572,9 @@ diff -Nur linux-4.1.20/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/ # ACPI drivers obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o -diff -Nur linux-4.1.20/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/busses/i2c-bcm2708.c ---- linux-4.1.20/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/i2c/busses/i2c-bcm2708.c 2016-03-16 19:54:05.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/i2c/busses/i2c-bcm2708.c linux-4.1.22/drivers/i2c/busses/i2c-bcm2708.c +--- linux-4.1.22.orig/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/i2c/busses/i2c-bcm2708.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,539 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -40115,9 +40115,9 @@ diff -Nur linux-4.1.20/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/bu +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Nur linux-4.1.20/drivers/input/joystick/Kconfig linux-rpi/drivers/input/joystick/Kconfig ---- linux-4.1.20/drivers/input/joystick/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/input/joystick/Kconfig 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/input/joystick/Kconfig linux-4.1.22/drivers/input/joystick/Kconfig +--- linux-4.1.22.orig/drivers/input/joystick/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/input/joystick/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -329,4 +329,12 @@ To compile this as a module choose M here: the module will be called maplecontrol. @@ -40131,18 +40131,18 @@ diff -Nur linux-4.1.20/drivers/input/joystick/Kconfig linux-rpi/drivers/input/jo + This is the joystick driver for the Raspberry Pi Sense HAT + endif -diff -Nur linux-4.1.20/drivers/input/joystick/Makefile linux-rpi/drivers/input/joystick/Makefile ---- linux-4.1.20/drivers/input/joystick/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/input/joystick/Makefile 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/input/joystick/Makefile linux-4.1.22/drivers/input/joystick/Makefile +--- linux-4.1.22.orig/drivers/input/joystick/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/input/joystick/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -32,4 +32,5 @@ obj-$(CONFIG_JOYSTICK_XPAD) += xpad.o obj-$(CONFIG_JOYSTICK_ZHENHUA) += zhenhua.o obj-$(CONFIG_JOYSTICK_WALKERA0701) += walkera0701.o +obj-$(CONFIG_JOYSTICK_RPISENSE) += rpisense-js.o -diff -Nur linux-4.1.20/drivers/input/joystick/rpisense-js.c linux-rpi/drivers/input/joystick/rpisense-js.c ---- linux-4.1.20/drivers/input/joystick/rpisense-js.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/input/joystick/rpisense-js.c 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/input/joystick/rpisense-js.c linux-4.1.22/drivers/input/joystick/rpisense-js.c +--- linux-4.1.22.orig/drivers/input/joystick/rpisense-js.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/input/joystick/rpisense-js.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,153 @@ +/* + * Raspberry Pi Sense HAT joystick driver @@ -40297,9 +40297,9 @@ diff -Nur linux-4.1.20/drivers/input/joystick/rpisense-js.c linux-rpi/drivers/in +MODULE_DESCRIPTION("Raspberry Pi Sense HAT joystick driver"); +MODULE_AUTHOR("Serge Schneider "); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/drivers/input/touchscreen/Kconfig linux-rpi/drivers/input/touchscreen/Kconfig ---- linux-4.1.20/drivers/input/touchscreen/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/input/touchscreen/Kconfig 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/input/touchscreen/Kconfig linux-4.1.22/drivers/input/touchscreen/Kconfig +--- linux-4.1.22.orig/drivers/input/touchscreen/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/input/touchscreen/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -295,6 +295,19 @@ To compile this driver as a module, choose M here: the module will be called egalax_ts. @@ -40334,9 +40334,9 @@ diff -Nur linux-4.1.20/drivers/input/touchscreen/Kconfig linux-rpi/drivers/input config TOUCHSCREEN_MIGOR tristate "Renesas MIGO-R touchscreen" depends on SH_MIGOR && I2C -diff -Nur linux-4.1.20/drivers/input/touchscreen/Makefile linux-rpi/drivers/input/touchscreen/Makefile ---- linux-4.1.20/drivers/input/touchscreen/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/input/touchscreen/Makefile 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/input/touchscreen/Makefile linux-4.1.22/drivers/input/touchscreen/Makefile +--- linux-4.1.22.orig/drivers/input/touchscreen/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/input/touchscreen/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -29,12 +29,14 @@ obj-$(CONFIG_TOUCHSCREEN_DA9052) += da9052_tsi.o obj-$(CONFIG_TOUCHSCREEN_DYNAPRO) += dynapro.o @@ -40352,9 +40352,9 @@ diff -Nur linux-4.1.20/drivers/input/touchscreen/Makefile linux-rpi/drivers/inpu obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o obj-$(CONFIG_TOUCHSCREEN_GOODIX) += goodix.o obj-$(CONFIG_TOUCHSCREEN_ILI210X) += ili210x.o -diff -Nur linux-4.1.20/drivers/input/touchscreen/ft6236.c linux-rpi/drivers/input/touchscreen/ft6236.c ---- linux-4.1.20/drivers/input/touchscreen/ft6236.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/input/touchscreen/ft6236.c 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/input/touchscreen/ft6236.c linux-4.1.22/drivers/input/touchscreen/ft6236.c +--- linux-4.1.22.orig/drivers/input/touchscreen/ft6236.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/input/touchscreen/ft6236.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,326 @@ +/* + * FocalTech FT6236 TouchScreen driver. @@ -40682,9 +40682,9 @@ diff -Nur linux-4.1.20/drivers/input/touchscreen/ft6236.c linux-rpi/drivers/inpu +MODULE_AUTHOR("Noralf Trønnes "); +MODULE_DESCRIPTION("FocalTech FT6236 TouchScreen driver"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/drivers/input/touchscreen/rpi-ft5406.c linux-rpi/drivers/input/touchscreen/rpi-ft5406.c ---- linux-4.1.20/drivers/input/touchscreen/rpi-ft5406.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/input/touchscreen/rpi-ft5406.c 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/input/touchscreen/rpi-ft5406.c linux-4.1.22/drivers/input/touchscreen/rpi-ft5406.c +--- linux-4.1.22.orig/drivers/input/touchscreen/rpi-ft5406.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/input/touchscreen/rpi-ft5406.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,246 @@ +/* + * Driver for memory based ft5406 touchscreen @@ -40932,9 +40932,9 @@ diff -Nur linux-4.1.20/drivers/input/touchscreen/rpi-ft5406.c linux-rpi/drivers/ +MODULE_AUTHOR("Gordon Hollingworth"); +MODULE_DESCRIPTION("Touchscreen driver for memory based FT5406"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/drivers/irqchip/irq-bcm2835.c linux-rpi/drivers/irqchip/irq-bcm2835.c ---- linux-4.1.20/drivers/irqchip/irq-bcm2835.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/irqchip/irq-bcm2835.c 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/irqchip/irq-bcm2835.c linux-4.1.22/drivers/irqchip/irq-bcm2835.c +--- linux-4.1.22.orig/drivers/irqchip/irq-bcm2835.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/irqchip/irq-bcm2835.c 2016-04-29 18:02:46.000000000 +0200 @@ -56,7 +56,7 @@ #include "irqchip.h" @@ -41033,9 +41033,9 @@ diff -Nur linux-4.1.20/drivers/irqchip/irq-bcm2835.c linux-rpi/drivers/irqchip/i return 0; } -diff -Nur linux-4.1.20/drivers/leds/leds-gpio.c linux-rpi/drivers/leds/leds-gpio.c ---- linux-4.1.20/drivers/leds/leds-gpio.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/leds/leds-gpio.c 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/leds/leds-gpio.c linux-4.1.22/drivers/leds/leds-gpio.c +--- linux-4.1.22.orig/drivers/leds/leds-gpio.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/leds/leds-gpio.c 2016-04-29 18:02:46.000000000 +0200 @@ -41,6 +41,13 @@ led_dat->platform_gpio_blink_set(led_dat->gpiod, led_dat->new_level, NULL, NULL); @@ -41082,9 +41082,9 @@ diff -Nur linux-4.1.20/drivers/leds/leds-gpio.c linux-rpi/drivers/leds/leds-gpio if (template->default_state == LEDS_GPIO_DEFSTATE_KEEP) state = !!gpiod_get_value_cansleep(led_dat->gpiod); else -diff -Nur linux-4.1.20/drivers/leds/trigger/Kconfig linux-rpi/drivers/leds/trigger/Kconfig ---- linux-4.1.20/drivers/leds/trigger/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/leds/trigger/Kconfig 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/leds/trigger/Kconfig linux-4.1.22/drivers/leds/trigger/Kconfig +--- linux-4.1.22.orig/drivers/leds/trigger/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/leds/trigger/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -108,4 +108,11 @@ This enables direct flash/torch on/off by the driver, kernel space. If unsure, say Y. @@ -41097,17 +41097,17 @@ diff -Nur linux-4.1.20/drivers/leds/trigger/Kconfig linux-rpi/drivers/leds/trigg + If unsure, say Y. + endif # LEDS_TRIGGERS -diff -Nur linux-4.1.20/drivers/leds/trigger/Makefile linux-rpi/drivers/leds/trigger/Makefile ---- linux-4.1.20/drivers/leds/trigger/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/leds/trigger/Makefile 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/leds/trigger/Makefile linux-4.1.22/drivers/leds/trigger/Makefile +--- linux-4.1.22.orig/drivers/leds/trigger/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/leds/trigger/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -8,3 +8,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT) += ledtrig-transient.o obj-$(CONFIG_LEDS_TRIGGER_CAMERA) += ledtrig-camera.o +obj-$(CONFIG_LEDS_TRIGGER_INPUT) += ledtrig-input.o -diff -Nur linux-4.1.20/drivers/leds/trigger/ledtrig-input.c linux-rpi/drivers/leds/trigger/ledtrig-input.c ---- linux-4.1.20/drivers/leds/trigger/ledtrig-input.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/leds/trigger/ledtrig-input.c 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/leds/trigger/ledtrig-input.c linux-4.1.22/drivers/leds/trigger/ledtrig-input.c +--- linux-4.1.22.orig/drivers/leds/trigger/ledtrig-input.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/leds/trigger/ledtrig-input.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,54 @@ +/* + * Set LED GPIO to Input "Trigger" @@ -41163,9 +41163,9 @@ diff -Nur linux-4.1.20/drivers/leds/trigger/ledtrig-input.c linux-rpi/drivers/le +MODULE_AUTHOR("Phil Elwell "); +MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\""); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/drivers/mailbox/Kconfig linux-rpi/drivers/mailbox/Kconfig ---- linux-4.1.20/drivers/mailbox/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mailbox/Kconfig 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mailbox/Kconfig linux-4.1.22/drivers/mailbox/Kconfig +--- linux-4.1.22.orig/drivers/mailbox/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mailbox/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -60,4 +60,13 @@ An implementation of the Altera Mailbox soft core. It is used to send message between processors. Say Y here if you want to use the @@ -41180,18 +41180,18 @@ diff -Nur linux-4.1.20/drivers/mailbox/Kconfig linux-rpi/drivers/mailbox/Kconfig + BCM2835 Mailbox. + endif -diff -Nur linux-4.1.20/drivers/mailbox/Makefile linux-rpi/drivers/mailbox/Makefile ---- linux-4.1.20/drivers/mailbox/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mailbox/Makefile 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mailbox/Makefile linux-4.1.22/drivers/mailbox/Makefile +--- linux-4.1.22.orig/drivers/mailbox/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mailbox/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -11,3 +11,5 @@ obj-$(CONFIG_PCC) += pcc.o obj-$(CONFIG_ALTERA_MBOX) += mailbox-altera.o + +obj-$(CONFIG_BCM2835_MBOX) += bcm2835-mailbox.o -diff -Nur linux-4.1.20/drivers/mailbox/bcm2835-mailbox.c linux-rpi/drivers/mailbox/bcm2835-mailbox.c ---- linux-4.1.20/drivers/mailbox/bcm2835-mailbox.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/mailbox/bcm2835-mailbox.c 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mailbox/bcm2835-mailbox.c linux-4.1.22/drivers/mailbox/bcm2835-mailbox.c +--- linux-4.1.22.orig/drivers/mailbox/bcm2835-mailbox.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/mailbox/bcm2835-mailbox.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,231 @@ +/* + * Copyright (C) 2010,2015 Broadcom @@ -41424,9 +41424,9 @@ diff -Nur linux-4.1.20/drivers/mailbox/bcm2835-mailbox.c linux-rpi/drivers/mailb +MODULE_AUTHOR("Lubomir Rintel "); +MODULE_DESCRIPTION("BCM2835 mailbox IPC driver"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/drivers/mailbox/mailbox.c linux-rpi/drivers/mailbox/mailbox.c ---- linux-4.1.20/drivers/mailbox/mailbox.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mailbox/mailbox.c 2016-03-16 19:54:06.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mailbox/mailbox.c linux-4.1.22/drivers/mailbox/mailbox.c +--- linux-4.1.22.orig/drivers/mailbox/mailbox.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mailbox/mailbox.c 2016-04-29 18:02:46.000000000 +0200 @@ -304,13 +304,23 @@ unsigned long flags; int ret; @@ -41460,9 +41460,9 @@ diff -Nur linux-4.1.20/drivers/mailbox/mailbox.c linux-rpi/drivers/mailbox/mailb if (!chan || chan->cl || !try_module_get(mbox->dev->driver->owner)) { dev_dbg(dev, "%s: mailbox not free\n", __func__); mutex_unlock(&con_mutex); -diff -Nur linux-4.1.20/drivers/media/platform/Kconfig linux-rpi/drivers/media/platform/Kconfig ---- linux-4.1.20/drivers/media/platform/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/media/platform/Kconfig 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/Kconfig linux-4.1.22/drivers/media/platform/Kconfig +--- linux-4.1.22.orig/drivers/media/platform/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/media/platform/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -11,6 +11,8 @@ if V4L_PLATFORM_DRIVERS @@ -41472,9 +41472,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/Kconfig linux-rpi/drivers/media/pl source "drivers/media/platform/marvell-ccic/Kconfig" config VIDEO_VIA_CAMERA -diff -Nur linux-4.1.20/drivers/media/platform/Makefile linux-rpi/drivers/media/platform/Makefile ---- linux-4.1.20/drivers/media/platform/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/media/platform/Makefile 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/Makefile linux-4.1.22/drivers/media/platform/Makefile +--- linux-4.1.22.orig/drivers/media/platform/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/media/platform/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -2,6 +2,8 @@ # Makefile for the video capture/playback device drivers. # @@ -41484,9 +41484,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/Makefile linux-rpi/drivers/media/p obj-$(CONFIG_VIDEO_TIMBERDALE) += timblogiw.o obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/media/platform/bcm2835/Kconfig ---- linux-4.1.20/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/Kconfig 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/Kconfig linux-4.1.22/drivers/media/platform/bcm2835/Kconfig +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,25 @@ +# Broadcom VideoCore IV v4l2 camera support + @@ -41513,18 +41513,18 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/ + + +endif # VIDEO_BM2835 -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/Makefile linux-rpi/drivers/media/platform/bcm2835/Makefile ---- linux-4.1.20/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/Makefile 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/Makefile linux-4.1.22/drivers/media/platform/bcm2835/Makefile +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,5 @@ +bcm2835-v4l2-objs := bcm2835-camera.o controls.o mmal-vchiq.o + +obj-$(CONFIG_VIDEO_BCM2835_MMAL) += bcm2835-v4l2.o + +ccflags-$(CONFIG_VIDEO_BCM2835) += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c ---- linux-4.1.20/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/bcm2835-camera.c linux-4.1.22/drivers/media/platform/bcm2835/bcm2835-camera.c +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/bcm2835-camera.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,1842 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -43368,9 +43368,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi + +module_init(bm2835_mmal_init); +module_exit(bm2835_mmal_exit); -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h ---- linux-4.1.20/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/bcm2835-camera.h linux-4.1.22/drivers/media/platform/bcm2835/bcm2835-camera.h +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/bcm2835-camera.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,126 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -43498,9 +43498,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi + (pix_fmt)->pixelformat, (pix_fmt)->bytesperline, \ + (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \ +} -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/controls.c linux-rpi/drivers/media/platform/bcm2835/controls.c ---- linux-4.1.20/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/controls.c 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/controls.c linux-4.1.22/drivers/media/platform/bcm2835/controls.c +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/controls.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,1324 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -44826,9 +44826,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/controls.c linux-rpi/drive + + return 0; +} -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-common.h ---- linux-4.1.20/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-common.h 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-common.h linux-4.1.22/drivers/media/platform/bcm2835/mmal-common.h +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/mmal-common.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,53 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -44883,9 +44883,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/dr + u32 u; + u32 v; +}; -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h ---- linux-4.1.20/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-encodings.h linux-4.1.22/drivers/media/platform/bcm2835/mmal-encodings.h +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/mmal-encodings.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,127 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -45014,9 +45014,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi +/* @} MmalColorSpace List */ + +#endif /* MMAL_ENCODINGS_H */ -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h ---- linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-msg-common.h linux-4.1.22/drivers/media/platform/bcm2835/mmal-msg-common.h +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/mmal-msg-common.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,50 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -45068,9 +45068,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rp +}; + +#endif /* MMAL_MSG_COMMON_H */ -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h ---- linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-msg-format.h linux-4.1.22/drivers/media/platform/bcm2835/mmal-msg-format.h +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/mmal-msg-format.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,81 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -45153,9 +45153,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rp +}; + +#endif /* MMAL_MSG_FORMAT_H */ -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h ---- linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-msg-port.h linux-4.1.22/drivers/media/platform/bcm2835/mmal-msg-port.h +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/mmal-msg-port.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,107 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -45264,9 +45264,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/ + */ + +}; -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h ---- linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-msg.h linux-4.1.22/drivers/media/platform/bcm2835/mmal-msg.h +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/mmal-msg.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,404 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -45672,9 +45672,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drive + u8 payload[MMAL_MSG_MAX_PAYLOAD]; + } u; +}; -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-parameters.h linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h ---- linux-4.1.20/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-parameters.h linux-4.1.22/drivers/media/platform/bcm2835/mmal-parameters.h +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/mmal-parameters.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,656 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -46332,9 +46332,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-parameters.h linux-rp + u32 num_effect_params; + u32 effect_parameter[MMAL_MAX_IMAGEFX_PARAMETERS]; +}; -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c ---- linux-4.1.20/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-vchiq.c linux-4.1.22/drivers/media/platform/bcm2835/mmal-vchiq.c +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/mmal-vchiq.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,1916 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -48252,9 +48252,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/dri + kfree(instance); + return -ENODEV; +} -diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h ---- linux-4.1.20/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h 2016-03-16 19:54:07.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-vchiq.h linux-4.1.22/drivers/media/platform/bcm2835/mmal-vchiq.h +--- linux-4.1.22.orig/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/media/platform/bcm2835/mmal-vchiq.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,178 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -48434,9 +48434,9 @@ diff -Nur linux-4.1.20/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/dri + struct mmal_buffer *buf); + +#endif /* MMAL_VCHIQ_H */ -diff -Nur linux-4.1.20/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c ---- linux-4.1.20/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2016-03-16 19:54:08.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-4.1.22/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +--- linux-4.1.22.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2016-04-29 18:02:46.000000000 +0200 @@ -1755,6 +1755,10 @@ &rtl28xxu_props, "Compro VideoMate U620F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, @@ -48448,9 +48448,9 @@ diff -Nur linux-4.1.20/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers { DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a03, &rtl28xxu_props, "Leadtek WinFast DTV Dongle mini", NULL) }, { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A, -diff -Nur linux-4.1.20/drivers/mfd/Kconfig linux-rpi/drivers/mfd/Kconfig ---- linux-4.1.20/drivers/mfd/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mfd/Kconfig 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mfd/Kconfig linux-4.1.22/drivers/mfd/Kconfig +--- linux-4.1.22.orig/drivers/mfd/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mfd/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -10,6 +10,14 @@ select IRQ_DOMAIN default n @@ -48466,18 +48466,18 @@ diff -Nur linux-4.1.20/drivers/mfd/Kconfig linux-rpi/drivers/mfd/Kconfig config MFD_CS5535 tristate "AMD CS5535 and CS5536 southbridge core functions" select MFD_CORE -diff -Nur linux-4.1.20/drivers/mfd/Makefile linux-rpi/drivers/mfd/Makefile ---- linux-4.1.20/drivers/mfd/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mfd/Makefile 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mfd/Makefile linux-4.1.22/drivers/mfd/Makefile +--- linux-4.1.22.orig/drivers/mfd/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mfd/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -185,3 +185,5 @@ intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o obj-$(CONFIG_MFD_MT6397) += mt6397-core.o + +obj-$(CONFIG_MFD_RPISENSE_CORE) += rpisense-core.o -diff -Nur linux-4.1.20/drivers/mfd/rpisense-core.c linux-rpi/drivers/mfd/rpisense-core.c ---- linux-4.1.20/drivers/mfd/rpisense-core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/mfd/rpisense-core.c 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mfd/rpisense-core.c linux-4.1.22/drivers/mfd/rpisense-core.c +--- linux-4.1.22.orig/drivers/mfd/rpisense-core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/mfd/rpisense-core.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,157 @@ +/* + * Raspberry Pi Sense HAT core driver @@ -48636,9 +48636,9 @@ diff -Nur linux-4.1.20/drivers/mfd/rpisense-core.c linux-rpi/drivers/mfd/rpisens +MODULE_AUTHOR("Serge Schneider "); +MODULE_LICENSE("GPL"); + -diff -Nur linux-4.1.20/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig ---- linux-4.1.20/drivers/misc/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/misc/Kconfig 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/Kconfig linux-4.1.22/drivers/misc/Kconfig +--- linux-4.1.22.orig/drivers/misc/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/misc/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -10,6 +10,14 @@ select INPUT_POLLDEV default n @@ -48662,9 +48662,9 @@ diff -Nur linux-4.1.20/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig source "drivers/misc/mic/Kconfig" source "drivers/misc/genwqe/Kconfig" source "drivers/misc/echo/Kconfig" -diff -Nur linux-4.1.20/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile ---- linux-4.1.20/drivers/misc/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/misc/Makefile 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/Makefile linux-4.1.22/drivers/misc/Makefile +--- linux-4.1.22.orig/drivers/misc/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/misc/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -9,6 +9,7 @@ obj-$(CONFIG_INTEL_MID_PTI) += pti.o obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o @@ -48681,9 +48681,9 @@ diff -Nur linux-4.1.20/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile obj-y += mic/ obj-$(CONFIG_GENWQE) += genwqe/ obj-$(CONFIG_ECHO) += echo/ -diff -Nur linux-4.1.20/drivers/misc/bcm2835_smi.c linux-rpi/drivers/misc/bcm2835_smi.c ---- linux-4.1.20/drivers/misc/bcm2835_smi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/bcm2835_smi.c 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/bcm2835_smi.c linux-4.1.22/drivers/misc/bcm2835_smi.c +--- linux-4.1.22.orig/drivers/misc/bcm2835_smi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/bcm2835_smi.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,985 @@ +/** + * Broadcom Secondary Memory Interface driver @@ -49670,9 +49670,9 @@ diff -Nur linux-4.1.20/drivers/misc/bcm2835_smi.c linux-rpi/drivers/misc/bcm2835 +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Device driver for BCM2835's secondary memory interface"); +MODULE_AUTHOR("Luke Wren "); -diff -Nur linux-4.1.20/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc/vc04_services/Kconfig ---- linux-4.1.20/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/Kconfig 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/Kconfig linux-4.1.22/drivers/misc/vc04_services/Kconfig +--- linux-4.1.22.orig/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/Kconfig 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,9 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -49683,9 +49683,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc + BCM2708 family of products. + Defaults to Y when the Broadcom Videocore services + are included in the build, N otherwise. -diff -Nur linux-4.1.20/drivers/misc/vc04_services/Makefile linux-rpi/drivers/misc/vc04_services/Makefile ---- linux-4.1.20/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/Makefile 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/Makefile linux-4.1.22/drivers/misc/vc04_services/Makefile +--- linux-4.1.22.orig/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/Makefile 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,14 @@ +obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o + @@ -49701,9 +49701,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/Makefile linux-rpi/drivers/mis + +ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/misc/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 + -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-4.1.22/drivers/misc/vc04_services/interface/vchi/connections/connection.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,328 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -50033,9 +50033,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/connections/con +#endif /* CONNECTION_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-4.1.22/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -50241,9 +50241,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/message_drivers +#endif // _VCHI_MESSAGE_H_ + +/****************************** End of file ***********************************/ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi.h linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,378 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -50623,9 +50623,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rp +#endif /* VCHI_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,224 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -50851,9 +50851,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linu +#endif /* VCHI_CFG_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -50926,9 +50926,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_cfg_intern +//#define VCHI_RX_NANOLOCKS + +#endif /*VCHI_CFG_INTERNAL_H_*/ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi_common.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,175 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -51105,9 +51105,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_common.h l + + +#endif // VCHI_COMMON_H_ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -51151,9 +51151,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -51195,9 +51195,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h li +#include "vchiq_util.h" + +#endif -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -51241,9 +51241,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 +#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1 + +#endif /* VCHIQ_2835_H */ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,580 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -51825,9 +51825,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 + + kfree(pagelist); +} -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,2903 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -54732,9 +54732,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,220 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -54956,9 +54956,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. + + +#endif /* VCHIQ_ARM_H */ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2016-03-16 19:54:10.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -54997,9 +54997,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_buil +const char *vchiq_get_build_version(void); +const char *vchiq_get_build_time(void); +const char *vchiq_get_build_date(void); -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2010-2014 Broadcom. All rights reserved. @@ -55070,9 +55070,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg. +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -55194,9 +55194,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn + mutex_unlock(&g_connected_mutex); +} +EXPORT_SYMBOL(vchiq_add_connected_callback); -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -55248,9 +55248,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn +void vchiq_call_connected_callbacks(void); + +#endif /* VCHIQ_CONNECTED_H */ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,3929 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -59181,9 +59181,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + numBytes = 0; + } +} -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2016-04-29 18:02:46.000000000 +0200 @@ -0,0 +1,712 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -59897,9 +59897,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + size_t numBytes); + +#endif -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,383 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -60284,9 +60284,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debu +} + +#endif /* CONFIG_DEBUG_FS */ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -60340,9 +60340,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debu +void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance); + +#endif /* VCHIQ_DEBUGFS_H */ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,87 @@ +#!/usr/bin/perl -w + @@ -60431,9 +60431,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genv + return vchiq_build_time; +} +EOF -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,189 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -60624,9 +60624,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h + short *peer_version); + +#endif /* VCHIQ_IF_H */ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,131 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -60759,9 +60759,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioct +#define VCHIQ_IOC_MAX 17 + +#endif -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,458 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -61221,9 +61221,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern + + return status; +} -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -61294,9 +61294,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kill +#define mutex_lock_interruptible mutex_lock_interruptible_killable + +#endif -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -61369,9 +61369,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memd + const VCHIQ_PLATFORM_DATA_T * platform_data); + +#endif -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -61431,9 +61431,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_page +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,860 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -62295,9 +62295,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim + return ret; +} +EXPORT_SYMBOL(vchi_service_release); -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,156 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -62455,9 +62455,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + + return header; +} -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,82 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -62541,9 +62541,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util +extern VCHIQ_HEADER_T *vchiu_queue_pop(VCHIU_QUEUE_T *queue); + +#endif -diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c ---- linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c +--- linux-4.1.22.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -62604,9 +62604,9 @@ diff -Nur linux-4.1.20/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_vers +{ + return vchiq_build_time; +} -diff -Nur linux-4.1.20/drivers/mmc/core/quirks.c linux-rpi/drivers/mmc/core/quirks.c ---- linux-4.1.20/drivers/mmc/core/quirks.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mmc/core/quirks.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mmc/core/quirks.c linux-4.1.22/drivers/mmc/core/quirks.c +--- linux-4.1.22.orig/drivers/mmc/core/quirks.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mmc/core/quirks.c 2016-04-29 18:02:47.000000000 +0200 @@ -71,6 +71,7 @@ void mmc_fixup_device(struct mmc_card *card, const struct mmc_fixup *table) @@ -62626,9 +62626,9 @@ diff -Nur linux-4.1.20/drivers/mmc/core/quirks.c linux-rpi/drivers/mmc/core/quir + card->quirks |= MMC_QUIRK_BLK_NO_CMD23; } EXPORT_SYMBOL(mmc_fixup_device); -diff -Nur linux-4.1.20/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconfig ---- linux-4.1.20/drivers/mmc/host/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mmc/host/Kconfig 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mmc/host/Kconfig linux-4.1.22/drivers/mmc/host/Kconfig +--- linux-4.1.22.orig/drivers/mmc/host/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mmc/host/Kconfig 2016-04-29 18:02:47.000000000 +0200 @@ -4,6 +4,45 @@ comment "MMC/SD/SDIO Host Controller Drivers" @@ -62675,9 +62675,9 @@ diff -Nur linux-4.1.20/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconf config MMC_ARMMMCI tristate "ARM AMBA Multimedia Card Interface support" depends on ARM_AMBA -diff -Nur linux-4.1.20/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Makefile ---- linux-4.1.20/drivers/mmc/host/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mmc/host/Makefile 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mmc/host/Makefile linux-4.1.22/drivers/mmc/host/Makefile +--- linux-4.1.22.orig/drivers/mmc/host/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mmc/host/Makefile 2016-04-29 18:02:47.000000000 +0200 @@ -18,6 +18,8 @@ obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o obj-$(CONFIG_MMC_SDHCI_F_SDH30) += sdhci_f_sdh30.o @@ -62687,9 +62687,9 @@ diff -Nur linux-4.1.20/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Make obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o obj-$(CONFIG_MMC_OMAP) += omap.o -diff -Nur linux-4.1.20/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host/bcm2835-mmc.c ---- linux-4.1.20/drivers/mmc/host/bcm2835-mmc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/mmc/host/bcm2835-mmc.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mmc/host/bcm2835-mmc.c linux-4.1.22/drivers/mmc/host/bcm2835-mmc.c +--- linux-4.1.22.orig/drivers/mmc/host/bcm2835-mmc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/mmc/host/bcm2835-mmc.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1588 @@ +/* + * BCM2835 MMC host driver. @@ -64279,9 +64279,9 @@ diff -Nur linux-4.1.20/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host +MODULE_DESCRIPTION("BCM2835 SDHCI driver"); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Gellert Weisz"); -diff -Nur linux-4.1.20/drivers/mmc/host/bcm2835-sdhost.c linux-rpi/drivers/mmc/host/bcm2835-sdhost.c ---- linux-4.1.20/drivers/mmc/host/bcm2835-sdhost.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/mmc/host/bcm2835-sdhost.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mmc/host/bcm2835-sdhost.c linux-4.1.22/drivers/mmc/host/bcm2835-sdhost.c +--- linux-4.1.22.orig/drivers/mmc/host/bcm2835-sdhost.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/mmc/host/bcm2835-sdhost.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,2122 @@ +/* + * BCM2835 SD host driver. @@ -66405,9 +66405,9 @@ diff -Nur linux-4.1.20/drivers/mmc/host/bcm2835-sdhost.c linux-rpi/drivers/mmc/h +MODULE_DESCRIPTION("BCM2835 SDHost driver"); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Phil Elwell"); -diff -Nur linux-4.1.20/drivers/mtd/nand/Kconfig linux-rpi/drivers/mtd/nand/Kconfig ---- linux-4.1.20/drivers/mtd/nand/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mtd/nand/Kconfig 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mtd/nand/Kconfig linux-4.1.22/drivers/mtd/nand/Kconfig +--- linux-4.1.22.orig/drivers/mtd/nand/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mtd/nand/Kconfig 2016-04-29 18:02:47.000000000 +0200 @@ -41,6 +41,13 @@ tristate default n @@ -66422,9 +66422,9 @@ diff -Nur linux-4.1.20/drivers/mtd/nand/Kconfig linux-rpi/drivers/mtd/nand/Kconf config MTD_NAND_DENALI tristate "Support Denali NAND controller" depends on HAS_DMA -diff -Nur linux-4.1.20/drivers/mtd/nand/Makefile linux-rpi/drivers/mtd/nand/Makefile ---- linux-4.1.20/drivers/mtd/nand/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/mtd/nand/Makefile 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mtd/nand/Makefile linux-4.1.22/drivers/mtd/nand/Makefile +--- linux-4.1.22.orig/drivers/mtd/nand/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/mtd/nand/Makefile 2016-04-29 18:02:47.000000000 +0200 @@ -14,6 +14,7 @@ obj-$(CONFIG_MTD_NAND_DENALI_PCI) += denali_pci.o obj-$(CONFIG_MTD_NAND_DENALI_DT) += denali_dt.o @@ -66433,9 +66433,9 @@ diff -Nur linux-4.1.20/drivers/mtd/nand/Makefile linux-rpi/drivers/mtd/nand/Make obj-$(CONFIG_MTD_NAND_BF5XX) += bf5xx_nand.o obj-$(CONFIG_MTD_NAND_S3C2410) += s3c2410.o obj-$(CONFIG_MTD_NAND_DAVINCI) += davinci_nand.o -diff -Nur linux-4.1.20/drivers/mtd/nand/bcm2835_smi_nand.c linux-rpi/drivers/mtd/nand/bcm2835_smi_nand.c ---- linux-4.1.20/drivers/mtd/nand/bcm2835_smi_nand.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/mtd/nand/bcm2835_smi_nand.c 2016-03-16 19:54:11.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/mtd/nand/bcm2835_smi_nand.c linux-4.1.22/drivers/mtd/nand/bcm2835_smi_nand.c +--- linux-4.1.22.orig/drivers/mtd/nand/bcm2835_smi_nand.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/mtd/nand/bcm2835_smi_nand.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,268 @@ +/** + * NAND flash driver for Broadcom Secondary Memory Interface @@ -66705,9 +66705,9 @@ diff -Nur linux-4.1.20/drivers/mtd/nand/bcm2835_smi_nand.c linux-rpi/drivers/mtd +MODULE_DESCRIPTION + ("Driver for NAND chips using Broadcom Secondary Memory Interface"); +MODULE_AUTHOR("Luke Wren "); -diff -Nur linux-4.1.20/drivers/net/ethernet/microchip/enc28j60.c linux-rpi/drivers/net/ethernet/microchip/enc28j60.c ---- linux-4.1.20/drivers/net/ethernet/microchip/enc28j60.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/net/ethernet/microchip/enc28j60.c 2016-03-16 19:54:14.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/ethernet/microchip/enc28j60.c linux-4.1.22/drivers/net/ethernet/microchip/enc28j60.c +--- linux-4.1.22.orig/drivers/net/ethernet/microchip/enc28j60.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/net/ethernet/microchip/enc28j60.c 2016-04-29 18:02:47.000000000 +0200 @@ -1630,10 +1630,21 @@ return 0; } @@ -66730,9 +66730,9 @@ diff -Nur linux-4.1.20/drivers/net/ethernet/microchip/enc28j60.c linux-rpi/drive }, .probe = enc28j60_probe, .remove = enc28j60_remove, -diff -Nur linux-4.1.20/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc95xx.c ---- linux-4.1.20/drivers/net/usb/smsc95xx.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/net/usb/smsc95xx.c 2016-03-16 19:54:16.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/usb/smsc95xx.c linux-4.1.22/drivers/net/usb/smsc95xx.c +--- linux-4.1.22.orig/drivers/net/usb/smsc95xx.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/net/usb/smsc95xx.c 2016-04-29 18:02:47.000000000 +0200 @@ -59,6 +59,7 @@ #define SUSPEND_SUSPEND3 (0x08) #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ @@ -66848,9 +66848,9 @@ diff -Nur linux-4.1.20/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc usbnet_skb_return(dev, ax_skb); } -diff -Nur linux-4.1.20/drivers/net/wireless/Kconfig linux-rpi/drivers/net/wireless/Kconfig ---- linux-4.1.20/drivers/net/wireless/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/Kconfig 2016-03-16 19:54:16.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/Kconfig linux-4.1.22/drivers/net/wireless/Kconfig +--- linux-4.1.22.orig/drivers/net/wireless/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/net/wireless/Kconfig 2016-04-29 18:02:47.000000000 +0200 @@ -277,7 +277,9 @@ source "drivers/net/wireless/orinoco/Kconfig" source "drivers/net/wireless/p54/Kconfig" @@ -66862,9 +66862,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/Kconfig linux-rpi/drivers/net/wirele source "drivers/net/wireless/ti/Kconfig" source "drivers/net/wireless/zd1211rw/Kconfig" source "drivers/net/wireless/mwifiex/Kconfig" -diff -Nur linux-4.1.20/drivers/net/wireless/Makefile linux-rpi/drivers/net/wireless/Makefile ---- linux-4.1.20/drivers/net/wireless/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/Makefile 2016-03-16 19:54:16.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/Makefile linux-4.1.22/drivers/net/wireless/Makefile +--- linux-4.1.22.orig/drivers/net/wireless/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/net/wireless/Makefile 2016-04-29 18:02:47.000000000 +0200 @@ -24,7 +24,8 @@ obj-$(CONFIG_ZD1211RW) += zd1211rw/ obj-$(CONFIG_RTL8180) += rtl818x/ @@ -66884,9 +66884,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/Makefile linux-rpi/drivers/net/wirel obj-$(CONFIG_P54_COMMON) += p54/ obj-$(CONFIG_ATH_CARDS) += ath/ -diff -Nur linux-4.1.20/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c linux-rpi/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c ---- linux-4.1.20/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c linux-4.1.22/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +--- linux-4.1.22.orig/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c 2016-04-29 18:02:47.000000000 +0200 @@ -2482,6 +2482,8 @@ * preference in cfg struct to apply this to * FW later while initializing the dongle @@ -66896,9 +66896,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c linux- cfg->pwr_save = enabled; if (!check_vif_up(ifp->vif)) { -diff -Nur linux-4.1.20/drivers/net/wireless/brcm80211/brcmfmac/sdio.c linux-rpi/drivers/net/wireless/brcm80211/brcmfmac/sdio.c ---- linux-4.1.20/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio.c linux-4.1.22/drivers/net/wireless/brcm80211/brcmfmac/sdio.c +--- linux-4.1.22.orig/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/net/wireless/brcm80211/brcmfmac/sdio.c 2016-04-29 18:02:47.000000000 +0200 @@ -609,6 +609,8 @@ #define BCM4334_NVRAM_NAME "brcm/brcmfmac4334-sdio.txt" #define BCM43340_FIRMWARE_NAME "brcm/brcmfmac43340-sdio.bin" @@ -66925,9 +66925,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/brcm80211/brcmfmac/sdio.c linux-rpi/ { BRCM_CC_4335_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4335) }, { BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, BRCMF_FIRMWARE_NVRAM(BCM43362) }, { BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, BRCMF_FIRMWARE_NVRAM(BCM4339) }, -diff -Nur linux-4.1.20/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-rpi/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h ---- linux-4.1.20/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linux-4.1.22/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +--- linux-4.1.22.orig/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h 2016-04-29 18:02:47.000000000 +0200 @@ -34,6 +34,7 @@ #define BRCM_CC_4330_CHIP_ID 0x4330 #define BRCM_CC_4334_CHIP_ID 0x4334 @@ -66936,9 +66936,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h linu #define BRCM_CC_43362_CHIP_ID 43362 #define BRCM_CC_4335_CHIP_ID 0x4335 #define BRCM_CC_4339_CHIP_ID 0x4339 -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/Kconfig linux-rpi/drivers/net/wireless/mediatek/Kconfig ---- linux-4.1.20/drivers/net/wireless/mediatek/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/Kconfig 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/Kconfig linux-4.1.22/drivers/net/wireless/mediatek/Kconfig +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/Kconfig 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,10 @@ +menuconfig WL_MEDIATEK + bool "Mediatek Wireless LAN support" @@ -66950,14 +66950,14 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/Kconfig linux-rpi/drivers/n +if WL_MEDIATEK +source "drivers/net/wireless/mediatek/mt7601u/Kconfig" +endif # WL_MEDIATEK -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/Makefile linux-rpi/drivers/net/wireless/mediatek/Makefile ---- linux-4.1.20/drivers/net/wireless/mediatek/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/Makefile 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/Makefile linux-4.1.22/drivers/net/wireless/mediatek/Makefile +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/Makefile 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_MT7601U) += mt7601u/ -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/Kconfig linux-rpi/drivers/net/wireless/mediatek/mt7601u/Kconfig ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/Kconfig 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/Kconfig linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/Kconfig +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/Kconfig 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,6 @@ +config MT7601U + tristate "MediaTek MT7601U (USB) support" @@ -66965,9 +66965,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/Kconfig linux-rpi/d + depends on USB + ---help--- + This adds support for MT7601U-based wireless USB dongles. -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/Makefile linux-rpi/drivers/net/wireless/mediatek/mt7601u/Makefile ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/Makefile 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/Makefile linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/Makefile +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/Makefile 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,9 @@ +ccflags-y += -D__CHECK_ENDIAN__ + @@ -66978,9 +66978,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/Makefile linux-rpi/ + mac.o util.o debugfs.o tx.o + +CFLAGS_trace.o := -I$(src) -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/core.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/core.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/core.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/core.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/core.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/core.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -67060,9 +67060,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/core.c linux-rpi/dr + + return false; +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/debugfs.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/debugfs.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/debugfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/debugfs.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/debugfs.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/debugfs.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/debugfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/debugfs.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,172 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -67236,9 +67236,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/debugfs.c linux-rpi + debugfs_create_file("eeprom_param", S_IRUSR, dir, dev, + &fops_eeprom_param); +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/dma.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/dma.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/dma.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/dma.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/dma.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/dma.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,529 @@ +/* + * Copyright (C) 2015 Jakub Kicinski @@ -67769,9 +67769,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/dma.c linux-rpi/dri + + tasklet_kill(&dev->tx_tasklet); +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/dma.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/dma.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/dma.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/dma.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/dma.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/dma.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -67900,9 +67900,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/dma.h linux-rpi/dri +}; + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/eeprom.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/eeprom.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/eeprom.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/eeprom.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/eeprom.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/eeprom.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/eeprom.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/eeprom.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,418 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -68322,9 +68322,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/eeprom.c linux-rpi/ + kfree(eeprom); + return ret; +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/eeprom.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/eeprom.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/eeprom.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/eeprom.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/eeprom.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/eeprom.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/eeprom.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/eeprom.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -68477,9 +68477,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/eeprom.h linux-rpi/ +} + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/init.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/init.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/init.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/init.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/init.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/init.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,630 @@ +/* + * (c) Copyright 2002-2010, Ralink Technology, Inc. @@ -69111,9 +69111,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/init.c linux-rpi/dr + + return 0; +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/initvals.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/initvals.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/initvals.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/initvals.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/initvals.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/initvals.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/initvals.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/initvals.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,164 @@ +/* + * (c) Copyright 2002-2010, Ralink Technology, Inc. @@ -69279,9 +69279,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/initvals.h linux-rp +}; + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/initvals_phy.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/initvals_phy.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/initvals_phy.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/initvals_phy.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/initvals_phy.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/initvals_phy.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/initvals_phy.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/initvals_phy.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,291 @@ +/* + * (c) Copyright 2002-2010, Ralink Technology, Inc. @@ -69574,9 +69574,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/initvals_phy.h linu +}; + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mac.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/mac.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/mac.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mac.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mac.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mac.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,577 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -70155,9 +70155,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mac.c linux-rpi/dri + + return 0; +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mac.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/mac.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mac.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/mac.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mac.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mac.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mac.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mac.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,178 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -70337,9 +70337,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mac.h linux-rpi/dri +void mt76_send_tx_status(struct mt7601u_dev *dev, struct mt76_tx_status *stat); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/main.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/main.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/main.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/main.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/main.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/main.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/main.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/main.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,413 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -70754,9 +70754,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/main.c linux-rpi/dr + .sta_rate_tbl_update = mt76_sta_rate_tbl_update, + .set_rts_threshold = mt7601u_set_rts_threshold, +}; -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mcu.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/mcu.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mcu.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/mcu.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mcu.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mcu.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mcu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mcu.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,534 @@ +/* + * (c) Copyright 2002-2010, Ralink Technology, Inc. @@ -71292,9 +71292,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mcu.c linux-rpi/dri + usb_kill_urb(dev->mcu.resp.urb); + mt7601u_usb_free_buf(dev, &dev->mcu.resp); +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mcu.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/mcu.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mcu.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/mcu.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mcu.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mcu.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mcu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mcu.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -71390,9 +71390,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mcu.h linux-rpi/dri +int mt7601u_mcu_tssi_read_kick(struct mt7601u_dev *dev, int use_hvga); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mt7601u.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/mt7601u.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mt7601u.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/mt7601u.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mt7601u.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mt7601u.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/mt7601u.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/mt7601u.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,396 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -71790,9 +71790,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/mt7601u.h linux-rpi + struct mt76_wcid *wcid, int hw_q); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/phy.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/phy.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/phy.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/phy.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/phy.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/phy.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/phy.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/phy.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1251 @@ +/* + * (c) Copyright 2002-2010, Ralink Technology, Inc. @@ -73045,9 +73045,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/phy.c linux-rpi/dri + + return 0; +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/regs.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/regs.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/regs.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/regs.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/regs.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/regs.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,636 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -73685,9 +73685,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/regs.h linux-rpi/dr +}; + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/trace.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/trace.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/trace.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/trace.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/trace.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/trace.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/trace.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/trace.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -73710,9 +73710,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/trace.c linux-rpi/d +#include "trace.h" + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/trace.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/trace.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/trace.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/trace.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/trace.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/trace.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/trace.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/trace.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,400 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -74114,9 +74114,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/trace.h linux-rpi/d +#define TRACE_INCLUDE_FILE trace + +#include -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/tx.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/tx.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/tx.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/tx.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/tx.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/tx.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/tx.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/tx.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,322 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -74440,9 +74440,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/tx.c linux-rpi/driv + + return 0; +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/usb.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/usb.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/usb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/usb.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/usb.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/usb.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/usb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/usb.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,362 @@ +/* + * Copyright (C) 2015 Jakub Kicinski @@ -74806,9 +74806,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/usb.c linux-rpi/dri + .disable_hub_initiated_lpm = 1, +}; +module_usb_driver(mt7601u_driver); -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/usb.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/usb.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/usb.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/usb.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/usb.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/usb.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2015 Jakub Kicinski @@ -74889,9 +74889,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/usb.h linux-rpi/dri + const u16 offset, const u32 val); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/util.c linux-rpi/drivers/net/wireless/mediatek/mt7601u/util.c ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/util.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/util.c linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/util.c +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/util.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -74935,9 +74935,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/util.c linux-rpi/dr + skb->data[len + 1] = 0; + return 0; +} -diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/util.h linux-rpi/drivers/net/wireless/mediatek/mt7601u/util.h ---- linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/mediatek/mt7601u/util.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/util.h linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/util.h +--- linux-4.1.22.orig/drivers/net/wireless/mediatek/mt7601u/util.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/mediatek/mt7601u/util.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2014 Felix Fietkau @@ -75016,9 +75016,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/mediatek/mt7601u/util.h linux-rpi/dr + }) + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi/drivers/net/wireless/rtl8192cu/Kconfig ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/Kconfig 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/Kconfig linux-4.1.22/drivers/net/wireless/rtl8192cu/Kconfig +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/Kconfig 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,9 @@ +config RTL8192CU + tristate "Realtek 8192C USB WiFi" @@ -75029,9 +75029,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi/drivers/ + ---help--- + This option adds the Realtek RTL8192CU USB device such as Edimax EW-7811Un. + -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/Makefile linux-rpi/drivers/net/wireless/rtl8192cu/Makefile ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/Makefile 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/Makefile linux-4.1.22/drivers/net/wireless/rtl8192cu/Makefile +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/Makefile 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,615 @@ +EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) +EXTRA_CFLAGS += -O1 @@ -75648,18 +75648,18 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/Makefile linux-rpi/drivers + cd os_dep/linux ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko + cd os_dep ; rm -fr *.mod.c *.mod *.o .*.cmd *.ko +endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/clean linux-rpi/drivers/net/wireless/rtl8192cu/clean ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/clean 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/clean 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/clean linux-4.1.22/drivers/net/wireless/rtl8192cu/clean +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/clean 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/clean 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,5 @@ +#!/bin/bash +rmmod 8192cu +rmmod 8192ce +rmmod 8192du +rmmod 8192de -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c linux-rpi/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1145 @@ +/****************************************************************************** + * @@ -76806,9 +76806,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c lin +} +#endif //CONFIG_ADAPTOR_INFO_CACHING_FILE +#endif //PLATFORM_LINUX -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ap.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ap.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ap.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ap.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ap.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,2939 @@ +/****************************************************************************** + * @@ -79749,9 +79749,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ap.c linux-rpi/dr + +#endif //CONFIG_NATIVEAP_MLME +#endif //CONFIG_AP_MODE -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1699 @@ +/****************************************************************************** + * @@ -81452,9 +81452,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rp +} + +#endif // CONFIG_BR_EXT -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,3034 @@ +/****************************************************************************** + * @@ -84490,9 +84490,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi/d +_func_exit_; + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_debug.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_debug.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_debug.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1336 @@ +/****************************************************************************** + * @@ -85830,9 +85830,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi +#endif /* CONFIG_DM_ADAPTIVITY */ + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,422 @@ +/****************************************************************************** + * @@ -86256,9 +86256,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rp + +_func_exit_; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1914 @@ +/****************************************************************************** + * @@ -88174,9 +88174,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux + action = (action >= ACT_PUBLIC_MAX) ? ACT_PUBLIC_MAX : action; + return _action_public_str[action]; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_io.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_io.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_io.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_io.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_io.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_io.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,462 @@ +/****************************************************************************** + * @@ -88640,9 +88640,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi/dr + return _rtw_writeN(adapter, addr, length, data); +} +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,195 @@ +/****************************************************************************** + * @@ -88839,9 +88839,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c lin + return _TRUE; +} +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1031 @@ +/****************************************************************************** + * @@ -89874,9 +89874,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux + return status; +} +//************** oid_rtl_seg_03_00 section end ************** -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1493 @@ +/****************************************************************************** + * @@ -91371,9 +91371,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux + DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" band:%d fail\n", FUNC_ADPT_ARG(adapter), band); + return _FAIL; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_iol.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_iol.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_iol.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,262 @@ +/****************************************************************************** + * @@ -91637,9 +91637,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi/d +} + +#endif //CONFIG_IOL -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,3966 @@ +/****************************************************************************** + * @@ -95607,9 +95607,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi/ + return _FALSE; +} +#endif //CONFIG_CONCURRENT_MODE -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,13599 @@ +/****************************************************************************** + * @@ -109210,9 +109210,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux- +#endif //CONFIG_TDLS + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_mp.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_mp.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1323 @@ +/****************************************************************************** + * @@ -110537,9 +110537,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi/dr +} + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,2953 @@ +/****************************************************************************** + * @@ -113494,9 +113494,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux- + return 0; +#endif +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,5293 @@ +/****************************************************************************** + * @@ -118791,9 +118791,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi/d +} + +#endif //CONFIG_P2P -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1538 @@ +/****************************************************************************** + * @@ -120333,9 +120333,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-r + } + return 0; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_recv.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_recv.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_recv.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,4286 @@ +/****************************************************************************** + * @@ -124623,9 +124623,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi/ + +} +#endif //CONFIG_NEW_SIGNAL_STAT_PROCESS -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_rf.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_rf.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_rf.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,94 @@ +/****************************************************************************** + * @@ -124721,9 +124721,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi/dr + + return ch; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_security.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_security.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_security.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_security.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_security.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_security.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,3114 @@ +/****************************************************************************** + * @@ -127839,9 +127839,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux- + + return status; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,351 @@ +/****************************************************************************** + * @@ -128194,9 +128194,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_sreset.c linux-rp + DBG_871X("%s done in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start)); +#endif +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,847 @@ +/****************************************************************************** + * @@ -129045,9 +129045,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-r + return res; + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,2940 @@ +/****************************************************************************** + * @@ -131989,9 +131989,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_tdls.c linux-rpi/ +} + +#endif //CONFIG_TDLS -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,2304 @@ +/****************************************************************************** + * @@ -134297,9 +134297,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux +exit: + return status; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,4155 @@ +/****************************************************************************** + * @@ -138456,9 +138456,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi/ + } +} +#endif //CONFIG_XMIT_ACK -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,175 @@ +/****************************************************************************** + * @@ -138635,9 +138635,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/HalPwrSeqCmd.c linux-r + + return _TRUE; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/dm.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/dm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/dm.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/dm.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/dm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/dm.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,313 @@ +/****************************************************************************** + * @@ -138952,9 +138952,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/dm.c linux-rpi/drivers + return; +#endif /* CONFIG_DM_ADAPTIVITY */ +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/dm.h linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/dm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/dm.h 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/dm.h linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/dm.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/dm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/dm.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,30 @@ +/****************************************************************************** + * @@ -138986,9 +138986,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/dm.h linux-rpi/drivers +void dm_adaptivity(_adapter *pAdapter); + +#endif /* __DM_H__ */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/hal_com.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_com.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/hal_com.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_com.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/hal_com.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/hal_com.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/hal_com.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/hal_com.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,370 @@ +/****************************************************************************** + * @@ -139360,9 +139360,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/hal_com.c linux-rpi/dr +exit: + return ret; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/hal_intf.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_intf.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/hal_intf.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/hal_intf.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/hal_intf.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,545 @@ +/****************************************************************************** + * @@ -139909,9 +139909,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/hal_intf.c linux-rpi/d +{ + return adapter->HalFunc.c2h_id_filter_ccx; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1154 @@ +/****************************************************************************** + * @@ -141067,9 +141067,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd. +} + +#endif //CONFIG_WOWLAN -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,5055 @@ +/****************************************************************************** + * @@ -146126,9 +146126,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c + } + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,3627 @@ +/****************************************************************************** + * @@ -149757,9 +149757,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_ + pHalFunc->c2h_handler = c2h_handler_8192c; + pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_8192c; +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1207 @@ +/****************************************************************************** + * @@ -150968,9 +150968,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c +} + +#endif // CONFIG_MP_INCLUDE -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,4840 @@ +/****************************************************************************** + * @@ -155812,9 +155812,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phyc + _PHY_SetRFPathSwitch(pAdapter, bMain, _FALSE); + } +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1030 @@ +/****************************************************************************** + * @@ -156846,9 +156846,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf60 +} /* PHY_RFShadowRead */ + +/* End of HalRf6052.c */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,874 @@ +/****************************************************************************** + * @@ -157724,9 +157724,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxde + //Offset 20 + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,93 @@ +/****************************************************************************** + * @@ -157821,9 +157821,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sres + } +} +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 2016-03-16 19:54:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,62 @@ +/****************************************************************************** + * @@ -157887,9 +157887,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_xmit + } +} +#endif //CONFIG_XMIT_ACK -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,8757 @@ +/****************************************************************************** + * @@ -166648,9 +166648,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CU +0xc78,0x621e001e, +0xc78,0x621f001e, +}; -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,2557 @@ +/****************************************************************************** + * @@ -169209,9 +169209,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CU +0x94,0x01,0x40,0x1e,0x90,0xfd,0x11,0xe0,0xb5,0x05,0x14,0x90,0x01,0x17,0xe0,0xb5, +0x05,0x07,0x90,0xfd,0x11,0xe4,0xf0,0x80,0x06,0xed,0x04,0x90,0xfd,0x11,0xf0,0xe4, +0x2f,0xff,0x22,0x00,0x18,0x58,}; -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,2674 @@ +/****************************************************************************** + * @@ -171887,9 +171887,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu + DeInitLed871x( &(ledpriv->SwLed0) ); + DeInitLed871x( &(ledpriv->SwLed1) ); +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,227 @@ +/****************************************************************************** + * @@ -172118,9 +172118,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu +#endif + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1149 @@ +/****************************************************************************** + * @@ -173271,9 +173271,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu + +} +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,6260 @@ +/****************************************************************************** + * @@ -179535,9 +179535,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halin +_func_exit_; + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1205 @@ +/****************************************************************************** + * @@ -180744,9 +180744,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_c + return ret; + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1535 @@ +/****************************************************************************** + * @@ -182283,9 +182283,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_l + _func_exit_; + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1264 @@ +/****************************************************************************** + * @@ -183551,18 +183551,18 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_x + return ret; + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 linux-rpi/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 linux-4.1.22/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,4 @@ +#DHCP client +DEVICE=wlan0 +BOOTPROTO=dhcp +ONBOOT=yes \ No newline at end of file -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,85 @@ +/****************************************************************************** + * @@ -183649,9 +183649,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h l +extern u32 Rtl8192CEAGCTAB_1TArray[AGCTAB_1TArrayLength]; + +#endif //__INC_HAL8192CE_FW_IMG_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,427 @@ +/****************************************************************************** + * @@ -184080,9 +184080,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h l +#define PHY_SetMacReg PHY_SetBBReg + +#endif // __INC_HAL8192CPHYCFG_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1122 @@ +/****************************************************************************** + * @@ -185206,9 +185206,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h l + + +#endif //__INC_HAL8192SPHYREG_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,105 @@ +/****************************************************************************** + * @@ -185315,9 +185315,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h l +extern u32 Rtl8192CUAGCTAB_1T_HPArray[AGCTAB_1T_HPArrayLength]; + +#endif //__INC_HAL8192CU_FW_IMG_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,33 @@ +/****************************************************************************** + * @@ -185352,9 +185352,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wow +extern u8 Rtl8192CUFwUMCBCutWWImgArray[UMCBCutWWImgArrayLength]; + +#endif //__INC_HAL8192CU_FW_IMG_WOWLAN_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,66 @@ +/****************************************************************************** + * @@ -185422,9 +185422,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h l +extern const u32 Rtl8192DEAGCTAB_1TArray[Rtl8192DEAGCTAB_1TArrayLength]; + +#endif //__INC_HAL8192CU_FW_IMG_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,527 @@ +/****************************************************************************** + * @@ -185953,9 +185953,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h l +#define PHY_SetMacReg PHY_SetBBReg + +#endif // __INC_HAL8192SPHYCFG_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1170 @@ +/****************************************************************************** + * @@ -187127,9 +187127,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h l + + +#endif //__INC_HAL8192SPHYREG_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,66 @@ +/****************************************************************************** + * @@ -187197,9 +187197,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h l +extern const u32 Rtl8192DUAGCTAB_1TArray[Rtl8192DUAGCTAB_1TArrayLength]; + +#endif //__INC_HAL8192CU_FW_IMG_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,29 @@ +/****************************************************************************** + * @@ -187230,9 +187230,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wow +extern u8 Rtl8192DUFwWWImgArray[DUWWImgArrayLength]; + +#endif //__INC_HAL8192DU_FW_IMG_WOWLAN_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,137 @@ +/****************************************************************************** + * @@ -187371,9 +187371,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/HalPwrSeqCmd.h lin + WLAN_PWR_CFG PwrCfgCmd[]); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/autoconf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/autoconf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/autoconf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/autoconf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/autoconf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/autoconf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,336 @@ +/****************************************************************************** + * @@ -187711,9 +187711,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-r + +//turn off power tracking when traffic is busy +//#define CONFIG_BUSY_TRAFFIC_SKIP_PWR_TRACK -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/basic_types.h linux-rpi/drivers/net/wireless/rtl8192cu/include/basic_types.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/basic_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/basic_types.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/basic_types.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/basic_types.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/basic_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/basic_types.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,320 @@ +/****************************************************************************** + * @@ -188035,9 +188035,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/basic_types.h linu +typedef unsigned char BOOLEAN,*PBOOLEAN; + +#endif //__BASIC_TYPES_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,87 @@ +/****************************************************************************** + * @@ -188126,9 +188126,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/big_endi +#include + +#endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,212 @@ +/****************************************************************************** + * @@ -188342,9 +188342,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/generic. +#endif + +#endif /* _LINUX_BYTEORDER_GENERIC_H */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,89 @@ +/****************************************************************************** + * @@ -188435,9 +188435,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/little_e +#include + +#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,140 @@ +/****************************************************************************** + * @@ -188579,9 +188579,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h l +#endif + +#endif /* _LINUX_BYTEORDER_SWAB_H */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,156 @@ +/****************************************************************************** + * @@ -188739,9 +188739,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h +#endif + +#endif /* _LINUX_BYTEORDER_SWABB_H */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/circ_buf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/circ_buf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/circ_buf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/circ_buf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/circ_buf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/circ_buf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,27 @@ +/****************************************************************************** + * @@ -188770,9 +188770,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-r +#define CIRC_SPACE(head,tail,size) CIRC_CNT((tail),((head)+1),(size)) + +#endif //_CIRC_BUF_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,35 @@ +/****************************************************************************** + * @@ -188809,9 +188809,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux- +extern struct cmd_obj *_rtw_dequeue_cmd(_queue *queue); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_conf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_conf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_conf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_conf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_conf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,77 @@ +/****************************************************************************** + * @@ -188890,9 +188890,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-r +//#include + +#endif // __DRV_CONF_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,661 @@ +/****************************************************************************** + * @@ -189555,9 +189555,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types.h linux- + + +#endif //__DRV_TYPES_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,92 @@ +/****************************************************************************** + * @@ -189651,9 +189651,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h lin + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,24 @@ +/****************************************************************************** + * @@ -189679,9 +189679,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,69 @@ +/****************************************************************************** + * @@ -189752,9 +189752,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_sdio.h l +} SDIO_DATA, *PSDIO_DATA; + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,94 @@ +/****************************************************************************** + * @@ -189850,9 +189850,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h lin + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ethernet.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ethernet.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ethernet.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ethernet.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ethernet.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ethernet.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,41 @@ +/****************************************************************************** + * @@ -189895,9 +189895,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-r + + +#endif // #ifndef __INC_ETHERNET_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-rpi/drivers/net/wireless/rtl8192cu/include/h2clbk.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/h2clbk.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/h2clbk.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/h2clbk.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/h2clbk.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/h2clbk.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,35 @@ +/****************************************************************************** + * @@ -189934,9 +189934,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-rpi +void _lbk_evt(IN PADAPTER Adapter); + +void h2c_event_callback(unsigned char *dev, unsigned char *pbuf); -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/hal_com.h linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_com.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/hal_com.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_com.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/hal_com.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/hal_com.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/hal_com.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/hal_com.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,145 @@ +/****************************************************************************** + * @@ -190083,9 +190083,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/hal_com.h linux-rp +s32 c2h_evt_read(_adapter *adapter, u8 *buf); + +#endif //__HAL_COMMON_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/hal_intf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_intf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/hal_intf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/hal_intf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/hal_intf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/hal_intf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/hal_intf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/hal_intf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,431 @@ +/****************************************************************************** + * @@ -190518,9 +190518,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/hal_intf.h linux-r +c2h_id_filter rtw_hal_c2h_id_filter_ccx(_adapter *adapter); + +#endif //__HAL_INTF_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ieee80211.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ieee80211.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ieee80211.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ieee80211.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1579 @@ +/****************************************************************************** + * @@ -192101,9 +192101,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux- +const char *action_public_str(u8 action); + +#endif /* IEEE80211_H */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,476 @@ +/****************************************************************************** + * @@ -192581,9 +192581,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h li + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-rpi/drivers/net/wireless/rtl8192cu/include/if_ether.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/if_ether.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/if_ether.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/if_ether.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/if_ether.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/if_ether.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,112 @@ +/****************************************************************************** + * @@ -192697,9 +192697,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-r + + +#endif /* _LINUX_IF_ETHER_H */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,179 @@ +/****************************************************************************** + * @@ -192880,9 +192880,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h l +#endif + +#endif //__IOCTL_CFG80211_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi/drivers/net/wireless/rtl8192cu/include/ip.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ip.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/ip.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ip.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ip.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/ip.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/ip.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,141 @@ +/****************************************************************************** + * @@ -193025,9 +193025,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi/dri +}; + +#endif /* _LINUX_IP_H */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/linux/wireless.h linux-rpi/drivers/net/wireless/rtl8192cu/include/linux/wireless.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/linux/wireless.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/linux/wireless.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/linux/wireless.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,90 @@ +/****************************************************************************** + * @@ -193119,9 +193119,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/linux/wireless.h l +}; + +#endif /* _LINUX_WIRELESS_H */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,39 @@ +/****************************************************************************** + * @@ -193162,9 +193162,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux +void rtw_reset_securitypriv( _adapter *adapter ); + +#endif //_MLME_OSDEP_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h linux-rpi/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,353 @@ +/****************************************************************************** + * @@ -193519,9 +193519,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h li +#define OID_RT_PRO_EFUSE_MAP 0xFF871217 //Q, S + +#endif //#ifndef __CUSTOM_OID_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-rpi/drivers/net/wireless/rtl8192cu/include/nic_spec.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/nic_spec.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/nic_spec.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/nic_spec.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/nic_spec.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/nic_spec.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,46 @@ +/****************************************************************************** + * @@ -193569,9 +193569,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-r + + +#endif // __RTL8711_SPEC_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,170 @@ +/****************************************************************************** + * @@ -193743,9 +193743,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h + NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \ +} +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_intf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/osdep_intf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/osdep_intf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,154 @@ +/****************************************************************************** + * @@ -193901,9 +193901,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux +void rtw_ndev_destructor(_nic_hdl ndev); + +#endif //_OSDEP_INTF_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/osdep_service.h linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_service.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/osdep_service.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/osdep_service.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/osdep_service.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/osdep_service.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/osdep_service.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/osdep_service.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1813 @@ +/****************************************************************************** + * @@ -195718,9 +195718,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/osdep_service.h li +void rtw_cbuf_free(struct rtw_cbuf *cbuf); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_hal.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/pci_hal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_hal.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/pci_hal.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/pci_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/pci_hal.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,167 @@ +/****************************************************************************** + * @@ -195889,9 +195889,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rp +#endif + +#endif //__PCIE_HAL_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_ops.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/pci_ops.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_ops.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/pci_ops.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/pci_ops.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/pci_ops.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,60 @@ +/****************************************************************************** + * @@ -195953,9 +195953,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rp +#endif + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_osintf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/pci_osintf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/pci_osintf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,32 @@ +/****************************************************************************** + * @@ -195989,9 +195989,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/recv_osdep.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/recv_osdep.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/recv_osdep.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,57 @@ +/****************************************************************************** + * @@ -196050,9 +196050,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux + + +#endif // -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,152 @@ +/****************************************************************************** + * @@ -196206,9 +196206,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h lin +#endif // CONFIG_WOWLAN + +#endif // __RTL8192C_CMD_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,515 @@ +/****************************************************************************** + * @@ -196725,9 +196725,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linu +#endif + +#endif //__HAL8190PCIDM_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,26 @@ +/****************************************************************************** + * @@ -196755,9 +196755,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h l + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,934 @@ +/****************************************************************************** + * @@ -197693,9 +197693,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h lin +extern void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,41 @@ +/****************************************************************************** + * @@ -197738,9 +197738,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h lin +#endif + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,183 @@ +/****************************************************************************** + * @@ -197925,9 +197925,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h li +void rtl8192c_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *pdesc); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,91 @@ +/****************************************************************************** + * @@ -198020,9 +198020,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linu + + +#endif/* End of HalRf.h */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1864 @@ +/****************************************************************************** + * @@ -199888,9 +199888,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h li +#include "basic_types.h" + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,32 @@ +/****************************************************************************** + * @@ -199924,9 +199924,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h +extern void rtl8192c_sreset_linked_status_check(_adapter *padapter); +#endif +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,128 @@ +/****************************************************************************** + * @@ -200056,9 +200056,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h li +#endif + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,140 @@ +/****************************************************************************** + * @@ -200200,9 +200200,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h lin +#endif // CONFIG_WOWLAN + +#endif // __RTL8192D_CMD_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,420 @@ +/****************************************************************************** + * @@ -200624,9 +200624,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linu +VOID rtl8192d_dm_CheckTXPowerTracking(IN PADAPTER Adapter); + +#endif //__HAL8190PCIDM_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1125 @@ +/****************************************************************************** + * @@ -201753,9 +201753,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h lin + + +#endif //end CONFIG_MP_INCLUDED -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,42 @@ +/****************************************************************************** + * @@ -201799,9 +201799,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h lin +#endif + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,186 @@ +/****************************************************************************** + * @@ -201989,9 +201989,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h li +void rtl8192d_query_rx_desc_status(union recv_frame *precvframe, struct recv_stat *pdesc); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,96 @@ +/****************************************************************************** + * @@ -202089,9 +202089,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linu + + +#endif/* End of HalRf.h */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1840 @@ +/****************************************************************************** + * @@ -203933,9 +203933,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h li +#include "basic_types.h" + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,144 @@ +/****************************************************************************** + * @@ -204081,9 +204081,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h li + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_android.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_android.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_android.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_android.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_android.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_android.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_android.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_android.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,89 @@ +/****************************************************************************** + * @@ -204174,9 +204174,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_android.h linu +#endif /* defined(RTW_ENABLE_WIFI_CONTROL_FUNC) */ + +#endif //__RTW_ANDROID_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ap.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ap.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ap.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ap.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ap.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,63 @@ +/****************************************************************************** + * @@ -204241,9 +204241,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ap.h linux-rpi +#endif //end of CONFIG_AP_MODE + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,75 @@ +/****************************************************************************** + * @@ -204320,9 +204320,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux +void nat25_db_cleanup(_adapter *priv); + +#endif // _RTW_BR_EXT_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,39 @@ +/****************************************************************************** + * @@ -204363,9 +204363,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h li +#endif + +#endif /* _RTL871X_BYTEORDER_H_ */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1166 @@ +/****************************************************************************** + * @@ -205533,9 +205533,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rp +#endif + +#endif // _CMD_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_debug.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_debug.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_debug.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,537 @@ +/****************************************************************************** + * @@ -206074,9 +206074,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux- +#endif //CONFIG_PROC_DEBUG + +#endif //__RTW_DEBUG_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,152 @@ +/****************************************************************************** + * @@ -206230,9 +206230,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux +#endif //PLATFORM_LINUX + +#endif //__RTL871X_EEPROM_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,123 @@ +/****************************************************************************** + * @@ -206357,9 +206357,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux- +void EFUSE_ShadowRead(PADAPTER pAdapter, u8 Type, u16 Offset, u32 *Value); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_event.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_event.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_event.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_event.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_event.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_event.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,153 @@ +/****************************************************************************** + * @@ -206514,9 +206514,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux- + + +#endif // _WLANEVENT_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ht.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ht.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ht.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,49 @@ +/****************************************************************************** + * @@ -206567,9 +206567,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi +}; + +#endif //_RTL871X_HT_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_io.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_io.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_io.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_io.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,504 @@ +/****************************************************************************** + * @@ -207075,9 +207075,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi +*/ + +#endif //_RTL8711_IO_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,268 @@ +/****************************************************************************** + * @@ -207347,9 +207347,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux- + ); + +#endif // #ifndef __INC_CEINFO_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,35 @@ +/****************************************************************************** + * @@ -207386,9 +207386,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,83 @@ +/****************************************************************************** + * @@ -207473,9 +207473,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h li + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,78 @@ +/****************************************************************************** + * @@ -207555,9 +207555,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h li +int rtw_set_band(_adapter *adapter, enum _BAND band); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_iol.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_iol.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_iol.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,89 @@ +/****************************************************************************** + * @@ -207648,9 +207648,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-rp +bool rtw_IOL_applied(ADAPTER *adapter); + +#endif //__RTW_IOL_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_led.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_led.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_led.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_led.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_led.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_led.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,216 @@ +/****************************************************************************** + * @@ -207868,9 +207868,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rp +extern void BlinkHandler(PLED_871x pLed); + +#endif //__RTW_LED_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,843 @@ +/****************************************************************************** + * @@ -208715,9 +208715,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-r +void rtw_proxim_send_packet(_adapter *padapter,u8 *pbuf,u16 len,u8 hw_rate); +#endif //CONFIG_INTEL_PROXIM +#endif //__RTL871X_MLME_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,962 @@ +/****************************************************************************** + * @@ -209681,9 +209681,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h lin +#endif//_RTL8192C_CMD_C_ + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mp.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mp.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,711 @@ +/****************************************************************************** + * @@ -210396,9 +210396,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi +extern void Hal_ProSetCrystalCap (PADAPTER pAdapter , u32 CrystalCapVal); + +#endif //_RTW_MP_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,595 @@ +/****************************************************************************** + * @@ -210995,9 +210995,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h lin +#endif /* _RTW_MP_IOCTL_C_ */ + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1096 @@ +/****************************************************************************** + * @@ -212095,9 +212095,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef. + + +#endif //__INC_HAL8192SPHYREG_H -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,160 @@ +/****************************************************************************** + * @@ -212259,9 +212259,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rp + (wdinfo)->find_phase_state_exchange_cnt != P2P_FINDPHASE_EX_NONE) + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,362 @@ +/****************************************************************************** + * @@ -212625,9 +212625,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linu +int rtw_pm_set_lps(_adapter *padapter, u8 mode); + +#endif //__RTL871X_PWRCTRL_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_qos.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_qos.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_qos.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,39 @@ +/****************************************************************************** + * @@ -212668,9 +212668,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rp + + +#endif //_RTL871X_QOS_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_recv.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_recv.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_recv.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,730 @@ +/****************************************************************************** + * @@ -213402,9 +213402,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-r +extern void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_rf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_rf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_rf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,151 @@ +/****************************************************************************** + * @@ -213557,9 +213557,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi + + +#endif //_RTL8711_RF_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_security.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_security.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_security.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_security.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_security.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_security.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_security.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_security.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,446 @@ +/****************************************************************************** + * @@ -214007,9 +214007,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_security.h lin +u8 rtw_handle_tkip_countermeasure(_adapter* adapter, const char *caller); + +#endif //__RTL871X_SECURITY_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,73 @@ +/****************************************************************************** + * @@ -214084,9 +214084,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_sreset.h linux +void sreset_reset(_adapter *padapter); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,142 @@ +/****************************************************************************** + * @@ -214230,14 +214230,14 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_tdls.h linux-r +#endif //CONFIG_TDLS + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_version.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_version.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_version.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_version.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_version.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_version.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_version.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_version.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1 @@ +#define DRIVERVERSION "v4.0.2_9000.20130911" -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,753 @@ +/****************************************************************************** + * @@ -214992,9 +214992,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-r +#include + +#endif //_RTL871X_XMIT_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-rpi/drivers/net/wireless/rtl8192cu/include/sta_info.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/sta_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/sta_info.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/sta_info.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/sta_info.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/sta_info.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,431 @@ +/****************************************************************************** + * @@ -215427,9 +215427,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-r +extern u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr); + +#endif //_STA_INFO_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_hal.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_hal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_hal.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_hal.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_hal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_hal.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,36 @@ +/****************************************************************************** + * @@ -215467,9 +215467,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rp +#endif // CONFIG_WOWLAN_MANUAL +#endif //CONFIG_WOWLAN +#endif //__USB_HAL_H__ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_ops.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_ops.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_ops.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_ops.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,109 @@ +/****************************************************************************** + * @@ -215580,9 +215580,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rp +} + +#endif //__USB_OPS_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,62 @@ +/****************************************************************************** + * @@ -215646,9 +215646,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_ops_linux.h li +void usb_write_port_cancel(struct intf_hdl *pintfhdl); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_osintf.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_osintf.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_osintf.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,37 @@ +/****************************************************************************** + * @@ -215687,9 +215687,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux + + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,59 @@ +/****************************************************************************** + * @@ -215750,9 +215750,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h l +//BOOLEAN CEusbGetDescriptorRequest(PCE_USB_DEVICE CEdevice, IN short urbLength, IN UCHAR DescriptorType, IN UCHAR Index, IN USHORT LanguageId, IN PVOID TransferBuffer, IN ULONG TransferBufferLength); + +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi/drivers/net/wireless/rtl8192cu/include/wifi.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/wifi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/wifi.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/wifi.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/wifi.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/wifi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/wifi.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,1245 @@ +/****************************************************************************** + * @@ -216999,9 +216999,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi/d + + +#endif // _WIFI_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linux-rpi/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,702 @@ +/****************************************************************************** + * @@ -217705,9 +217705,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linu + + +#endif //#ifndef WLAN_BSSDEF_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux-rpi/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux-4.1.22/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,94 @@ +/****************************************************************************** + * @@ -217803,9 +217803,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux +extern void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe); + +#endif //__XMIT_OSDEP_H_ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c 2016-04-29 18:02:47.000000000 +0200 @@ -0,0 +1,5488 @@ +/****************************************************************************** + * @@ -223295,9 +223295,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg8021 +} + +#endif //CONFIG_IOCTL_CFG80211 -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,11908 @@ +/****************************************************************************** + * @@ -235207,9 +235207,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c +#endif +}; +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,585 @@ +/****************************************************************************** + * @@ -235796,9 +235796,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c + +#endif +#endif -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,2748 @@ +/****************************************************************************** + * @@ -238548,9 +238548,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c li +#endif + free_netdev(ndev); +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,1996 @@ +/****************************************************************************** + * @@ -240548,9 +240548,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c li + +module_init(rtw_drv_entry); +module_exit(rtw_drv_halt); -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,21 @@ +/****************************************************************************** + * @@ -240573,9 +240573,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_ops_linux +#define _PCI_OPS_LINUX_C_ + +#include -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,447 @@ +/****************************************************************************** + * @@ -241024,9 +241024,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c + _init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl); + +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,838 @@ +/****************************************************************************** + * @@ -241866,9 +241866,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c + platform_driver_unregister(&wifi_device_legacy); +} +#endif /* defined(RTW_ENABLE_WIFI_CONTROL_FUNC) */ -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,1655 @@ +/****************************************************************************** + * @@ -243525,9 +243525,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c li +} +EXPORT_SYMBOL(rtw_usb_get_sw_pointer); +#endif //CONFIG_INTEL_PROXIM -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,648 @@ +/****************************************************************************** + * @@ -244177,9 +244177,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_ops_linux + pxmitbuf++; + } +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,420 @@ +/****************************************************************************** + * @@ -244601,9 +244601,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c + rtw_mstat_update(MSTAT_TYPE_SKB, MSTAT_ALLOC_SUCCESS, pkt->truesize); + return _rtw_xmit_entry(pkt, pnetdev); +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,2299 @@ +/****************************************************************************** + * @@ -246904,9 +246904,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c lin +{ + rtw_mfree((u8*)cbuf, sizeof(*cbuf) + sizeof(void*)*cbuf->size); +} -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/runwpa linux-rpi/drivers/net/wireless/rtl8192cu/runwpa ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/runwpa 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/runwpa 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/runwpa linux-4.1.22/drivers/net/wireless/rtl8192cu/runwpa +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/runwpa 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/runwpa 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,18 @@ +#!/bin/bash + @@ -246926,9 +246926,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/runwpa linux-rpi/drivers/n + + fi +fi -diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi/drivers/net/wireless/rtl8192cu/wlan0dhcp ---- linux-4.1.20/drivers/net/wireless/rtl8192cu/wlan0dhcp 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/net/wireless/rtl8192cu/wlan0dhcp 2016-03-16 19:54:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-4.1.22/drivers/net/wireless/rtl8192cu/wlan0dhcp +--- linux-4.1.22.orig/drivers/net/wireless/rtl8192cu/wlan0dhcp 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/net/wireless/rtl8192cu/wlan0dhcp 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,15 @@ +#!/bin/bash + @@ -246945,9 +246945,9 @@ diff -Nur linux-4.1.20/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi/driver +rm -f /etc/sysconfig/network-scripts/ifcfg-wlan0 + +echo "get ip: $var1" -diff -Nur linux-4.1.20/drivers/of/fdt.c linux-rpi/drivers/of/fdt.c ---- linux-4.1.20/drivers/of/fdt.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/of/fdt.c 2016-03-16 19:54:20.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/of/fdt.c linux-4.1.22/drivers/of/fdt.c +--- linux-4.1.22.orig/drivers/of/fdt.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/of/fdt.c 2016-04-29 18:02:48.000000000 +0200 @@ -933,19 +933,38 @@ /* Retrieve command line */ @@ -246992,9 +246992,9 @@ diff -Nur linux-4.1.20/drivers/of/fdt.c linux-rpi/drivers/of/fdt.c #endif /* CONFIG_CMDLINE */ pr_debug("Command line is: %s\n", (char*)data); -diff -Nur linux-4.1.20/drivers/pinctrl/Makefile linux-rpi/drivers/pinctrl/Makefile ---- linux-4.1.20/drivers/pinctrl/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/pinctrl/Makefile 2016-03-16 19:54:20.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/pinctrl/Makefile linux-4.1.22/drivers/pinctrl/Makefile +--- linux-4.1.22.orig/drivers/pinctrl/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/pinctrl/Makefile 2016-04-29 18:02:48.000000000 +0200 @@ -38,6 +38,7 @@ obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o obj-$(CONFIG_PINCTRL_ZYNQ) += pinctrl-zynq.o @@ -247003,9 +247003,9 @@ diff -Nur linux-4.1.20/drivers/pinctrl/Makefile linux-rpi/drivers/pinctrl/Makefi obj-$(CONFIG_ARCH_BCM) += bcm/ obj-$(CONFIG_ARCH_BERLIN) += berlin/ obj-y += freescale/ -diff -Nur linux-4.1.20/drivers/pinctrl/bcm/pinctrl-bcm2835.c linux-rpi/drivers/pinctrl/bcm/pinctrl-bcm2835.c ---- linux-4.1.20/drivers/pinctrl/bcm/pinctrl-bcm2835.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/pinctrl/bcm/pinctrl-bcm2835.c 2016-03-16 19:54:20.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/pinctrl/bcm/pinctrl-bcm2835.c linux-4.1.22/drivers/pinctrl/bcm/pinctrl-bcm2835.c +--- linux-4.1.22.orig/drivers/pinctrl/bcm/pinctrl-bcm2835.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/pinctrl/bcm/pinctrl-bcm2835.c 2016-04-29 18:02:48.000000000 +0200 @@ -47,6 +47,7 @@ #define MODULE_NAME "pinctrl-bcm2835" #define BCM2835_NUM_GPIOS 54 @@ -247123,15 +247123,6 @@ diff -Nur linux-4.1.20/drivers/pinctrl/bcm/pinctrl-bcm2835.c linux-rpi/drivers/p clear_bit(offset, &pc->enabled_irq_map[bank]); spin_unlock_irqrestore(&pc->irq_lock[bank], flags); } -@@ -786,7 +818,7 @@ - } - if (num_pulls) { - err = of_property_read_u32_index(np, "brcm,pull", -- (num_funcs > 1) ? i : 0, &pull); -+ (num_pulls > 1) ? i : 0, &pull); - if (err) - goto out; - err = bcm2835_pctl_dt_node_to_map_pull(pc, np, pin, @@ -993,8 +1025,6 @@ for (i = 0; i < BCM2835_NUM_BANKS; i++) { unsigned long events; @@ -247169,9 +247160,9 @@ diff -Nur linux-4.1.20/drivers/pinctrl/bcm/pinctrl-bcm2835.c linux-rpi/drivers/p .of_match_table = bcm2835_pinctrl_match, }, }; -diff -Nur linux-4.1.20/drivers/power/reset/gpio-poweroff.c linux-rpi/drivers/power/reset/gpio-poweroff.c ---- linux-4.1.20/drivers/power/reset/gpio-poweroff.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/power/reset/gpio-poweroff.c 2016-03-16 19:54:21.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/power/reset/gpio-poweroff.c linux-4.1.22/drivers/power/reset/gpio-poweroff.c +--- linux-4.1.22.orig/drivers/power/reset/gpio-poweroff.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/power/reset/gpio-poweroff.c 2016-04-29 18:02:48.000000000 +0200 @@ -48,9 +48,11 @@ static int gpio_poweroff_probe(struct platform_device *pdev) { @@ -247185,9 +247176,9 @@ diff -Nur linux-4.1.20/drivers/power/reset/gpio-poweroff.c linux-rpi/drivers/pow dev_err(&pdev->dev, "%s: pm_power_off function already registered", __func__); -diff -Nur linux-4.1.20/drivers/pwm/Kconfig linux-rpi/drivers/pwm/Kconfig ---- linux-4.1.20/drivers/pwm/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/pwm/Kconfig 2016-03-16 19:54:21.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/pwm/Kconfig linux-4.1.22/drivers/pwm/Kconfig +--- linux-4.1.22.orig/drivers/pwm/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/pwm/Kconfig 2016-04-29 18:02:48.000000000 +0200 @@ -85,7 +85,7 @@ config PWM_BCM2835 @@ -247197,9 +247188,9 @@ diff -Nur linux-4.1.20/drivers/pwm/Kconfig linux-rpi/drivers/pwm/Kconfig help PWM framework driver for BCM2835 controller (Raspberry Pi) -diff -Nur linux-4.1.20/drivers/rtc/rtc-ds1307.c linux-rpi/drivers/rtc/rtc-ds1307.c ---- linux-4.1.20/drivers/rtc/rtc-ds1307.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/rtc/rtc-ds1307.c 2016-03-16 19:54:21.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/rtc/rtc-ds1307.c linux-4.1.22/drivers/rtc/rtc-ds1307.c +--- linux-4.1.22.orig/drivers/rtc/rtc-ds1307.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/rtc/rtc-ds1307.c 2016-04-29 18:02:48.000000000 +0200 @@ -1242,6 +1242,14 @@ return 0; } @@ -247215,9 +247206,9 @@ diff -Nur linux-4.1.20/drivers/rtc/rtc-ds1307.c linux-rpi/drivers/rtc/rtc-ds1307 static struct i2c_driver ds1307_driver = { .driver = { .name = "rtc-ds1307", -diff -Nur linux-4.1.20/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig ---- linux-4.1.20/drivers/spi/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/spi/Kconfig 2016-03-16 19:54:28.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/spi/Kconfig linux-4.1.22/drivers/spi/Kconfig +--- linux-4.1.22.orig/drivers/spi/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/spi/Kconfig 2016-04-29 18:02:48.000000000 +0200 @@ -77,7 +77,7 @@ config SPI_BCM2835 @@ -247242,9 +247233,9 @@ diff -Nur linux-4.1.20/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig config SPI_BFIN5XX tristate "SPI controller driver for ADI Blackfin5xx" depends on BLACKFIN && !BF60x -diff -Nur linux-4.1.20/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile ---- linux-4.1.20/drivers/spi/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/spi/Makefile 2016-03-16 19:54:28.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/spi/Makefile linux-4.1.22/drivers/spi/Makefile +--- linux-4.1.22.orig/drivers/spi/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/spi/Makefile 2016-04-29 18:02:48.000000000 +0200 @@ -20,6 +20,7 @@ obj-$(CONFIG_SPI_BCM63XX_HSSPI) += spi-bcm63xx-hsspi.o obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o @@ -247253,9 +247244,9 @@ diff -Nur linux-4.1.20/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o -diff -Nur linux-4.1.20/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm2708.c ---- linux-4.1.20/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/spi/spi-bcm2708.c 2016-03-16 19:54:28.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/spi/spi-bcm2708.c linux-4.1.22/drivers/spi/spi-bcm2708.c +--- linux-4.1.22.orig/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/spi/spi-bcm2708.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,628 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -247885,9 +247876,9 @@ diff -Nur linux-4.1.20/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm27 +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Nur linux-4.1.20/drivers/spi/spi-bcm2835.c linux-rpi/drivers/spi/spi-bcm2835.c ---- linux-4.1.20/drivers/spi/spi-bcm2835.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/spi/spi-bcm2835.c 2016-03-16 19:54:28.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/spi/spi-bcm2835.c linux-4.1.22/drivers/spi/spi-bcm2835.c +--- linux-4.1.22.orig/drivers/spi/spi-bcm2835.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/spi/spi-bcm2835.c 2016-04-29 18:02:48.000000000 +0200 @@ -20,18 +20,22 @@ * GNU General Public License for more details. */ @@ -248446,9 +248437,9 @@ diff -Nur linux-4.1.20/drivers/spi/spi-bcm2835.c linux-rpi/drivers/spi/spi-bcm28 return 0; } -diff -Nur linux-4.1.20/drivers/spi/spidev.c linux-rpi/drivers/spi/spidev.c ---- linux-4.1.20/drivers/spi/spidev.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/spi/spidev.c 2016-03-16 19:54:32.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/spi/spidev.c linux-4.1.22/drivers/spi/spidev.c +--- linux-4.1.22.orig/drivers/spi/spidev.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/spi/spidev.c 2016-04-29 18:02:48.000000000 +0200 @@ -707,6 +707,7 @@ #ifdef CONFIG_OF static const struct of_device_id spidev_dt_ids[] = { @@ -248457,9 +248448,9 @@ diff -Nur linux-4.1.20/drivers/spi/spidev.c linux-rpi/drivers/spi/spidev.c {}, }; MODULE_DEVICE_TABLE(of, spidev_dt_ids); -diff -Nur linux-4.1.20/drivers/staging/fbtft/fbtft-core.c linux-rpi/drivers/staging/fbtft/fbtft-core.c ---- linux-4.1.20/drivers/staging/fbtft/fbtft-core.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/staging/fbtft/fbtft-core.c 2016-03-16 19:54:38.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/staging/fbtft/fbtft-core.c linux-4.1.22/drivers/staging/fbtft/fbtft-core.c +--- linux-4.1.22.orig/drivers/staging/fbtft/fbtft-core.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/staging/fbtft/fbtft-core.c 2016-04-29 18:02:48.000000000 +0200 @@ -1074,6 +1074,11 @@ p = of_prop_next_u32(prop, NULL, &val); if (!p) @@ -248472,9 +248463,9 @@ diff -Nur linux-4.1.20/drivers/staging/fbtft/fbtft-core.c linux-rpi/drivers/stag while (p) { if (val & FBTFT_OF_INIT_CMD) { val &= 0xFFFF; -diff -Nur linux-4.1.20/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/staging/media/lirc/Kconfig ---- linux-4.1.20/drivers/staging/media/lirc/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/staging/media/lirc/Kconfig 2016-03-16 19:54:44.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/staging/media/lirc/Kconfig linux-4.1.22/drivers/staging/media/lirc/Kconfig +--- linux-4.1.22.orig/drivers/staging/media/lirc/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/staging/media/lirc/Kconfig 2016-04-29 18:02:48.000000000 +0200 @@ -32,6 +32,12 @@ help Driver for Homebrew Parallel Port Receivers @@ -248488,9 +248479,9 @@ diff -Nur linux-4.1.20/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/stag config LIRC_SASEM tristate "Sasem USB IR Remote" depends on LIRC && USB -diff -Nur linux-4.1.20/drivers/staging/media/lirc/Makefile linux-rpi/drivers/staging/media/lirc/Makefile ---- linux-4.1.20/drivers/staging/media/lirc/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/staging/media/lirc/Makefile 2016-03-16 19:54:44.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/staging/media/lirc/Makefile linux-4.1.22/drivers/staging/media/lirc/Makefile +--- linux-4.1.22.orig/drivers/staging/media/lirc/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/staging/media/lirc/Makefile 2016-04-29 18:02:48.000000000 +0200 @@ -6,6 +6,7 @@ obj-$(CONFIG_LIRC_BT829) += lirc_bt829.o obj-$(CONFIG_LIRC_IMON) += lirc_imon.o @@ -248499,9 +248490,9 @@ diff -Nur linux-4.1.20/drivers/staging/media/lirc/Makefile linux-rpi/drivers/sta obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o obj-$(CONFIG_LIRC_SIR) += lirc_sir.o -diff -Nur linux-4.1.20/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/staging/media/lirc/lirc_rpi.c ---- linux-4.1.20/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/staging/media/lirc/lirc_rpi.c 2016-03-16 19:54:44.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/staging/media/lirc/lirc_rpi.c linux-4.1.22/drivers/staging/media/lirc/lirc_rpi.c +--- linux-4.1.22.orig/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/staging/media/lirc/lirc_rpi.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,765 @@ +/* + * lirc_rpi.c @@ -249268,9 +249259,9 @@ diff -Nur linux-4.1.20/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/s + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); -diff -Nur linux-4.1.20/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig ---- linux-4.1.20/drivers/thermal/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/thermal/Kconfig 2016-03-16 19:54:46.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/thermal/Kconfig linux-4.1.22/drivers/thermal/Kconfig +--- linux-4.1.22.orig/drivers/thermal/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/thermal/Kconfig 2016-04-29 18:02:48.000000000 +0200 @@ -238,6 +238,13 @@ enforce idle time which results in more package C-state residency. The user interface is exposed via generic thermal framework. @@ -249285,9 +249276,9 @@ diff -Nur linux-4.1.20/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig config X86_PKG_TEMP_THERMAL tristate "X86 package temperature thermal driver" depends on X86_THERMAL_VECTOR -diff -Nur linux-4.1.20/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefile ---- linux-4.1.20/drivers/thermal/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/thermal/Makefile 2016-03-16 19:54:46.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/thermal/Makefile linux-4.1.22/drivers/thermal/Makefile +--- linux-4.1.22.orig/drivers/thermal/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/thermal/Makefile 2016-04-29 18:02:48.000000000 +0200 @@ -33,6 +33,7 @@ obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o @@ -249296,9 +249287,9 @@ diff -Nur linux-4.1.20/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefi obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/ -diff -Nur linux-4.1.20/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/thermal/bcm2835-thermal.c ---- linux-4.1.20/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/thermal/bcm2835-thermal.c 2016-03-16 19:54:46.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/thermal/bcm2835-thermal.c linux-4.1.22/drivers/thermal/bcm2835-thermal.c +--- linux-4.1.22.orig/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/thermal/bcm2835-thermal.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,141 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -249441,9 +249432,9 @@ diff -Nur linux-4.1.20/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/therm +MODULE_AUTHOR("Noralf Trønnes"); +MODULE_DESCRIPTION("Thermal driver for bcm2835 chip"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/drivers/tty/serial/8250/8250_core.c linux-rpi/drivers/tty/serial/8250/8250_core.c ---- linux-4.1.20/drivers/tty/serial/8250/8250_core.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/tty/serial/8250/8250_core.c 2016-03-16 19:54:47.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.22/drivers/tty/serial/8250/8250_core.c +--- linux-4.1.22.orig/drivers/tty/serial/8250/8250_core.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/tty/serial/8250/8250_core.c 2016-04-29 18:02:48.000000000 +0200 @@ -3270,6 +3270,8 @@ if (nr_uarts > UART_NR) @@ -249453,9 +249444,9 @@ diff -Nur linux-4.1.20/drivers/tty/serial/8250/8250_core.c linux-rpi/drivers/tty for (i = 0; i < nr_uarts; i++) { struct uart_8250_port *up = &serial8250_ports[i]; -diff -Nur linux-4.1.20/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/serial/amba-pl011.c ---- linux-4.1.20/drivers/tty/serial/amba-pl011.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/tty/serial/amba-pl011.c 2016-03-16 19:54:47.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/tty/serial/amba-pl011.c linux-4.1.22/drivers/tty/serial/amba-pl011.c +--- linux-4.1.22.orig/drivers/tty/serial/amba-pl011.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/tty/serial/amba-pl011.c 2016-04-29 18:02:48.000000000 +0200 @@ -85,7 +85,7 @@ static unsigned int get_fifosize_arm(struct amba_device *dev) @@ -249478,9 +249469,9 @@ diff -Nur linux-4.1.20/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/ser base = devm_ioremap(&dev->dev, dev->res.start, resource_size(&dev->res)); -diff -Nur linux-4.1.20/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile ---- linux-4.1.20/drivers/usb/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/usb/Makefile 2016-03-16 19:54:48.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/Makefile linux-4.1.22/drivers/usb/Makefile +--- linux-4.1.22.orig/drivers/usb/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/usb/Makefile 2016-04-29 18:02:48.000000000 +0200 @@ -7,6 +7,7 @@ obj-$(CONFIG_USB) += core/ obj-$(CONFIG_USB_SUPPORT) += phy/ @@ -249489,9 +249480,9 @@ diff -Nur linux-4.1.20/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile obj-$(CONFIG_USB_DWC3) += dwc3/ obj-$(CONFIG_USB_DWC2) += dwc2/ obj-$(CONFIG_USB_ISP1760) += isp1760/ -diff -Nur linux-4.1.20/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/generic.c ---- linux-4.1.20/drivers/usb/core/generic.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/usb/core/generic.c 2016-03-16 19:54:48.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/core/generic.c linux-4.1.22/drivers/usb/core/generic.c +--- linux-4.1.22.orig/drivers/usb/core/generic.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/usb/core/generic.c 2016-04-29 18:02:48.000000000 +0200 @@ -152,6 +152,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -249500,10 +249491,10 @@ diff -Nur linux-4.1.20/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/gen } return i; } -diff -Nur linux-4.1.20/drivers/usb/core/hub.c linux-rpi/drivers/usb/core/hub.c ---- linux-4.1.20/drivers/usb/core/hub.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/usb/core/hub.c 2016-03-16 19:54:48.000000000 +0100 -@@ -4927,7 +4927,7 @@ +diff -Nur linux-4.1.22.orig/drivers/usb/core/hub.c linux-4.1.22/drivers/usb/core/hub.c +--- linux-4.1.22.orig/drivers/usb/core/hub.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/usb/core/hub.c 2016-04-29 18:02:48.000000000 +0200 +@@ -4933,7 +4933,7 @@ if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; @@ -249512,9 +249503,9 @@ diff -Nur linux-4.1.20/drivers/usb/core/hub.c linux-rpi/drivers/usb/core/hub.c usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_OVER_CURRENT); msleep(100); /* Cool down */ -diff -Nur linux-4.1.20/drivers/usb/core/message.c linux-rpi/drivers/usb/core/message.c ---- linux-4.1.20/drivers/usb/core/message.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/usb/core/message.c 2016-03-16 19:54:48.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/core/message.c linux-4.1.22/drivers/usb/core/message.c +--- linux-4.1.22.orig/drivers/usb/core/message.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/usb/core/message.c 2016-04-29 18:02:48.000000000 +0200 @@ -1872,6 +1872,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -249601,9 +249592,9 @@ diff -Nur linux-4.1.20/drivers/usb/core/message.c linux-rpi/drivers/usb/core/mes /* Now that the interfaces are installed, re-enable LPM. */ usb_unlocked_enable_lpm(dev); -diff -Nur linux-4.1.20/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/core/otg_whitelist.h ---- linux-4.1.20/drivers/usb/core/otg_whitelist.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/usb/core/otg_whitelist.h 2016-03-16 19:54:48.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/core/otg_whitelist.h linux-4.1.22/drivers/usb/core/otg_whitelist.h +--- linux-4.1.22.orig/drivers/usb/core/otg_whitelist.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/usb/core/otg_whitelist.h 2016-04-29 18:02:48.000000000 +0200 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -249757,9 +249748,9 @@ diff -Nur linux-4.1.20/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/co return 0; } -diff -Nur linux-4.1.20/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/gadget/file_storage.c ---- linux-4.1.20/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/gadget/file_storage.c 2016-03-16 19:54:48.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/gadget/file_storage.c linux-4.1.22/drivers/usb/gadget/file_storage.c +--- linux-4.1.22.orig/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/gadget/file_storage.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,3676 @@ +/* + * file_storage.c -- File-backed USB Storage Gadget, for USB development @@ -253437,9 +253428,9 @@ diff -Nur linux-4.1.20/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/g + kref_put(&fsg->ref, fsg_release); +} +module_exit(fsg_cleanup); -diff -Nur linux-4.1.20/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconfig ---- linux-4.1.20/drivers/usb/host/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/usb/host/Kconfig 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/Kconfig linux-4.1.22/drivers/usb/host/Kconfig +--- linux-4.1.22.orig/drivers/usb/host/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/usb/host/Kconfig 2016-04-29 18:02:48.000000000 +0200 @@ -738,6 +738,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -253460,9 +253451,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconf config USB_IMX21_HCD tristate "i.MX21 HCD support" depends on ARM && ARCH_MXC -diff -Nur linux-4.1.20/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Makefile ---- linux-4.1.20/drivers/usb/host/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/usb/host/Makefile 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/Makefile linux-4.1.22/drivers/usb/host/Makefile +--- linux-4.1.22.orig/drivers/usb/host/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/usb/host/Makefile 2016-04-29 18:02:48.000000000 +0200 @@ -67,6 +67,8 @@ obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o @@ -253472,9 +253463,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Make obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drivers/usb/host/dwc_common_port/Makefile ---- linux-4.1.20/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/Makefile linux-4.1.22/drivers/usb/host/dwc_common_port/Makefile +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/Makefile 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -253534,9 +253525,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drive + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd ---- linux-4.1.20/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-4.1.22/drivers/usb/host/dwc_common_port/Makefile.fbsd +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/Makefile.fbsd 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -253555,9 +253546,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi/ + dwc_common_fbsd.c dwc_mem.c + +.include -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux ---- linux-4.1.20/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/Makefile.linux linux-4.1.22/drivers/usb/host/dwc_common_port/Makefile.linux +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/Makefile.linux 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -253608,9 +253599,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/drivers/usb/host/dwc_common_port/changes.txt ---- linux-4.1.20/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/changes.txt 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/changes.txt linux-4.1.22/drivers/usb/host/dwc_common_port/changes.txt +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/changes.txt 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -253786,9 +253777,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/dr +A DWC_LIBMODULE #define has also been added. If this is not defined, then the +module code in dwc_common_linux.c is not compiled in. This allows linking the +library code directly into a driver module, instead of as a standalone module. -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg ---- linux-4.1.20/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-4.1.22/drivers/usb/host/dwc_common_port/doc/doxygen.cfg +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -254060,9 +254051,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rp +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_cc.c linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_cc.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_cc.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -254596,9 +254587,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drive +} + +#endif /* DWC_CCLIB */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_cc.h linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_cc.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_cc.h 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,224 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -254824,9 +254815,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drive +#endif + +#endif /* _DWC_CC_H_ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -256136,9 +256127,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux- +{ + return wq->pending; +} -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_common_linux.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,1434 @@ +#include +#include @@ -257574,9 +257565,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux +MODULE_LICENSE ("GPL"); + +#endif /* DWC_LIBMODULE */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -258853,9 +258844,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux- +{ + return wq->pending; +} -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_crypto.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_crypto.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -259165,9 +259156,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/d +} + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_crypto.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_crypto.h 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -259280,9 +259271,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/d +#endif + +#endif /* _DWC_CRYPTO_H_ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_dh.c linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_dh.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_dh.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -259575,9 +259566,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drive +#endif /* !CONFIG_MACH_IPMATE */ + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_dh.h linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_dh.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_dh.h 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -259685,9 +259676,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drive +#endif + +#endif /* _DWC_DH_H_ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_list.h linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_list.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_list.h 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,594 @@ +/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ +/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ @@ -260283,9 +260274,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/dri +#endif + +#endif /* _DWC_LIST_H_ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_mem.c linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_mem.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_mem.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -260532,9 +260523,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/driv +} + +#endif /* DWC_DEBUG_MEMORY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_modpow.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_modpow.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -261172,9 +261163,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/d +#endif /* CONFIG_MACH_IPMATE */ + +#endif /*DWC_CRYPTOLIB */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_modpow.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_modpow.h 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -261210,9 +261201,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/d +#endif + +#endif /* _LINUX_BIGNUM_H */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_notifier.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_notifier.c 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -261533,9 +261524,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi +} + +#endif /* DWC_NOTIFYLIB */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_notifier.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_notifier.h 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -261659,9 +261650,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi +#endif + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h ---- linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_os.h linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_os.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/dwc_os.h 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,1276 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -262939,9 +262930,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drive +#endif + +#endif /* _DWC_OS_H_ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/usb/host/dwc_common_port/usb.h ---- linux-4.1.20/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_common_port/usb.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_common_port/usb.h linux-4.1.22/drivers/usb/host/dwc_common_port/usb.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_common_port/usb.h 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -263889,9 +263880,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/ +#endif + +#endif /* _USB_H_ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/host/dwc_otg/Makefile ---- linux-4.1.20/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/Makefile 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/Makefile linux-4.1.22/drivers/usb/host/dwc_otg/Makefile +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/Makefile 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,82 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -263975,9 +263966,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/h + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + +endif -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg ---- linux-4.1.20/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-4.1.22/drivers/usb/host/dwc_otg/doc/doxygen.cfg +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2016-04-29 18:02:48.000000000 +0200 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -264203,9 +264194,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/driver +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dummy_audio.c linux-4.1.22/drivers/usb/host/dwc_otg/dummy_audio.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dummy_audio.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -265782,9 +265773,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/ + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_cfi_common.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -265928,9 +265919,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drive +typedef struct cfi_string cfi_string_t; + +#endif -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_adp.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -266786,9 +266777,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/ +#endif + return 1; +} -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_adp.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -266870,9 +266861,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/ +extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if); + +#endif //__DWC_OTG_ADP_H__ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_attr.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -268084,9 +268075,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_attr.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -268177,9 +268168,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers +#endif + ); +#endif -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -270057,9 +270048,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/ +} + +#endif //DWC_UTE_CFI -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -270381,9 +270372,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/ +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cil.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,7141 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -277526,9 +277517,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/ + dwc_otg_pcd_start_srp_timer(core_if); + return; +} -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cil.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -278994,9 +278985,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/ +////////////////////////////////////////////////////////////////////// + +#endif -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1594 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -280592,9 +280583,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi/dri + DWC_SPINUNLOCK(core_if->lock); + return retval; +} -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -281301,9 +281292,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi/driv +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -281422,9 +281413,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/ + +#endif /*DEBUG*/ +#endif -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_driver.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1757 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -283183,9 +283174,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drive + + +*/ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_driver.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -283273,9 +283264,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drive +#endif + +#endif -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1355 @@ +/* + * dwc_otg_fiq_fsm.c - The finite state machine FIQ @@ -284632,9 +284623,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi/driv + mb(); + fiq_fsm_spin_unlock(&state->lock); +} -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,370 @@ +/* + * dwc_otg_fiq_fsm.h - Finite state machine FIQ header definitions @@ -285006,9 +284997,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-rpi/driv +extern void dwc_otg_fiq_nop(struct fiq_state *state); + +#endif /* DWC_OTG_FIQ_FSM_H_ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,80 @@ +/* + * dwc_otg_fiq_fsm.S - assembly stub for the FSM FIQ @@ -285090,9 +285081,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-rpi/dri + subs pc, lr, #4; +_dwc_otg_fiq_stub_end: +END(_dwc_otg_fiq_stub) -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,4257 @@ + +/* ========================================================================== @@ -289351,9 +289342,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/ +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,862 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -290217,9 +290208,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/ +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -291353,9 +291344,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi/dri +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -291774,9 +291765,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi/drive + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,2727 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -294505,9 +294496,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi/dri + return retval; +} +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,999 @@ + +/* ========================================================================== @@ -295508,9 +295499,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,957 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -296469,9 +296460,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -296661,9 +296652,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi/drive + + +#endif /* _DWC_OS_DEP_H_ */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,2712 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -299377,9 +299368,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/ +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -299647,9 +299638,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/ +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -300011,9 +300002,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi/drive +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -305162,9 +305153,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi/dri +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1360 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -306526,9 +306517,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi/dr +EXPORT_SYMBOL(usb_gadget_unregister_driver); + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h ---- linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_regs.h +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -309080,9 +309071,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers +} gpwrdn_data_t; + +#endif -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/usb/host/dwc_otg/test/Makefile ---- linux-4.1.20/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/Makefile 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/test/Makefile linux-4.1.22/drivers/usb/host/dwc_otg/test/Makefile +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/test/Makefile 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -309100,9 +309091,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/ + else echo "=======> $$test, FAILED" ; \ + fi \ + done -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm ---- linux-4.1.20/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-4.1.22/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -309441,9 +309432,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi/d +); + +1; -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl ---- linux-4.1.20/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-4.1.22/drivers/usb/host/dwc_otg/test/test_mod_param.pl +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -309578,9 +309569,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi + +test_main(); +0; -diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl ---- linux-4.1.20/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2016-03-16 19:54:49.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-4.1.22/drivers/usb/host/dwc_otg/test/test_sysfs.pl +--- linux-4.1.22.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -309775,9 +309766,9 @@ diff -Nur linux-4.1.20/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/dri + +test_main(); +0; -diff -Nur linux-4.1.20/drivers/video/backlight/Kconfig linux-rpi/drivers/video/backlight/Kconfig ---- linux-4.1.20/drivers/video/backlight/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/video/backlight/Kconfig 2016-03-16 19:54:53.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/backlight/Kconfig linux-4.1.22/drivers/video/backlight/Kconfig +--- linux-4.1.22.orig/drivers/video/backlight/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/video/backlight/Kconfig 2016-04-29 18:02:49.000000000 +0200 @@ -263,6 +263,12 @@ If you have a LCD backlight adjustable by PWM, say Y to enable this driver. @@ -309791,9 +309782,9 @@ diff -Nur linux-4.1.20/drivers/video/backlight/Kconfig linux-rpi/drivers/video/b config BACKLIGHT_DA903X tristate "Backlight Driver for DA9030/DA9034 using WLED" depends on PMIC_DA903X -diff -Nur linux-4.1.20/drivers/video/backlight/Makefile linux-rpi/drivers/video/backlight/Makefile ---- linux-4.1.20/drivers/video/backlight/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/video/backlight/Makefile 2016-03-16 19:54:53.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/backlight/Makefile linux-4.1.22/drivers/video/backlight/Makefile +--- linux-4.1.22.orig/drivers/video/backlight/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/video/backlight/Makefile 2016-04-29 18:02:49.000000000 +0200 @@ -49,6 +49,7 @@ obj-$(CONFIG_BACKLIGHT_PANDORA) += pandora_bl.o obj-$(CONFIG_BACKLIGHT_PCF50633) += pcf50633-backlight.o @@ -309802,9 +309793,9 @@ diff -Nur linux-4.1.20/drivers/video/backlight/Makefile linux-rpi/drivers/video/ obj-$(CONFIG_BACKLIGHT_SAHARA) += kb3886_bl.o obj-$(CONFIG_BACKLIGHT_SKY81452) += sky81452-backlight.o obj-$(CONFIG_BACKLIGHT_TOSA) += tosa_bl.o -diff -Nur linux-4.1.20/drivers/video/backlight/rpi_backlight.c linux-rpi/drivers/video/backlight/rpi_backlight.c ---- linux-4.1.20/drivers/video/backlight/rpi_backlight.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/video/backlight/rpi_backlight.c 2016-03-16 19:54:53.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/backlight/rpi_backlight.c linux-4.1.22/drivers/video/backlight/rpi_backlight.c +--- linux-4.1.22.orig/drivers/video/backlight/rpi_backlight.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/video/backlight/rpi_backlight.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,119 @@ +/* + * rpi_bl.c - Backlight controller through VPU @@ -309925,9 +309916,9 @@ diff -Nur linux-4.1.20/drivers/video/backlight/rpi_backlight.c linux-rpi/drivers +MODULE_AUTHOR("Gordon Hollingworth "); +MODULE_DESCRIPTION("Raspberry Pi mailbox based Backlight Driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/drivers/video/fbdev/Kconfig linux-rpi/drivers/video/fbdev/Kconfig ---- linux-4.1.20/drivers/video/fbdev/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/Kconfig 2016-03-16 19:54:53.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/fbdev/Kconfig linux-4.1.22/drivers/video/fbdev/Kconfig +--- linux-4.1.22.orig/drivers/video/fbdev/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/video/fbdev/Kconfig 2016-04-29 18:02:49.000000000 +0200 @@ -224,6 +224,20 @@ comment "Frame buffer hardware drivers" depends on FB @@ -309966,9 +309957,9 @@ diff -Nur linux-4.1.20/drivers/video/fbdev/Kconfig linux-rpi/drivers/video/fbdev + + help + This is the framebuffer driver for the Raspberry Pi Sense HAT -diff -Nur linux-4.1.20/drivers/video/fbdev/Makefile linux-rpi/drivers/video/fbdev/Makefile ---- linux-4.1.20/drivers/video/fbdev/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/Makefile 2016-03-16 19:54:53.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/fbdev/Makefile linux-4.1.22/drivers/video/fbdev/Makefile +--- linux-4.1.22.orig/drivers/video/fbdev/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/video/fbdev/Makefile 2016-04-29 18:02:49.000000000 +0200 @@ -12,6 +12,7 @@ obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o @@ -309985,9 +309976,9 @@ diff -Nur linux-4.1.20/drivers/video/fbdev/Makefile linux-rpi/drivers/video/fbde # the test framebuffer is last obj-$(CONFIG_FB_VIRTUAL) += vfb.o -diff -Nur linux-4.1.20/drivers/video/fbdev/bcm2708_fb.c linux-rpi/drivers/video/fbdev/bcm2708_fb.c ---- linux-4.1.20/drivers/video/fbdev/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/bcm2708_fb.c 2016-03-16 19:54:54.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/fbdev/bcm2708_fb.c linux-4.1.22/drivers/video/fbdev/bcm2708_fb.c +--- linux-4.1.22.orig/drivers/video/fbdev/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/video/fbdev/bcm2708_fb.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,847 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -310836,9 +310827,9 @@ diff -Nur linux-4.1.20/drivers/video/fbdev/bcm2708_fb.c linux-rpi/drivers/video/ +MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer"); +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); +MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes"); -diff -Nur linux-4.1.20/drivers/video/fbdev/core/cfbimgblt.c linux-rpi/drivers/video/fbdev/core/cfbimgblt.c ---- linux-4.1.20/drivers/video/fbdev/core/cfbimgblt.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/core/cfbimgblt.c 2016-03-16 19:54:54.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/fbdev/core/cfbimgblt.c linux-4.1.22/drivers/video/fbdev/core/cfbimgblt.c +--- linux-4.1.22.orig/drivers/video/fbdev/core/cfbimgblt.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/video/fbdev/core/cfbimgblt.c 2016-04-29 18:02:49.000000000 +0200 @@ -28,6 +28,11 @@ * * Also need to add code to deal with cards endians that are different than @@ -311012,9 +311003,9 @@ diff -Nur linux-4.1.20/drivers/video/fbdev/core/cfbimgblt.c linux-rpi/drivers/vi slow_imageblit(image, p, dst1, fgcolor, bgcolor, start_index, pitch_index); } else -diff -Nur linux-4.1.20/drivers/video/fbdev/core/fbmem.c linux-rpi/drivers/video/fbdev/core/fbmem.c ---- linux-4.1.20/drivers/video/fbdev/core/fbmem.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/core/fbmem.c 2016-03-16 19:54:54.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/fbdev/core/fbmem.c linux-4.1.22/drivers/video/fbdev/core/fbmem.c +--- linux-4.1.22.orig/drivers/video/fbdev/core/fbmem.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/video/fbdev/core/fbmem.c 2016-04-29 18:02:49.000000000 +0200 @@ -1084,6 +1084,25 @@ } EXPORT_SYMBOL(fb_blank); @@ -311073,9 +311064,9 @@ diff -Nur linux-4.1.20/drivers/video/fbdev/core/fbmem.c linux-rpi/drivers/video/ arg = (unsigned long) compat_ptr(arg); case FBIOBLANK: ret = do_fb_ioctl(info, cmd, arg); -diff -Nur linux-4.1.20/drivers/video/fbdev/rpisense-fb.c linux-rpi/drivers/video/fbdev/rpisense-fb.c ---- linux-4.1.20/drivers/video/fbdev/rpisense-fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/video/fbdev/rpisense-fb.c 2016-03-16 19:54:55.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/fbdev/rpisense-fb.c linux-4.1.22/drivers/video/fbdev/rpisense-fb.c +--- linux-4.1.22.orig/drivers/video/fbdev/rpisense-fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/video/fbdev/rpisense-fb.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,293 @@ +/* + * Raspberry Pi Sense HAT framebuffer driver @@ -311370,9 +311361,9 @@ diff -Nur linux-4.1.20/drivers/video/fbdev/rpisense-fb.c linux-rpi/drivers/video +MODULE_AUTHOR("Serge Schneider "); +MODULE_LICENSE("GPL"); + -diff -Nur linux-4.1.20/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drivers/video/logo/logo_linux_clut224.ppm ---- linux-4.1.20/drivers/video/logo/logo_linux_clut224.ppm 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/video/logo/logo_linux_clut224.ppm 2016-03-16 19:54:57.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/video/logo/logo_linux_clut224.ppm linux-4.1.22/drivers/video/logo/logo_linux_clut224.ppm +--- linux-4.1.22.orig/drivers/video/logo/logo_linux_clut224.ppm 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/video/logo/logo_linux_clut224.ppm 2016-04-29 18:02:49.000000000 +0200 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -313859,9 +313850,9 @@ diff -Nur linux-4.1.20/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drive +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 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 -diff -Nur linux-4.1.20/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters/w1-gpio.c ---- linux-4.1.20/drivers/w1/masters/w1-gpio.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/w1/masters/w1-gpio.c 2016-03-16 19:54:57.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/w1/masters/w1-gpio.c linux-4.1.22/drivers/w1/masters/w1-gpio.c +--- linux-4.1.22.orig/drivers/w1/masters/w1-gpio.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/w1/masters/w1-gpio.c 2016-04-29 18:02:49.000000000 +0200 @@ -23,6 +23,19 @@ #include "../w1.h" #include "../w1_int.h" @@ -313996,9 +313987,9 @@ diff -Nur linux-4.1.20/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters return 0; } -diff -Nur linux-4.1.20/drivers/w1/slaves/w1_therm.c linux-rpi/drivers/w1/slaves/w1_therm.c ---- linux-4.1.20/drivers/w1/slaves/w1_therm.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/w1/slaves/w1_therm.c 2016-03-16 19:54:57.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/w1/slaves/w1_therm.c linux-4.1.22/drivers/w1/slaves/w1_therm.c +--- linux-4.1.22.orig/drivers/w1/slaves/w1_therm.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/w1/slaves/w1_therm.c 2016-04-29 18:02:49.000000000 +0200 @@ -92,13 +92,24 @@ static ssize_t w1_slave_show(struct device *device, struct device_attribute *attr, char *buf); @@ -314136,9 +314127,9 @@ diff -Nur linux-4.1.20/drivers/w1/slaves/w1_therm.c linux-rpi/drivers/w1/slaves/ static int __init w1_therm_init(void) { int err, i; -diff -Nur linux-4.1.20/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h ---- linux-4.1.20/drivers/w1/w1.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/w1/w1.h 2016-03-16 19:54:57.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/w1/w1.h linux-4.1.22/drivers/w1/w1.h +--- linux-4.1.22.orig/drivers/w1/w1.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/w1/w1.h 2016-04-29 18:02:49.000000000 +0200 @@ -171,6 +171,12 @@ u8 (*set_pullup)(void *, int); @@ -314152,9 +314143,9 @@ diff -Nur linux-4.1.20/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h void (*search)(void *, struct w1_master *, u8, w1_slave_found_callback); }; -diff -Nur linux-4.1.20/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c ---- linux-4.1.20/drivers/w1/w1_int.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/w1/w1_int.c 2016-03-16 19:54:57.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/w1/w1_int.c linux-4.1.22/drivers/w1/w1_int.c +--- linux-4.1.22.orig/drivers/w1/w1_int.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/w1/w1_int.c 2016-04-29 18:02:49.000000000 +0200 @@ -123,6 +123,20 @@ return(-EINVAL); } @@ -314176,9 +314167,9 @@ diff -Nur linux-4.1.20/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c /* Lock until the device is added (or not) to w1_masters. */ mutex_lock(&w1_mlock); /* Search for the first available id (starting at 1). */ -diff -Nur linux-4.1.20/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c ---- linux-4.1.20/drivers/w1/w1_io.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/w1/w1_io.c 2016-03-16 19:54:57.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/w1/w1_io.c linux-4.1.22/drivers/w1/w1_io.c +--- linux-4.1.22.orig/drivers/w1/w1_io.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/w1/w1_io.c 2016-04-29 18:02:49.000000000 +0200 @@ -134,10 +134,22 @@ static void w1_post_write(struct w1_master *dev) { @@ -314205,9 +314196,9 @@ diff -Nur linux-4.1.20/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c dev->pullup_duration = 0; } } -diff -Nur linux-4.1.20/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconfig ---- linux-4.1.20/drivers/watchdog/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/watchdog/Kconfig 2016-03-16 19:54:57.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/watchdog/Kconfig linux-4.1.22/drivers/watchdog/Kconfig +--- linux-4.1.22.orig/drivers/watchdog/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/watchdog/Kconfig 2016-04-29 18:02:49.000000000 +0200 @@ -451,6 +451,12 @@ To compile this driver as a module, choose M here: the module will be called retu_wdt. @@ -314230,9 +314221,9 @@ diff -Nur linux-4.1.20/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconf select WATCHDOG_CORE help Watchdog driver for the built in watchdog hardware in Broadcom -diff -Nur linux-4.1.20/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Makefile ---- linux-4.1.20/drivers/watchdog/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/drivers/watchdog/Makefile 2016-03-16 19:54:57.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/watchdog/Makefile linux-4.1.22/drivers/watchdog/Makefile +--- linux-4.1.22.orig/drivers/watchdog/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/drivers/watchdog/Makefile 2016-04-29 18:02:49.000000000 +0200 @@ -56,6 +56,7 @@ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o @@ -314241,9 +314232,9 @@ diff -Nur linux-4.1.20/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Make obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o obj-$(CONFIG_SIRFSOC_WATCHDOG) += sirfsoc_wdt.o -diff -Nur linux-4.1.20/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdog/bcm2708_wdog.c ---- linux-4.1.20/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/drivers/watchdog/bcm2708_wdog.c 2016-03-16 19:54:57.000000000 +0100 +diff -Nur linux-4.1.22.orig/drivers/watchdog/bcm2708_wdog.c linux-4.1.22/drivers/watchdog/bcm2708_wdog.c +--- linux-4.1.22.orig/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/drivers/watchdog/bcm2708_wdog.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,382 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -314627,9 +314618,9 @@ diff -Nur linux-4.1.20/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdo +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/include/drm/drmP.h linux-rpi/include/drm/drmP.h ---- linux-4.1.20/include/drm/drmP.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/include/drm/drmP.h 2016-03-16 19:55:15.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/drm/drmP.h linux-4.1.22/include/drm/drmP.h +--- linux-4.1.22.orig/include/drm/drmP.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/include/drm/drmP.h 2016-04-29 18:02:49.000000000 +0200 @@ -567,6 +567,13 @@ int (*gem_open_object) (struct drm_gem_object *, struct drm_file *); void (*gem_close_object) (struct drm_gem_object *, struct drm_file *); @@ -314644,9 +314635,9 @@ diff -Nur linux-4.1.20/include/drm/drmP.h linux-rpi/include/drm/drmP.h /* prime: */ /* export handle -> fd (see drm_gem_prime_handle_to_fd() helper) */ int (*prime_handle_to_fd)(struct drm_device *dev, struct drm_file *file_priv, -diff -Nur linux-4.1.20/include/drm/drm_crtc.h linux-rpi/include/drm/drm_crtc.h ---- linux-4.1.20/include/drm/drm_crtc.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/include/drm/drm_crtc.h 2016-03-16 19:55:15.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/drm/drm_crtc.h linux-4.1.22/include/drm/drm_crtc.h +--- linux-4.1.22.orig/include/drm/drm_crtc.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/include/drm/drm_crtc.h 2016-04-29 18:02:49.000000000 +0200 @@ -1538,4 +1538,19 @@ list_for_each_entry(plane, planelist, head) \ if (plane->type == DRM_PLANE_TYPE_OVERLAY) @@ -314667,9 +314658,9 @@ diff -Nur linux-4.1.20/include/drm/drm_crtc.h linux-rpi/include/drm/drm_crtc.h + list_for_each_entry(fb, &(dev)->mode_config.fb_list, head) + #endif /* __DRM_CRTC_H__ */ -diff -Nur linux-4.1.20/include/dt-bindings/clock/bcm2835.h linux-rpi/include/dt-bindings/clock/bcm2835.h ---- linux-4.1.20/include/dt-bindings/clock/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/dt-bindings/clock/bcm2835.h 2016-03-16 19:55:15.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/dt-bindings/clock/bcm2835.h linux-4.1.22/include/dt-bindings/clock/bcm2835.h +--- linux-4.1.22.orig/include/dt-bindings/clock/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/dt-bindings/clock/bcm2835.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2015 Broadcom Corporation @@ -314718,9 +314709,9 @@ diff -Nur linux-4.1.20/include/dt-bindings/clock/bcm2835.h linux-rpi/include/dt- +#define BCM2835_CLOCK_PERI_IMAGE 29 + +#define BCM2835_CLOCK_COUNT 30 -diff -Nur linux-4.1.20/include/linux/broadcom/bcm2835_smi.h linux-rpi/include/linux/broadcom/bcm2835_smi.h ---- linux-4.1.20/include/linux/broadcom/bcm2835_smi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/broadcom/bcm2835_smi.h 2016-03-16 19:55:16.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/broadcom/bcm2835_smi.h linux-4.1.22/include/linux/broadcom/bcm2835_smi.h +--- linux-4.1.22.orig/include/linux/broadcom/bcm2835_smi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/linux/broadcom/bcm2835_smi.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,391 @@ +/** + * Declarations and definitions for Broadcom's Secondary Memory Interface @@ -315113,9 +315104,9 @@ diff -Nur linux-4.1.20/include/linux/broadcom/bcm2835_smi.h linux-rpi/include/li +#endif /* BCM2835_SMI_IMPLEMENTATION */ + +#endif /* BCM2835_SMI_H */ -diff -Nur linux-4.1.20/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/broadcom/vc_cma.h ---- linux-4.1.20/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/broadcom/vc_cma.h 2016-03-16 19:55:16.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/broadcom/vc_cma.h linux-4.1.22/include/linux/broadcom/vc_cma.h +--- linux-4.1.22.orig/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/linux/broadcom/vc_cma.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,29 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -315146,9 +315137,9 @@ diff -Nur linux-4.1.20/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/b +#endif + +#endif /* VC_CMA_H */ -diff -Nur linux-4.1.20/include/linux/broadcom/vc_mem.h linux-rpi/include/linux/broadcom/vc_mem.h ---- linux-4.1.20/include/linux/broadcom/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/broadcom/vc_mem.h 2016-03-16 19:55:16.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/broadcom/vc_mem.h linux-4.1.22/include/linux/broadcom/vc_mem.h +--- linux-4.1.22.orig/include/linux/broadcom/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/linux/broadcom/vc_mem.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -315185,9 +315176,9 @@ diff -Nur linux-4.1.20/include/linux/broadcom/vc_mem.h linux-rpi/include/linux/b +#endif + +#endif /* _VC_MEM_H */ -diff -Nur linux-4.1.20/include/linux/leds.h linux-rpi/include/linux/leds.h ---- linux-4.1.20/include/linux/leds.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/include/linux/leds.h 2016-03-16 19:55:17.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/leds.h linux-4.1.22/include/linux/leds.h +--- linux-4.1.22.orig/include/linux/leds.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/include/linux/leds.h 2016-04-29 18:02:49.000000000 +0200 @@ -47,6 +47,9 @@ #define SET_BRIGHTNESS_ASYNC (1 << 21) #define SET_BRIGHTNESS_SYNC (1 << 22) @@ -315198,9 +315189,9 @@ diff -Nur linux-4.1.20/include/linux/leds.h linux-rpi/include/linux/leds.h /* Set LED brightness level */ /* Must not sleep, use a workqueue if needed */ -diff -Nur linux-4.1.20/include/linux/mfd/rpisense/core.h linux-rpi/include/linux/mfd/rpisense/core.h ---- linux-4.1.20/include/linux/mfd/rpisense/core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/mfd/rpisense/core.h 2016-03-16 19:55:17.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/mfd/rpisense/core.h linux-4.1.22/include/linux/mfd/rpisense/core.h +--- linux-4.1.22.orig/include/linux/mfd/rpisense/core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/linux/mfd/rpisense/core.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,47 @@ +/* + * Raspberry Pi Sense HAT core driver @@ -315249,9 +315240,9 @@ diff -Nur linux-4.1.20/include/linux/mfd/rpisense/core.h linux-rpi/include/linux +int rpisense_block_write(struct rpisense *rpisense, const char *buf, int count); + +#endif -diff -Nur linux-4.1.20/include/linux/mfd/rpisense/framebuffer.h linux-rpi/include/linux/mfd/rpisense/framebuffer.h ---- linux-4.1.20/include/linux/mfd/rpisense/framebuffer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/mfd/rpisense/framebuffer.h 2016-03-16 19:55:17.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/mfd/rpisense/framebuffer.h linux-4.1.22/include/linux/mfd/rpisense/framebuffer.h +--- linux-4.1.22.orig/include/linux/mfd/rpisense/framebuffer.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/linux/mfd/rpisense/framebuffer.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,32 @@ +/* + * Raspberry Pi Sense HAT framebuffer driver @@ -315285,9 +315276,9 @@ diff -Nur linux-4.1.20/include/linux/mfd/rpisense/framebuffer.h linux-rpi/includ +}; + +#endif -diff -Nur linux-4.1.20/include/linux/mfd/rpisense/joystick.h linux-rpi/include/linux/mfd/rpisense/joystick.h ---- linux-4.1.20/include/linux/mfd/rpisense/joystick.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/mfd/rpisense/joystick.h 2016-03-16 19:55:17.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/mfd/rpisense/joystick.h linux-4.1.22/include/linux/mfd/rpisense/joystick.h +--- linux-4.1.22.orig/include/linux/mfd/rpisense/joystick.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/linux/mfd/rpisense/joystick.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,35 @@ +/* + * Raspberry Pi Sense HAT joystick driver @@ -315324,9 +315315,9 @@ diff -Nur linux-4.1.20/include/linux/mfd/rpisense/joystick.h linux-rpi/include/l + + +#endif -diff -Nur linux-4.1.20/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host.h ---- linux-4.1.20/include/linux/mmc/host.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/include/linux/mmc/host.h 2016-03-16 19:55:17.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/mmc/host.h linux-4.1.22/include/linux/mmc/host.h +--- linux-4.1.22.orig/include/linux/mmc/host.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/include/linux/mmc/host.h 2016-04-29 18:02:49.000000000 +0200 @@ -285,6 +285,7 @@ MMC_CAP2_HS400_1_2V) #define MMC_CAP2_HSX00_1_2V (MMC_CAP2_HS200_1_2V_SDR | MMC_CAP2_HS400_1_2V) @@ -315335,9 +315326,9 @@ diff -Nur linux-4.1.20/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host mmc_pm_flag_t pm_caps; /* supported pm features */ -diff -Nur linux-4.1.20/include/linux/platform_data/bcm2708.h linux-rpi/include/linux/platform_data/bcm2708.h ---- linux-4.1.20/include/linux/platform_data/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/platform_data/bcm2708.h 2016-03-16 19:55:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/platform_data/bcm2708.h linux-4.1.22/include/linux/platform_data/bcm2708.h +--- linux-4.1.22.orig/include/linux/platform_data/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/linux/platform_data/bcm2708.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,23 @@ +/* + * include/linux/platform_data/bcm2708.h @@ -315362,9 +315353,9 @@ diff -Nur linux-4.1.20/include/linux/platform_data/bcm2708.h linux-rpi/include/l + bcm2708_gpio_pull_t value); + +#endif -diff -Nur linux-4.1.20/include/linux/platform_data/dma-bcm2708.h linux-rpi/include/linux/platform_data/dma-bcm2708.h ---- linux-4.1.20/include/linux/platform_data/dma-bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/linux/platform_data/dma-bcm2708.h 2016-03-16 19:55:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/platform_data/dma-bcm2708.h linux-4.1.22/include/linux/platform_data/dma-bcm2708.h +--- linux-4.1.22.orig/include/linux/platform_data/dma-bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/linux/platform_data/dma-bcm2708.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2010 Broadcom @@ -315493,9 +315484,9 @@ diff -Nur linux-4.1.20/include/linux/platform_data/dma-bcm2708.h linux-rpi/inclu +#endif /* CONFIG_DMA_BCM2708_LEGACY */ + +#endif /* _PLAT_BCM2708_DMA_H */ -diff -Nur linux-4.1.20/include/linux/serial_core.h linux-rpi/include/linux/serial_core.h ---- linux-4.1.20/include/linux/serial_core.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/include/linux/serial_core.h 2016-03-16 19:55:18.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/serial_core.h linux-4.1.22/include/linux/serial_core.h +--- linux-4.1.22.orig/include/linux/serial_core.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/include/linux/serial_core.h 2016-04-29 18:02:49.000000000 +0200 @@ -397,7 +397,7 @@ static inline int uart_tx_stopped(struct uart_port *port) { @@ -315505,9 +315496,9 @@ diff -Nur linux-4.1.20/include/linux/serial_core.h linux-rpi/include/linux/seria return 1; return 0; } -diff -Nur linux-4.1.20/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h ---- linux-4.1.20/include/linux/vmstat.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/include/linux/vmstat.h 2016-03-16 19:55:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/vmstat.h linux-4.1.22/include/linux/vmstat.h +--- linux-4.1.22.orig/include/linux/vmstat.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/include/linux/vmstat.h 2016-04-29 18:02:49.000000000 +0200 @@ -241,7 +241,11 @@ static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item) { @@ -315520,9 +315511,9 @@ diff -Nur linux-4.1.20/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h } static inline void __inc_zone_page_state(struct page *page, -diff -Nur linux-4.1.20/include/linux/w1-gpio.h linux-rpi/include/linux/w1-gpio.h ---- linux-4.1.20/include/linux/w1-gpio.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/include/linux/w1-gpio.h 2016-03-16 19:55:19.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/linux/w1-gpio.h linux-4.1.22/include/linux/w1-gpio.h +--- linux-4.1.22.orig/include/linux/w1-gpio.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/include/linux/w1-gpio.h 2016-04-29 18:02:49.000000000 +0200 @@ -18,6 +18,7 @@ struct w1_gpio_platform_data { unsigned int pin; @@ -315531,9 +315522,9 @@ diff -Nur linux-4.1.20/include/linux/w1-gpio.h linux-rpi/include/linux/w1-gpio.h void (*enable_external_pullup)(int enable); unsigned int ext_pullup_enable_pin; unsigned int pullup_duration; -diff -Nur linux-4.1.20/include/soc/bcm2835/raspberrypi-firmware.h linux-rpi/include/soc/bcm2835/raspberrypi-firmware.h ---- linux-4.1.20/include/soc/bcm2835/raspberrypi-firmware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/soc/bcm2835/raspberrypi-firmware.h 2016-03-16 19:55:21.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/soc/bcm2835/raspberrypi-firmware.h linux-4.1.22/include/soc/bcm2835/raspberrypi-firmware.h +--- linux-4.1.22.orig/include/soc/bcm2835/raspberrypi-firmware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/soc/bcm2835/raspberrypi-firmware.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,125 @@ +/* + * Copyright © 2015 Broadcom @@ -315660,9 +315651,9 @@ diff -Nur linux-4.1.20/include/soc/bcm2835/raspberrypi-firmware.h linux-rpi/incl +int rpi_firmware_property_list(struct rpi_firmware *fw, + void *data, size_t tag_size); +struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node); -diff -Nur linux-4.1.20/include/uapi/drm/Kbuild linux-rpi/include/uapi/drm/Kbuild ---- linux-4.1.20/include/uapi/drm/Kbuild 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/include/uapi/drm/Kbuild 2016-03-16 19:55:22.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/uapi/drm/Kbuild linux-4.1.22/include/uapi/drm/Kbuild +--- linux-4.1.22.orig/include/uapi/drm/Kbuild 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/include/uapi/drm/Kbuild 2016-04-29 18:02:49.000000000 +0200 @@ -14,6 +14,7 @@ header-y += savage_drm.h header-y += sis_drm.h @@ -315671,9 +315662,9 @@ diff -Nur linux-4.1.20/include/uapi/drm/Kbuild linux-rpi/include/uapi/drm/Kbuild header-y += via_drm.h header-y += vmwgfx_drm.h header-y += msm_drm.h -diff -Nur linux-4.1.20/include/uapi/drm/vc4_drm.h linux-rpi/include/uapi/drm/vc4_drm.h ---- linux-4.1.20/include/uapi/drm/vc4_drm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/include/uapi/drm/vc4_drm.h 2016-03-16 19:55:22.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/uapi/drm/vc4_drm.h linux-4.1.22/include/uapi/drm/vc4_drm.h +--- linux-4.1.22.orig/include/uapi/drm/vc4_drm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/include/uapi/drm/vc4_drm.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,279 @@ +/* + * Copyright © 2014-2015 Broadcom @@ -315954,9 +315945,9 @@ diff -Nur linux-4.1.20/include/uapi/drm/vc4_drm.h linux-rpi/include/uapi/drm/vc4 +}; + +#endif /* _UAPI_VC4_DRM_H_ */ -diff -Nur linux-4.1.20/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h ---- linux-4.1.20/include/uapi/linux/fb.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/include/uapi/linux/fb.h 2016-03-16 19:55:22.000000000 +0100 +diff -Nur linux-4.1.22.orig/include/uapi/linux/fb.h linux-4.1.22/include/uapi/linux/fb.h +--- linux-4.1.22.orig/include/uapi/linux/fb.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/include/uapi/linux/fb.h 2016-04-29 18:02:49.000000000 +0200 @@ -34,6 +34,11 @@ #define FBIOPUT_MODEINFO 0x4617 #define FBIOGET_DISPINFO 0x4618 @@ -315969,9 +315960,9 @@ diff -Nur linux-4.1.20/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ #define FB_TYPE_PLANES 1 /* Non interleaved planes */ -diff -Nur linux-4.1.20/kernel/cgroup.c linux-rpi/kernel/cgroup.c ---- linux-4.1.20/kernel/cgroup.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/kernel/cgroup.c 2016-03-16 19:55:24.000000000 +0100 +diff -Nur linux-4.1.22.orig/kernel/cgroup.c linux-4.1.22/kernel/cgroup.c +--- linux-4.1.22.orig/kernel/cgroup.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/kernel/cgroup.c 2016-04-29 18:02:49.000000000 +0200 @@ -5406,6 +5406,29 @@ } __setup("cgroup_disable=", cgroup_disable); @@ -316002,10 +315993,10 @@ diff -Nur linux-4.1.20/kernel/cgroup.c linux-rpi/kernel/cgroup.c static int __init cgroup_set_legacy_files_on_dfl(char *str) { printk("cgroup: using legacy files on the default hierarchy\n"); -diff -Nur linux-4.1.20/mm/memcontrol.c linux-rpi/mm/memcontrol.c ---- linux-4.1.20/mm/memcontrol.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/mm/memcontrol.c 2016-03-16 19:55:26.000000000 +0100 -@@ -5390,6 +5390,7 @@ +diff -Nur linux-4.1.22.orig/mm/memcontrol.c linux-4.1.22/mm/memcontrol.c +--- linux-4.1.22.orig/mm/memcontrol.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/mm/memcontrol.c 2016-04-29 18:02:49.000000000 +0200 +@@ -5396,6 +5396,7 @@ .dfl_cftypes = memory_files, .legacy_cftypes = mem_cgroup_legacy_files, .early_init = 0, @@ -316013,10 +316004,10 @@ diff -Nur linux-4.1.20/mm/memcontrol.c linux-rpi/mm/memcontrol.c }; /** -diff -Nur linux-4.1.20/mm/page_alloc.c linux-rpi/mm/page_alloc.c ---- linux-4.1.20/mm/page_alloc.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/mm/page_alloc.c 2016-03-16 19:55:26.000000000 +0100 -@@ -6485,8 +6485,6 @@ +diff -Nur linux-4.1.22.orig/mm/page_alloc.c linux-4.1.22/mm/page_alloc.c +--- linux-4.1.22.orig/mm/page_alloc.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/mm/page_alloc.c 2016-04-29 18:02:49.000000000 +0200 +@@ -6509,8 +6509,6 @@ /* Make sure the range is really isolated. */ if (test_pages_isolated(outer_start, end, false)) { @@ -316025,9 +316016,9 @@ diff -Nur linux-4.1.20/mm/page_alloc.c linux-rpi/mm/page_alloc.c ret = -EBUSY; goto done; } -diff -Nur linux-4.1.20/scripts/dtc/checks.c linux-rpi/scripts/dtc/checks.c ---- linux-4.1.20/scripts/dtc/checks.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/checks.c 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/checks.c linux-4.1.22/scripts/dtc/checks.c +--- linux-4.1.22.orig/scripts/dtc/checks.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/checks.c 2016-04-29 18:02:49.000000000 +0200 @@ -53,7 +53,7 @@ void *data; bool warn, error; @@ -316280,9 +316271,9 @@ diff -Nur linux-4.1.20/scripts/dtc/checks.c linux-rpi/scripts/dtc/checks.c { struct node *dt = bi->dt; int i; -diff -Nur linux-4.1.20/scripts/dtc/data.c linux-rpi/scripts/dtc/data.c ---- linux-4.1.20/scripts/dtc/data.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/data.c 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/data.c linux-4.1.22/scripts/dtc/data.c +--- linux-4.1.22.orig/scripts/dtc/data.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/data.c 2016-04-29 18:02:49.000000000 +0200 @@ -74,7 +74,7 @@ struct data d; char *q; @@ -316318,9 +316309,9 @@ diff -Nur linux-4.1.20/scripts/dtc/data.c linux-rpi/scripts/dtc/data.c - return 1; + return true; } -diff -Nur linux-4.1.20/scripts/dtc/dtc-lexer.l linux-rpi/scripts/dtc/dtc-lexer.l ---- linux-4.1.20/scripts/dtc/dtc-lexer.l 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-lexer.l 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/dtc-lexer.l linux-4.1.22/scripts/dtc/dtc-lexer.l +--- linux-4.1.22.orig/scripts/dtc/dtc-lexer.l 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/dtc-lexer.l 2016-04-29 18:02:49.000000000 +0200 @@ -20,7 +20,6 @@ %option noyywrap nounput noinput never-interactive @@ -316458,9 +316449,9 @@ diff -Nur linux-4.1.20/scripts/dtc/dtc-lexer.l linux-rpi/scripts/dtc/dtc-lexer.l + + treesource_error = true; } -diff -Nur linux-4.1.20/scripts/dtc/dtc-lexer.lex.c_shipped linux-rpi/scripts/dtc/dtc-lexer.lex.c_shipped ---- linux-4.1.20/scripts/dtc/dtc-lexer.lex.c_shipped 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-lexer.lex.c_shipped 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/dtc-lexer.lex.c_shipped linux-4.1.22/scripts/dtc/dtc-lexer.lex.c_shipped +--- linux-4.1.22.orig/scripts/dtc/dtc-lexer.lex.c_shipped 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/dtc-lexer.lex.c_shipped 2016-04-29 18:02:49.000000000 +0200 @@ -372,8 +372,8 @@ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; @@ -317315,9 +317306,9 @@ diff -Nur linux-4.1.20/scripts/dtc/dtc-lexer.lex.c_shipped linux-rpi/scripts/dtc + treesource_error = true; } -diff -Nur linux-4.1.20/scripts/dtc/dtc-parser.tab.c_shipped linux-rpi/scripts/dtc/dtc-parser.tab.c_shipped ---- linux-4.1.20/scripts/dtc/dtc-parser.tab.c_shipped 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-parser.tab.c_shipped 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/dtc-parser.tab.c_shipped linux-4.1.22/scripts/dtc/dtc-parser.tab.c_shipped +--- linux-4.1.22.orig/scripts/dtc/dtc-parser.tab.c_shipped 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/dtc-parser.tab.c_shipped 2016-04-29 18:02:49.000000000 +0200 @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.7.12-4996. */ +/* A Bison parser, made by GNU Bison 3.0.2. */ @@ -319987,9 +319978,9 @@ diff -Nur linux-4.1.20/scripts/dtc/dtc-parser.tab.c_shipped linux-rpi/scripts/dt - return c; + ERROR(&yylloc, "%s", s); } -diff -Nur linux-4.1.20/scripts/dtc/dtc-parser.tab.h_shipped linux-rpi/scripts/dtc/dtc-parser.tab.h_shipped ---- linux-4.1.20/scripts/dtc/dtc-parser.tab.h_shipped 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-parser.tab.h_shipped 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/dtc-parser.tab.h_shipped linux-4.1.22/scripts/dtc/dtc-parser.tab.h_shipped +--- linux-4.1.22.orig/scripts/dtc/dtc-parser.tab.h_shipped 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/dtc-parser.tab.h_shipped 2016-04-29 18:02:49.000000000 +0200 @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.7.12-4996. */ +/* A Bison parser, made by GNU Bison 3.0.2. */ @@ -320161,9 +320152,9 @@ diff -Nur linux-4.1.20/scripts/dtc/dtc-parser.tab.h_shipped linux-rpi/scripts/dt -#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_DTC_PARSER_TAB_H_INCLUDED */ -diff -Nur linux-4.1.20/scripts/dtc/dtc-parser.y linux-rpi/scripts/dtc/dtc-parser.y ---- linux-4.1.20/scripts/dtc/dtc-parser.y 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc-parser.y 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/dtc-parser.y linux-4.1.22/scripts/dtc/dtc-parser.y +--- linux-4.1.22.orig/scripts/dtc/dtc-parser.y 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/dtc-parser.y 2016-04-29 18:02:49.000000000 +0200 @@ -17,31 +17,28 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA @@ -320438,9 +320429,9 @@ diff -Nur linux-4.1.20/scripts/dtc/dtc-parser.y linux-rpi/scripts/dtc/dtc-parser - return c; + ERROR(&yylloc, "%s", s); } -diff -Nur linux-4.1.20/scripts/dtc/dtc.c linux-rpi/scripts/dtc/dtc.c ---- linux-4.1.20/scripts/dtc/dtc.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc.c 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/dtc.c linux-4.1.22/scripts/dtc/dtc.c +--- linux-4.1.22.orig/scripts/dtc/dtc.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/dtc.c 2016-04-29 18:02:49.000000000 +0200 @@ -29,6 +29,7 @@ int minsize; /* Minimum blob size */ int padsize; /* Additional padding to blob */ @@ -320536,9 +320527,9 @@ diff -Nur linux-4.1.20/scripts/dtc/dtc.c linux-rpi/scripts/dtc/dtc.c if (! outf) die("Couldn't open output file %s: %s\n", outname, strerror(errno)); -diff -Nur linux-4.1.20/scripts/dtc/dtc.h linux-rpi/scripts/dtc/dtc.h ---- linux-4.1.20/scripts/dtc/dtc.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/dtc.h 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/dtc.h linux-4.1.22/scripts/dtc/dtc.h +--- linux-4.1.22.orig/scripts/dtc/dtc.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/dtc.h 2016-04-29 18:02:49.000000000 +0200 @@ -38,9 +38,9 @@ #include "util.h" @@ -320664,9 +320655,9 @@ diff -Nur linux-4.1.20/scripts/dtc/dtc.h linux-rpi/scripts/dtc/dtc.h /* Flattened trees */ -diff -Nur linux-4.1.20/scripts/dtc/flattree.c linux-rpi/scripts/dtc/flattree.c ---- linux-4.1.20/scripts/dtc/flattree.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/flattree.c 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/flattree.c linux-4.1.22/scripts/dtc/flattree.c +--- linux-4.1.22.orig/scripts/dtc/flattree.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/flattree.c 2016-04-29 18:02:49.000000000 +0200 @@ -261,7 +261,13 @@ { struct property *prop; @@ -320834,9 +320825,9 @@ diff -Nur linux-4.1.20/scripts/dtc/flattree.c linux-rpi/scripts/dtc/flattree.c emit->endnode(etarget, tree->labels); } -diff -Nur linux-4.1.20/scripts/dtc/fstree.c linux-rpi/scripts/dtc/fstree.c ---- linux-4.1.20/scripts/dtc/fstree.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/fstree.c 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/fstree.c linux-4.1.22/scripts/dtc/fstree.c +--- linux-4.1.22.orig/scripts/dtc/fstree.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/fstree.c 2016-04-29 18:02:49.000000000 +0200 @@ -37,26 +37,26 @@ tree = build_node(NULL, NULL); @@ -320885,9 +320876,9 @@ diff -Nur linux-4.1.20/scripts/dtc/fstree.c linux-rpi/scripts/dtc/fstree.c } closedir(d); -diff -Nur linux-4.1.20/scripts/dtc/livetree.c linux-rpi/scripts/dtc/livetree.c ---- linux-4.1.20/scripts/dtc/livetree.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/livetree.c 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/livetree.c linux-4.1.22/scripts/dtc/livetree.c +--- linux-4.1.22.orig/scripts/dtc/livetree.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/livetree.c 2016-04-29 18:02:49.000000000 +0200 @@ -511,7 +511,9 @@ struct node *get_node_by_ref(struct node *tree, const char *ref) @@ -320899,9 +320890,9 @@ diff -Nur linux-4.1.20/scripts/dtc/livetree.c linux-rpi/scripts/dtc/livetree.c return get_node_by_path(tree, ref); else return get_node_by_label(tree, ref); -diff -Nur linux-4.1.20/scripts/dtc/srcpos.c linux-rpi/scripts/dtc/srcpos.c ---- linux-4.1.20/scripts/dtc/srcpos.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/srcpos.c 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/srcpos.c linux-4.1.22/scripts/dtc/srcpos.c +--- linux-4.1.22.orig/scripts/dtc/srcpos.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/srcpos.c 2016-04-29 18:02:49.000000000 +0200 @@ -34,7 +34,7 @@ static struct search_path *search_path_head, **search_path_tail; @@ -321002,9 +320993,9 @@ diff -Nur linux-4.1.20/scripts/dtc/srcpos.c linux-rpi/scripts/dtc/srcpos.c va_end(va); } -diff -Nur linux-4.1.20/scripts/dtc/srcpos.h linux-rpi/scripts/dtc/srcpos.h ---- linux-4.1.20/scripts/dtc/srcpos.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/srcpos.h 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/srcpos.h linux-4.1.22/scripts/dtc/srcpos.h +--- linux-4.1.22.orig/scripts/dtc/srcpos.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/srcpos.h 2016-04-29 18:02:49.000000000 +0200 @@ -21,6 +21,7 @@ #define _SRCPOS_H_ @@ -321041,9 +321032,9 @@ diff -Nur linux-4.1.20/scripts/dtc/srcpos.h linux-rpi/scripts/dtc/srcpos.h extern void srcpos_set_line(char *f, int l); -diff -Nur linux-4.1.20/scripts/dtc/treesource.c linux-rpi/scripts/dtc/treesource.c ---- linux-4.1.20/scripts/dtc/treesource.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/treesource.c 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/treesource.c linux-4.1.22/scripts/dtc/treesource.c +--- linux-4.1.22.orig/scripts/dtc/treesource.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/treesource.c 2016-04-29 18:02:49.000000000 +0200 @@ -26,12 +26,12 @@ extern YYLTYPE yylloc; @@ -321098,9 +321089,9 @@ diff -Nur linux-4.1.20/scripts/dtc/treesource.c linux-rpi/scripts/dtc/treesource if ((const void *)bp >= propend) break; fprintf(f, " "); -diff -Nur linux-4.1.20/scripts/dtc/util.c linux-rpi/scripts/dtc/util.c ---- linux-4.1.20/scripts/dtc/util.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/util.c 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/util.c linux-4.1.22/scripts/dtc/util.c +--- linux-4.1.22.orig/scripts/dtc/util.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/util.c 2016-04-29 18:02:49.000000000 +0200 @@ -39,11 +39,11 @@ char *xstrdup(const char *s) { @@ -321157,9 +321148,9 @@ diff -Nur linux-4.1.20/scripts/dtc/util.c linux-rpi/scripts/dtc/util.c printf(">"); } else { printf(" = ["); -diff -Nur linux-4.1.20/scripts/dtc/util.h linux-rpi/scripts/dtc/util.h ---- linux-4.1.20/scripts/dtc/util.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/util.h 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/util.h linux-4.1.22/scripts/dtc/util.h +--- linux-4.1.22.orig/scripts/dtc/util.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/util.h 2016-04-29 18:02:49.000000000 +0200 @@ -2,6 +2,7 @@ #define _UTIL_H @@ -321185,15 +321176,15 @@ diff -Nur linux-4.1.20/scripts/dtc/util.h linux-rpi/scripts/dtc/util.h /* * Parse an escaped character starting at index i in string s. The resulting -diff -Nur linux-4.1.20/scripts/dtc/version_gen.h linux-rpi/scripts/dtc/version_gen.h ---- linux-4.1.20/scripts/dtc/version_gen.h 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/scripts/dtc/version_gen.h 2016-03-16 19:55:33.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/dtc/version_gen.h linux-4.1.22/scripts/dtc/version_gen.h +--- linux-4.1.22.orig/scripts/dtc/version_gen.h 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/scripts/dtc/version_gen.h 2016-04-29 18:02:49.000000000 +0200 @@ -1 +1 @@ -#define DTC_VERSION "DTC 1.4.0-dirty" +#define DTC_VERSION "DTC 1.4.1-g36c70742" -diff -Nur linux-4.1.20/scripts/knlinfo linux-rpi/scripts/knlinfo ---- linux-4.1.20/scripts/knlinfo 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/scripts/knlinfo 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/knlinfo linux-4.1.22/scripts/knlinfo +--- linux-4.1.22.orig/scripts/knlinfo 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/scripts/knlinfo 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,168 @@ +#!/usr/bin/env perl +# ---------------------------------------------------------------------- @@ -321363,9 +321354,9 @@ diff -Nur linux-4.1.20/scripts/knlinfo linux-rpi/scripts/knlinfo + my ($data) = @_; + return unpack('H*', $data); +} -diff -Nur linux-4.1.20/scripts/mkknlimg linux-rpi/scripts/mkknlimg ---- linux-4.1.20/scripts/mkknlimg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/scripts/mkknlimg 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/scripts/mkknlimg linux-4.1.22/scripts/mkknlimg +--- linux-4.1.22.orig/scripts/mkknlimg 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/scripts/mkknlimg 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,244 @@ +#!/usr/bin/env perl +# ---------------------------------------------------------------------- @@ -321611,9 +321602,9 @@ diff -Nur linux-4.1.20/scripts/mkknlimg linux-rpi/scripts/mkknlimg + my $val = $configs->{$wanted} || 'n'; + return (($val eq 'y') || ($val eq '1')); +} -diff -Nur linux-4.1.20/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig ---- linux-4.1.20/sound/arm/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/arm/Kconfig 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/arm/Kconfig linux-4.1.22/sound/arm/Kconfig +--- linux-4.1.22.orig/sound/arm/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/arm/Kconfig 2016-04-29 18:02:49.000000000 +0200 @@ -40,5 +40,13 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -321628,9 +321619,9 @@ diff -Nur linux-4.1.20/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig + endif # SND_ARM -diff -Nur linux-4.1.20/sound/arm/Makefile linux-rpi/sound/arm/Makefile ---- linux-4.1.20/sound/arm/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/arm/Makefile 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/arm/Makefile linux-4.1.22/sound/arm/Makefile +--- linux-4.1.22.orig/sound/arm/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/arm/Makefile 2016-04-29 18:02:49.000000000 +0200 @@ -14,3 +14,8 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -321640,9 +321631,9 @@ diff -Nur linux-4.1.20/sound/arm/Makefile linux-rpi/sound/arm/Makefile +snd-bcm2835-objs := bcm2835.o bcm2835-ctl.o bcm2835-pcm.o bcm2835-vchiq.o + +ccflags-y += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 -diff -Nur linux-4.1.20/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c ---- linux-4.1.20/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835-ctl.c 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/arm/bcm2835-ctl.c linux-4.1.22/sound/arm/bcm2835-ctl.c +--- linux-4.1.22.orig/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/arm/bcm2835-ctl.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,323 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -321967,9 +321958,9 @@ diff -Nur linux-4.1.20/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c + } + return 0; +} -diff -Nur linux-4.1.20/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c ---- linux-4.1.20/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835-pcm.c 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/arm/bcm2835-pcm.c linux-4.1.22/sound/arm/bcm2835-pcm.c +--- linux-4.1.22.orig/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/arm/bcm2835-pcm.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,557 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -322528,9 +322519,9 @@ diff -Nur linux-4.1.20/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c + + return 0; +} -diff -Nur linux-4.1.20/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vchiq.c ---- linux-4.1.20/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835-vchiq.c 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/arm/bcm2835-vchiq.c linux-4.1.22/sound/arm/bcm2835-vchiq.c +--- linux-4.1.22.orig/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/arm/bcm2835-vchiq.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,902 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -323434,9 +323425,9 @@ diff -Nur linux-4.1.20/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vch + +module_param(force_bulk, bool, 0444); +MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio"); -diff -Nur linux-4.1.20/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c ---- linux-4.1.20/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835.c 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/arm/bcm2835.c linux-4.1.22/sound/arm/bcm2835.c +--- linux-4.1.22.orig/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/arm/bcm2835.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,511 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -323949,9 +323940,9 @@ diff -Nur linux-4.1.20/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2835_alsa"); -diff -Nur linux-4.1.20/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h ---- linux-4.1.20/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/bcm2835.h 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/arm/bcm2835.h linux-4.1.22/sound/arm/bcm2835.h +--- linux-4.1.22.orig/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/arm/bcm2835.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,167 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -324120,9 +324111,9 @@ diff -Nur linux-4.1.20/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h +void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream); + +#endif /* __SOUND_ARM_BCM2835_H */ -diff -Nur linux-4.1.20/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc_vchi_audioserv_defs.h ---- linux-4.1.20/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/arm/vc_vchi_audioserv_defs.h 2016-03-16 19:55:34.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/arm/vc_vchi_audioserv_defs.h linux-4.1.22/sound/arm/vc_vchi_audioserv_defs.h +--- linux-4.1.22.orig/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/arm/vc_vchi_audioserv_defs.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,116 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -324240,9 +324231,9 @@ diff -Nur linux-4.1.20/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc +} VC_AUDIO_MSG_T; + +#endif // _VC_AUDIO_DEFS_H_ -diff -Nur linux-4.1.20/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig ---- linux-4.1.20/sound/soc/bcm/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/Kconfig 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/Kconfig linux-4.1.22/sound/soc/bcm/Kconfig +--- linux-4.1.22.orig/sound/soc/bcm/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/soc/bcm/Kconfig 2016-04-29 18:02:49.000000000 +0200 @@ -7,3 +7,71 @@ Say Y or M if you want to add support for codecs attached to the BCM2835 I2S interface. You will also need @@ -324315,9 +324306,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig + select SND_SOC_TPA6130A2 + help + Say Y or M if you want to add support for RaspiDAC Rev.3x. -diff -Nur linux-4.1.20/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile ---- linux-4.1.20/sound/soc/bcm/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/Makefile 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/Makefile linux-4.1.22/sound/soc/bcm/Makefile +--- linux-4.1.22.orig/sound/soc/bcm/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/soc/bcm/Makefile 2016-04-29 18:02:49.000000000 +0200 @@ -3,3 +3,26 @@ obj-$(CONFIG_SND_BCM2835_SOC_I2S) += snd-soc-bcm2835-i2s.o @@ -324345,9 +324336,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile +obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o +obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o +obj-$(CONFIG_SND_BCM2708_SOC_RASPIDAC3) += snd-soc-raspidac3.o -diff -Nur linux-4.1.20/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm2708-i2s.c ---- linux-4.1.20/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/bcm2708-i2s.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/bcm2708-i2s.c linux-4.1.22/sound/soc/bcm/bcm2708-i2s.c +--- linux-4.1.22.orig/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/bcm2708-i2s.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,1014 @@ +/* + * ALSA SoC I2S Audio Layer for Broadcom BCM2708 SoC @@ -325363,9 +325354,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm27 +MODULE_DESCRIPTION("BCM2708 I2S interface"); +MODULE_AUTHOR("Florian Meier "); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/bcm/bcm2708-i2s.h linux-rpi/sound/soc/bcm/bcm2708-i2s.h ---- linux-4.1.20/sound/soc/bcm/bcm2708-i2s.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/bcm2708-i2s.h 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/bcm2708-i2s.h linux-4.1.22/sound/soc/bcm/bcm2708-i2s.h +--- linux-4.1.22.orig/sound/soc/bcm/bcm2708-i2s.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/bcm2708-i2s.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,35 @@ +/* + * I2S configuration for sound cards. @@ -325402,9 +325393,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/bcm2708-i2s.h linux-rpi/sound/soc/bcm/bcm27 +extern void bcm2708_i2s_set_gpio(int gpio); + +#endif -diff -Nur linux-4.1.20/sound/soc/bcm/bcm2835-i2s.c linux-rpi/sound/soc/bcm/bcm2835-i2s.c ---- linux-4.1.20/sound/soc/bcm/bcm2835-i2s.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/bcm2835-i2s.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/bcm2835-i2s.c linux-4.1.22/sound/soc/bcm/bcm2835-i2s.c +--- linux-4.1.22.orig/sound/soc/bcm/bcm2835-i2s.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/soc/bcm/bcm2835-i2s.c 2016-04-29 18:02:49.000000000 +0200 @@ -861,6 +861,7 @@ { .compatible = "brcm,bcm2835-i2s", }, {}, @@ -325413,9 +325404,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/bcm2835-i2s.c linux-rpi/sound/soc/bcm/bcm28 static struct platform_driver bcm2835_i2s_driver = { .probe = bcm2835_i2s_probe, -diff -Nur linux-4.1.20/sound/soc/bcm/hifiberry_amp.c linux-rpi/sound/soc/bcm/hifiberry_amp.c ---- linux-4.1.20/sound/soc/bcm/hifiberry_amp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_amp.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/hifiberry_amp.c linux-4.1.22/sound/soc/bcm/hifiberry_amp.c +--- linux-4.1.22.orig/sound/soc/bcm/hifiberry_amp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/hifiberry_amp.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,128 @@ +/* + * ASoC Driver for HifiBerry AMP @@ -325545,9 +325536,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/hifiberry_amp.c linux-rpi/sound/soc/bcm/hif +MODULE_AUTHOR("Sebastian Eickhoff "); +MODULE_DESCRIPTION("ASoC driver for HiFiBerry-AMP"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hifiberry_dac.c ---- linux-4.1.20/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_dac.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/hifiberry_dac.c linux-4.1.22/sound/soc/bcm/hifiberry_dac.c +--- linux-4.1.22.orig/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/hifiberry_dac.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,123 @@ +/* + * ASoC Driver for HifiBerry DAC @@ -325672,9 +325663,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hif +MODULE_AUTHOR("Florian Meier "); +MODULE_DESCRIPTION("ASoC Driver for HifiBerry DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/bcm/hifiberry_dacplus.c linux-rpi/sound/soc/bcm/hifiberry_dacplus.c ---- linux-4.1.20/sound/soc/bcm/hifiberry_dacplus.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_dacplus.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/hifiberry_dacplus.c linux-4.1.22/sound/soc/bcm/hifiberry_dacplus.c +--- linux-4.1.22.orig/sound/soc/bcm/hifiberry_dacplus.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/hifiberry_dacplus.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,353 @@ +/* + * ASoC Driver for HiFiBerry DAC+ / DAC Pro @@ -326029,9 +326020,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/hifiberry_dacplus.c linux-rpi/sound/soc/bcm +MODULE_AUTHOR("Daniel Matuschek "); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hifiberry_digi.c ---- linux-4.1.20/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/hifiberry_digi.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/hifiberry_digi.c linux-4.1.22/sound/soc/bcm/hifiberry_digi.c +--- linux-4.1.22.orig/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/hifiberry_digi.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,224 @@ +/* + * ASoC Driver for HifiBerry Digi @@ -326257,9 +326248,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hi +MODULE_AUTHOR("Daniel Matuschek "); +MODULE_DESCRIPTION("ASoC Driver for HifiBerry Digi"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaudio-dac.c ---- linux-4.1.20/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/iqaudio-dac.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/iqaudio-dac.c linux-4.1.22/sound/soc/bcm/iqaudio-dac.c +--- linux-4.1.22.orig/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/iqaudio-dac.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,142 @@ +/* + * ASoC Driver for IQaudIO DAC @@ -326403,9 +326394,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaud +MODULE_AUTHOR("Florian Meier "); +MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/bcm/raspidac3.c linux-rpi/sound/soc/bcm/raspidac3.c ---- linux-4.1.20/sound/soc/bcm/raspidac3.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/raspidac3.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/raspidac3.c linux-4.1.22/sound/soc/bcm/raspidac3.c +--- linux-4.1.22.orig/sound/soc/bcm/raspidac3.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/raspidac3.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,192 @@ +/* + * ASoC Driver for RaspiDAC v3 @@ -326599,9 +326590,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/raspidac3.c linux-rpi/sound/soc/bcm/raspida +MODULE_AUTHOR("Jan Grulich "); +MODULE_DESCRIPTION("ASoC Driver for RaspiDAC Rev.3x"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c ---- linux-4.1.20/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/rpi-dac.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/rpi-dac.c linux-4.1.22/sound/soc/bcm/rpi-dac.c +--- linux-4.1.22.orig/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/rpi-dac.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,119 @@ +/* + * ASoC Driver for RPi-DAC. @@ -326722,9 +326713,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c +MODULE_AUTHOR("Florian Meier "); +MODULE_DESCRIPTION("ASoC Driver for RPi-DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/bcm/rpi-proto.c linux-rpi/sound/soc/bcm/rpi-proto.c ---- linux-4.1.20/sound/soc/bcm/rpi-proto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/bcm/rpi-proto.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/bcm/rpi-proto.c linux-4.1.22/sound/soc/bcm/rpi-proto.c +--- linux-4.1.22.orig/sound/soc/bcm/rpi-proto.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/bcm/rpi-proto.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,154 @@ +/* + * ASoC driver for PROTO AudioCODEC (with a WM8731) @@ -326880,9 +326871,9 @@ diff -Nur linux-4.1.20/sound/soc/bcm/rpi-proto.c linux-rpi/sound/soc/bcm/rpi-pro +MODULE_AUTHOR("Florian Meier"); +MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)"); +MODULE_LICENSE("GPL"); -diff -Nur linux-4.1.20/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconfig ---- linux-4.1.20/sound/soc/codecs/Kconfig 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/Kconfig 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/codecs/Kconfig linux-4.1.22/sound/soc/codecs/Kconfig +--- linux-4.1.22.orig/sound/soc/codecs/Kconfig 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/soc/codecs/Kconfig 2016-04-29 18:02:49.000000000 +0200 @@ -83,6 +83,8 @@ select SND_SOC_PCM512x_I2C if I2C select SND_SOC_PCM512x_SPI if SPI_MASTER @@ -326923,9 +326914,9 @@ diff -Nur linux-4.1.20/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconf config SND_SOC_TLV320AIC23 tristate -diff -Nur linux-4.1.20/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Makefile ---- linux-4.1.20/sound/soc/codecs/Makefile 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/Makefile 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/codecs/Makefile linux-4.1.22/sound/soc/codecs/Makefile +--- linux-4.1.22.orig/sound/soc/codecs/Makefile 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/soc/codecs/Makefile 2016-04-29 18:02:49.000000000 +0200 @@ -78,6 +78,8 @@ snd-soc-pcm512x-spi-objs := pcm512x-spi.o snd-soc-rl6231-objs := rl6231.o @@ -326960,9 +326951,9 @@ diff -Nur linux-4.1.20/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Make obj-$(CONFIG_SND_SOC_TLV320AIC23) += snd-soc-tlv320aic23.o obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C) += snd-soc-tlv320aic23-i2c.o obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI) += snd-soc-tlv320aic23-spi.o -diff -Nur linux-4.1.20/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pcm1794a.c ---- linux-4.1.20/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/pcm1794a.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/codecs/pcm1794a.c linux-4.1.22/sound/soc/codecs/pcm1794a.c +--- linux-4.1.22.orig/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/codecs/pcm1794a.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,69 @@ +/* + * Driver for the PCM1794A codec @@ -327033,9 +327024,9 @@ diff -Nur linux-4.1.20/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pc +MODULE_DESCRIPTION("ASoC PCM1794A codec driver"); +MODULE_AUTHOR("Florian Meier "); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pcm5102a.c ---- linux-4.1.20/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/pcm5102a.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/codecs/pcm5102a.c linux-4.1.22/sound/soc/codecs/pcm5102a.c +--- linux-4.1.22.orig/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/codecs/pcm5102a.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,70 @@ +/* + * Driver for the PCM5102A codec @@ -327107,9 +327098,9 @@ diff -Nur linux-4.1.20/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pc +MODULE_DESCRIPTION("ASoC PCM5102A codec driver"); +MODULE_AUTHOR("Florian Meier "); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm512x.c ---- linux-4.1.20/sound/soc/codecs/pcm512x.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/pcm512x.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/codecs/pcm512x.c linux-4.1.22/sound/soc/codecs/pcm512x.c +--- linux-4.1.22.orig/sound/soc/codecs/pcm512x.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/soc/codecs/pcm512x.c 2016-04-29 18:02:49.000000000 +0200 @@ -856,7 +856,8 @@ int fssp; int gpio; @@ -327120,9 +327111,9 @@ diff -Nur linux-4.1.20/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm if (lrclk_div == 0) { dev_err(dev, "No LRCLK?\n"); return -EINVAL; -diff -Nur linux-4.1.20/sound/soc/codecs/tas5713.c linux-rpi/sound/soc/codecs/tas5713.c ---- linux-4.1.20/sound/soc/codecs/tas5713.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/tas5713.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/codecs/tas5713.c linux-4.1.22/sound/soc/codecs/tas5713.c +--- linux-4.1.22.orig/sound/soc/codecs/tas5713.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/codecs/tas5713.c 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,369 @@ +/* + * ASoC Driver for TAS5713 @@ -327493,9 +327484,9 @@ diff -Nur linux-4.1.20/sound/soc/codecs/tas5713.c linux-rpi/sound/soc/codecs/tas +MODULE_AUTHOR("Sebastian Eickhoff "); +MODULE_DESCRIPTION("ASoC driver for TAS5713"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.20/sound/soc/codecs/tas5713.h linux-rpi/sound/soc/codecs/tas5713.h ---- linux-4.1.20/sound/soc/codecs/tas5713.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/tas5713.h 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/codecs/tas5713.h linux-4.1.22/sound/soc/codecs/tas5713.h +--- linux-4.1.22.orig/sound/soc/codecs/tas5713.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.22/sound/soc/codecs/tas5713.h 2016-04-29 18:02:49.000000000 +0200 @@ -0,0 +1,210 @@ +/* + * ASoC Driver for TAS5713 @@ -327707,9 +327698,9 @@ diff -Nur linux-4.1.20/sound/soc/codecs/tas5713.h linux-rpi/sound/soc/codecs/tas + + +#endif /* _TAS5713_H */ -diff -Nur linux-4.1.20/sound/soc/codecs/tpa6130a2.c linux-rpi/sound/soc/codecs/tpa6130a2.c ---- linux-4.1.20/sound/soc/codecs/tpa6130a2.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/tpa6130a2.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/codecs/tpa6130a2.c linux-4.1.22/sound/soc/codecs/tpa6130a2.c +--- linux-4.1.22.orig/sound/soc/codecs/tpa6130a2.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/soc/codecs/tpa6130a2.c 2016-04-29 18:02:49.000000000 +0200 @@ -4,6 +4,7 @@ * Copyright (C) Nokia Corporation * @@ -327789,9 +327780,9 @@ diff -Nur linux-4.1.20/sound/soc/codecs/tpa6130a2.c linux-rpi/sound/soc/codecs/t }; /* -diff -Nur linux-4.1.20/sound/soc/codecs/wm8804.c linux-rpi/sound/soc/codecs/wm8804.c ---- linux-4.1.20/sound/soc/codecs/wm8804.c 2016-03-17 19:11:03.000000000 +0100 -+++ linux-rpi/sound/soc/codecs/wm8804.c 2016-03-16 19:55:37.000000000 +0100 +diff -Nur linux-4.1.22.orig/sound/soc/codecs/wm8804.c linux-4.1.22/sound/soc/codecs/wm8804.c +--- linux-4.1.22.orig/sound/soc/codecs/wm8804.c 2016-04-19 13:58:05.000000000 +0200 ++++ linux-4.1.22/sound/soc/codecs/wm8804.c 2016-04-29 18:02:49.000000000 +0200 @@ -304,6 +304,7 @@ blen = 0x1; break; -- cgit v1.2.3