diff options
Diffstat (limited to 'target/arm/bcm28xx')
| -rw-r--r-- | target/arm/bcm28xx/patches/3.18.10/0000-raspberry-pi.patch (renamed from target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch) | 3312 | ||||
| -rw-r--r-- | target/arm/bcm28xx/patches/3.18.10/0001-i2s-allow-to-enable-ALSA-MMAP.patch | 54 | ||||
| -rw-r--r-- | target/arm/bcm28xx/patches/3.18.9/0001-add-support-for-rpi-proto-hardware.patch | 282 | ||||
| -rw-r--r-- | target/arm/bcm28xx/patches/3.18.9/0002-enable-MMAP-by-default-allow-overide-via-use_mmap.patch | 37 |
4 files changed, 2124 insertions, 1561 deletions
diff --git a/target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch b/target/arm/bcm28xx/patches/3.18.10/0000-raspberry-pi.patch index 1e7b73230..d9b021fc0 100644 --- a/target/arm/bcm28xx/patches/3.18.9/0000-raspberry-pi.patch +++ b/target/arm/bcm28xx/patches/3.18.10/0000-raspberry-pi.patch @@ -1,6 +1,93 @@ -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708.dtsi linux-3.18.9/arch/arm/boot/dts/bcm2708.dtsi ---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2708.dtsi 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/bcm2708.dtsi 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/ads7846-overlay.dts linux-rpi/arch/arm/boot/dts/ads7846-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/ads7846-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/ads7846-overlay.dts 2015-03-26 11:46:41.692226515 +0100 +@@ -0,0 +1,83 @@ ++/* ++ * Generic Device Tree overlay for the ADS7846 touch controller ++ * ++ */ ++ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; ++ ++ fragment@0 { ++ target = <&spi0>; ++ __overlay__ { ++ status = "okay"; ++ ++ spidev@0{ ++ status = "disabled"; ++ }; ++ ++ spidev@1{ ++ status = "disabled"; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&gpio>; ++ __overlay__ { ++ ads7846_pins: ads7846_pins { ++ brcm,pins = <255>; /* illegal default value */ ++ brcm,function = <0>; /* in */ ++ brcm,pull = <0>; /* none */ ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&spi0>; ++ __overlay__ { ++ /* needed to avoid dtc warning */ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ ads7846: ads7846@1 { ++ compatible = "ti,ads7846"; ++ reg = <1>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ads7846_pins>; ++ ++ spi-max-frequency = <2000000>; ++ interrupts = <255 2>; /* high-to-low edge triggered */ ++ interrupt-parent = <&gpio>; ++ pendown-gpio = <&gpio 255 0>; ++ ++ /* driver defaults */ ++ ti,x-min = /bits/ 16 <0>; ++ ti,y-min = /bits/ 16 <0>; ++ ti,x-max = /bits/ 16 <0x0FFF>; ++ ti,y-max = /bits/ 16 <0x0FFF>; ++ ti,pressure-min = /bits/ 16 <0>; ++ ti,pressure-max = /bits/ 16 <0xFFFF>; ++ ti,x-plate-ohms = /bits/ 16 <400>; ++ }; ++ }; ++ }; ++ __overrides__ { ++ cs = <&ads7846>,"reg:0"; ++ speed = <&ads7846>,"spi-max-frequency:0"; ++ penirq = <&ads7846_pins>,"brcm,pins:0", /* REQUIRED */ ++ <&ads7846>,"interrupts:0", ++ <&ads7846>,"pendown-gpio:4"; ++ penirq_pull = <&ads7846_pins>,"brcm,pull:0"; ++ swapxy = <&ads7846>,"ti,swap-xy?"; ++ xmin = <&ads7846>,"ti,x-min;0"; ++ ymin = <&ads7846>,"ti,y-min;0"; ++ xmax = <&ads7846>,"ti,x-max;0"; ++ ymax = <&ads7846>,"ti,y-max;0"; ++ pmin = <&ads7846>,"ti,pressure-min;0"; ++ pmax = <&ads7846>,"ti,pressure-max;0"; ++ xohms = <&ads7846>,"ti,x-plate-ohms;0"; ++ }; ++}; +diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dts/bcm2708.dtsi +--- linux-3.18.10/arch/arm/boot/dts/bcm2708.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/bcm2708.dtsi 2015-03-26 11:46:41.696226518 +0100 @@ -0,0 +1,109 @@ +/include/ "skeleton.dtsi" + @@ -111,9 +198,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708.dtsi linux-3.18.9/arch/arm + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts +--- linux-3.18.10/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 2015-03-26 11:46:41.696226518 +0100 @@ -0,0 +1,107 @@ +/dts-v1/; + @@ -222,9 +309,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-3.18.9/arc + act_led_trigger = <&act_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +--- linux-3.18.10/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 2015-03-26 11:46:41.696226518 +0100 @@ -0,0 +1,117 @@ +/dts-v1/; + @@ -343,9 +430,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-3.18. + pwr_led_trigger = <&pwr_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709.dtsi linux-3.18.9/arch/arm/boot/dts/bcm2709.dtsi ---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2709.dtsi 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/bcm2709.dtsi 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2709.dtsi linux-rpi/arch/arm/boot/dts/bcm2709.dtsi +--- linux-3.18.10/arch/arm/boot/dts/bcm2709.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/bcm2709.dtsi 2015-03-26 11:46:41.696226518 +0100 @@ -0,0 +1,160 @@ +/include/ "skeleton.dtsi" + @@ -507,9 +594,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709.dtsi linux-3.18.9/arch/arm + <&v7_cpu3>, "clock-frequency:0"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-3.18.9/arch/arm/boot/dts/bcm2709-rpi-2-b.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/bcm2709-rpi-2-b.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-rpi/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +--- linux-3.18.10/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 2015-03-26 11:46:41.696226518 +0100 @@ -0,0 +1,117 @@ +/dts-v1/; + @@ -628,9 +715,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bcm2709-rpi-2-b.dts linux-3.18.9/a + pwr_led_trigger = <&pwr_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts linux-3.18.9/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts linux-rpi/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts 2015-03-26 11:46:41.696226518 +0100 @@ -0,0 +1,23 @@ +// Definitions for BMP085/BMP180 digital barometric pressure and temperature sensors from Bosch Sensortec +/dts-v1/; @@ -655,9 +742,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/bmp085_i2c-sensor-overlay.dts linu + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/ds1307-rtc-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/ds1307-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/ds1307-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/ds1307-rtc-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/ds1307-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/ds1307-rtc-overlay.dts 2015-03-26 11:46:41.700226520 +0100 @@ -0,0 +1,22 @@ +// Definitions for DS1307 Real Time Clock +/dts-v1/; @@ -681,9 +768,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-3.18. + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/enc28j60-overlay.dts linux-3.18.9/arch/arm/boot/dts/enc28j60-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/enc28j60-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/enc28j60-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/enc28j60-overlay.dts linux-rpi/arch/arm/boot/dts/enc28j60-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/enc28j60-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/enc28j60-overlay.dts 2015-03-26 11:46:41.700226520 +0100 @@ -0,0 +1,29 @@ +// Overlay for the Microchip ENC28J60 Ethernet Controller +/dts-v1/; @@ -714,9 +801,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/enc28j60-overlay.dts linux-3.18.9/ + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-amp-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-amp-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/hifiberry-amp-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-amp-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/hifiberry-amp-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/hifiberry-amp-overlay.dts 2015-03-26 11:46:41.700226520 +0100 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry Amp/Amp+ +/dts-v1/; @@ -757,9 +844,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-3. + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-dac-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dac-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/hifiberry-dac-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/hifiberry-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts 2015-03-26 11:46:41.700226520 +0100 @@ -0,0 +1,34 @@ +// Definitions for HiFiBerry DAC +/dts-v1/; @@ -795,9 +882,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-3. + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 2015-03-26 11:46:41.700226520 +0100 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry DAC+ +/dts-v1/; @@ -838,9 +925,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linu + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-3.18.9/arch/arm/boot/dts/hifiberry-digi-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-digi-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/hifiberry-digi-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/hifiberry-digi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts 2015-03-26 11:46:41.700226520 +0100 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry Digi +/dts-v1/; @@ -881,9 +968,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-3 + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28a-overlay.dts linux-3.18.9/arch/arm/boot/dts/hy28a-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/hy28a-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/hy28a-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/hy28a-overlay.dts linux-rpi/arch/arm/boot/dts/hy28a-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/hy28a-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/hy28a-overlay.dts 2015-03-26 11:46:41.700226520 +0100 @@ -0,0 +1,87 @@ +/* + * Device Tree overlay for HY28A display @@ -972,9 +1059,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28a-overlay.dts linux-3.18.9/arc + <&hy28a_pins>, "brcm,pins:2"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28b-overlay.dts linux-3.18.9/arch/arm/boot/dts/hy28b-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/hy28b-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/hy28b-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/hy28b-overlay.dts linux-rpi/arch/arm/boot/dts/hy28b-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/hy28b-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/hy28b-overlay.dts 2015-03-26 11:46:41.700226520 +0100 @@ -0,0 +1,142 @@ +/* + * Device Tree overlay for HY28b display shield by Texy @@ -1118,10 +1205,10 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/hy28b-overlay.dts linux-3.18.9/arc + <&hy28b_pins>, "brcm,pins:2"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/i2c-rtc-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/i2c-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500 -@@ -0,0 +1,43 @@ +diff -Nur linux-3.18.10/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/i2c-rtc-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/i2c-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/i2c-rtc-overlay.dts 2015-03-26 11:46:41.700226520 +0100 +@@ -0,0 +1,49 @@ +// Definitions for several I2C based Real Time Clocks +/dts-v1/; +/plugin/; @@ -1156,6 +1243,11 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-3.18.9/a + reg = <0x68>; + status = "disable"; + }; ++ pcf8563: pcf8563@51 { ++ compatible = "nxp,pcf8563"; ++ reg = <0x51>; ++ status = "disable"; ++ }; + }; + }; + __overrides__ { @@ -1163,11 +1255,12 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/i2c-rtc-overlay.dts linux-3.18.9/a + ds3231 = <&ds3231>,"status"; + pcf2127 = <&pcf2127>,"status"; + pcf8523 = <&pcf8523>,"status"; ++ pcf8563 = <&pcf8563>,"status"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-3.18.9/arch/arm/boot/dts/iqaudio-dac-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dac-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/iqaudio-dac-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/iqaudio-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts 2015-03-26 11:46:41.712226533 +0100 @@ -0,0 +1,39 @@ +// Definitions for IQaudIO DAC +/dts-v1/; @@ -1208,9 +1301,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-3.18 + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-3.18.9/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 2015-03-26 11:46:41.712226533 +0100 @@ -0,0 +1,39 @@ +// Definitions for IQaudIO DAC+ +/dts-v1/; @@ -1251,9 +1344,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux- + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-3.18.9/arch/arm/boot/dts/lirc-rpi-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/lirc-rpi-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/lirc-rpi-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/lirc-rpi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts 2015-03-26 11:46:41.712226533 +0100 @@ -0,0 +1,57 @@ +// Definitions for lirc-rpi module +/dts-v1/; @@ -1312,10 +1405,10 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-3.18.9/ + debug = <&lirc_rpi>,"rpi,debug:0"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boot/dts/Makefile ---- linux-3.18.9.orig/arch/arm/boot/dts/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/Makefile 2015-03-08 03:38:45.266040943 -0500 -@@ -53,7 +53,41 @@ +diff -Nur linux-3.18.10/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Makefile +--- linux-3.18.10/arch/arm/boot/dts/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/Makefile 2015-03-26 11:46:41.692226515 +0100 +@@ -53,7 +53,46 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb @@ -1330,6 +1423,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boo +dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b.dtb +dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b-plus.dtb +dtb-$(CONFIG_BCM2709_DT) += bcm2709-rpi-2-b.dtb ++dtb-$(RPI_DT_OVERLAYS) += ads7846-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += bmp085_i2c-sensor-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += ds1307-rtc-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += enc28j60-overlay.dtb @@ -1342,12 +1436,16 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boo +dtb-$(RPI_DT_OVERLAYS) += hy28b-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += iqaudio-dac-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += iqaudio-dacplus-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += rpi-proto-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += lirc-rpi-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += pcf2127-rtc-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += pcf8523-rtc-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += rpi-display-overlay.dtb ++dtb-$(RPI_DT_OVERLAYS) += tinylcd35-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += w1-gpio-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += w1-gpio-pullup-overlay.dtb +dtb-$(RPI_DT_OVERLAYS) += spi-bcm2835-overlay.dtb @@ -1357,7 +1455,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boo dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ -@@ -519,6 +553,12 @@ +@@ -519,6 +558,12 @@ targets += dtbs dtbs_install targets += $(dtb-y) @@ -1370,9 +1468,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/Makefile linux-3.18.9/arch/arm/boo endif # *.dtb used to be generated in the directory above. Clean out the -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/mcp2515-can0-overlay.dts linux-3.18.9/arch/arm/boot/dts/mcp2515-can0-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/mcp2515-can0-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/mcp2515-can0-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/mcp2515-can0-overlay.dts linux-rpi/arch/arm/boot/dts/mcp2515-can0-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/mcp2515-can0-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/mcp2515-can0-overlay.dts 2015-03-26 11:46:41.716226537 +0100 @@ -0,0 +1,69 @@ +/* + * Device tree overlay for mcp251x/can0 on spi0.0 @@ -1443,9 +1541,122 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/mcp2515-can0-overlay.dts linux-3.1 + interrupt = <&can0_pins>,"brcm,pins:0",<&can0>,"interrupts:0"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pcf2127-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/pcf2127-rtc-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/mz61581-overlay.dts linux-rpi/arch/arm/boot/dts/mz61581-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/mz61581-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/mz61581-overlay.dts 2015-03-26 11:46:41.716226537 +0100 +@@ -0,0 +1,109 @@ ++/* ++ * Device Tree overlay for MZ61581-PI-EXT 2014.12.28 by Tontec ++ * ++ */ ++ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; ++ ++ fragment@0 { ++ target = <&spi0>; ++ __overlay__ { ++ status = "okay"; ++ ++ spidev@0{ ++ status = "disabled"; ++ }; ++ ++ spidev@1{ ++ status = "disabled"; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&gpio>; ++ __overlay__ { ++ mz61581_pins: mz61581_pins { ++ brcm,pins = <4 15 18 25>; ++ brcm,function = <0 1 1 1>; /* in out out out */ ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&spi0>; ++ __overlay__ { ++ /* needed to avoid dtc warning */ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ mz61581: mz61581@0{ ++ compatible = "samsung,s6d02a1"; ++ reg = <0>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&mz61581_pins>; ++ ++ spi-max-frequency = <128000000>; ++ spi-cpol; ++ spi-cpha; ++ ++ width = <320>; ++ height = <480>; ++ rotate = <270>; ++ bgr; ++ fps = <30>; ++ buswidth = <8>; ++ ++ reset-gpios = <&gpio 15 0>; ++ dc-gpios = <&gpio 25 0>; ++ led-gpios = <&gpio 18 0>; ++ ++ init = <0x10000b0 00 ++ 0x1000011 ++ 0x20000ff ++ 0x10000b3 0x02 0x00 0x00 0x00 ++ 0x10000c0 0x13 0x3b 0x00 0x02 0x00 0x01 0x00 0x43 ++ 0x10000c1 0x08 0x16 0x08 0x08 ++ 0x10000c4 0x11 0x07 0x03 0x03 ++ 0x10000c6 0x00 ++ 0x10000c8 0x03 0x03 0x13 0x5c 0x03 0x07 0x14 0x08 0x00 0x21 0x08 0x14 0x07 0x53 0x0c 0x13 0x03 0x03 0x21 0x00 ++ 0x1000035 0x00 ++ 0x1000036 0xa0 ++ 0x100003a 0x55 ++ 0x1000044 0x00 0x01 ++ 0x10000d0 0x07 0x07 0x1d 0x03 ++ 0x10000d1 0x03 0x30 0x10 ++ 0x10000d2 0x03 0x14 0x04 ++ 0x1000029 ++ 0x100002c>; ++ ++ /* This is a workaround to make sure the init sequence slows down and doesn't fail */ ++ debug = <3>; ++ }; ++ ++ mz61581_ts: mz61581_ts@1 { ++ compatible = "ti,ads7846"; ++ reg = <1>; ++ ++ spi-max-frequency = <2000000>; ++ interrupts = <4 2>; /* high-to-low edge triggered */ ++ interrupt-parent = <&gpio>; ++ pendown-gpio = <&gpio 4 0>; ++ ++ ti,x-plate-ohms = /bits/ 16 <60>; ++ ti,pressure-max = /bits/ 16 <255>; ++ }; ++ }; ++ }; ++ __overrides__ { ++ speed = <&mz61581>, "spi-max-frequency:0"; ++ rotate = <&mz61581>, "rotate:0"; ++ fps = <&mz61581>, "fps:0"; ++ debug = <&mz61581>, "debug:0"; ++ xohms = <&mz61581_ts>,"ti,x-plate-ohms;0"; ++ }; ++}; +diff -Nur linux-3.18.10/arch/arm/boot/dts/pcf2127-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/pcf2127-rtc-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/pcf2127-rtc-overlay.dts 2015-03-26 11:46:41.720226540 +0100 @@ -0,0 +1,22 @@ +// Definitions for PCF2127 Real Time Clock +/dts-v1/; @@ -1469,9 +1680,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pcf2127-rtc-overlay.dts linux-3.18 + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pcf8523-rtc-overlay.dts linux-3.18.9/arch/arm/boot/dts/pcf8523-rtc-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/pcf8523-rtc-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/pcf8523-rtc-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/pcf8523-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/pcf8523-rtc-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/pcf8523-rtc-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/pcf8523-rtc-overlay.dts 2015-03-26 11:46:41.720226540 +0100 @@ -0,0 +1,22 @@ +// Definitions for PCF8523 Real Time Clock +/dts-v1/; @@ -1495,9 +1706,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pcf8523-rtc-overlay.dts linux-3.18 + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/piscreen-overlay.dts linux-3.18.9/arch/arm/boot/dts/piscreen-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/piscreen-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/piscreen-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/piscreen-overlay.dts linux-rpi/arch/arm/boot/dts/piscreen-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/piscreen-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/piscreen-overlay.dts 2015-03-26 11:46:41.720226540 +0100 @@ -0,0 +1,94 @@ +/* + * Device Tree overlay for PiScreen 3.5" display shield by Ozzmaker @@ -1548,7 +1759,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/piscreen-overlay.dts linux-3.18.9/ + pinctrl-names = "default"; + pinctrl-0 = <&piscreen_pins>; + -+ spi-max-frequency = <32000000>; ++ spi-max-frequency = <24000000>; + rotate = <270>; + bgr; + fps = <30>; @@ -1593,9 +1804,128 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/piscreen-overlay.dts linux-3.18.9/ + debug = <&piscreen>,"debug:0"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pps-gpio-overlay.dts linux-3.18.9/arch/arm/boot/dts/pps-gpio-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/pps-gpio-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/pps-gpio-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/pitft28-resistive-overlay.dts linux-rpi/arch/arm/boot/dts/pitft28-resistive-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/pitft28-resistive-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/pitft28-resistive-overlay.dts 2015-03-26 11:46:41.720226540 +0100 +@@ -0,0 +1,115 @@ ++/* ++ * Device Tree overlay for Adafruit PiTFT 2.8" resistive touch screen ++ * ++ */ ++ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; ++ ++ fragment@0 { ++ target = <&spi0>; ++ __overlay__ { ++ status = "okay"; ++ ++ spidev@0{ ++ status = "disabled"; ++ }; ++ ++ spidev@1{ ++ status = "disabled"; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&gpio>; ++ __overlay__ { ++ pitft_pins: pitft_pins { ++ brcm,pins = <24 25>; ++ brcm,function = <0 1>; /* in out */ ++ brcm,pull = <2 0>; /* pullup none */ ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&spi0>; ++ __overlay__ { ++ /* needed to avoid dtc warning */ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ pitft: pitft@0{ ++ compatible = "ilitek,ili9340"; ++ reg = <0>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pitft_pins>; ++ ++ spi-max-frequency = <32000000>; ++ rotate = <90>; ++ fps = <25>; ++ bgr; ++ buswidth = <8>; ++ dc-gpios = <&gpio 25 0>; ++ debug = <0>; ++ }; ++ ++ pitft_ts@1 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ compatible = "st,stmpe610"; ++ reg = <1>; ++ ++ spi-max-frequency = <500000>; ++ irq-gpio = <&gpio 24 0x2>; /* IRQF_TRIGGER_FALLING */ ++ interrupts = <24 2>; /* high-to-low edge triggered */ ++ interrupt-parent = <&gpio>; ++ interrupt-controller; ++ ++ stmpe_touchscreen { ++ compatible = "st,stmpe-ts"; ++ st,sample-time = <4>; ++ st,mod-12b = <1>; ++ st,ref-sel = <0>; ++ st,adc-freq = <2>; ++ st,ave-ctrl = <3>; ++ st,touch-det-delay = <4>; ++ st,settling = <2>; ++ st,fraction-z = <7>; ++ st,i-drive = <0>; ++ }; ++ ++ stmpe_gpio: stmpe_gpio { ++ #gpio-cells = <2>; ++ compatible = "st,stmpe-gpio"; ++ /* ++ * only GPIO2 is wired/available ++ * and it is wired to the backlight ++ */ ++ st,norequest-mask = <0x7b>; ++ }; ++ }; ++ }; ++ }; ++ ++ fragment@3 { ++ target-path = "/soc"; ++ __overlay__ { ++ backlight { ++ compatible = "gpio-backlight"; ++ gpios = <&stmpe_gpio 2 0>; ++ default-on; ++ }; ++ }; ++ }; ++ ++ __overrides__ { ++ speed = <&pitft>,"spi-max-frequency:0"; ++ rotate = <&pitft>,"rotate:0"; ++ fps = <&pitft>,"fps:0"; ++ debug = <&pitft>,"debug:0"; ++ }; ++}; +diff -Nur linux-3.18.10/arch/arm/boot/dts/pps-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/pps-gpio-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/pps-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/pps-gpio-overlay.dts 2015-03-26 11:46:41.720226540 +0100 @@ -0,0 +1,34 @@ +/dts-v1/; +/plugin/; @@ -1631,10 +1961,10 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/pps-gpio-overlay.dts linux-3.18.9/ + <&pps_pins>,"brcm,pins:0"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/rpi-display-overlay.dts linux-3.18.9/arch/arm/boot/dts/rpi-display-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/rpi-display-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/rpi-display-overlay.dts 2015-03-08 03:38:45.266040943 -0500 -@@ -0,0 +1,81 @@ +diff -Nur linux-3.18.10/arch/arm/boot/dts/rpi-display-overlay.dts linux-rpi/arch/arm/boot/dts/rpi-display-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/rpi-display-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/rpi-display-overlay.dts 2015-03-26 11:46:41.724226543 +0100 +@@ -0,0 +1,82 @@ +/* + * Device Tree overlay for rpi-display by Watterott + * @@ -1667,6 +1997,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/rpi-display-overlay.dts linux-3.18 + rpi_display_pins: rpi_display_pins { + brcm,pins = <18 23 24 25>; + brcm,function = <1 1 1 0>; /* out out out in */ ++ brcm,pull = <0 0 0 2>; /* - - - up */ + }; + }; + }; @@ -1716,9 +2047,52 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/rpi-display-overlay.dts linux-3.18 + xohms = <&rpidisplay_ts>,"ti,x-plate-ohms;0"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/spi-bcm2835-overlay.dts linux-3.18.9/arch/arm/boot/dts/spi-bcm2835-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/spi-bcm2835-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/spi-bcm2835-overlay.dts 2015-03-08 03:38:45.266040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/rpi-proto-overlay.dts linux-rpi/arch/arm/boot/dts/rpi-proto-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/rpi-proto-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/rpi-proto-overlay.dts 2015-03-26 11:46:41.724226543 +0100 +@@ -0,0 +1,39 @@ ++// Definitions for Rpi-Proto ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2708"; ++ ++ fragment@0 { ++ target = <&sound>; ++ __overlay__ { ++ compatible = "rpi,rpi-proto"; ++ i2s-controller = <&i2s>; ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&i2s>; ++ __overlay__ { ++ status = "okay"; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ wm8731@1a { ++ #sound-dai-cells = <0>; ++ compatible = "wlf,wm8731"; ++ reg = <0x1a>; ++ status = "okay"; ++ }; ++ }; ++ }; ++}; +diff -Nur linux-3.18.10/arch/arm/boot/dts/spi-bcm2835-overlay.dts linux-rpi/arch/arm/boot/dts/spi-bcm2835-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/spi-bcm2835-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/spi-bcm2835-overlay.dts 2015-03-26 11:46:41.724226543 +0100 @@ -0,0 +1,18 @@ +/* + * Device tree overlay for spi-bcm2835 @@ -1738,9 +2112,229 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/spi-bcm2835-overlay.dts linux-3.18 + }; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-overlay.dts linux-3.18.9/arch/arm/boot/dts/w1-gpio-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/w1-gpio-overlay.dts 2015-03-08 03:38:45.270040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/tinylcd35-overlay.dts linux-rpi/arch/arm/boot/dts/tinylcd35-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/tinylcd35-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/tinylcd35-overlay.dts 2015-03-26 11:46:41.732226551 +0100 +@@ -0,0 +1,216 @@ ++/* ++ * tinylcd35-overlay.dts ++ * ++ * ------------------------------------------------- ++ * www.tinlylcd.com ++ * ------------------------------------------------- ++ * Device---Driver-----BUS GPIO's ++ * display tinylcd35 spi0.0 25 24 18 ++ * touch ads7846 spi0.1 5 ++ * rtc ds1307 i2c1-0068 ++ * rtc pcf8563 i2c1-0051 ++ * keypad gpio-keys --------- 17 22 27 23 28 ++ * ++ * ++ * TinyLCD.com 3.5 inch TFT ++ * ++ * Version 001 ++ * 5/3/2015 -- Noralf Trønnes Initial Device tree framework ++ * 10/3/2015 -- tinylcd@gmail.com added ds1307 support. ++ * ++ */ ++ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; ++ ++ fragment@0 { ++ target = <&spi0>; ++ __overlay__ { ++ status = "okay"; ++ ++ spidev@0{ ++ status = "disabled"; ++ }; ++ ++ spidev@1{ ++ status = "disabled"; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&gpio>; ++ __overlay__ { ++ tinylcd35_pins: tinylcd35_pins { ++ brcm,pins = <25 24 18>; ++ brcm,function = <1>; /* out */ ++ }; ++ tinylcd35_ts_pins: tinylcd35_ts_pins { ++ brcm,pins = <5>; ++ brcm,function = <0>; /* in */ ++ }; ++ keypad_pins: keypad_pins { ++ brcm,pins = <4 17 22 23 27>; ++ brcm,function = <0>; /* in */ ++ brcm,pull = <1>; /* down */ ++ }; ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&spi0>; ++ __overlay__ { ++ /* needed to avoid dtc warning */ ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ tinylcd35: tinylcd35@0{ ++ compatible = "neosec,tinylcd"; ++ reg = <0>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&tinylcd35_pins>, ++ <&tinylcd35_ts_pins>; ++ ++ spi-max-frequency = <48000000>; ++ rotate = <270>; ++ fps = <20>; ++ bgr; ++ buswidth = <8>; ++ reset-gpios = <&gpio 25 0>; ++ dc-gpios = <&gpio 24 0>; ++ led-gpios = <&gpio 18 1>; ++ debug = <0>; ++ ++ init = <0x10000B0 0x80 ++ 0x10000C0 0x0A 0x0A ++ 0x10000C1 0x01 0x01 ++ 0x10000C2 0x33 ++ 0x10000C5 0x00 0x42 0x80 ++ 0x10000B1 0xD0 0x11 ++ 0x10000B4 0x02 ++ 0x10000B6 0x00 0x22 0x3B ++ 0x10000B7 0x07 ++ 0x1000036 0x58 ++ 0x10000F0 0x36 0xA5 0xD3 ++ 0x10000E5 0x80 ++ 0x10000E5 0x01 ++ 0x10000B3 0x00 ++ 0x10000E5 0x00 ++ 0x10000F0 0x36 0xA5 0x53 ++ 0x10000E0 0x00 0x35 0x33 0x00 0x00 0x00 0x00 0x35 0x33 0x00 0x00 0x00 ++ 0x100003A 0x55 ++ 0x1000011 ++ 0x2000001 ++ 0x1000029>; ++ }; ++ ++ tinylcd35_ts: tinylcd35_ts@1 { ++ compatible = "ti,ads7846"; ++ reg = <1>; ++ status = "disabled"; ++ ++ spi-max-frequency = <2000000>; ++ interrupts = <5 2>; /* high-to-low edge triggered */ ++ interrupt-parent = <&gpio>; ++ pendown-gpio = <&gpio 5 0>; ++ ti,x-plate-ohms = /bits/ 16 <100>; ++ ti,pressure-max = /bits/ 16 <255>; ++ }; ++ }; ++ }; ++ ++ /* RTC */ ++ ++ fragment@3 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ pcf8563: pcf8563@51 { ++ compatible = "nxp,pcf8563"; ++ reg = <0x51>; ++ status = "disabled"; ++ }; ++ }; ++ }; ++ ++ fragment@4 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ ds1307: ds1307@68 { ++ compatible = "maxim,ds1307"; ++ reg = <0x68>; ++ status = "disabled"; ++ }; ++ }; ++ }; ++ ++ /* ++ * Values for input event code is found under the ++ * 'Keys and buttons' heading in include/uapi/linux/input.h ++ */ ++ fragment@5 { ++ target-path = "/soc"; ++ __overlay__ { ++ keypad: keypad { ++ compatible = "gpio-keys"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&keypad_pins>; ++ status = "disabled"; ++ autorepeat; ++ ++ button@17 { ++ label = "GPIO KEY_UP"; ++ linux,code = <103>; ++ gpios = <&gpio 17 0>; ++ }; ++ button@22 { ++ label = "GPIO KEY_DOWN"; ++ linux,code = <108>; ++ gpios = <&gpio 22 0>; ++ }; ++ button@27 { ++ label = "GPIO KEY_LEFT"; ++ linux,code = <105>; ++ gpios = <&gpio 27 0>; ++ }; ++ button@23 { ++ label = "GPIO KEY_RIGHT"; ++ linux,code = <106>; ++ gpios = <&gpio 23 0>; ++ }; ++ button@4 { ++ label = "GPIO KEY_ENTER"; ++ linux,code = <28>; ++ gpios = <&gpio 4 0>; ++ }; ++ }; ++ }; ++ }; ++ ++ __overrides__ { ++ speed = <&tinylcd35>,"spi-max-frequency:0"; ++ rotate = <&tinylcd35>,"rotate:0"; ++ fps = <&tinylcd35>,"fps:0"; ++ debug = <&tinylcd35>,"debug:0"; ++ touch = <&tinylcd35_ts>,"status"; ++ touchgpio = <&tinylcd35_ts_pins>,"brcm,pins:0", ++ <&tinylcd35_ts>,"interrupts:0", ++ <&tinylcd35_ts>,"pendown-gpio:4"; ++ xohms = <&tinylcd35_ts>,"ti,x-plate-ohms;0"; ++ rtc-pcf = <&i2c1>,"status", ++ <&pcf8563>,"status"; ++ rtc-ds = <&i2c1>,"status", ++ <&ds1307>,"status"; ++ keypad = <&keypad>,"status"; ++ }; ++}; +diff -Nur linux-3.18.10/arch/arm/boot/dts/w1-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/w1-gpio-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/w1-gpio-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/w1-gpio-overlay.dts 2015-03-26 11:46:41.732226551 +0100 @@ -0,0 +1,39 @@ +// Definitions for w1-gpio module (without external pullup) +/dts-v1/; @@ -1781,9 +2375,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-overlay.dts linux-3.18.9/a + pullup = <&w1>,"rpi,parasitic-power:0"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts linux-3.18.9/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts ---- linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts 2015-03-08 03:38:45.270040943 -0500 +diff -Nur linux-3.18.10/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts linux-rpi/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts +--- linux-3.18.10/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts 2015-03-26 11:46:41.732226551 +0100 @@ -0,0 +1,41 @@ +// Definitions for w1-gpio module (with external pullup) +/dts-v1/; @@ -1826,10 +2420,10 @@ diff -Nur linux-3.18.9.orig/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts linux-3 + pullup = <&w1>,"rpi,parasitic-power:0"; + }; +}; -diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch/arm/configs/bcm2709_defconfig ---- linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/configs/bcm2709_defconfig 2015-03-08 03:38:45.270040943 -0500 -@@ -0,0 +1,1193 @@ +diff -Nur linux-3.18.10/arch/arm/configs/bcm2709_defconfig linux-rpi/arch/arm/configs/bcm2709_defconfig +--- linux-3.18.10/arch/arm/configs/bcm2709_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/configs/bcm2709_defconfig 2015-03-26 11:46:41.736226555 +0100 +@@ -0,0 +1,1204 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_PHYS_OFFSET=0 +CONFIG_LOCALVERSION="-v7" @@ -1882,6 +2476,8 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +CONFIG_CMA=y ++CONFIG_ZSMALLOC=m ++CONFIG_PGTABLE_MAPPING=y +CONFIG_UACCESS_WITH_MEMCPY=y +CONFIG_SECCOMP=y +CONFIG_ZBOOT_ROM_TEXT=0x0 @@ -2224,6 +2820,8 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=5 ++CONFIG_ZRAM=m ++CONFIG_ZRAM_LZ4_COMPRESS=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m @@ -2355,7 +2953,8 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m -+# CONFIG_INPUT_KEYBOARD is not set ++# CONFIG_KEYBOARD_ATKBD is not set ++CONFIG_KEYBOARD_GPIO=m +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_IFORCE=m @@ -2366,6 +2965,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_EGALAX=m +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m ++CONFIG_TOUCHSCREEN_STMPE=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_ATI_REMOTE2=m @@ -2407,6 +3007,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +CONFIG_PPS_CLIENT_GPIO=m +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_ARIZONA=m ++CONFIG_GPIO_STMPE=y +CONFIG_W1=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m @@ -2432,6 +3033,8 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +CONFIG_WATCHDOG=y +CONFIG_BCM2708_WDT=m +CONFIG_UCB1400_CORE=m ++CONFIG_MFD_STMPE=y ++CONFIG_STMPE_SPI=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_ARIZONA_SPI=m +CONFIG_MFD_WM5102=y @@ -2602,7 +3205,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +CONFIG_VIDEO_MT9V011=m +CONFIG_FB=y +CONFIG_FB_BCM2708=y ++CONFIG_FB_UDL=m +# CONFIG_BACKLIGHT_GENERIC is not set ++CONFIG_BACKLIGHT_GPIO=m +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set @@ -2634,6 +3239,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m +CONFIG_SND_BCM2708_SOC_RPI_DAC=m ++CONFIG_SND_BCM2708_SOC_RPI_PROTO=m +CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m +CONFIG_SND_SIMPLE_CARD=m +CONFIG_SOUND_PRIME=m @@ -2705,7 +3311,6 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_UAS=m +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m @@ -3023,10 +3628,10 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcm2709_defconfig linux-3.18.9/arch +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/arm/configs/bcmrpi_defconfig ---- linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/configs/bcmrpi_defconfig 2015-03-08 03:38:45.270040943 -0500 -@@ -0,0 +1,1189 @@ +diff -Nur linux-3.18.10/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig +--- linux-3.18.10/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2015-03-26 11:46:41.736226555 +0100 +@@ -0,0 +1,1200 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_PHYS_OFFSET=0 +# CONFIG_LOCALVERSION_AUTO is not set @@ -3074,6 +3679,8 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +CONFIG_CMA=y ++CONFIG_ZSMALLOC=m ++CONFIG_PGTABLE_MAPPING=y +CONFIG_UACCESS_WITH_MEMCPY=y +CONFIG_SECCOMP=y +CONFIG_ZBOOT_ROM_TEXT=0x0 @@ -3415,6 +4022,8 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=5 ++CONFIG_ZRAM=m ++CONFIG_ZRAM_LZ4_COMPRESS=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m @@ -3546,7 +4155,8 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m -+# CONFIG_INPUT_KEYBOARD is not set ++# CONFIG_KEYBOARD_ATKBD is not set ++CONFIG_KEYBOARD_GPIO=m +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_IFORCE=m @@ -3557,6 +4167,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_EGALAX=m +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m ++CONFIG_TOUCHSCREEN_STMPE=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_ATI_REMOTE2=m @@ -3598,6 +4209,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +CONFIG_PPS_CLIENT_GPIO=m +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_ARIZONA=m ++CONFIG_GPIO_STMPE=y +CONFIG_W1=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m @@ -3623,6 +4235,8 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +CONFIG_WATCHDOG=y +CONFIG_BCM2708_WDT=m +CONFIG_UCB1400_CORE=m ++CONFIG_MFD_STMPE=y ++CONFIG_STMPE_SPI=y +CONFIG_MFD_ARIZONA_I2C=m +CONFIG_MFD_ARIZONA_SPI=m +CONFIG_MFD_WM5102=y @@ -3793,7 +4407,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +CONFIG_VIDEO_MT9V011=m +CONFIG_FB=y +CONFIG_FB_BCM2708=y ++CONFIG_FB_UDL=m +# CONFIG_BACKLIGHT_GENERIC is not set ++CONFIG_BACKLIGHT_GPIO=m +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set @@ -3825,6 +4441,7 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m +CONFIG_SND_BCM2708_SOC_RPI_DAC=m ++CONFIG_SND_BCM2708_SOC_RPI_PROTO=m +CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m +CONFIG_SND_SIMPLE_CARD=m +CONFIG_SOUND_PRIME=m @@ -3896,7 +4513,6 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m +CONFIG_USB_STORAGE_ENE_UB6250=m -+CONFIG_USB_UAS=m +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +CONFIG_USBIP_CORE=m @@ -4216,9 +4832,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/configs/bcmrpi_defconfig linux-3.18.9/arch/ +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.18.9.orig/arch/arm/include/asm/dma-mapping.h linux-3.18.9/arch/arm/include/asm/dma-mapping.h ---- linux-3.18.9.orig/arch/arm/include/asm/dma-mapping.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/include/asm/dma-mapping.h 2015-03-08 03:38:45.270040943 -0500 +diff -Nur linux-3.18.10/arch/arm/include/asm/dma-mapping.h linux-rpi/arch/arm/include/asm/dma-mapping.h +--- linux-3.18.10/arch/arm/include/asm/dma-mapping.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/include/asm/dma-mapping.h 2015-03-26 11:46:41.748226564 +0100 @@ -58,37 +58,21 @@ #ifndef __arch_pfn_to_dma static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) @@ -4258,9 +4874,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/include/asm/dma-mapping.h linux-3.18.9/arch return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); } -diff -Nur linux-3.18.9.orig/arch/arm/include/asm/entry-macro-multi.S linux-3.18.9/arch/arm/include/asm/entry-macro-multi.S ---- linux-3.18.9.orig/arch/arm/include/asm/entry-macro-multi.S 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/include/asm/entry-macro-multi.S 2015-03-08 03:38:45.270040943 -0500 +diff -Nur linux-3.18.10/arch/arm/include/asm/entry-macro-multi.S linux-rpi/arch/arm/include/asm/entry-macro-multi.S +--- linux-3.18.10/arch/arm/include/asm/entry-macro-multi.S 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/include/asm/entry-macro-multi.S 2015-03-26 11:46:41.748226564 +0100 @@ -1,5 +1,6 @@ #include <asm/assembler.h> @@ -4276,9 +4892,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/include/asm/entry-macro-multi.S linux-3.18. .macro arch_irq_handler, symbol_name .align 5 -diff -Nur linux-3.18.9.orig/arch/arm/include/asm/irqflags.h linux-3.18.9/arch/arm/include/asm/irqflags.h ---- linux-3.18.9.orig/arch/arm/include/asm/irqflags.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/include/asm/irqflags.h 2015-03-08 03:38:45.270040943 -0500 +diff -Nur linux-3.18.10/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/include/asm/irqflags.h +--- linux-3.18.10/arch/arm/include/asm/irqflags.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/include/asm/irqflags.h 2015-03-26 11:46:41.748226564 +0100 @@ -145,12 +145,22 @@ } @@ -4305,9 +4921,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/include/asm/irqflags.h linux-3.18.9/arch/ar : : "r" (flags) : "memory", "cc"); -diff -Nur linux-3.18.9.orig/arch/arm/include/asm/string.h linux-3.18.9/arch/arm/include/asm/string.h ---- linux-3.18.9.orig/arch/arm/include/asm/string.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/include/asm/string.h 2015-03-08 03:38:45.270040943 -0500 +diff -Nur linux-3.18.10/arch/arm/include/asm/string.h linux-rpi/arch/arm/include/asm/string.h +--- linux-3.18.10/arch/arm/include/asm/string.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/include/asm/string.h 2015-03-26 11:46:41.752226568 +0100 @@ -24,6 +24,11 @@ #define __HAVE_ARCH_MEMSET extern void * memset(void *, int, __kernel_size_t); @@ -4320,9 +4936,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/include/asm/string.h linux-3.18.9/arch/arm/ extern void __memzero(void *ptr, __kernel_size_t n); #define memset(p,v,n) \ -diff -Nur linux-3.18.9.orig/arch/arm/include/asm/uaccess.h linux-3.18.9/arch/arm/include/asm/uaccess.h ---- linux-3.18.9.orig/arch/arm/include/asm/uaccess.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/include/asm/uaccess.h 2015-03-08 03:38:45.270040943 -0500 +diff -Nur linux-3.18.10/arch/arm/include/asm/uaccess.h linux-rpi/arch/arm/include/asm/uaccess.h +--- linux-3.18.10/arch/arm/include/asm/uaccess.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/include/asm/uaccess.h 2015-03-26 11:46:41.752226568 +0100 @@ -475,6 +475,7 @@ #ifdef CONFIG_MMU @@ -4331,9 +4947,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/include/asm/uaccess.h linux-3.18.9/arch/arm 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-3.18.9.orig/arch/arm/Kconfig linux-3.18.9/arch/arm/Kconfig ---- linux-3.18.9.orig/arch/arm/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/Kconfig 2015-03-08 03:38:45.270040943 -0500 +diff -Nur linux-3.18.10/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig +--- linux-3.18.10/arch/arm/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/Kconfig 2015-03-26 11:46:41.692226515 +0100 @@ -381,6 +381,23 @@ This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. @@ -4394,9 +5010,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/Kconfig linux-3.18.9/arch/arm/Kconfig source "arch/arm/mach-zynq/Kconfig" -diff -Nur linux-3.18.9.orig/arch/arm/Kconfig.debug linux-3.18.9/arch/arm/Kconfig.debug ---- linux-3.18.9.orig/arch/arm/Kconfig.debug 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/Kconfig.debug 2015-03-08 03:38:45.270040943 -0500 +diff -Nur linux-3.18.10/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug +--- linux-3.18.10/arch/arm/Kconfig.debug 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/Kconfig.debug 2015-03-26 11:46:41.692226515 +0100 @@ -985,6 +985,14 @@ options; the platform specific options are deprecated and will be soon removed. @@ -4412,9 +5028,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/Kconfig.debug linux-3.18.9/arch/arm/Kconfig endchoice config DEBUG_EXYNOS_UART -diff -Nur linux-3.18.9.orig/arch/arm/kernel/fiqasm.S linux-3.18.9/arch/arm/kernel/fiqasm.S ---- linux-3.18.9.orig/arch/arm/kernel/fiqasm.S 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/kernel/fiqasm.S 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S +--- linux-3.18.10/arch/arm/kernel/fiqasm.S 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/kernel/fiqasm.S 2015-03-26 11:46:41.756226573 +0100 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 ret lr @@ -4423,9 +5039,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/kernel/fiqasm.S linux-3.18.9/arch/arm/kerne +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-3.18.9.orig/arch/arm/kernel/head.S linux-3.18.9/arch/arm/kernel/head.S ---- linux-3.18.9.orig/arch/arm/kernel/head.S 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/kernel/head.S 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/kernel/head.S linux-rpi/arch/arm/kernel/head.S +--- linux-3.18.10/arch/arm/kernel/head.S 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/kernel/head.S 2015-03-26 11:46:41.756226573 +0100 @@ -673,6 +673,14 @@ ldrcc r7, [r4], #4 @ use branch for delay slot bcc 1b @@ -4441,9 +5057,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/kernel/head.S linux-3.18.9/arch/arm/kernel/ #endif ENDPROC(__fixup_a_pv_table) -diff -Nur linux-3.18.9.orig/arch/arm/kernel/process.c linux-3.18.9/arch/arm/kernel/process.c ---- linux-3.18.9.orig/arch/arm/kernel/process.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/kernel/process.c 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c +--- linux-3.18.10/arch/arm/kernel/process.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/kernel/process.c 2015-03-26 11:46:41.760226578 +0100 @@ -166,6 +166,16 @@ } #endif @@ -4461,9 +5077,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/kernel/process.c linux-3.18.9/arch/arm/kern /* * Called by kexec, immediately prior to machine_kexec(). * -diff -Nur linux-3.18.9.orig/arch/arm/lib/arm-mem.h linux-3.18.9/arch/arm/lib/arm-mem.h ---- linux-3.18.9.orig/arch/arm/lib/arm-mem.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/arm-mem.h 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/arm-mem.h linux-rpi/arch/arm/lib/arm-mem.h +--- linux-3.18.10/arch/arm/lib/arm-mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/lib/arm-mem.h 2015-03-26 11:46:41.760226578 +0100 @@ -0,0 +1,159 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -4624,9 +5240,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/arm-mem.h linux-3.18.9/arch/arm/lib/arm + .endif +92: +.endm -diff -Nur linux-3.18.9.orig/arch/arm/lib/copy_from_user.S linux-3.18.9/arch/arm/lib/copy_from_user.S ---- linux-3.18.9.orig/arch/arm/lib/copy_from_user.S 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/copy_from_user.S 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/copy_from_user.S linux-rpi/arch/arm/lib/copy_from_user.S +--- linux-3.18.10/arch/arm/lib/copy_from_user.S 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/lib/copy_from_user.S 2015-03-26 11:46:41.764226581 +0100 @@ -84,11 +84,13 @@ .text @@ -4642,9 +5258,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/copy_from_user.S linux-3.18.9/arch/arm/ .pushsection .fixup,"ax" .align 0 -diff -Nur linux-3.18.9.orig/arch/arm/lib/exports_rpi.c linux-3.18.9/arch/arm/lib/exports_rpi.c ---- linux-3.18.9.orig/arch/arm/lib/exports_rpi.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/exports_rpi.c 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/exports_rpi.c linux-rpi/arch/arm/lib/exports_rpi.c +--- linux-3.18.10/arch/arm/lib/exports_rpi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/lib/exports_rpi.c 2015-03-26 11:46:41.764226581 +0100 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2014, Raspberry Pi (Trading) Ltd. @@ -4683,9 +5299,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/exports_rpi.c linux-3.18.9/arch/arm/lib +#include <linux/module.h> + +EXPORT_SYMBOL(memcmp); -diff -Nur linux-3.18.9.orig/arch/arm/lib/Makefile linux-3.18.9/arch/arm/lib/Makefile ---- linux-3.18.9.orig/arch/arm/lib/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/Makefile 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/Makefile linux-rpi/arch/arm/lib/Makefile +--- linux-3.18.10/arch/arm/lib/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/lib/Makefile 2015-03-26 11:46:41.760226578 +0100 @@ -6,15 +6,24 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ @@ -4714,9 +5330,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/Makefile linux-3.18.9/arch/arm/lib/Make mmu-y := clear_user.o copy_page.o getuser.o putuser.o # the code in uaccess.S is not preemption safe and -diff -Nur linux-3.18.9.orig/arch/arm/lib/memcmp_rpi.S linux-3.18.9/arch/arm/lib/memcmp_rpi.S ---- linux-3.18.9.orig/arch/arm/lib/memcmp_rpi.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/memcmp_rpi.S 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/memcmp_rpi.S linux-rpi/arch/arm/lib/memcmp_rpi.S +--- linux-3.18.10/arch/arm/lib/memcmp_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/lib/memcmp_rpi.S 2015-03-26 11:46:41.764226581 +0100 @@ -0,0 +1,285 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5003,9 +5619,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/memcmp_rpi.S linux-3.18.9/arch/arm/lib/ + .unreq DAT7 + .unreq OFF +ENDPROC(memcmp) -diff -Nur linux-3.18.9.orig/arch/arm/lib/memcpymove.h linux-3.18.9/arch/arm/lib/memcpymove.h ---- linux-3.18.9.orig/arch/arm/lib/memcpymove.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/memcpymove.h 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/memcpymove.h linux-rpi/arch/arm/lib/memcpymove.h +--- linux-3.18.10/arch/arm/lib/memcpymove.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/lib/memcpymove.h 2015-03-26 11:46:41.764226581 +0100 @@ -0,0 +1,506 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5513,9 +6129,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/memcpymove.h linux-3.18.9/arch/arm/lib/ + .unreq LAST + .unreq OFF +.endm -diff -Nur linux-3.18.9.orig/arch/arm/lib/memcpy_rpi.S linux-3.18.9/arch/arm/lib/memcpy_rpi.S ---- linux-3.18.9.orig/arch/arm/lib/memcpy_rpi.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/memcpy_rpi.S 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/memcpy_rpi.S linux-rpi/arch/arm/lib/memcpy_rpi.S +--- linux-3.18.10/arch/arm/lib/memcpy_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/lib/memcpy_rpi.S 2015-03-26 11:46:41.764226581 +0100 @@ -0,0 +1,59 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5576,9 +6192,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/memcpy_rpi.S linux-3.18.9/arch/arm/lib/ +ENTRY(memcpy) + memcpy 0 +ENDPROC(memcpy) -diff -Nur linux-3.18.9.orig/arch/arm/lib/memmove_rpi.S linux-3.18.9/arch/arm/lib/memmove_rpi.S ---- linux-3.18.9.orig/arch/arm/lib/memmove_rpi.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/memmove_rpi.S 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/memmove_rpi.S linux-rpi/arch/arm/lib/memmove_rpi.S +--- linux-3.18.10/arch/arm/lib/memmove_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/lib/memmove_rpi.S 2015-03-26 11:46:41.764226581 +0100 @@ -0,0 +1,61 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5641,9 +6257,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/memmove_rpi.S linux-3.18.9/arch/arm/lib + bpl memcpy /* pl works even over -1 - 0 and 0x7fffffff - 0x80000000 boundaries */ + memcpy 1 +ENDPROC(memmove) -diff -Nur linux-3.18.9.orig/arch/arm/lib/memset_rpi.S linux-3.18.9/arch/arm/lib/memset_rpi.S ---- linux-3.18.9.orig/arch/arm/lib/memset_rpi.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/memset_rpi.S 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/memset_rpi.S linux-rpi/arch/arm/lib/memset_rpi.S +--- linux-3.18.10/arch/arm/lib/memset_rpi.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/lib/memset_rpi.S 2015-03-26 11:46:41.764226581 +0100 @@ -0,0 +1,121 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -5766,9 +6382,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/memset_rpi.S linux-3.18.9/arch/arm/lib/ + .unreq DAT2 + .unreq DAT3 +ENDPROC(memset) -diff -Nur linux-3.18.9.orig/arch/arm/lib/uaccess_with_memcpy.c linux-3.18.9/arch/arm/lib/uaccess_with_memcpy.c ---- linux-3.18.9.orig/arch/arm/lib/uaccess_with_memcpy.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/lib/uaccess_with_memcpy.c 2015-03-08 03:38:45.274040943 -0500 +diff -Nur linux-3.18.10/arch/arm/lib/uaccess_with_memcpy.c linux-rpi/arch/arm/lib/uaccess_with_memcpy.c +--- linux-3.18.10/arch/arm/lib/uaccess_with_memcpy.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/lib/uaccess_with_memcpy.c 2015-03-26 11:46:41.764226581 +0100 @@ -22,6 +22,14 @@ #include <asm/current.h> #include <asm/page.h> @@ -5912,9 +6528,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/lib/uaccess_with_memcpy.c linux-3.18.9/arch static unsigned long noinline __clear_user_memset(void __user *addr, unsigned long n) -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.18.9/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/armctrl.c 2015-03-08 03:38:45.294040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.18.10/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,315 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -6231,9 +6847,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.18.9/arch/ar + armctrl_dt_init(); + return 0; +} -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.18.9/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/armctrl.h 2015-03-08 03:38:45.294040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.18.10/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -6262,9 +6878,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.18.9/arch/ar + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.18.9/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/bcm2708.c 2015-03-08 03:38:45.294040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.18.10/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,1132 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -7398,9 +8014,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.18.9/arch/ar +MODULE_PARM_DESC(pps_gpio_pin, "Set GPIO pin to reserve for PPS"); +module_param(vc_i2c_override, bool, 0644); +MODULE_PARM_DESC(vc_i2c_override, "Allow the use of VC's I2C peripheral."); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.18.9/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/bcm2708_gpio.c 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.18.10/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,426 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -7828,9 +8444,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.18.9/ar + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.18.9/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/bcm2708.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.18.10/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -7881,9 +8497,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.18.9/arch/ar +} + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/dma.c linux-3.18.9/arch/arm/mach-bcm2708/dma.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/dma.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/dma.c 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c +--- linux-3.18.10/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/dma.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,409 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -8294,9 +8910,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/dma.c linux-3.18.9/arch/arm/ma +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/arm_control.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -8717,9 +9333,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h lin +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/arm_power.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.18.10/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,62 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -8783,9 +9399,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux +}; + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/clkdev.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -8794,9 +9410,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3. +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.18.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -8820,9 +9436,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S lin + .endm + +#include <debug/pl01x.S> -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/dma.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.18.10/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,94 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -8918,9 +9534,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.18. + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.18.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -8991,9 +9607,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S lin +1020: @ EQ will be set if no irqs pending + + .endm -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/frc.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -9033,9 +9649,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.18. +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/gpio.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -9054,9 +9670,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.18 +#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/hardware.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -9086,9 +9702,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux- +#include <mach/platform.h> + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/io.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/io.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -9117,9 +9733,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.18.9 +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/irqs.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -9320,9 +9936,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.18 +#define NR_IRQS (BCM2708_ALLOC_IRQS+FREE_IRQS) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/memory.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -9381,9 +9997,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3. +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - BCM_PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/platform.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,228 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -9613,9 +10229,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux- +#endif + +/* END */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/power.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/power.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.18.10/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -9643,9 +10259,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.1 +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/system.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/system.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -9685,9 +10301,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3. +} + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/timex.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -9712,9 +10328,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.1 + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/uncompress.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -9800,9 +10416,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linu + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vcio.h 2015-03-08 03:38:45.298040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.18.10/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,165 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -9969,9 +10585,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.18 +#define DEVICE_FILE_NAME "vcio" + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.18.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -10008,9 +10624,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3. +#endif + +#endif /* VC_MEM_H */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,181 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10193,9 +10809,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_defs.h linu +} VC_SM_MSG_UNION_T; + +#endif /* __VC_SM_DEFS_H__INCLUDED__ */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,55 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10252,9 +10868,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_sm_knl.h linux + long unsigned int *data); + +#endif /* __VC_SM_KNL_H__INCLUDED__ */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,82 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10338,9 +10954,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vc_vchi_sm.h linu + VC_SM_ACTION_CLEAN_T *action_clean); + +#endif /* __VC_VCHI_SM_H__INCLUDED__ */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -10362,9 +10978,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xe8000000) -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,233 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10599,9 +11215,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/include/mach/vmcs_sm_ioctl.h l +/* ---- Function Prototypes ---------------------------------------------- */ + +#endif /* __VMCS_SM_IOCTL_H__INCLUDED__ */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/Kconfig linux-3.18.9/arch/arm/mach-bcm2708/Kconfig ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/Kconfig 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig +--- linux-3.18.10/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/Kconfig 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,52 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -10655,9 +11271,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/Kconfig linux-3.18.9/arch/arm/ + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/Makefile linux-3.18.9/arch/arm/mach-bcm2708/Makefile ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/Makefile 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile +--- linux-3.18.10/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/Makefile 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,7 @@ +# +# Makefile for the linux kernel. @@ -10666,16 +11282,16 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/Makefile linux-3.18.9/arch/arm +obj-$(CONFIG_MACH_BCM2708) += bcm2708.o armctrl.o vcio.o power.o dma.o +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.18.9/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/Makefile.boot 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/Makefile.boot 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.18.10/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/Makefile.boot 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/power.c linux-3.18.9/arch/arm/mach-bcm2708/power.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/power.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/power.c 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm2708/power.c +--- linux-3.18.10/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/power.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,197 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -10874,9 +11490,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/power.c linux-3.18.9/arch/arm/ +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/vcio.c linux-3.18.9/arch/arm/mach-bcm2708/vcio.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/vcio.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/vcio.c 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2708/vcio.c +--- linux-3.18.10/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/vcio.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,484 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -11362,9 +11978,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/vcio.c linux-3.18.9/arch/arm/m +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.18.9/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2708/vc_mem.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2708/vc_mem.c 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.18.10/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/vc_mem.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,432 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -11798,9 +12414,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.18.9/arch/arm +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); + -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.c linux-3.18.9/arch/arm/mach-bcm2709/armctrl.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/armctrl.c 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/armctrl.c linux-rpi/arch/arm/mach-bcm2709/armctrl.c +--- linux-3.18.10/arch/arm/mach-bcm2709/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/armctrl.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,369 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -12171,9 +12787,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.c linux-3.18.9/arch/ar + armctrl_dt_init(); + return 0; +} -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.h linux-3.18.9/arch/arm/mach-bcm2709/armctrl.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/armctrl.h 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/armctrl.h linux-rpi/arch/arm/mach-bcm2709/armctrl.h +--- linux-3.18.10/arch/arm/mach-bcm2709/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/armctrl.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -12202,9 +12818,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/armctrl.h linux-3.18.9/arch/ar + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2708_gpio.c linux-3.18.9/arch/arm/mach-bcm2709/bcm2708_gpio.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2708_gpio.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/bcm2708_gpio.c 2015-03-08 03:38:45.302040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2709/bcm2708_gpio.c +--- linux-3.18.10/arch/arm/mach-bcm2709/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/bcm2708_gpio.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,426 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -12632,9 +13248,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2708_gpio.c linux-3.18.9/ar + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.c linux-3.18.9/arch/arm/mach-bcm2709/bcm2709.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/bcm2709.c 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/bcm2709.c linux-rpi/arch/arm/mach-bcm2709/bcm2709.c +--- linux-3.18.10/arch/arm/mach-bcm2709/bcm2709.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/bcm2709.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,1297 @@ +/* + * linux/arch/arm/mach-bcm2709/bcm2709.c @@ -13933,9 +14549,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.c linux-3.18.9/arch/ar +MODULE_PARM_DESC(pps_gpio_pin, "Set GPIO pin to reserve for PPS"); +module_param(vc_i2c_override, bool, 0644); +MODULE_PARM_DESC(vc_i2c_override, "Allow the use of VC's I2C peripheral."); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.h linux-3.18.9/arch/arm/mach-bcm2709/bcm2709.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/bcm2709.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/bcm2709.h linux-rpi/arch/arm/mach-bcm2709/bcm2709.h +--- linux-3.18.10/arch/arm/mach-bcm2709/bcm2709.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/bcm2709.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -13986,9 +14602,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/bcm2709.h linux-3.18.9/arch/ar +} + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.c linux-3.18.9/arch/arm/mach-bcm2709/clock.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/clock.c 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/clock.c linux-rpi/arch/arm/mach-bcm2709/clock.c +--- linux-3.18.10/arch/arm/mach-bcm2709/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/clock.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -14051,9 +14667,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.c linux-3.18.9/arch/arm/ + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.h linux-3.18.9/arch/arm/mach-bcm2709/clock.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/clock.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/clock.h linux-rpi/arch/arm/mach-bcm2709/clock.h +--- linux-3.18.10/arch/arm/mach-bcm2709/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/clock.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -14079,9 +14695,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/clock.h linux-3.18.9/arch/arm/ +struct clk { + unsigned long rate; +}; -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/delay.S linux-3.18.9/arch/arm/mach-bcm2709/delay.S ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/delay.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/delay.S 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/delay.S linux-rpi/arch/arm/mach-bcm2709/delay.S +--- linux-3.18.10/arch/arm/mach-bcm2709/delay.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/delay.S 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,21 @@ +/* + * linux/arch/arm/lib/delay.S @@ -14104,9 +14720,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/delay.S linux-3.18.9/arch/arm/ + bhi bcm2708_delay + mov pc, lr +ENDPROC(bcm2708_delay) -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/dma.c linux-3.18.9/arch/arm/mach-bcm2709/dma.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/dma.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/dma.c 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/dma.c linux-rpi/arch/arm/mach-bcm2709/dma.c +--- linux-3.18.10/arch/arm/mach-bcm2709/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/dma.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,409 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -14517,9 +15133,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/dma.c linux-3.18.9/arch/arm/ma +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/dmaer.c linux-3.18.9/arch/arm/mach-bcm2709/dmaer.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/dmaer.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/dmaer.c 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/dmaer.c linux-rpi/arch/arm/mach-bcm2709/dmaer.c +--- linux-3.18.10/arch/arm/mach-bcm2709/dmaer.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/dmaer.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,886 @@ +#include <linux/init.h> +#include <linux/sched.h> @@ -15407,9 +16023,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/dmaer.c linux-3.18.9/arch/arm/ +MODULE_AUTHOR("Simon Hall"); +module_init(dmaer_init); +module_exit(dmaer_exit); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_control.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/arm_control.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_control.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/arm_control.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2709/include/mach/arm_control.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,493 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -15904,9 +16520,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_control.h lin +#define ARM_LOCAL_MAILBOX3_CLR3 HW_REGISTER_RW(ARM_LOCAL_BASE+0x0FC) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_power.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/arm_power.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_power.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/arm_power.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2709/include/mach/arm_power.h +--- linux-3.18.10/arch/arm/mach-bcm2709/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/include/mach/arm_power.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,62 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -15970,16 +16586,16 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/arm_power.h linux +}; + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/barriers.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/barriers.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/barriers.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/barriers.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/barriers.h linux-rpi/arch/arm/mach-bcm2709/include/mach/barriers.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,3 @@ +#define mb() dsb() +#define rmb() dsb() +#define wmb() mb() -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/clkdev.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/clkdev.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/clkdev.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/clkdev.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2709/include/mach/clkdev.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -15988,9 +16604,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/clkdev.h linux-3. +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/debug-macro.S linux-3.18.9/arch/arm/mach-bcm2709/include/mach/debug-macro.S ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/debug-macro.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/debug-macro.S 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2709/include/mach/debug-macro.S +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -16014,9 +16630,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/debug-macro.S lin + .endm + +#include <debug/pl01x.S> -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/dma.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/dma.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/dma.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/dma.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2709/include/mach/dma.h +--- linux-3.18.10/arch/arm/mach-bcm2709/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/include/mach/dma.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,94 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -16112,9 +16728,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/dma.h linux-3.18. + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/entry-macro.S linux-3.18.9/arch/arm/mach-bcm2709/include/mach/entry-macro.S ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/entry-macro.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/entry-macro.S 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2709/include/mach/entry-macro.S +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,120 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -16236,9 +16852,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/entry-macro.S lin + .macro arch_irq_handler_default +1: get_irqnr_and_base r0, r2, r6, lr + .endm -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/frc.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/frc.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/frc.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/frc.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2709/include/mach/frc.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -16278,9 +16894,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/frc.h linux-3.18. +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/gpio.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/gpio.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/gpio.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/gpio.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2709/include/mach/gpio.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -16299,9 +16915,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/gpio.h linux-3.18 +#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/hardware.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/hardware.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/hardware.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/hardware.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2709/include/mach/hardware.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -16331,9 +16947,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/hardware.h linux- +#include <mach/platform.h> + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/io.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/io.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/io.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/io.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/io.h linux-rpi/arch/arm/mach-bcm2709/include/mach/io.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -16362,9 +16978,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/io.h linux-3.18.9 +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/irqs.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/irqs.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/irqs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/irqs.h 2015-03-08 03:38:45.306040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2709/include/mach/irqs.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,225 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -16585,15 +17201,15 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/irqs.h linux-3.18 +#define FIQ_IRQS (128) +#define GPIO_IRQ_START (HARD_IRQS + FIQ_IRQS) +#define GPIO_IRQS (32*5) -+#define SPARE_ALLOC_IRQS 32 ++#define SPARE_ALLOC_IRQS 64 +#define BCM2708_ALLOC_IRQS (HARD_IRQS+FIQ_IRQS+GPIO_IRQS+SPARE_ALLOC_IRQS) -+#define FREE_IRQS 32 ++#define FREE_IRQS 128 +#define NR_IRQS (BCM2708_ALLOC_IRQS+FREE_IRQS) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/memory.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/memory.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/memory.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/memory.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2709/include/mach/memory.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -16652,9 +17268,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/memory.h linux-3. +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - BCM_PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/platform.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/platform.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/platform.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/platform.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2709/include/mach/platform.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,225 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -16881,9 +17497,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/platform.h linux- +#endif + +/* END */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/power.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/power.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/power.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/power.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/power.h linux-rpi/arch/arm/mach-bcm2709/include/mach/power.h +--- linux-3.18.10/arch/arm/mach-bcm2709/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/include/mach/power.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -16911,9 +17527,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/power.h linux-3.1 +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/system.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/system.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/system.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/system.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/system.h linux-rpi/arch/arm/mach-bcm2709/include/mach/system.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -16953,9 +17569,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/system.h linux-3. +} + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/timex.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/timex.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/timex.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/timex.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2709/include/mach/timex.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -16980,9 +17596,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/timex.h linux-3.1 + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/uncompress.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/uncompress.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/uncompress.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/uncompress.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2709/include/mach/uncompress.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -17068,9 +17684,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/uncompress.h linu + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vcio.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vcio.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vcio.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vcio.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vcio.h +--- linux-3.18.10/arch/arm/mach-bcm2709/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/include/mach/vcio.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,165 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -17237,9 +17853,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vcio.h linux-3.18 +#define DEVICE_FILE_NAME "vcio" + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_mem.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vc_mem.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_mem.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vc_mem.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vc_mem.h +--- linux-3.18.10/arch/arm/mach-bcm2709/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/include/mach/vc_mem.h 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -17276,9 +17892,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_mem.h linux-3. +#endif + +#endif /* VC_MEM_H */ -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_support.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vc_support.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_support.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vc_support.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/vc_support.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vc_support.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,69 @@ +#ifndef _VC_SUPPORT_H_ +#define _VC_SUPPORT_H_ @@ -17349,9 +17965,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vc_support.h linu + unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5); + +#endif -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vmalloc.h linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vmalloc.h ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vmalloc.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/include/mach/vmalloc.h 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2709/include/mach/vmalloc.h +--- linux-3.18.10/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 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -17373,9 +17989,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/include/mach/vmalloc.h linux-3 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xff000000) -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/Kconfig linux-3.18.9/arch/arm/mach-bcm2709/Kconfig ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/Kconfig 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/Kconfig linux-rpi/arch/arm/mach-bcm2709/Kconfig +--- linux-3.18.10/arch/arm/mach-bcm2709/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/Kconfig 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,49 @@ +menu "Broadcom BCM2709 Implementations" + depends on ARCH_BCM2709 @@ -17426,9 +18042,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/Kconfig linux-3.18.9/arch/arm/ + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/Makefile linux-3.18.9/arch/arm/mach-bcm2709/Makefile ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/Makefile 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/Makefile linux-rpi/arch/arm/mach-bcm2709/Makefile +--- linux-3.18.10/arch/arm/mach-bcm2709/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/Makefile 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,7 @@ +# +# Makefile for the linux kernel. @@ -17437,16 +18053,16 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/Makefile linux-3.18.9/arch/arm +obj-$(CONFIG_MACH_BCM2709) += bcm2709.o armctrl.o vcio.o power.o dma.o +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/Makefile.boot linux-3.18.9/arch/arm/mach-bcm2709/Makefile.boot ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/Makefile.boot 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/Makefile.boot 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/Makefile.boot linux-rpi/arch/arm/mach-bcm2709/Makefile.boot +--- linux-3.18.10/arch/arm/mach-bcm2709/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/Makefile.boot 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/power.c linux-3.18.9/arch/arm/mach-bcm2709/power.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/power.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/power.c 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/power.c linux-rpi/arch/arm/mach-bcm2709/power.c +--- linux-3.18.10/arch/arm/mach-bcm2709/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/power.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,195 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -17643,9 +18259,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/power.c linux-3.18.9/arch/arm/ +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/vcio.c linux-3.18.9/arch/arm/mach-bcm2709/vcio.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/vcio.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/vcio.c 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/vcio.c linux-rpi/arch/arm/mach-bcm2709/vcio.c +--- linux-3.18.10/arch/arm/mach-bcm2709/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/vcio.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,484 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -18131,9 +18747,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/vcio.c linux-3.18.9/arch/arm/m +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_mem.c linux-3.18.9/arch/arm/mach-bcm2709/vc_mem.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_mem.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/vc_mem.c 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/vc_mem.c linux-rpi/arch/arm/mach-bcm2709/vc_mem.c +--- linux-3.18.10/arch/arm/mach-bcm2709/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/vc_mem.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,431 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -18566,9 +19182,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_mem.c linux-3.18.9/arch/arm +module_param(phys_addr, uint, 0644); +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); -diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_support.c linux-3.18.9/arch/arm/mach-bcm2709/vc_support.c ---- linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_support.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/arch/arm/mach-bcm2709/vc_support.c 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mach-bcm2709/vc_support.c linux-rpi/arch/arm/mach-bcm2709/vc_support.c +--- linux-3.18.10/arch/arm/mach-bcm2709/vc_support.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2709/vc_support.c 2015-03-26 11:46:41.772226586 +0100 @@ -0,0 +1,318 @@ +/* + * vc_support.c @@ -18888,9 +19504,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mach-bcm2709/vc_support.c linux-3.18.9/arch + return 1; + } +} -diff -Nur linux-3.18.9.orig/arch/arm/Makefile linux-3.18.9/arch/arm/Makefile ---- linux-3.18.9.orig/arch/arm/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/Makefile 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/Makefile linux-rpi/arch/arm/Makefile +--- linux-3.18.10/arch/arm/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/Makefile 2015-03-26 11:46:41.692226515 +0100 @@ -146,6 +146,8 @@ machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_AXXIA) += axxia @@ -18900,9 +19516,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/Makefile linux-3.18.9/arch/arm/Makefile machine-$(CONFIG_ARCH_BERLIN) += berlin machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx -diff -Nur linux-3.18.9.orig/arch/arm/mm/Kconfig linux-3.18.9/arch/arm/mm/Kconfig ---- linux-3.18.9.orig/arch/arm/mm/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/mm/Kconfig 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig +--- linux-3.18.10/arch/arm/mm/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/mm/Kconfig 2015-03-26 11:46:42.112226903 +0100 @@ -358,7 +358,7 @@ # ARMv6 @@ -18912,9 +19528,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mm/Kconfig linux-3.18.9/arch/arm/mm/Kconfig select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6 -diff -Nur linux-3.18.9.orig/arch/arm/mm/proc-v6.S linux-3.18.9/arch/arm/mm/proc-v6.S ---- linux-3.18.9.orig/arch/arm/mm/proc-v6.S 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/mm/proc-v6.S 2015-03-08 03:38:45.310040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S +--- linux-3.18.10/arch/arm/mm/proc-v6.S 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/mm/proc-v6.S 2015-03-26 11:46:42.116226906 +0100 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -18938,9 +19554,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mm/proc-v6.S linux-3.18.9/arch/arm/mm/proc- ret lr ENTRY(cpu_v6_dcache_clean_area) -diff -Nur linux-3.18.9.orig/arch/arm/mm/proc-v7.S linux-3.18.9/arch/arm/mm/proc-v7.S ---- linux-3.18.9.orig/arch/arm/mm/proc-v7.S 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/mm/proc-v7.S 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/arch/arm/mm/proc-v7.S linux-rpi/arch/arm/mm/proc-v7.S +--- linux-3.18.10/arch/arm/mm/proc-v7.S 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/mm/proc-v7.S 2015-03-26 11:46:42.116226906 +0100 @@ -441,6 +441,7 @@ orr r0, r0, r6 @ set them THUMB( orr r0, r0, #1 << 30 ) @ Thumb exceptions @@ -18949,9 +19565,9 @@ diff -Nur linux-3.18.9.orig/arch/arm/mm/proc-v7.S linux-3.18.9/arch/arm/mm/proc- ENDPROC(__v7_setup) .align 2 -diff -Nur linux-3.18.9.orig/arch/arm/tools/mach-types linux-3.18.9/arch/arm/tools/mach-types ---- linux-3.18.9.orig/arch/arm/tools/mach-types 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/arch/arm/tools/mach-types 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types +--- linux-3.18.10/arch/arm/tools/mach-types 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/arch/arm/tools/mach-types 2015-03-26 11:46:42.172226958 +0100 @@ -522,6 +522,8 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -18961,9 +19577,29 @@ diff -Nur linux-3.18.9.orig/arch/arm/tools/mach-types linux-3.18.9/arch/arm/tool 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-3.18.9.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-3.18.9/Documentation/video4linux/bcm2835-v4l2.txt ---- linux-3.18.9.orig/Documentation/video4linux/bcm2835-v4l2.txt 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/Documentation/video4linux/bcm2835-v4l2.txt 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/Documentation/sound/alsa/ControlNames.txt linux-rpi/Documentation/sound/alsa/ControlNames.txt +--- linux-3.18.10/Documentation/sound/alsa/ControlNames.txt 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/Documentation/sound/alsa/ControlNames.txt 2015-03-26 11:46:41.644226470 +0100 +@@ -49,11 +49,11 @@ + IEC958 + + Exceptions: +- [Digital] Capture Source +- [Digital] Capture Switch (aka input gain switch) +- [Digital] Capture Volume (aka input gain volume) +- [Digital] Playback Switch (aka output gain switch) +- [Digital] Playback Volume (aka output gain volume) ++ [Analogue|Digital] Capture Source ++ [Analogue|Digital] Capture Switch (aka input gain switch) ++ [Analogue|Digital] Capture Volume (aka input gain volume) ++ [Analogue|Digital] Playback Switch (aka output gain switch) ++ [Analogue|Digital] Playback Volume (aka output gain volume) + Tone Control - Switch + Tone Control - Bass + Tone Control - Treble +diff -Nur linux-3.18.10/Documentation/video4linux/bcm2835-v4l2.txt linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt +--- linux-3.18.10/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/Documentation/video4linux/bcm2835-v4l2.txt 2015-03-26 11:46:41.656226478 +0100 @@ -0,0 +1,60 @@ + +BCM2835 (aka Raspberry Pi) V4L2 driver @@ -19025,9 +19661,9 @@ diff -Nur linux-3.18.9.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-3.1 +List of available formats: + +$ v4l2-ctl --list-formats -diff -Nur linux-3.18.9.orig/drivers/char/broadcom/Kconfig linux-3.18.9/drivers/char/broadcom/Kconfig ---- linux-3.18.9.orig/drivers/char/broadcom/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/char/broadcom/Kconfig 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/broadcom/Kconfig linux-rpi/drivers/char/broadcom/Kconfig +--- linux-3.18.10/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/char/broadcom/Kconfig 2015-03-26 11:46:46.136230632 +0100 @@ -0,0 +1,22 @@ +# +# Broadcom char driver config @@ -19051,15 +19687,15 @@ diff -Nur linux-3.18.9.orig/drivers/char/broadcom/Kconfig linux-3.18.9/drivers/c + help + Support for the VC shared memory on the Broadcom reference + design. Uses the VCHIQ stack. -diff -Nur linux-3.18.9.orig/drivers/char/broadcom/Makefile linux-3.18.9/drivers/char/broadcom/Makefile ---- linux-3.18.9.orig/drivers/char/broadcom/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/char/broadcom/Makefile 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/broadcom/Makefile linux-rpi/drivers/char/broadcom/Makefile +--- linux-3.18.10/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/char/broadcom/Makefile 2015-03-26 11:46:46.136230632 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ +obj-$(CONFIG_BCM_VC_SM) += vc_sm/ -diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_cma/Makefile linux-3.18.9/drivers/char/broadcom/vc_cma/Makefile ---- linux-3.18.9.orig/drivers/char/broadcom/vc_cma/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/char/broadcom/vc_cma/Makefile 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/broadcom/vc_cma/Makefile linux-rpi/drivers/char/broadcom/vc_cma/Makefile +--- linux-3.18.10/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/char/broadcom/vc_cma/Makefile 2015-03-26 11:46:46.136230632 +0100 @@ -0,0 +1,14 @@ +ccflags-y += -Wall -Wstrict-prototypes -Wno-trigraphs +ccflags-y += -Werror @@ -19075,9 +19711,9 @@ diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_cma/Makefile linux-3.18.9/d +obj-$(CONFIG_BCM_VC_CMA) += vc-cma.o + +vc-cma-objs := vc_cma.o -diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.18.9/drivers/char/broadcom/vc_cma/vc_cma.c ---- linux-3.18.9.orig/drivers/char/broadcom/vc_cma/vc_cma.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/char/broadcom/vc_cma/vc_cma.c 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi/drivers/char/broadcom/vc_cma/vc_cma.c +--- linux-3.18.10/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 2015-03-26 11:46:46.136230632 +0100 @@ -0,0 +1,1193 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -20272,9 +20908,9 @@ diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.18.9/d +module_exit(vc_cma_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_sm/Makefile linux-3.18.9/drivers/char/broadcom/vc_sm/Makefile ---- linux-3.18.9.orig/drivers/char/broadcom/vc_sm/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/char/broadcom/vc_sm/Makefile 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/broadcom/vc_sm/Makefile linux-rpi/drivers/char/broadcom/vc_sm/Makefile +--- linux-3.18.10/drivers/char/broadcom/vc_sm/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/char/broadcom/vc_sm/Makefile 2015-03-26 11:46:46.136230632 +0100 @@ -0,0 +1,21 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs -O2 + @@ -20297,9 +20933,9 @@ diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_sm/Makefile linux-3.18.9/dr +vc-sm-objs := \ + vmcs_sm.o \ + vc_vchi_sm.o -diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-3.18.9/drivers/char/broadcom/vc_sm/vc_vchi_sm.c ---- linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/char/broadcom/vc_sm/vc_vchi_sm.c 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vc_vchi_sm.c +--- linux-3.18.10/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 2015-03-26 11:46:46.136230632 +0100 @@ -0,0 +1,492 @@ +/***************************************************************************** +* Copyright 2011-2012 Broadcom Corporation. All rights reserved. @@ -20793,9 +21429,9 @@ diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vc_vchi_sm.c linux-3.18. + return vc_vchi_sm_send_msg(handle, VC_SM_MSG_TYPE_ACTION_CLEAN, + msg, sizeof(*msg), 0, 0, 0, 0); +} -diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-3.18.9/drivers/char/broadcom/vc_sm/vmcs_sm.c ---- linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vmcs_sm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/char/broadcom/vc_sm/vmcs_sm.c 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-rpi/drivers/char/broadcom/vc_sm/vmcs_sm.c +--- linux-3.18.10/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 2015-03-26 11:46:46.136230632 +0100 @@ -0,0 +1,3163 @@ +/***************************************************************************** +* Copyright 2011-2012 Broadcom Corporation. All rights reserved. @@ -23960,9 +24596,9 @@ diff -Nur linux-3.18.9.orig/drivers/char/broadcom/vc_sm/vmcs_sm.c linux-3.18.9/d +MODULE_AUTHOR("Broadcom"); +MODULE_DESCRIPTION("VideoCore SharedMemory Driver"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/drivers/char/hw_random/bcm2708-rng.c linux-3.18.9/drivers/char/hw_random/bcm2708-rng.c ---- linux-3.18.9.orig/drivers/char/hw_random/bcm2708-rng.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/char/hw_random/bcm2708-rng.c 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/hw_random/bcm2708-rng.c linux-rpi/drivers/char/hw_random/bcm2708-rng.c +--- linux-3.18.10/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/char/hw_random/bcm2708-rng.c 2015-03-26 11:46:46.140230636 +0100 @@ -0,0 +1,118 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -24082,9 +24718,9 @@ diff -Nur linux-3.18.9.orig/drivers/char/hw_random/bcm2708-rng.c linux-3.18.9/dr + +MODULE_DESCRIPTION("BCM2708 H/W Random Number Generator (RNG) driver"); +MODULE_LICENSE("GPL and additional rights"); -diff -Nur linux-3.18.9.orig/drivers/char/hw_random/Kconfig linux-3.18.9/drivers/char/hw_random/Kconfig ---- linux-3.18.9.orig/drivers/char/hw_random/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/char/hw_random/Kconfig 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/hw_random/Kconfig linux-rpi/drivers/char/hw_random/Kconfig +--- linux-3.18.10/drivers/char/hw_random/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/char/hw_random/Kconfig 2015-03-26 11:46:46.136230632 +0100 @@ -320,6 +320,17 @@ If unsure, say Y. @@ -24103,9 +24739,9 @@ diff -Nur linux-3.18.9.orig/drivers/char/hw_random/Kconfig linux-3.18.9/drivers/ config HW_RANDOM_MSM tristate "Qualcomm SoCs Random Number Generator support" depends on HW_RANDOM && ARCH_QCOM -diff -Nur linux-3.18.9.orig/drivers/char/hw_random/Makefile linux-3.18.9/drivers/char/hw_random/Makefile ---- linux-3.18.9.orig/drivers/char/hw_random/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/char/hw_random/Makefile 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/hw_random/Makefile linux-rpi/drivers/char/hw_random/Makefile +--- linux-3.18.10/drivers/char/hw_random/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/char/hw_random/Makefile 2015-03-26 11:46:46.140230636 +0100 @@ -28,5 +28,6 @@ obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o @@ -24113,9 +24749,9 @@ diff -Nur linux-3.18.9.orig/drivers/char/hw_random/Makefile linux-3.18.9/drivers +obj-$(CONFIG_HW_RANDOM_BCM2708) += bcm2708-rng.o obj-$(CONFIG_HW_RANDOM_MSM) += msm-rng.o obj-$(CONFIG_HW_RANDOM_XGENE) += xgene-rng.o -diff -Nur linux-3.18.9.orig/drivers/char/Kconfig linux-3.18.9/drivers/char/Kconfig ---- linux-3.18.9.orig/drivers/char/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/char/Kconfig 2015-03-08 03:38:45.314040942 -0500 +diff -Nur linux-3.18.10/drivers/char/Kconfig linux-rpi/drivers/char/Kconfig +--- linux-3.18.10/drivers/char/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/char/Kconfig 2015-03-26 11:46:46.032230536 +0100 @@ -581,6 +581,8 @@ source "drivers/s390/char/Kconfig" @@ -24125,17 +24761,17 @@ diff -Nur linux-3.18.9.orig/drivers/char/Kconfig linux-3.18.9/drivers/char/Kconf config MSM_SMD_PKT bool "Enable device interface for some SMD packet ports" default n -diff -Nur linux-3.18.9.orig/drivers/char/Makefile linux-3.18.9/drivers/char/Makefile ---- linux-3.18.9.orig/drivers/char/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/char/Makefile 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/char/Makefile linux-rpi/drivers/char/Makefile +--- linux-3.18.10/drivers/char/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/char/Makefile 2015-03-26 11:46:46.032230536 +0100 @@ -62,3 +62,4 @@ obj-$(CONFIG_TILE_SROM) += tile-srom.o obj-$(CONFIG_XILLYBUS) += xillybus/ +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ -diff -Nur linux-3.18.9.orig/drivers/clocksource/arm_arch_timer.c linux-3.18.9/drivers/clocksource/arm_arch_timer.c ---- linux-3.18.9.orig/drivers/clocksource/arm_arch_timer.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/clocksource/arm_arch_timer.c 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/clocksource/arm_arch_timer.c linux-rpi/drivers/clocksource/arm_arch_timer.c +--- linux-3.18.10/drivers/clocksource/arm_arch_timer.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/clocksource/arm_arch_timer.c 2015-03-26 11:46:46.384230862 +0100 @@ -795,3 +795,39 @@ } CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", @@ -24176,9 +24812,9 @@ diff -Nur linux-3.18.9.orig/drivers/clocksource/arm_arch_timer.c linux-3.18.9/dr + arch_timer_common_init(); + return 0; +} -diff -Nur linux-3.18.9.orig/drivers/cpufreq/bcm2835-cpufreq.c linux-3.18.9/drivers/cpufreq/bcm2835-cpufreq.c ---- linux-3.18.9.orig/drivers/cpufreq/bcm2835-cpufreq.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/cpufreq/bcm2835-cpufreq.c 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c +--- linux-3.18.10/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/cpufreq/bcm2835-cpufreq.c 2015-03-26 11:46:46.388230866 +0100 @@ -0,0 +1,224 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -24404,9 +25040,9 @@ diff -Nur linux-3.18.9.orig/drivers/cpufreq/bcm2835-cpufreq.c linux-3.18.9/drive + +module_init(bcm2835_cpufreq_module_init); +module_exit(bcm2835_cpufreq_module_exit); -diff -Nur linux-3.18.9.orig/drivers/cpufreq/Kconfig.arm linux-3.18.9/drivers/cpufreq/Kconfig.arm ---- linux-3.18.9.orig/drivers/cpufreq/Kconfig.arm 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/cpufreq/Kconfig.arm 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/cpufreq/Kconfig.arm linux-rpi/drivers/cpufreq/Kconfig.arm +--- linux-3.18.10/drivers/cpufreq/Kconfig.arm 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/cpufreq/Kconfig.arm 2015-03-26 11:46:46.388230866 +0100 @@ -241,6 +241,14 @@ help This adds the CPUFreq driver support for SPEAr SOCs. @@ -24422,9 +25058,9 @@ diff -Nur linux-3.18.9.orig/drivers/cpufreq/Kconfig.arm linux-3.18.9/drivers/cpu config ARM_TEGRA_CPUFREQ bool "TEGRA CPUFreq support" depends on ARCH_TEGRA -diff -Nur linux-3.18.9.orig/drivers/cpufreq/Makefile linux-3.18.9/drivers/cpufreq/Makefile ---- linux-3.18.9.orig/drivers/cpufreq/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/cpufreq/Makefile 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/cpufreq/Makefile linux-rpi/drivers/cpufreq/Makefile +--- linux-3.18.10/drivers/cpufreq/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/cpufreq/Makefile 2015-03-26 11:46:46.388230866 +0100 @@ -75,6 +75,7 @@ obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o @@ -24433,9 +25069,9 @@ diff -Nur linux-3.18.9.orig/drivers/cpufreq/Makefile linux-3.18.9/drivers/cpufre obj-$(CONFIG_ARM_TEGRA_CPUFREQ) += tegra-cpufreq.o obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ) += vexpress-spc-cpufreq.o -diff -Nur linux-3.18.9.orig/drivers/dma/bcm2708-dmaengine.c linux-3.18.9/drivers/dma/bcm2708-dmaengine.c ---- linux-3.18.9.orig/drivers/dma/bcm2708-dmaengine.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/dma/bcm2708-dmaengine.c 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/dma/bcm2708-dmaengine.c linux-rpi/drivers/dma/bcm2708-dmaengine.c +--- linux-3.18.10/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/dma/bcm2708-dmaengine.c 2015-03-26 11:46:46.792231240 +0100 @@ -0,0 +1,1052 @@ +/* + * BCM2835 DMA engine support @@ -25489,9 +26125,9 @@ diff -Nur linux-3.18.9.orig/drivers/dma/bcm2708-dmaengine.c linux-3.18.9/drivers +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_AUTHOR("Gellert Weisz <gellert@raspberrypi.org>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/drivers/dma/Kconfig linux-3.18.9/drivers/dma/Kconfig ---- linux-3.18.9.orig/drivers/dma/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/dma/Kconfig 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/dma/Kconfig linux-rpi/drivers/dma/Kconfig +--- linux-3.18.10/drivers/dma/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/dma/Kconfig 2015-03-26 11:46:46.792231240 +0100 @@ -330,6 +330,12 @@ select DMA_ENGINE select DMA_VIRTUAL_CHANNELS @@ -25505,9 +26141,9 @@ diff -Nur linux-3.18.9.orig/drivers/dma/Kconfig linux-3.18.9/drivers/dma/Kconfig config TI_CPPI41 tristate "AM33xx CPPI41 DMA support" depends on ARCH_OMAP -diff -Nur linux-3.18.9.orig/drivers/dma/Makefile linux-3.18.9/drivers/dma/Makefile ---- linux-3.18.9.orig/drivers/dma/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/dma/Makefile 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/dma/Makefile linux-rpi/drivers/dma/Makefile +--- linux-3.18.10/drivers/dma/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/dma/Makefile 2015-03-26 11:46:46.792231240 +0100 @@ -38,6 +38,7 @@ obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o obj-$(CONFIG_DMA_OMAP) += omap-dma.o @@ -25516,9 +26152,9 @@ diff -Nur linux-3.18.9.orig/drivers/dma/Makefile linux-3.18.9/drivers/dma/Makefi obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o obj-$(CONFIG_TI_CPPI41) += cppi41.o -diff -Nur linux-3.18.9.orig/drivers/hid/usbhid/hid-core.c linux-3.18.9/drivers/hid/usbhid/hid-core.c ---- linux-3.18.9.orig/drivers/hid/usbhid/hid-core.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/hid/usbhid/hid-core.c 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/hid/usbhid/hid-core.c linux-rpi/drivers/hid/usbhid/hid-core.c +--- linux-3.18.10/drivers/hid/usbhid/hid-core.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/hid/usbhid/hid-core.c 2015-03-26 11:46:50.116234319 +0100 @@ -49,7 +49,7 @@ * Module parameters. */ @@ -25543,9 +26179,9 @@ diff -Nur linux-3.18.9.orig/drivers/hid/usbhid/hid-core.c linux-3.18.9/drivers/h ret = -ENOMEM; if (usb_endpoint_dir_in(endpoint)) { -diff -Nur linux-3.18.9.orig/drivers/hwmon/bcm2835-hwmon.c linux-3.18.9/drivers/hwmon/bcm2835-hwmon.c ---- linux-3.18.9.orig/drivers/hwmon/bcm2835-hwmon.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/hwmon/bcm2835-hwmon.c 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/hwmon/bcm2835-hwmon.c linux-rpi/drivers/hwmon/bcm2835-hwmon.c +--- linux-3.18.10/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/hwmon/bcm2835-hwmon.c 2015-03-26 11:46:50.124234326 +0100 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -25766,9 +26402,9 @@ diff -Nur linux-3.18.9.orig/drivers/hwmon/bcm2835-hwmon.c linux-3.18.9/drivers/h +MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip"); + +module_platform_driver(bcm2835_hwmon_driver); -diff -Nur linux-3.18.9.orig/drivers/hwmon/Kconfig linux-3.18.9/drivers/hwmon/Kconfig ---- linux-3.18.9.orig/drivers/hwmon/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/hwmon/Kconfig 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/hwmon/Kconfig linux-rpi/drivers/hwmon/Kconfig +--- linux-3.18.10/drivers/hwmon/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/hwmon/Kconfig 2015-03-26 11:46:50.120234322 +0100 @@ -1680,6 +1680,16 @@ This driver provides support for the Ultra45 workstation environmental sensors. @@ -25786,9 +26422,9 @@ diff -Nur linux-3.18.9.orig/drivers/hwmon/Kconfig linux-3.18.9/drivers/hwmon/Kco if ACPI comment "ACPI drivers" -diff -Nur linux-3.18.9.orig/drivers/hwmon/Makefile linux-3.18.9/drivers/hwmon/Makefile ---- linux-3.18.9.orig/drivers/hwmon/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/hwmon/Makefile 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/hwmon/Makefile linux-rpi/drivers/hwmon/Makefile +--- linux-3.18.10/drivers/hwmon/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/hwmon/Makefile 2015-03-26 11:46:50.120234322 +0100 @@ -153,6 +153,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -25797,9 +26433,9 @@ diff -Nur linux-3.18.9.orig/drivers/hwmon/Makefile linux-3.18.9/drivers/hwmon/Ma obj-$(CONFIG_PMBUS) += pmbus/ -diff -Nur linux-3.18.9.orig/drivers/i2c/busses/i2c-bcm2708.c linux-3.18.9/drivers/i2c/busses/i2c-bcm2708.c ---- linux-3.18.9.orig/drivers/i2c/busses/i2c-bcm2708.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/i2c/busses/i2c-bcm2708.c 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/i2c/busses/i2c-bcm2708.c linux-rpi/drivers/i2c/busses/i2c-bcm2708.c +--- linux-3.18.10/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/i2c/busses/i2c-bcm2708.c 2015-03-26 11:46:50.140234341 +0100 @@ -0,0 +1,521 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -26322,9 +26958,9 @@ diff -Nur linux-3.18.9.orig/drivers/i2c/busses/i2c-bcm2708.c linux-3.18.9/driver +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Nur linux-3.18.9.orig/drivers/i2c/busses/Kconfig linux-3.18.9/drivers/i2c/busses/Kconfig ---- linux-3.18.9.orig/drivers/i2c/busses/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/i2c/busses/Kconfig 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/i2c/busses/Kconfig linux-rpi/drivers/i2c/busses/Kconfig +--- linux-3.18.10/drivers/i2c/busses/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/i2c/busses/Kconfig 2015-03-26 11:46:50.140234341 +0100 @@ -361,7 +361,7 @@ config I2C_BCM2835 @@ -26360,9 +26996,9 @@ diff -Nur linux-3.18.9.orig/drivers/i2c/busses/Kconfig linux-3.18.9/drivers/i2c/ config I2C_BCM_KONA tristate "BCM Kona I2C adapter" depends on ARCH_BCM_MOBILE -diff -Nur linux-3.18.9.orig/drivers/i2c/busses/Makefile linux-3.18.9/drivers/i2c/busses/Makefile ---- linux-3.18.9.orig/drivers/i2c/busses/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/i2c/busses/Makefile 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/i2c/busses/Makefile linux-rpi/drivers/i2c/busses/Makefile +--- linux-3.18.10/drivers/i2c/busses/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/i2c/busses/Makefile 2015-03-26 11:46:50.140234341 +0100 @@ -33,6 +33,7 @@ obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o obj-$(CONFIG_I2C_AXXIA) += i2c-axxia.o @@ -26371,9 +27007,9 @@ diff -Nur linux-3.18.9.orig/drivers/i2c/busses/Makefile linux-3.18.9/drivers/i2c obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o obj-$(CONFIG_I2C_CADENCE) += i2c-cadence.o obj-$(CONFIG_I2C_CBUS_GPIO) += i2c-cbus-gpio.o -diff -Nur linux-3.18.9.orig/drivers/leds/trigger/Kconfig linux-3.18.9/drivers/leds/trigger/Kconfig ---- linux-3.18.9.orig/drivers/leds/trigger/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/leds/trigger/Kconfig 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/leds/trigger/Kconfig linux-rpi/drivers/leds/trigger/Kconfig +--- linux-3.18.10/drivers/leds/trigger/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/leds/trigger/Kconfig 2015-03-26 11:46:50.276234466 +0100 @@ -108,4 +108,11 @@ This enables direct flash/torch on/off by the driver, kernel space. If unsure, say Y. @@ -26386,9 +27022,9 @@ diff -Nur linux-3.18.9.orig/drivers/leds/trigger/Kconfig linux-3.18.9/drivers/le + If unsure, say Y. + endif # LEDS_TRIGGERS -diff -Nur linux-3.18.9.orig/drivers/leds/trigger/ledtrig-input.c linux-3.18.9/drivers/leds/trigger/ledtrig-input.c ---- linux-3.18.9.orig/drivers/leds/trigger/ledtrig-input.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/leds/trigger/ledtrig-input.c 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/leds/trigger/ledtrig-input.c linux-rpi/drivers/leds/trigger/ledtrig-input.c +--- linux-3.18.10/drivers/leds/trigger/ledtrig-input.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/leds/trigger/ledtrig-input.c 2015-03-26 11:46:50.276234466 +0100 @@ -0,0 +1,65 @@ +/* + * Set LED GPIO to Input "Trigger" @@ -26455,17 +27091,17 @@ diff -Nur linux-3.18.9.orig/drivers/leds/trigger/ledtrig-input.c linux-3.18.9/dr +MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.org>"); +MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\""); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/leds/trigger/Makefile linux-3.18.9/drivers/leds/trigger/Makefile ---- linux-3.18.9.orig/drivers/leds/trigger/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/leds/trigger/Makefile 2015-03-08 03:38:45.318040942 -0500 +diff -Nur linux-3.18.10/drivers/leds/trigger/Makefile linux-rpi/drivers/leds/trigger/Makefile +--- linux-3.18.10/drivers/leds/trigger/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/leds/trigger/Makefile 2015-03-26 11:46:50.276234466 +0100 @@ -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-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.c linux-3.18.9/drivers/media/platform/bcm2835/bcm2835-camera.c ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/bcm2835-camera.c 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/bcm2835-camera.c linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c +--- linux-3.18.10/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.c 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,1828 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -28295,9 +28931,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.c linu + +module_init(bm2835_mmal_init); +module_exit(bm2835_mmal_exit); -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.h linux-3.18.9/drivers/media/platform/bcm2835/bcm2835-camera.h ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/bcm2835-camera.h 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/bcm2835-camera.h linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h +--- linux-3.18.10/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/bcm2835-camera.h 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,126 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -28425,9 +29061,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/bcm2835-camera.h linu + (pix_fmt)->pixelformat, (pix_fmt)->bytesperline, \ + (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \ +} -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/controls.c linux-3.18.9/drivers/media/platform/bcm2835/controls.c ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/controls.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/controls.c 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/controls.c linux-rpi/drivers/media/platform/bcm2835/controls.c +--- linux-3.18.10/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/controls.c 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,1322 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -29751,9 +30387,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/controls.c linux-3.18 + + return 0; +} -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/Kconfig linux-3.18.9/drivers/media/platform/bcm2835/Kconfig ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/Kconfig 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/Kconfig linux-rpi/drivers/media/platform/bcm2835/Kconfig +--- linux-3.18.10/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/Kconfig 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,25 @@ +# Broadcom VideoCore IV v4l2 camera support + @@ -29780,18 +30416,18 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/Kconfig linux-3.18.9/ + + +endif # VIDEO_BM2835 -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/Makefile linux-3.18.9/drivers/media/platform/bcm2835/Makefile ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/Makefile 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/Makefile linux-rpi/drivers/media/platform/bcm2835/Makefile +--- linux-3.18.10/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/Makefile 2015-03-26 11:46:50.408234586 +0100 @@ -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-3.18.9.orig/drivers/media/platform/bcm2835/mmal-common.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-common.h ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-common.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-common.h 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/mmal-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-common.h +--- linux-3.18.10/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/mmal-common.h 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,53 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -29846,9 +30482,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-common.h linux-3 + u32 v; +}; + -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-encodings.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-encodings.h ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-encodings.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-encodings.h 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/mmal-encodings.h linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h +--- linux-3.18.10/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/mmal-encodings.h 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,127 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -29977,9 +30613,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-encodings.h linu +/* @} MmalColorSpace List */ + +#endif /* MMAL_ENCODINGS_H */ -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-common.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-common.h ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-common.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-common.h 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/mmal-msg-common.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-common.h +--- linux-3.18.10/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 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,50 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -30031,9 +30667,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-common.h lin +}; + +#endif /* MMAL_MSG_COMMON_H */ -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-format.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-format.h ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-format.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-format.h 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/mmal-msg-format.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-format.h +--- linux-3.18.10/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 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,81 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -30116,9 +30752,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-format.h lin +}; + +#endif /* MMAL_MSG_FORMAT_H */ -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg.h ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg.h 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/mmal-msg.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h +--- linux-3.18.10/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/mmal-msg.h 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,404 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -30524,9 +31160,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg.h linux-3.18 + u8 payload[MMAL_MSG_MAX_PAYLOAD]; + } u; +}; -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-port.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-port.h ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-port.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-msg-port.h 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/mmal-msg-port.h linux-rpi/drivers/media/platform/bcm2835/mmal-msg-port.h +--- linux-3.18.10/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 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,107 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -30635,9 +31271,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-msg-port.h linux + */ + +}; -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-parameters.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-parameters.h ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-parameters.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-parameters.h 2015-03-08 03:38:45.322040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/mmal-parameters.h linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h +--- linux-3.18.10/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/mmal-parameters.h 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,656 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -31295,9 +31931,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-parameters.h lin + u32 num_effect_params; + u32 effect_parameter[MMAL_MAX_IMAGEFX_PARAMETERS]; +}; -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.c linux-3.18.9/drivers/media/platform/bcm2835/mmal-vchiq.c ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-vchiq.c 2015-03-08 03:38:45.342040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/mmal-vchiq.c linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c +--- linux-3.18.10/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.c 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,1916 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -33215,9 +33851,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.c linux-3. + kfree(instance); + return -ENODEV; +} -diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.h linux-3.18.9/drivers/media/platform/bcm2835/mmal-vchiq.h ---- linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/bcm2835/mmal-vchiq.h 2015-03-08 03:38:45.342040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/bcm2835/mmal-vchiq.h linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h +--- linux-3.18.10/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/media/platform/bcm2835/mmal-vchiq.h 2015-03-26 11:46:50.408234586 +0100 @@ -0,0 +1,178 @@ +/* + * Broadcom BM2835 V4L2 driver @@ -33397,9 +34033,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/bcm2835/mmal-vchiq.h linux-3. + struct mmal_buffer *buf); + +#endif /* MMAL_VCHIQ_H */ -diff -Nur linux-3.18.9.orig/drivers/media/platform/Kconfig linux-3.18.9/drivers/media/platform/Kconfig ---- linux-3.18.9.orig/drivers/media/platform/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/Kconfig 2015-03-08 03:38:45.342040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/Kconfig linux-rpi/drivers/media/platform/Kconfig +--- linux-3.18.10/drivers/media/platform/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/media/platform/Kconfig 2015-03-26 11:46:50.408234586 +0100 @@ -124,6 +124,7 @@ source "drivers/media/platform/soc_camera/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" @@ -33408,9 +34044,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/Kconfig linux-3.18.9/drivers/ endif # V4L_PLATFORM_DRIVERS -diff -Nur linux-3.18.9.orig/drivers/media/platform/Makefile linux-3.18.9/drivers/media/platform/Makefile ---- linux-3.18.9.orig/drivers/media/platform/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/media/platform/Makefile 2015-03-08 03:38:45.346040942 -0500 +diff -Nur linux-3.18.10/drivers/media/platform/Makefile linux-rpi/drivers/media/platform/Makefile +--- linux-3.18.10/drivers/media/platform/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/media/platform/Makefile 2015-03-26 11:46:50.408234586 +0100 @@ -49,4 +49,6 @@ obj-y += omap/ @@ -33418,9 +34054,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/platform/Makefile linux-3.18.9/drivers +obj-$(CONFIG_VIDEO_BCM2835) += bcm2835/ + ccflags-y += -I$(srctree)/drivers/media/i2c -diff -Nur linux-3.18.9.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.18.9/drivers/media/usb/dvb-usb-v2/rtl28xxu.c ---- linux-3.18.9.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-03-08 03:38:45.346040942 -0500 +diff -Nur linux-3.18.10/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +--- linux-3.18.10/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2015-03-26 11:46:50.560234730 +0100 @@ -1531,6 +1531,10 @@ &rtl2832u_props, "Compro VideoMate U620F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, @@ -33432,9 +34068,9 @@ diff -Nur linux-3.18.9.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.18.9 { DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a03, &rtl2832u_props, "Leadtek WinFast DTV Dongle mini", NULL) }, { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A, -diff -Nur linux-3.18.9.orig/drivers/misc/Kconfig linux-3.18.9/drivers/misc/Kconfig ---- linux-3.18.9.orig/drivers/misc/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/misc/Kconfig 2015-03-08 03:38:45.346040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/Kconfig linux-rpi/drivers/misc/Kconfig +--- linux-3.18.10/drivers/misc/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/misc/Kconfig 2015-03-26 11:46:50.980235118 +0100 @@ -524,6 +524,7 @@ source "drivers/misc/altera-stapl/Kconfig" source "drivers/misc/mei/Kconfig" @@ -33443,9 +34079,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/Kconfig linux-3.18.9/drivers/misc/Kconf source "drivers/misc/mic/Kconfig" source "drivers/misc/genwqe/Kconfig" source "drivers/misc/echo/Kconfig" -diff -Nur linux-3.18.9.orig/drivers/misc/Makefile linux-3.18.9/drivers/misc/Makefile ---- linux-3.18.9.orig/drivers/misc/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/misc/Makefile 2015-03-08 03:38:45.346040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/Makefile linux-rpi/drivers/misc/Makefile +--- linux-3.18.10/drivers/misc/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/misc/Makefile 2015-03-26 11:46:50.980235118 +0100 @@ -51,6 +51,7 @@ obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/ obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o @@ -33454,9 +34090,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/Makefile linux-3.18.9/drivers/misc/Make obj-y += mic/ obj-$(CONFIG_GENWQE) += genwqe/ obj-$(CONFIG_ECHO) += echo/ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/connections/connection.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2015-03-08 03:38:45.350040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi/drivers/misc/vc04_services/interface/vchi/connections/connection.h +--- linux-3.18.10/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 2015-03-26 11:46:50.996235135 +0100 @@ -0,0 +1,328 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -33786,9 +34422,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/connection +#endif /* CONNECTION_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2015-03-08 03:38:45.350040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,204 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -33994,9 +34630,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/message_dr +#endif // _VCHI_MESSAGE_H_ + +/****************************** End of file ***********************************/ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2015-03-08 03:38:45.350040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,224 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34222,9 +34858,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +#endif /* VCHI_CFG_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2015-03-08 03:38:45.354040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34297,9 +34933,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_i +//#define VCHI_RX_NANOLOCKS + +#endif /*VCHI_CFG_INTERNAL_H_*/ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_common.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2015-03-08 03:38:45.354040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_common.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,175 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34476,9 +35112,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_commo + + +#endif // VCHI_COMMON_H_ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi.h 2015-03-08 03:38:45.354040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,378 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34858,9 +35494,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi.h lin +#endif /* VCHI_H_ */ + +/****************************** End of file **********************************/ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_mh.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2015-03-08 03:38:45.354040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -34904,9 +35540,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2015-03-08 03:38:45.358040942 -0500 +diff -Nur linux-3.18.10/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-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,562 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -35470,9 +36106,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + + kfree(pagelist); +} -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2015-03-08 03:38:45.358040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -35516,9 +36152,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1 + +#endif /* VCHIQ_2835_H */ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2015-03-08 03:38:45.362040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,2884 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -38404,9 +39040,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +module_exit(vchiq_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2015-03-08 03:38:45.362040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,223 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -38631,9 +39267,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + + +#endif /* VCHIQ_ARM_H */ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2015-03-08 03:38:45.362040942 -0500 +diff -Nur linux-3.18.10/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-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,37 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -38672,9 +39308,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +const char *vchiq_get_build_version(void); +const char *vchiq_get_build_time(void); +const char *vchiq_get_build_date(void); -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2015-03-08 03:38:45.362040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2010-2014 Broadcom. All rights reserved. @@ -38745,9 +39381,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2015-03-08 03:38:45.362040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,120 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -38869,9 +39505,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + mutex_unlock(&g_connected_mutex); +} +EXPORT_SYMBOL(vchiq_add_connected_callback); -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2015-03-08 03:38:45.362040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -38923,9 +39559,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +void vchiq_call_connected_callbacks(void); + +#endif /* VCHIQ_CONNECTED_H */ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2015-03-08 03:38:45.362040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,3934 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -42861,9 +43497,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + numBytes = 0; + } +} -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2015-03-08 03:38:45.362040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,712 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -43577,9 +44213,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + size_t numBytes); + +#endif -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c 2015-03-08 03:38:45.362040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,383 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -43964,9 +44600,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +} + +#endif /* CONFIG_DEBUG_FS */ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_debugfs.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,52 @@ +/** + * Copyright (c) 2014 Raspberry Pi (Trading) Ltd. All rights reserved. @@ -44020,9 +44656,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance); + +#endif /* VCHIQ_DEBUGFS_H */ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,87 @@ +#!/usr/bin/perl -w + @@ -44111,9 +44747,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + return vchiq_build_time; +} +EOF -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -44155,9 +44791,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +#include "vchiq_util.h" + +#endif -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,189 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -44348,9 +44984,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + short *peer_version); + +#endif /* VCHIQ_IF_H */ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,131 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -44483,9 +45119,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +#define VCHIQ_IOC_MAX 17 + +#endif -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/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-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,458 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -44945,9 +45581,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + + return status; +} -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_killable.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,69 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -45018,9 +45654,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +#define mutex_lock_interruptible mutex_lock_interruptible_killable + +#endif -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,71 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -45093,9 +45729,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + const VCHIQ_PLATFORM_DATA_T * platform_data); + +#endif -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -45155,9 +45791,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,860 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -46019,9 +46655,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + return ret; +} +EXPORT_SYMBOL(vchi_service_release); -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,152 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -46175,9 +46811,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq + + return header; +} -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,81 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -46260,9 +46896,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +extern VCHIQ_HEADER_T *vchiu_queue_pop(VCHIU_QUEUE_T *queue); + +#endif -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c ---- linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c +--- linux-3.18.10/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 2015-03-26 11:46:51.088235219 +0100 @@ -0,0 +1,59 @@ +/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -46323,9 +46959,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq +{ + return vchiq_build_time; +} -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/Kconfig linux-3.18.9/drivers/misc/vc04_services/Kconfig ---- linux-3.18.9.orig/drivers/misc/vc04_services/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/Kconfig 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/Kconfig linux-rpi/drivers/misc/vc04_services/Kconfig +--- linux-3.18.10/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/misc/vc04_services/Kconfig 2015-03-26 11:46:50.996235135 +0100 @@ -0,0 +1,9 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -46336,9 +46972,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/Kconfig linux-3.18.9/driv + BCM2708 family of products. + Defaults to Y when the Broadcom Videocore services + are included in the build, N otherwise. -diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/Makefile linux-3.18.9/drivers/misc/vc04_services/Makefile ---- linux-3.18.9.orig/drivers/misc/vc04_services/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/misc/vc04_services/Makefile 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/misc/vc04_services/Makefile linux-rpi/drivers/misc/vc04_services/Makefile +--- linux-3.18.10/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/misc/vc04_services/Makefile 2015-03-26 11:46:50.996235135 +0100 @@ -0,0 +1,14 @@ +obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o + @@ -46354,9 +46990,9 @@ diff -Nur linux-3.18.9.orig/drivers/misc/vc04_services/Makefile linux-3.18.9/dri + +ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/misc/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 + -diff -Nur linux-3.18.9.orig/drivers/mmc/core/quirks.c linux-3.18.9/drivers/mmc/core/quirks.c ---- linux-3.18.9.orig/drivers/mmc/core/quirks.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/mmc/core/quirks.c 2015-03-08 03:38:45.366040942 -0500 +diff -Nur linux-3.18.10/drivers/mmc/core/quirks.c linux-rpi/drivers/mmc/core/quirks.c +--- linux-3.18.10/drivers/mmc/core/quirks.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/mmc/core/quirks.c 2015-03-26 11:46:51.092235223 +0100 @@ -95,5 +95,9 @@ f->vendor_fixup(card, f->data); } @@ -46367,9 +47003,9 @@ diff -Nur linux-3.18.9.orig/drivers/mmc/core/quirks.c linux-3.18.9/drivers/mmc/c + card->quirks |= MMC_QUIRK_BLK_NO_CMD23; } EXPORT_SYMBOL(mmc_fixup_device); -diff -Nur linux-3.18.9.orig/drivers/mmc/host/bcm2835-mmc.c linux-3.18.9/drivers/mmc/host/bcm2835-mmc.c ---- linux-3.18.9.orig/drivers/mmc/host/bcm2835-mmc.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/mmc/host/bcm2835-mmc.c 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/mmc/host/bcm2835-mmc.c linux-rpi/drivers/mmc/host/bcm2835-mmc.c +--- linux-3.18.10/drivers/mmc/host/bcm2835-mmc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/mmc/host/bcm2835-mmc.c 2015-03-26 11:46:51.092235223 +0100 @@ -0,0 +1,1557 @@ +/* + * BCM2835 MMC host driver. @@ -47928,9 +48564,9 @@ diff -Nur linux-3.18.9.orig/drivers/mmc/host/bcm2835-mmc.c linux-3.18.9/drivers/ +MODULE_DESCRIPTION("BCM2835 SDHCI driver"); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Gellert Weisz"); -diff -Nur linux-3.18.9.orig/drivers/mmc/host/Kconfig linux-3.18.9/drivers/mmc/host/Kconfig ---- linux-3.18.9.orig/drivers/mmc/host/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/mmc/host/Kconfig 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/mmc/host/Kconfig linux-rpi/drivers/mmc/host/Kconfig +--- linux-3.18.10/drivers/mmc/host/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/mmc/host/Kconfig 2015-03-26 11:46:51.092235223 +0100 @@ -281,17 +281,6 @@ If you have a controller with this interface, say Y or M here. @@ -47985,9 +48621,9 @@ diff -Nur linux-3.18.9.orig/drivers/mmc/host/Kconfig linux-3.18.9/drivers/mmc/ho config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP -diff -Nur linux-3.18.9.orig/drivers/mmc/host/Makefile linux-3.18.9/drivers/mmc/host/Makefile ---- linux-3.18.9.orig/drivers/mmc/host/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/mmc/host/Makefile 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/mmc/host/Makefile linux-rpi/drivers/mmc/host/Makefile +--- linux-3.18.10/drivers/mmc/host/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/mmc/host/Makefile 2015-03-26 11:46:51.092235223 +0100 @@ -17,6 +17,7 @@ obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o @@ -47996,9 +48632,9 @@ diff -Nur linux-3.18.9.orig/drivers/mmc/host/Makefile linux-3.18.9/drivers/mmc/h obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o obj-$(CONFIG_MMC_OMAP) += omap.o -diff -Nur linux-3.18.9.orig/drivers/net/ethernet/microchip/enc28j60.c linux-3.18.9/drivers/net/ethernet/microchip/enc28j60.c ---- linux-3.18.9.orig/drivers/net/ethernet/microchip/enc28j60.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/net/ethernet/microchip/enc28j60.c 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/net/ethernet/microchip/enc28j60.c linux-rpi/drivers/net/ethernet/microchip/enc28j60.c +--- linux-3.18.10/drivers/net/ethernet/microchip/enc28j60.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/net/ethernet/microchip/enc28j60.c 2015-03-26 11:46:51.880235952 +0100 @@ -1630,10 +1630,21 @@ return 0; } @@ -48021,9 +48657,9 @@ diff -Nur linux-3.18.9.orig/drivers/net/ethernet/microchip/enc28j60.c linux-3.18 }, .probe = enc28j60_probe, .remove = enc28j60_remove, -diff -Nur linux-3.18.9.orig/drivers/net/usb/smsc95xx.c linux-3.18.9/drivers/net/usb/smsc95xx.c ---- linux-3.18.9.orig/drivers/net/usb/smsc95xx.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/net/usb/smsc95xx.c 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/net/usb/smsc95xx.c linux-rpi/drivers/net/usb/smsc95xx.c +--- linux-3.18.10/drivers/net/usb/smsc95xx.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/net/usb/smsc95xx.c 2015-03-26 11:46:51.956236021 +0100 @@ -59,6 +59,7 @@ #define SUSPEND_SUSPEND3 (0x08) #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ @@ -48103,9 +48739,9 @@ diff -Nur linux-3.18.9.orig/drivers/net/usb/smsc95xx.c linux-3.18.9/drivers/net/ /* try reading mac address from EEPROM */ if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, dev->net->dev_addr) == 0) { -diff -Nur linux-3.18.9.orig/drivers/of/fdt.c linux-3.18.9/drivers/of/fdt.c ---- linux-3.18.9.orig/drivers/of/fdt.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/of/fdt.c 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/of/fdt.c linux-rpi/drivers/of/fdt.c +--- linux-3.18.10/drivers/of/fdt.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/of/fdt.c 2015-03-26 11:46:52.772236778 +0100 @@ -901,19 +901,38 @@ /* Retrieve command line */ @@ -48164,9 +48800,9 @@ diff -Nur linux-3.18.9.orig/drivers/of/fdt.c linux-3.18.9/drivers/of/fdt.c if (!d) return -ENOENT; -diff -Nur linux-3.18.9.orig/drivers/pinctrl/pinctrl-bcm2835.c linux-3.18.9/drivers/pinctrl/pinctrl-bcm2835.c ---- linux-3.18.9.orig/drivers/pinctrl/pinctrl-bcm2835.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/pinctrl/pinctrl-bcm2835.c 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/pinctrl/pinctrl-bcm2835.c linux-rpi/drivers/pinctrl/pinctrl-bcm2835.c +--- linux-3.18.10/drivers/pinctrl/pinctrl-bcm2835.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/pinctrl/pinctrl-bcm2835.c 2015-03-26 11:46:52.964236956 +0100 @@ -47,6 +47,7 @@ #define MODULE_NAME "pinctrl-bcm2835" #define BCM2835_NUM_GPIOS 54 @@ -48304,9 +48940,9 @@ diff -Nur linux-3.18.9.orig/drivers/pinctrl/pinctrl-bcm2835.c linux-3.18.9/drive len = strlen(dev_name(pc->dev)) + 16; name = devm_kzalloc(pc->dev, len, GFP_KERNEL); -diff -Nur linux-3.18.9.orig/drivers/rtc/rtc-ds1307.c linux-3.18.9/drivers/rtc/rtc-ds1307.c ---- linux-3.18.9.orig/drivers/rtc/rtc-ds1307.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/rtc/rtc-ds1307.c 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/rtc/rtc-ds1307.c linux-rpi/drivers/rtc/rtc-ds1307.c +--- linux-3.18.10/drivers/rtc/rtc-ds1307.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/rtc/rtc-ds1307.c 2015-03-26 11:46:53.432237389 +0100 @@ -1241,6 +1241,14 @@ return 0; } @@ -48322,9 +48958,9 @@ diff -Nur linux-3.18.9.orig/drivers/rtc/rtc-ds1307.c linux-3.18.9/drivers/rtc/rt static struct i2c_driver ds1307_driver = { .driver = { .name = "rtc-ds1307", -diff -Nur linux-3.18.9.orig/drivers/spi/Kconfig linux-3.18.9/drivers/spi/Kconfig ---- linux-3.18.9.orig/drivers/spi/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/spi/Kconfig 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/spi/Kconfig linux-rpi/drivers/spi/Kconfig +--- linux-3.18.10/drivers/spi/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/spi/Kconfig 2015-03-26 11:46:53.876237802 +0100 @@ -77,7 +77,7 @@ config SPI_BCM2835 @@ -48349,9 +48985,9 @@ diff -Nur linux-3.18.9.orig/drivers/spi/Kconfig linux-3.18.9/drivers/spi/Kconfig config SPI_BFIN5XX tristate "SPI controller driver for ADI Blackfin5xx" depends on BLACKFIN && !BF60x -diff -Nur linux-3.18.9.orig/drivers/spi/Makefile linux-3.18.9/drivers/spi/Makefile ---- linux-3.18.9.orig/drivers/spi/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/spi/Makefile 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/spi/Makefile linux-rpi/drivers/spi/Makefile +--- linux-3.18.10/drivers/spi/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/spi/Makefile 2015-03-26 11:46:53.876237802 +0100 @@ -20,6 +20,7 @@ obj-$(CONFIG_SPI_BCM63XX_HSSPI) += spi-bcm63xx-hsspi.o obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o @@ -48360,9 +48996,9 @@ diff -Nur linux-3.18.9.orig/drivers/spi/Makefile linux-3.18.9/drivers/spi/Makefi 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-3.18.9.orig/drivers/spi/spi-bcm2708.c linux-3.18.9/drivers/spi/spi-bcm2708.c ---- linux-3.18.9.orig/drivers/spi/spi-bcm2708.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/spi/spi-bcm2708.c 2015-03-08 03:38:45.370040942 -0500 +diff -Nur linux-3.18.10/drivers/spi/spi-bcm2708.c linux-rpi/drivers/spi/spi-bcm2708.c +--- linux-3.18.10/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/spi/spi-bcm2708.c 2015-03-26 11:46:53.876237802 +0100 @@ -0,0 +1,635 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -48999,9 +49635,9 @@ diff -Nur linux-3.18.9.orig/drivers/spi/spi-bcm2708.c linux-3.18.9/drivers/spi/s +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_agm1264k-fl.c linux-3.18.9/drivers/staging/fbtft/fb_agm1264k-fl.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_agm1264k-fl.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_agm1264k-fl.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_agm1264k-fl.c linux-rpi/drivers/staging/fbtft/fb_agm1264k-fl.c +--- linux-3.18.10/drivers/staging/fbtft/fb_agm1264k-fl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_agm1264k-fl.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,462 @@ +/* + * FB driver for Two KS0108 LCD controllers in AGM1264K-FL display @@ -49465,9 +50101,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_agm1264k-fl.c linux-3.18.9/ +MODULE_DESCRIPTION("Two KS0108 LCD controllers in AGM1264K-FL display"); +MODULE_AUTHOR("ololoshka2871"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_bd663474.c linux-3.18.9/drivers/staging/fbtft/fb_bd663474.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_bd663474.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_bd663474.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_bd663474.c linux-rpi/drivers/staging/fbtft/fb_bd663474.c +--- linux-3.18.10/drivers/staging/fbtft/fb_bd663474.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_bd663474.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,193 @@ +/* + * FB driver for the uPD161704 LCD Controller @@ -49662,9 +50298,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_bd663474.c linux-3.18.9/dri +MODULE_DESCRIPTION("FB driver for the uPD161704 LCD Controller"); +MODULE_AUTHOR("Seong-Woo Kim"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8340bn.c linux-3.18.9/drivers/staging/fbtft/fb_hx8340bn.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8340bn.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_hx8340bn.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_hx8340bn.c linux-rpi/drivers/staging/fbtft/fb_hx8340bn.c +--- linux-3.18.10/drivers/staging/fbtft/fb_hx8340bn.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_hx8340bn.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,229 @@ +/* + * FB driver for the HX8340BN LCD Controller @@ -49895,9 +50531,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8340bn.c linux-3.18.9/dri +MODULE_DESCRIPTION("FB driver for the HX8340BN LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8347d.c linux-3.18.9/drivers/staging/fbtft/fb_hx8347d.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8347d.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_hx8347d.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_hx8347d.c linux-rpi/drivers/staging/fbtft/fb_hx8347d.c +--- linux-3.18.10/drivers/staging/fbtft/fb_hx8347d.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_hx8347d.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,181 @@ +/* + * FB driver for the HX8347D LCD Controller @@ -50080,9 +50716,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8347d.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the HX8347D LCD Controller"); +MODULE_AUTHOR("Christian Vogelgsang"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8353d.c linux-3.18.9/drivers/staging/fbtft/fb_hx8353d.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8353d.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_hx8353d.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_hx8353d.c linux-rpi/drivers/staging/fbtft/fb_hx8353d.c +--- linux-3.18.10/drivers/staging/fbtft/fb_hx8353d.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_hx8353d.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,166 @@ +/* + * FB driver for the HX8353D LCD Controller @@ -50250,9 +50886,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_hx8353d.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the HX8353D LCD Controller"); +MODULE_AUTHOR("Petr Olivka"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9320.c linux-3.18.9/drivers/staging/fbtft/fb_ili9320.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9320.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ili9320.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ili9320.c linux-rpi/drivers/staging/fbtft/fb_ili9320.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ili9320.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ili9320.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,234 @@ +/* + * FB driver for the ILI9320 LCD Controller @@ -50488,9 +51124,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9320.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the ILI9320 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9325.c linux-3.18.9/drivers/staging/fbtft/fb_ili9325.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9325.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ili9325.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ili9325.c linux-rpi/drivers/staging/fbtft/fb_ili9325.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ili9325.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ili9325.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,291 @@ +/* + * FB driver for the ILI9325 LCD Controller @@ -50783,9 +51419,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9325.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the ILI9325 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9340.c linux-3.18.9/drivers/staging/fbtft/fb_ili9340.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9340.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ili9340.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ili9340.c linux-rpi/drivers/staging/fbtft/fb_ili9340.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ili9340.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ili9340.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,163 @@ +/* + * FB driver for the ILI9340 LCD Controller @@ -50950,9 +51586,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9340.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the ILI9340 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9341.c linux-3.18.9/drivers/staging/fbtft/fb_ili9341.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9341.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ili9341.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ili9341.c linux-rpi/drivers/staging/fbtft/fb_ili9341.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ili9341.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ili9341.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,179 @@ +/* + * FB driver for the ILI9341 LCD display controller @@ -51133,9 +51769,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9341.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the ILI9341 LCD display controller"); +MODULE_AUTHOR("Christian Vogelgsang"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9481.c linux-3.18.9/drivers/staging/fbtft/fb_ili9481.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9481.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ili9481.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ili9481.c linux-rpi/drivers/staging/fbtft/fb_ili9481.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ili9481.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ili9481.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,117 @@ +/* + * FB driver for the ILI9481 LCD Controller @@ -51254,9 +51890,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9481.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the ILI9481 LCD Controller"); +MODULE_AUTHOR("Petr Olivka"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9486.c linux-3.18.9/drivers/staging/fbtft/fb_ili9486.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9486.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ili9486.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ili9486.c linux-rpi/drivers/staging/fbtft/fb_ili9486.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ili9486.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ili9486.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,121 @@ +/* + * FB driver for the ILI9486 LCD Controller @@ -51379,9 +52015,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ili9486.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the ILI9486 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_pcd8544.c linux-3.18.9/drivers/staging/fbtft/fb_pcd8544.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_pcd8544.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_pcd8544.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_pcd8544.c linux-rpi/drivers/staging/fbtft/fb_pcd8544.c +--- linux-3.18.10/drivers/staging/fbtft/fb_pcd8544.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_pcd8544.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,177 @@ +/* + * FB driver for the PCD8544 LCD Controller @@ -51560,9 +52196,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_pcd8544.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the PCD8544 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ra8875.c linux-3.18.9/drivers/staging/fbtft/fb_ra8875.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ra8875.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ra8875.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ra8875.c linux-rpi/drivers/staging/fbtft/fb_ra8875.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ra8875.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ra8875.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,331 @@ +/****************************************************************************** + @@ -51895,9 +52531,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ra8875.c linux-3.18.9/drive +MODULE_DESCRIPTION("FB driver for the RA8875 LCD Controller"); +MODULE_AUTHOR("Pf@nne"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d02a1.c linux-3.18.9/drivers/staging/fbtft/fb_s6d02a1.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d02a1.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_s6d02a1.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_s6d02a1.c linux-rpi/drivers/staging/fbtft/fb_s6d02a1.c +--- linux-3.18.10/drivers/staging/fbtft/fb_s6d02a1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_s6d02a1.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,168 @@ +/* + * FB driver for the S6D02A1 LCD Controller @@ -52067,9 +52703,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d02a1.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the S6D02A1 LCD Controller"); +MODULE_AUTHOR("WOLFGANG BUENING"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d1121.c linux-3.18.9/drivers/staging/fbtft/fb_s6d1121.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d1121.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_s6d1121.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_s6d1121.c linux-rpi/drivers/staging/fbtft/fb_s6d1121.c +--- linux-3.18.10/drivers/staging/fbtft/fb_s6d1121.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_s6d1121.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,208 @@ +/* + * FB driver for the S6D1121 LCD Controller @@ -52279,9 +52915,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_s6d1121.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the S6D1121 LCD Controller"); +MODULE_AUTHOR("Roman Rolinsky"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1289.c linux-3.18.9/drivers/staging/fbtft/fb_ssd1289.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1289.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ssd1289.c 2015-03-08 03:38:45.374040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ssd1289.c linux-rpi/drivers/staging/fbtft/fb_ssd1289.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ssd1289.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ssd1289.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,206 @@ +/* + * FB driver for the SSD1289 LCD Controller @@ -52489,9 +53125,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1289.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the SSD1289 LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1306.c linux-3.18.9/drivers/staging/fbtft/fb_ssd1306.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1306.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ssd1306.c 2015-03-08 03:38:45.378040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ssd1306.c linux-rpi/drivers/staging/fbtft/fb_ssd1306.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ssd1306.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ssd1306.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,229 @@ +/* + * FB driver for the SSD1306 OLED Controller @@ -52722,9 +53358,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1306.c linux-3.18.9/driv +MODULE_DESCRIPTION("SSD1306 OLED Driver"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1331.c linux-3.18.9/drivers/staging/fbtft/fb_ssd1331.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1331.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ssd1331.c 2015-03-08 03:38:45.378040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ssd1331.c linux-rpi/drivers/staging/fbtft/fb_ssd1331.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ssd1331.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ssd1331.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,205 @@ +#include <linux/module.h> +#include <linux/kernel.h> @@ -52931,9 +53567,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1331.c linux-3.18.9/driv +MODULE_DESCRIPTION("SSD1331 OLED Driver"); +MODULE_AUTHOR("Alec Smecher (adapted from SSD1351 by James Davies)"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1351.c linux-3.18.9/drivers/staging/fbtft/fb_ssd1351.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1351.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_ssd1351.c 2015-03-08 03:38:45.378040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_ssd1351.c linux-rpi/drivers/staging/fbtft/fb_ssd1351.c +--- linux-3.18.10/drivers/staging/fbtft/fb_ssd1351.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_ssd1351.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,258 @@ +#include <linux/module.h> +#include <linux/kernel.h> @@ -53193,9 +53829,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_ssd1351.c linux-3.18.9/driv +MODULE_DESCRIPTION("SSD1351 OLED Driver"); +MODULE_AUTHOR("James Davies"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_st7735r.c linux-3.18.9/drivers/staging/fbtft/fb_st7735r.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_st7735r.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_st7735r.c 2015-03-08 03:38:45.378040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_st7735r.c linux-rpi/drivers/staging/fbtft/fb_st7735r.c +--- linux-3.18.10/drivers/staging/fbtft/fb_st7735r.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_st7735r.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,195 @@ +/* + * FB driver for the ST7735R LCD Controller @@ -53392,9 +54028,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_st7735r.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the ST7735R LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-bus.c linux-3.18.9/drivers/staging/fbtft/fbtft-bus.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fbtft-bus.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fbtft-bus.c 2015-03-08 03:38:45.378040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fbtft-bus.c linux-rpi/drivers/staging/fbtft/fbtft-bus.c +--- linux-3.18.10/drivers/staging/fbtft/fbtft-bus.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fbtft-bus.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,256 @@ +#include <linux/export.h> +#include <linux/errno.h> @@ -53652,9 +54288,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-bus.c linux-3.18.9/drive + return par->fbtftops.write(par, vmem16, len); +} +EXPORT_SYMBOL(fbtft_write_vmem16_bus16); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-core.c linux-3.18.9/drivers/staging/fbtft/fbtft-core.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fbtft-core.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fbtft-core.c 2015-03-08 03:38:45.378040942 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fbtft-core.c linux-rpi/drivers/staging/fbtft/fbtft-core.c +--- linux-3.18.10/drivers/staging/fbtft/fbtft-core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fbtft-core.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,1521 @@ +/* + * Copyright (C) 2013 Noralf Tronnes @@ -55177,9 +55813,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-core.c linux-3.18.9/driv +EXPORT_SYMBOL(fbtft_remove_common); + +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft_device.c linux-3.18.9/drivers/staging/fbtft/fbtft_device.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fbtft_device.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fbtft_device.c 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fbtft_device.c linux-rpi/drivers/staging/fbtft/fbtft_device.c +--- linux-3.18.10/drivers/staging/fbtft/fbtft_device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fbtft_device.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,1444 @@ +/* + * @@ -56625,9 +57261,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft_device.c linux-3.18.9/dr +MODULE_DESCRIPTION("Add a FBTFT device."); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft.h linux-3.18.9/drivers/staging/fbtft/fbtft.h ---- linux-3.18.9.orig/drivers/staging/fbtft/fbtft.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fbtft.h 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fbtft.h linux-rpi/drivers/staging/fbtft/fbtft.h +--- linux-3.18.10/drivers/staging/fbtft/fbtft.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fbtft.h 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,447 @@ +/* + * Copyright (C) 2013 Noralf Tronnes @@ -57076,9 +57712,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft.h linux-3.18.9/drivers/s +} while (0) + +#endif /* __LINUX_FBTFT_H */ -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-io.c linux-3.18.9/drivers/staging/fbtft/fbtft-io.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fbtft-io.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fbtft-io.c 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fbtft-io.c linux-rpi/drivers/staging/fbtft/fbtft-io.c +--- linux-3.18.10/drivers/staging/fbtft/fbtft-io.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fbtft-io.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,239 @@ +#include <linux/export.h> +#include <linux/errno.h> @@ -57319,9 +57955,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-io.c linux-3.18.9/driver + return -1; +} +EXPORT_SYMBOL(fbtft_write_gpio16_wr_latched); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-sysfs.c linux-3.18.9/drivers/staging/fbtft/fbtft-sysfs.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fbtft-sysfs.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fbtft-sysfs.c 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fbtft-sysfs.c linux-rpi/drivers/staging/fbtft/fbtft-sysfs.c +--- linux-3.18.10/drivers/staging/fbtft/fbtft-sysfs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fbtft-sysfs.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,222 @@ +#include "fbtft.h" + @@ -57545,9 +58181,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fbtft-sysfs.c linux-3.18.9/dri + if (par->gamma.curves && par->fbtftops.set_gamma) + device_remove_file(par->info->dev, &gamma_device_attrs[0]); +} -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_tinylcd.c linux-3.18.9/drivers/staging/fbtft/fb_tinylcd.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_tinylcd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_tinylcd.c 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_tinylcd.c linux-rpi/drivers/staging/fbtft/fb_tinylcd.c +--- linux-3.18.10/drivers/staging/fbtft/fb_tinylcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_tinylcd.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,124 @@ +/* + * Custom FB driver for tinylcd.com display @@ -57673,9 +58309,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_tinylcd.c linux-3.18.9/driv +MODULE_DESCRIPTION("Custom FB driver for tinylcd.com display"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_tls8204.c linux-3.18.9/drivers/staging/fbtft/fb_tls8204.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_tls8204.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_tls8204.c 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_tls8204.c linux-rpi/drivers/staging/fbtft/fb_tls8204.c +--- linux-3.18.10/drivers/staging/fbtft/fb_tls8204.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_tls8204.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,176 @@ +/* + * FB driver for the TLS8204 LCD Controller @@ -57853,9 +58489,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_tls8204.c linux-3.18.9/driv +MODULE_DESCRIPTION("FB driver for the TLS8204 LCD Controller"); +MODULE_AUTHOR("Michael Hope"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_uc1701.c linux-3.18.9/drivers/staging/fbtft/fb_uc1701.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_uc1701.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_uc1701.c 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_uc1701.c linux-rpi/drivers/staging/fbtft/fb_uc1701.c +--- linux-3.18.10/drivers/staging/fbtft/fb_uc1701.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_uc1701.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,210 @@ +/* + * FB driver for the UC1701 LCD Controller @@ -58067,9 +58703,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_uc1701.c linux-3.18.9/drive +MODULE_DESCRIPTION("FB driver for the UC1701 LCD Controller"); +MODULE_AUTHOR("Juergen Holzmann"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_upd161704.c linux-3.18.9/drivers/staging/fbtft/fb_upd161704.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_upd161704.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_upd161704.c 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_upd161704.c linux-rpi/drivers/staging/fbtft/fb_upd161704.c +--- linux-3.18.10/drivers/staging/fbtft/fb_upd161704.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_upd161704.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,206 @@ +/* + * FB driver for the uPD161704 LCD Controller @@ -58277,9 +58913,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_upd161704.c linux-3.18.9/dr +MODULE_DESCRIPTION("FB driver for the uPD161704 LCD Controller"); +MODULE_AUTHOR("Seong-Woo Kim"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_watterott.c linux-3.18.9/drivers/staging/fbtft/fb_watterott.c ---- linux-3.18.9.orig/drivers/staging/fbtft/fb_watterott.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/fb_watterott.c 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/fb_watterott.c linux-rpi/drivers/staging/fbtft/fb_watterott.c +--- linux-3.18.10/drivers/staging/fbtft/fb_watterott.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/fb_watterott.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,324 @@ +/* + * FB driver for the Watterott LCD Controller @@ -58605,9 +59241,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/fb_watterott.c linux-3.18.9/dr +MODULE_DESCRIPTION("FB driver for the Watterott LCD Controller"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/flexfb.c linux-3.18.9/drivers/staging/fbtft/flexfb.c ---- linux-3.18.9.orig/drivers/staging/fbtft/flexfb.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/flexfb.c 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/flexfb.c linux-rpi/drivers/staging/fbtft/flexfb.c +--- linux-3.18.10/drivers/staging/fbtft/flexfb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/flexfb.c 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,592 @@ +/* + * Generic FB driver for TFT LCD displays @@ -59201,9 +59837,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/flexfb.c linux-3.18.9/drivers/ +MODULE_DESCRIPTION("Generic FB driver for TFT LCD displays"); +MODULE_AUTHOR("Noralf Tronnes"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/Kconfig linux-3.18.9/drivers/staging/fbtft/Kconfig ---- linux-3.18.9.orig/drivers/staging/fbtft/Kconfig 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/Kconfig 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/Kconfig linux-rpi/drivers/staging/fbtft/Kconfig +--- linux-3.18.10/drivers/staging/fbtft/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/Kconfig 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,169 @@ +menuconfig FB_TFT + tristate "Support for small TFT LCD display modules" @@ -59374,9 +60010,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/Kconfig linux-3.18.9/drivers/s +config FB_TFT_FBTFT_DEVICE + tristate "Module to for adding FBTFT devices" + depends on FB_TFT -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/Makefile linux-3.18.9/drivers/staging/fbtft/Makefile ---- linux-3.18.9.orig/drivers/staging/fbtft/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/Makefile 2015-03-08 03:38:45.406040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/Makefile linux-rpi/drivers/staging/fbtft/Makefile +--- linux-3.18.10/drivers/staging/fbtft/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/Makefile 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,34 @@ +# Core module +obj-$(CONFIG_FB_TFT) += fbtft.o @@ -59412,9 +60048,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/Makefile linux-3.18.9/drivers/ + +# Device modules +obj-$(CONFIG_FB_TFT_FBTFT_DEVICE) += fbtft_device.o -diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/README linux-3.18.9/drivers/staging/fbtft/README ---- linux-3.18.9.orig/drivers/staging/fbtft/README 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/fbtft/README 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/fbtft/README linux-rpi/drivers/staging/fbtft/README +--- linux-3.18.10/drivers/staging/fbtft/README 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/fbtft/README 2015-03-26 11:46:54.000237917 +0100 @@ -0,0 +1,32 @@ + FBTFT +========= @@ -59448,9 +60084,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/fbtft/README linux-3.18.9/drivers/st + + +Source: https://github.com/notro/fbtft/ -diff -Nur linux-3.18.9.orig/drivers/staging/Kconfig linux-3.18.9/drivers/staging/Kconfig ---- linux-3.18.9.orig/drivers/staging/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/staging/Kconfig 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/Kconfig linux-rpi/drivers/staging/Kconfig +--- linux-3.18.10/drivers/staging/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/staging/Kconfig 2015-03-26 11:46:53.888237809 +0100 @@ -108,4 +108,6 @@ source "drivers/staging/unisys/Kconfig" @@ -59458,17 +60094,17 @@ diff -Nur linux-3.18.9.orig/drivers/staging/Kconfig linux-3.18.9/drivers/staging +source "drivers/staging/fbtft/Kconfig" + endif # STAGING -diff -Nur linux-3.18.9.orig/drivers/staging/Makefile linux-3.18.9/drivers/staging/Makefile ---- linux-3.18.9.orig/drivers/staging/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/staging/Makefile 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/Makefile linux-rpi/drivers/staging/Makefile +--- linux-3.18.10/drivers/staging/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/staging/Makefile 2015-03-26 11:46:53.888237809 +0100 @@ -46,3 +46,4 @@ obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/ obj-$(CONFIG_CRYPTO_SKEIN) += skein/ obj-$(CONFIG_UNISYSSPAR) += unisys/ +obj-$(CONFIG_FB_TFT) += fbtft/ -diff -Nur linux-3.18.9.orig/drivers/staging/media/lirc/Kconfig linux-3.18.9/drivers/staging/media/lirc/Kconfig ---- linux-3.18.9.orig/drivers/staging/media/lirc/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/staging/media/lirc/Kconfig 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/media/lirc/Kconfig linux-rpi/drivers/staging/media/lirc/Kconfig +--- linux-3.18.10/drivers/staging/media/lirc/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/staging/media/lirc/Kconfig 2015-03-26 11:46:54.056237968 +0100 @@ -38,6 +38,12 @@ help Driver for Homebrew Parallel Port Receivers @@ -59482,9 +60118,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/media/lirc/Kconfig linux-3.18.9/driv config LIRC_SASEM tristate "Sasem USB IR Remote" depends on LIRC && USB -diff -Nur linux-3.18.9.orig/drivers/staging/media/lirc/lirc_rpi.c linux-3.18.9/drivers/staging/media/lirc/lirc_rpi.c ---- linux-3.18.9.orig/drivers/staging/media/lirc/lirc_rpi.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/staging/media/lirc/lirc_rpi.c 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/media/lirc/lirc_rpi.c linux-rpi/drivers/staging/media/lirc/lirc_rpi.c +--- linux-3.18.10/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/staging/media/lirc/lirc_rpi.c 2015-03-26 11:46:54.056237968 +0100 @@ -0,0 +1,765 @@ +/* + * lirc_rpi.c @@ -60251,9 +60887,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/media/lirc/lirc_rpi.c linux-3.18.9/d + +module_param(debug, bool, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(debug, "Enable debugging messages"); -diff -Nur linux-3.18.9.orig/drivers/staging/media/lirc/Makefile linux-3.18.9/drivers/staging/media/lirc/Makefile ---- linux-3.18.9.orig/drivers/staging/media/lirc/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/staging/media/lirc/Makefile 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/staging/media/lirc/Makefile linux-rpi/drivers/staging/media/lirc/Makefile +--- linux-3.18.10/drivers/staging/media/lirc/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/staging/media/lirc/Makefile 2015-03-26 11:46:54.056237968 +0100 @@ -7,6 +7,7 @@ obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o obj-$(CONFIG_LIRC_IMON) += lirc_imon.o @@ -60262,9 +60898,9 @@ diff -Nur linux-3.18.9.orig/drivers/staging/media/lirc/Makefile linux-3.18.9/dri obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o obj-$(CONFIG_LIRC_SIR) += lirc_sir.o -diff -Nur linux-3.18.9.orig/drivers/thermal/bcm2835-thermal.c linux-3.18.9/drivers/thermal/bcm2835-thermal.c ---- linux-3.18.9.orig/drivers/thermal/bcm2835-thermal.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/thermal/bcm2835-thermal.c 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/thermal/bcm2835-thermal.c linux-rpi/drivers/thermal/bcm2835-thermal.c +--- linux-3.18.10/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/thermal/bcm2835-thermal.c 2015-03-26 11:46:54.192238094 +0100 @@ -0,0 +1,184 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -60450,9 +61086,9 @@ diff -Nur linux-3.18.9.orig/drivers/thermal/bcm2835-thermal.c linux-3.18.9/drive +MODULE_DESCRIPTION("Thermal driver for bcm2835 chip"); + +module_platform_driver(bcm2835_thermal_driver); -diff -Nur linux-3.18.9.orig/drivers/thermal/Kconfig linux-3.18.9/drivers/thermal/Kconfig ---- linux-3.18.9.orig/drivers/thermal/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/thermal/Kconfig 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/thermal/Kconfig linux-rpi/drivers/thermal/Kconfig +--- linux-3.18.10/drivers/thermal/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/thermal/Kconfig 2015-03-26 11:46:54.192238094 +0100 @@ -206,6 +206,12 @@ enforce idle time which results in more package C-state residency. The user interface is exposed via generic thermal framework. @@ -60466,9 +61102,9 @@ diff -Nur linux-3.18.9.orig/drivers/thermal/Kconfig linux-3.18.9/drivers/thermal config X86_PKG_TEMP_THERMAL tristate "X86 package temperature thermal driver" depends on X86_THERMAL_VECTOR -diff -Nur linux-3.18.9.orig/drivers/thermal/Makefile linux-3.18.9/drivers/thermal/Makefile ---- linux-3.18.9.orig/drivers/thermal/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/thermal/Makefile 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/thermal/Makefile linux-rpi/drivers/thermal/Makefile +--- linux-3.18.10/drivers/thermal/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/thermal/Makefile 2015-03-26 11:46:54.192238094 +0100 @@ -29,6 +29,7 @@ obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o @@ -60477,9 +61113,9 @@ diff -Nur linux-3.18.9.orig/drivers/thermal/Makefile linux-3.18.9/drivers/therma 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-3.18.9.orig/drivers/tty/serial/amba-pl011.c linux-3.18.9/drivers/tty/serial/amba-pl011.c ---- linux-3.18.9.orig/drivers/tty/serial/amba-pl011.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/tty/serial/amba-pl011.c 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/tty/serial/amba-pl011.c linux-rpi/drivers/tty/serial/amba-pl011.c +--- linux-3.18.10/drivers/tty/serial/amba-pl011.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/tty/serial/amba-pl011.c 2015-03-26 11:46:54.212238112 +0100 @@ -58,6 +58,7 @@ #include <linux/pinctrl/consumer.h> #include <linux/sizes.h> @@ -60787,9 +61423,9 @@ diff -Nur linux-3.18.9.orig/drivers/tty/serial/amba-pl011.c linux-3.18.9/drivers pl011_dma_probe(&dev->dev, uap); /* Ensure interrupts from this UART are masked and cleared */ -diff -Nur linux-3.18.9.orig/drivers/usb/core/generic.c linux-3.18.9/drivers/usb/core/generic.c ---- linux-3.18.9.orig/drivers/usb/core/generic.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/usb/core/generic.c 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/core/generic.c linux-rpi/drivers/usb/core/generic.c +--- linux-3.18.10/drivers/usb/core/generic.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/usb/core/generic.c 2015-03-26 11:46:54.260238154 +0100 @@ -152,6 +152,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -60798,9 +61434,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/core/generic.c linux-3.18.9/drivers/usb/ } return i; } -diff -Nur linux-3.18.9.orig/drivers/usb/core/hub.c linux-3.18.9/drivers/usb/core/hub.c ---- linux-3.18.9.orig/drivers/usb/core/hub.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/usb/core/hub.c 2015-03-08 03:38:45.410040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/core/hub.c linux-rpi/drivers/usb/core/hub.c +--- linux-3.18.10/drivers/usb/core/hub.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/usb/core/hub.c 2015-03-26 11:46:54.260238154 +0100 @@ -4923,7 +4923,7 @@ if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; @@ -60810,9 +61446,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/core/hub.c linux-3.18.9/drivers/usb/core usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_OVER_CURRENT); msleep(100); /* Cool down */ -diff -Nur linux-3.18.9.orig/drivers/usb/core/message.c linux-3.18.9/drivers/usb/core/message.c ---- linux-3.18.9.orig/drivers/usb/core/message.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/usb/core/message.c 2015-03-08 03:38:45.414040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/core/message.c linux-rpi/drivers/usb/core/message.c +--- linux-3.18.10/drivers/usb/core/message.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/usb/core/message.c 2015-03-26 11:46:54.260238154 +0100 @@ -1872,6 +1872,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -60899,9 +61535,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/core/message.c linux-3.18.9/drivers/usb/ /* Now that the interfaces are installed, re-enable LPM. */ usb_unlocked_enable_lpm(dev); -diff -Nur linux-3.18.9.orig/drivers/usb/core/otg_whitelist.h linux-3.18.9/drivers/usb/core/otg_whitelist.h ---- linux-3.18.9.orig/drivers/usb/core/otg_whitelist.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/usb/core/otg_whitelist.h 2015-03-08 03:38:45.414040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/core/otg_whitelist.h linux-rpi/drivers/usb/core/otg_whitelist.h +--- linux-3.18.10/drivers/usb/core/otg_whitelist.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/usb/core/otg_whitelist.h 2015-03-26 11:46:54.260238154 +0100 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -61055,9 +61691,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/core/otg_whitelist.h linux-3.18.9/driver return 0; } -diff -Nur linux-3.18.9.orig/drivers/usb/gadget/file_storage.c linux-3.18.9/drivers/usb/gadget/file_storage.c ---- linux-3.18.9.orig/drivers/usb/gadget/file_storage.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/gadget/file_storage.c 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/gadget/file_storage.c linux-rpi/drivers/usb/gadget/file_storage.c +--- linux-3.18.10/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/usb/gadget/file_storage.c 2015-03-26 11:46:54.272238167 +0100 @@ -0,0 +1,3676 @@ +/* + * file_storage.c -- File-backed USB Storage Gadget, for USB development @@ -64735,9 +65371,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/gadget/file_storage.c linux-3.18.9/drive + kref_put(&fsg->ref, fsg_release); +} +module_exit(fsg_cleanup); -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/changes.txt linux-3.18.9/drivers/usb/host/dwc_common_port/changes.txt ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/changes.txt 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/changes.txt 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/changes.txt linux-rpi/drivers/usb/host/dwc_common_port/changes.txt +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -64913,9 +65549,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/changes.txt linux-3 +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-3.18.9.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-3.18.9/drivers/usb/host/dwc_common_port/doc/doxygen.cfg ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -65187,9 +65823,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg lin +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_cc.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_cc.c 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -65723,9 +66359,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.18 +} + +#endif /* DWC_CCLIB */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_cc.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_cc.h 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_cc.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,224 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -65951,9 +66587,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.18 +#endif + +#endif /* _DWC_CC_H_ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -67263,9 +67899,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c l +{ + return wq->pending; +} -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_linux.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_linux.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,1434 @@ +#include <linux/kernel.h> +#include <linux/init.h> @@ -68701,9 +69337,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c +MODULE_LICENSE ("GPL"); + +#endif /* DWC_LIBMODULE */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -69980,9 +70616,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c l +{ + return wq->pending; +} -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_crypto.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_crypto.c 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -70292,9 +70928,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c linux- +} + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_crypto.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_crypto.h 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_crypto.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -70407,9 +71043,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h linux- +#endif + +#endif /* _DWC_CRYPTO_H_ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_dh.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_dh.c 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -70702,9 +71338,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.18 +#endif /* !CONFIG_MACH_IPMATE */ + +#endif /* DWC_CRYPTOLIB */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_dh.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_dh.h 2015-03-08 03:38:45.418040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_dh.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -70812,9 +71448,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.18 +#endif + +#endif /* _DWC_DH_H_ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_list.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_list.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_list.h 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_list.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -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 $ */ @@ -71410,9 +72046,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_list.h linux-3. +#endif + +#endif /* _DWC_LIST_H_ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_mem.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_mem.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_mem.c 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_mem.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -71659,9 +72295,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.1 +} + +#endif /* DWC_DEBUG_MEMORY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_modpow.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_modpow.c 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -72299,9 +72935,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c linux- +#endif /* CONFIG_MACH_IPMATE */ + +#endif /*DWC_CRYPTOLIB */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_modpow.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_modpow.h 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_modpow.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -72337,9 +72973,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h linux- +#endif + +#endif /* _LINUX_BIGNUM_H */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_notifier.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_notifier.c 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -72660,9 +73296,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c linu +} + +#endif /* DWC_NOTIFYLIB */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_notifier.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_notifier.h 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_notifier.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -72786,9 +73422,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h linu +#endif + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_os.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_os.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/dwc_os.h 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi/drivers/usb/host/dwc_common_port/dwc_os.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,1276 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -74066,9 +74702,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.18 +#endif + +#endif /* _DWC_OS_H_ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/Makefile linux-rpi/drivers/usb/host/dwc_common_port/Makefile +--- linux-3.18.10/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/usb/host/dwc_common_port/Makefile 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -74128,9 +74764,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile linux-3.18 + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile.fbsd ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile.fbsd 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi/drivers/usb/host/dwc_common_port/Makefile.fbsd +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -74149,9 +74785,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd linux + dwc_common_fbsd.c dwc_mem.c + +.include <bsd.kmod.mk> -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile.linux ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.linux 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/Makefile.linux 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi/drivers/usb/host/dwc_common_port/Makefile.linux +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -74202,9 +74838,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/Makefile.linux linu + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/usb.h linux-3.18.9/drivers/usb/host/dwc_common_port/usb.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_common_port/usb.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_common_port/usb.h 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_common_port/usb.h linux-rpi/drivers/usb/host/dwc_common_port/usb.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -75152,9 +75788,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_common_port/usb.h linux-3.18.9/ +#endif + +#endif /* _USB_H_ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.18.9/drivers/usb/host/dwc_otg/doc/doxygen.cfg ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi/drivers/usb/host/dwc_otg/doc/doxygen.cfg +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -75380,9 +76016,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.18. +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.18.9/drivers/usb/host/dwc_otg/dummy_audio.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dummy_audio.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dummy_audio.c 2015-03-08 03:38:45.422040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi/drivers/usb/host/dwc_otg/dummy_audio.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -76959,9 +77595,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.18.9/ + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_cfi_common.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2015-03-08 03:38:45.426040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi/drivers/usb/host/dwc_otg/dwc_cfi_common.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -77105,9 +77741,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.18 +typedef struct cfi_string cfi_string_t; + +#endif -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_adp.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2015-03-08 03:38:45.426040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -77963,9 +78599,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.18.9/ +#endif + return 1; +} -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_adp.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2015-03-08 03:38:45.426040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_adp.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -78047,9 +78683,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.18.9/ +extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if); + +#endif //__DWC_OTG_ADP_H__ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_attr.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2015-03-08 03:38:45.426040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -79261,9 +79897,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.18.9 + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_attr.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2015-03-08 03:38:45.426040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_attr.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -79354,9 +79990,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.18.9 +#endif + ); +#endif -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2015-03-08 03:38:45.426040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -81234,9 +81870,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.18.9/ +} + +#endif //DWC_UTE_CFI -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2015-03-08 03:38:45.426040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +--- linux-3.18.10/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 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -81558,9 +82194,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.18.9/ +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2015-03-08 03:38:45.430040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.c +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,7141 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -88703,9 +89339,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.18.9/ + dwc_otg_pcd_start_srp_timer(core_if); + return; +} -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2015-03-08 03:38:45.434040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil.h +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -90171,9 +90807,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.18.9/ +////////////////////////////////////////////////////////////////////// + +#endif -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2015-03-08 03:38:45.434040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,1594 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -91769,9 +92405,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3. + DWC_SPINUNLOCK(core_if->lock); + return retval; +} -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_core_if.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2015-03-08 03:38:45.434040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -92478,9 +93114,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.1 +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_dbg.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2015-03-08 03:38:45.434040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -92599,9 +93235,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.18.9/ + +#endif /*DEBUG*/ +#endif -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_driver.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2015-03-08 03:38:45.434040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.c +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,1749 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -94352,9 +94988,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.18 + </td></tr> + +*/ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_driver.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2015-03-08 03:38:45.434040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_driver.h +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -94442,9 +95078,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.18 +#endif + +#endif -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c 2015-03-08 03:38:45.434040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,1346 @@ +/* + * dwc_otg_fiq_fsm.c - The finite state machine FIQ @@ -95792,9 +96428,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c linux-3.1 + mb(); + fiq_fsm_spin_unlock(&state->lock); +} -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h 2015-03-08 03:38:45.434040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,367 @@ +/* + * dwc_otg_fiq_fsm.h - Finite state machine FIQ header definitions @@ -96163,9 +96799,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h linux-3.1 +extern void dwc_otg_fiq_nop(struct fiq_state *state); + +#endif /* DWC_OTG_FIQ_FSM_H_ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S 2015-03-08 03:38:45.434040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S +--- linux-3.18.10/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 2015-03-26 11:46:54.312238202 +0100 @@ -0,0 +1,81 @@ +/* + * dwc_otg_fiq_fsm.S - assembly stub for the FSM FIQ @@ -96248,9 +96884,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S linux-3. +_dwc_otg_fiq_stub_end: +END(_dwc_otg_fiq_stub) + -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2015-03-08 03:38:45.450040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,4244 @@ + +/* ========================================================================== @@ -100496,9 +101132,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.18.9/ +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2015-03-08 03:38:45.450040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -101632,9 +102268,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3. +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2015-03-08 03:38:45.454040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,862 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -102498,9 +103134,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.18.9/ +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2015-03-08 03:38:45.454040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -102919,9 +103555,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.18 + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2015-03-08 03:38:45.454040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,2713 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -105636,9 +106272,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3. + return retval; +} +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2015-03-08 03:38:45.454040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,994 @@ + +/* ========================================================================== @@ -106634,9 +107270,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2015-03-08 03:38:45.454040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,957 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -107595,9 +108231,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2015-03-08 03:38:45.454040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -107787,9 +108423,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.18 + + +#endif /* _DWC_OS_DEP_H_ */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2015-03-08 03:38:45.458040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,2712 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -110503,9 +111139,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.18.9/ +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2015-03-08 03:38:45.458040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -110773,9 +111409,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.18.9/ +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2015-03-08 03:38:45.458040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -111137,9 +111773,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.18 +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2015-03-08 03:38:45.462040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -116288,9 +116924,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3. +} + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2015-03-08 03:38:45.462040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,1360 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -117652,9 +118288,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3 +EXPORT_SYMBOL(usb_gadget_unregister_driver); + +#endif /* DWC_HOST_ONLY */ -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_regs.h ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2015-03-08 03:38:45.466040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi/drivers/usb/host/dwc_otg/dwc_otg_regs.h +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -120206,9 +120842,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.18.9 +} gpwrdn_data_t; + +#endif -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/Makefile linux-3.18.9/drivers/usb/host/dwc_otg/Makefile ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/Makefile 2015-03-08 03:38:45.466040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/Makefile linux-rpi/drivers/usb/host/dwc_otg/Makefile +--- linux-3.18.10/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/usb/host/dwc_otg/Makefile 2015-03-26 11:46:54.308238199 +0100 @@ -0,0 +1,82 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -120292,9 +120928,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/Makefile linux-3.18.9/drive + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + +endif -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.18.9/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -120633,9 +121269,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux- +); + +1; -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/Makefile linux-3.18.9/drivers/usb/host/dwc_otg/test/Makefile ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/test/Makefile 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/test/Makefile linux-rpi/drivers/usb/host/dwc_otg/test/Makefile +--- linux-3.18.10/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/usb/host/dwc_otg/test/Makefile 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -120653,9 +121289,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/Makefile linux-3.18.9/ + else echo "=======> $$test, FAILED" ; \ + fi \ + done -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3.18.9/drivers/usb/host/dwc_otg/test/test_mod_param.pl ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_mod_param.pl +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -120790,9 +121426,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl linu + +test_main(); +0; -diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.18.9/drivers/usb/host/dwc_otg/test/test_sysfs.pl ---- linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi/drivers/usb/host/dwc_otg/test/test_sysfs.pl +--- linux-3.18.10/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 2015-03-26 11:46:54.320238212 +0100 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -120987,9 +121623,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3. + +test_main(); +0; -diff -Nur linux-3.18.9.orig/drivers/usb/host/Kconfig linux-3.18.9/drivers/usb/host/Kconfig ---- linux-3.18.9.orig/drivers/usb/host/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/Kconfig 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/Kconfig linux-rpi/drivers/usb/host/Kconfig +--- linux-3.18.10/drivers/usb/host/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/usb/host/Kconfig 2015-03-26 11:46:54.308238199 +0100 @@ -744,6 +744,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -121010,9 +121646,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/Kconfig linux-3.18.9/drivers/usb/ho config USB_IMX21_HCD tristate "i.MX21 HCD support" depends on ARM && ARCH_MXC -diff -Nur linux-3.18.9.orig/drivers/usb/host/Makefile linux-3.18.9/drivers/usb/host/Makefile ---- linux-3.18.9.orig/drivers/usb/host/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/usb/host/Makefile 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/host/Makefile linux-rpi/drivers/usb/host/Makefile +--- linux-3.18.10/drivers/usb/host/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/usb/host/Makefile 2015-03-26 11:46:54.308238199 +0100 @@ -71,6 +71,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -121022,9 +121658,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/host/Makefile linux-3.18.9/drivers/usb/h obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o -diff -Nur linux-3.18.9.orig/drivers/usb/Makefile linux-3.18.9/drivers/usb/Makefile ---- linux-3.18.9.orig/drivers/usb/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/usb/Makefile 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/usb/Makefile linux-rpi/drivers/usb/Makefile +--- linux-3.18.10/drivers/usb/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/usb/Makefile 2015-03-26 11:46:54.248238147 +0100 @@ -24,6 +24,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -121033,9 +121669,9 @@ diff -Nur linux-3.18.9.orig/drivers/usb/Makefile linux-3.18.9/drivers/usb/Makefi obj-$(CONFIG_USB_IMX21_HCD) += host/ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ obj-$(CONFIG_USB_FUSBH200_HCD) += host/ -diff -Nur linux-3.18.9.orig/drivers/video/fbdev/bcm2708_fb.c linux-3.18.9/drivers/video/fbdev/bcm2708_fb.c ---- linux-3.18.9.orig/drivers/video/fbdev/bcm2708_fb.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/video/fbdev/bcm2708_fb.c 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/video/fbdev/bcm2708_fb.c linux-rpi/drivers/video/fbdev/bcm2708_fb.c +--- linux-3.18.10/drivers/video/fbdev/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/video/fbdev/bcm2708_fb.c 2015-03-26 11:46:54.428238312 +0100 @@ -0,0 +1,818 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -121463,10 +122099,10 @@ diff -Nur linux-3.18.9.orig/drivers/video/fbdev/bcm2708_fb.c linux-3.18.9/driver + + bcm_mailbox_property(&p, p[0]); + -+ pr_info("bcm2708_fb_ioctl %x,%lx returns=%d p[1]=0x%x\n", cmd, arg, p[5], p[1]); -+ + if ( p[1] == VCMSG_REQUEST_SUCCESSFUL ) + result = 0; ++ else ++ pr_err("bcm2708_fb_ioctl %x,%lx returns=%d p[1]=0x%x\n", cmd, arg, p[5], p[1]); + } + return result; +} @@ -121855,9 +122491,9 @@ diff -Nur linux-3.18.9.orig/drivers/video/fbdev/bcm2708_fb.c linux-3.18.9/driver +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-3.18.9.orig/drivers/video/fbdev/core/cfbimgblt.c linux-3.18.9/drivers/video/fbdev/core/cfbimgblt.c ---- linux-3.18.9.orig/drivers/video/fbdev/core/cfbimgblt.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/video/fbdev/core/cfbimgblt.c 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/video/fbdev/core/cfbimgblt.c linux-rpi/drivers/video/fbdev/core/cfbimgblt.c +--- linux-3.18.10/drivers/video/fbdev/core/cfbimgblt.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/video/fbdev/core/cfbimgblt.c 2015-03-26 11:46:54.436238317 +0100 @@ -28,6 +28,11 @@ * * Also need to add code to deal with cards endians that are different than @@ -122031,9 +122667,9 @@ diff -Nur linux-3.18.9.orig/drivers/video/fbdev/core/cfbimgblt.c linux-3.18.9/dr slow_imageblit(image, p, dst1, fgcolor, bgcolor, start_index, pitch_index); } else -diff -Nur linux-3.18.9.orig/drivers/video/fbdev/core/fbmem.c linux-3.18.9/drivers/video/fbdev/core/fbmem.c ---- linux-3.18.9.orig/drivers/video/fbdev/core/fbmem.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/video/fbdev/core/fbmem.c 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/video/fbdev/core/fbmem.c linux-rpi/drivers/video/fbdev/core/fbmem.c +--- linux-3.18.10/drivers/video/fbdev/core/fbmem.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/video/fbdev/core/fbmem.c 2015-03-26 11:46:54.452238335 +0100 @@ -1084,6 +1084,25 @@ } EXPORT_SYMBOL(fb_blank); @@ -122092,9 +122728,9 @@ diff -Nur linux-3.18.9.orig/drivers/video/fbdev/core/fbmem.c linux-3.18.9/driver arg = (unsigned long) compat_ptr(arg); case FBIOBLANK: ret = do_fb_ioctl(info, cmd, arg); -diff -Nur linux-3.18.9.orig/drivers/video/fbdev/Kconfig linux-3.18.9/drivers/video/fbdev/Kconfig ---- linux-3.18.9.orig/drivers/video/fbdev/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/video/fbdev/Kconfig 2015-03-08 03:38:45.470040941 -0500 +diff -Nur linux-3.18.10/drivers/video/fbdev/Kconfig linux-rpi/drivers/video/fbdev/Kconfig +--- linux-3.18.10/drivers/video/fbdev/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/video/fbdev/Kconfig 2015-03-26 11:46:54.420238304 +0100 @@ -224,6 +224,20 @@ comment "Frame buffer hardware drivers" depends on FB @@ -122116,9 +122752,9 @@ diff -Nur linux-3.18.9.orig/drivers/video/fbdev/Kconfig linux-3.18.9/drivers/vid config FB_GRVGA tristate "Aeroflex Gaisler framebuffer support" depends on FB && SPARC -diff -Nur linux-3.18.9.orig/drivers/video/fbdev/Makefile linux-3.18.9/drivers/video/fbdev/Makefile ---- linux-3.18.9.orig/drivers/video/fbdev/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/video/fbdev/Makefile 2015-03-08 03:38:45.474040941 -0500 +diff -Nur linux-3.18.10/drivers/video/fbdev/Makefile linux-rpi/drivers/video/fbdev/Makefile +--- linux-3.18.10/drivers/video/fbdev/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/video/fbdev/Makefile 2015-03-26 11:46:54.420238304 +0100 @@ -12,6 +12,7 @@ obj-$(CONFIG_FB_WMT_GE_ROPS) += wmt_ge_rops.o @@ -122127,9 +122763,9 @@ diff -Nur linux-3.18.9.orig/drivers/video/fbdev/Makefile linux-3.18.9/drivers/vi obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o obj-$(CONFIG_FB_ARC) += arcfb.o obj-$(CONFIG_FB_CLPS711X) += clps711x-fb.o -diff -Nur linux-3.18.9.orig/drivers/video/logo/logo_linux_clut224.ppm linux-3.18.9/drivers/video/logo/logo_linux_clut224.ppm ---- linux-3.18.9.orig/drivers/video/logo/logo_linux_clut224.ppm 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/video/logo/logo_linux_clut224.ppm 2015-03-08 03:38:45.506040941 -0500 +diff -Nur linux-3.18.10/drivers/video/logo/logo_linux_clut224.ppm linux-rpi/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.18.10/drivers/video/logo/logo_linux_clut224.ppm 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/video/logo/logo_linux_clut224.ppm 2015-03-26 11:46:54.512238389 +0100 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -124616,9 +125252,9 @@ diff -Nur linux-3.18.9.orig/drivers/video/logo/logo_linux_clut224.ppm linux-3.18 +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-3.18.9.orig/drivers/w1/masters/w1-gpio.c linux-3.18.9/drivers/w1/masters/w1-gpio.c ---- linux-3.18.9.orig/drivers/w1/masters/w1-gpio.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/w1/masters/w1-gpio.c 2015-03-08 03:38:45.506040941 -0500 +diff -Nur linux-3.18.10/drivers/w1/masters/w1-gpio.c linux-rpi/drivers/w1/masters/w1-gpio.c +--- linux-3.18.10/drivers/w1/masters/w1-gpio.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/w1/masters/w1-gpio.c 2015-03-26 11:46:54.528238404 +0100 @@ -23,6 +23,19 @@ #include "../w1.h" #include "../w1_int.h" @@ -124753,9 +125389,9 @@ diff -Nur linux-3.18.9.orig/drivers/w1/masters/w1-gpio.c linux-3.18.9/drivers/w1 return 0; } -diff -Nur linux-3.18.9.orig/drivers/w1/w1.h linux-3.18.9/drivers/w1/w1.h ---- linux-3.18.9.orig/drivers/w1/w1.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/w1/w1.h 2015-03-08 03:38:45.506040941 -0500 +diff -Nur linux-3.18.10/drivers/w1/w1.h linux-rpi/drivers/w1/w1.h +--- linux-3.18.10/drivers/w1/w1.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/w1/w1.h 2015-03-26 11:46:54.528238404 +0100 @@ -171,6 +171,12 @@ u8 (*set_pullup)(void *, int); @@ -124769,9 +125405,9 @@ diff -Nur linux-3.18.9.orig/drivers/w1/w1.h linux-3.18.9/drivers/w1/w1.h void (*search)(void *, struct w1_master *, u8, w1_slave_found_callback); }; -diff -Nur linux-3.18.9.orig/drivers/w1/w1_int.c linux-3.18.9/drivers/w1/w1_int.c ---- linux-3.18.9.orig/drivers/w1/w1_int.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/w1/w1_int.c 2015-03-08 03:38:45.506040941 -0500 +diff -Nur linux-3.18.10/drivers/w1/w1_int.c linux-rpi/drivers/w1/w1_int.c +--- linux-3.18.10/drivers/w1/w1_int.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/w1/w1_int.c 2015-03-26 11:46:54.528238404 +0100 @@ -123,6 +123,20 @@ return(-EINVAL); } @@ -124793,9 +125429,9 @@ diff -Nur linux-3.18.9.orig/drivers/w1/w1_int.c linux-3.18.9/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-3.18.9.orig/drivers/w1/w1_io.c linux-3.18.9/drivers/w1/w1_io.c ---- linux-3.18.9.orig/drivers/w1/w1_io.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/w1/w1_io.c 2015-03-08 03:38:45.506040941 -0500 +diff -Nur linux-3.18.10/drivers/w1/w1_io.c linux-rpi/drivers/w1/w1_io.c +--- linux-3.18.10/drivers/w1/w1_io.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/w1/w1_io.c 2015-03-26 11:46:54.528238404 +0100 @@ -134,10 +134,22 @@ static void w1_post_write(struct w1_master *dev) { @@ -124822,9 +125458,9 @@ diff -Nur linux-3.18.9.orig/drivers/w1/w1_io.c linux-3.18.9/drivers/w1/w1_io.c dev->pullup_duration = 0; } } -diff -Nur linux-3.18.9.orig/drivers/watchdog/bcm2708_wdog.c linux-3.18.9/drivers/watchdog/bcm2708_wdog.c ---- linux-3.18.9.orig/drivers/watchdog/bcm2708_wdog.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/drivers/watchdog/bcm2708_wdog.c 2015-03-08 03:38:45.506040941 -0500 +diff -Nur linux-3.18.10/drivers/watchdog/bcm2708_wdog.c linux-rpi/drivers/watchdog/bcm2708_wdog.c +--- linux-3.18.10/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/drivers/watchdog/bcm2708_wdog.c 2015-03-26 11:46:54.528238404 +0100 @@ -0,0 +1,382 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -125208,9 +125844,9 @@ diff -Nur linux-3.18.9.orig/drivers/watchdog/bcm2708_wdog.c linux-3.18.9/drivers +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.18.9.orig/drivers/watchdog/Kconfig linux-3.18.9/drivers/watchdog/Kconfig ---- linux-3.18.9.orig/drivers/watchdog/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/watchdog/Kconfig 2015-03-08 03:38:45.506040941 -0500 +diff -Nur linux-3.18.10/drivers/watchdog/Kconfig linux-rpi/drivers/watchdog/Kconfig +--- linux-3.18.10/drivers/watchdog/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/watchdog/Kconfig 2015-03-26 11:46:54.528238404 +0100 @@ -452,6 +452,12 @@ To compile this driver as a module, choose M here: the module will be called retu_wdt. @@ -125224,9 +125860,9 @@ diff -Nur linux-3.18.9.orig/drivers/watchdog/Kconfig linux-3.18.9/drivers/watchd config MOXART_WDT tristate "MOXART watchdog" depends on ARCH_MOXART -diff -Nur linux-3.18.9.orig/drivers/watchdog/Makefile linux-3.18.9/drivers/watchdog/Makefile ---- linux-3.18.9.orig/drivers/watchdog/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/drivers/watchdog/Makefile 2015-03-08 03:38:45.510040940 -0500 +diff -Nur linux-3.18.10/drivers/watchdog/Makefile linux-rpi/drivers/watchdog/Makefile +--- linux-3.18.10/drivers/watchdog/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/drivers/watchdog/Makefile 2015-03-26 11:46:54.528238404 +0100 @@ -56,6 +56,7 @@ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o @@ -125235,9 +125871,9 @@ diff -Nur linux-3.18.9.orig/drivers/watchdog/Makefile linux-3.18.9/drivers/watch obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o obj-$(CONFIG_SIRFSOC_WATCHDOG) += sirfsoc_wdt.o -diff -Nur linux-3.18.9.orig/include/linux/broadcom/vc_cma.h linux-3.18.9/include/linux/broadcom/vc_cma.h ---- linux-3.18.9.orig/include/linux/broadcom/vc_cma.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/include/linux/broadcom/vc_cma.h 2015-03-08 03:38:45.510040940 -0500 +diff -Nur linux-3.18.10/include/linux/broadcom/vc_cma.h linux-rpi/include/linux/broadcom/vc_cma.h +--- linux-3.18.10/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/include/linux/broadcom/vc_cma.h 2015-03-26 11:46:55.548239348 +0100 @@ -0,0 +1,29 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -125268,9 +125904,9 @@ diff -Nur linux-3.18.9.orig/include/linux/broadcom/vc_cma.h linux-3.18.9/include +#endif + +#endif /* VC_CMA_H */ -diff -Nur linux-3.18.9.orig/include/linux/mmc/host.h linux-3.18.9/include/linux/mmc/host.h ---- linux-3.18.9.orig/include/linux/mmc/host.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/include/linux/mmc/host.h 2015-03-08 03:38:45.510040940 -0500 +diff -Nur linux-3.18.10/include/linux/mmc/host.h linux-rpi/include/linux/mmc/host.h +--- linux-3.18.10/include/linux/mmc/host.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/include/linux/mmc/host.h 2015-03-26 11:46:55.932239704 +0100 @@ -290,6 +290,7 @@ #define MMC_CAP2_HS400 (MMC_CAP2_HS400_1_8V | \ MMC_CAP2_HS400_1_2V) @@ -125279,9 +125915,9 @@ diff -Nur linux-3.18.9.orig/include/linux/mmc/host.h linux-3.18.9/include/linux/ mmc_pm_flag_t pm_caps; /* supported pm features */ -diff -Nur linux-3.18.9.orig/include/linux/mmc/sdhci.h linux-3.18.9/include/linux/mmc/sdhci.h ---- linux-3.18.9.orig/include/linux/mmc/sdhci.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/include/linux/mmc/sdhci.h 2015-03-08 03:38:45.510040940 -0500 +diff -Nur linux-3.18.10/include/linux/mmc/sdhci.h linux-rpi/include/linux/mmc/sdhci.h +--- linux-3.18.10/include/linux/mmc/sdhci.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/include/linux/mmc/sdhci.h 2015-03-26 11:46:55.932239704 +0100 @@ -130,6 +130,7 @@ #define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */ #define SDHCI_SDR104_NEEDS_TUNING (1<<10) /* SDR104/HS200 needs tuning */ @@ -125290,9 +125926,9 @@ diff -Nur linux-3.18.9.orig/include/linux/mmc/sdhci.h linux-3.18.9/include/linux unsigned int version; /* SDHCI spec. version */ -diff -Nur linux-3.18.9.orig/include/linux/platform_data/bcm2708.h linux-3.18.9/include/linux/platform_data/bcm2708.h ---- linux-3.18.9.orig/include/linux/platform_data/bcm2708.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/include/linux/platform_data/bcm2708.h 2015-03-08 03:38:45.514040940 -0500 +diff -Nur linux-3.18.10/include/linux/platform_data/bcm2708.h linux-rpi/include/linux/platform_data/bcm2708.h +--- linux-3.18.10/include/linux/platform_data/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/include/linux/platform_data/bcm2708.h 2015-03-26 11:46:56.020239783 +0100 @@ -0,0 +1,23 @@ +/* + * include/linux/platform_data/bcm2708.h @@ -125317,9 +125953,9 @@ diff -Nur linux-3.18.9.orig/include/linux/platform_data/bcm2708.h linux-3.18.9/i + bcm2708_gpio_pull_t value); + +#endif -diff -Nur linux-3.18.9.orig/include/linux/vmstat.h linux-3.18.9/include/linux/vmstat.h ---- linux-3.18.9.orig/include/linux/vmstat.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/include/linux/vmstat.h 2015-03-08 03:38:45.514040940 -0500 +diff -Nur linux-3.18.10/include/linux/vmstat.h linux-rpi/include/linux/vmstat.h +--- linux-3.18.10/include/linux/vmstat.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/include/linux/vmstat.h 2015-03-26 11:46:56.512240241 +0100 @@ -241,7 +241,11 @@ static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item) { @@ -125332,9 +125968,9 @@ diff -Nur linux-3.18.9.orig/include/linux/vmstat.h linux-3.18.9/include/linux/vm } static inline void __inc_zone_page_state(struct page *page, -diff -Nur linux-3.18.9.orig/include/linux/w1-gpio.h linux-3.18.9/include/linux/w1-gpio.h ---- linux-3.18.9.orig/include/linux/w1-gpio.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/include/linux/w1-gpio.h 2015-03-08 03:38:45.514040940 -0500 +diff -Nur linux-3.18.10/include/linux/w1-gpio.h linux-rpi/include/linux/w1-gpio.h +--- linux-3.18.10/include/linux/w1-gpio.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/include/linux/w1-gpio.h 2015-03-26 11:46:56.512240241 +0100 @@ -18,6 +18,7 @@ struct w1_gpio_platform_data { unsigned int pin; @@ -125343,9 +125979,9 @@ diff -Nur linux-3.18.9.orig/include/linux/w1-gpio.h linux-3.18.9/include/linux/w void (*enable_external_pullup)(int enable); unsigned int ext_pullup_enable_pin; unsigned int pullup_duration; -diff -Nur linux-3.18.9.orig/include/uapi/linux/fb.h linux-3.18.9/include/uapi/linux/fb.h ---- linux-3.18.9.orig/include/uapi/linux/fb.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/include/uapi/linux/fb.h 2015-03-08 03:38:45.514040940 -0500 +diff -Nur linux-3.18.10/include/uapi/linux/fb.h linux-rpi/include/uapi/linux/fb.h +--- linux-3.18.10/include/uapi/linux/fb.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/include/uapi/linux/fb.h 2015-03-26 11:46:58.608242179 +0100 @@ -34,6 +34,11 @@ #define FBIOPUT_MODEINFO 0x4617 #define FBIOGET_DISPINFO 0x4618 @@ -125358,9 +125994,9 @@ diff -Nur linux-3.18.9.orig/include/uapi/linux/fb.h linux-3.18.9/include/uapi/li #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ #define FB_TYPE_PLANES 1 /* Non interleaved planes */ -diff -Nur linux-3.18.9.orig/kernel/cgroup.c linux-3.18.9/kernel/cgroup.c ---- linux-3.18.9.orig/kernel/cgroup.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/kernel/cgroup.c 2015-03-08 03:38:45.514040940 -0500 +diff -Nur linux-3.18.10/kernel/cgroup.c linux-rpi/kernel/cgroup.c +--- linux-3.18.10/kernel/cgroup.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/kernel/cgroup.c 2015-03-26 11:46:59.356242871 +0100 @@ -5322,6 +5322,29 @@ } __setup("cgroup_disable=", cgroup_disable); @@ -125391,9 +126027,9 @@ diff -Nur linux-3.18.9.orig/kernel/cgroup.c linux-3.18.9/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-3.18.9.orig/mm/memcontrol.c linux-3.18.9/mm/memcontrol.c ---- linux-3.18.9.orig/mm/memcontrol.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/mm/memcontrol.c 2015-03-08 03:38:45.518040940 -0500 +diff -Nur linux-3.18.10/mm/memcontrol.c linux-rpi/mm/memcontrol.c +--- linux-3.18.10/mm/memcontrol.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/mm/memcontrol.c 2015-03-26 11:47:00.144243601 +0100 @@ -6207,6 +6207,7 @@ .bind = mem_cgroup_bind, .legacy_cftypes = mem_cgroup_files, @@ -125402,9 +126038,9 @@ diff -Nur linux-3.18.9.orig/mm/memcontrol.c linux-3.18.9/mm/memcontrol.c }; #ifdef CONFIG_MEMCG_SWAP -diff -Nur linux-3.18.9.orig/scripts/dtc/checks.c linux-3.18.9/scripts/dtc/checks.c ---- linux-3.18.9.orig/scripts/dtc/checks.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/checks.c 2015-03-08 03:38:45.518040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/checks.c linux-rpi/scripts/dtc/checks.c +--- linux-3.18.10/scripts/dtc/checks.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/checks.c 2015-03-26 11:47:02.296245591 +0100 @@ -53,7 +53,7 @@ void *data; bool warn, error; @@ -125657,9 +126293,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/checks.c linux-3.18.9/scripts/dtc/checks { struct node *dt = bi->dt; int i; -diff -Nur linux-3.18.9.orig/scripts/dtc/data.c linux-3.18.9/scripts/dtc/data.c ---- linux-3.18.9.orig/scripts/dtc/data.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/data.c 2015-03-08 03:38:45.518040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/data.c linux-rpi/scripts/dtc/data.c +--- linux-3.18.10/scripts/dtc/data.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/data.c 2015-03-26 11:47:02.296245591 +0100 @@ -74,7 +74,7 @@ struct data d; char *q; @@ -125695,9 +126331,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/data.c linux-3.18.9/scripts/dtc/data.c - return 1; + return true; } -diff -Nur linux-3.18.9.orig/scripts/dtc/dtc.c linux-3.18.9/scripts/dtc/dtc.c ---- linux-3.18.9.orig/scripts/dtc/dtc.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/dtc.c 2015-03-08 03:38:45.518040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/dtc.c linux-rpi/scripts/dtc/dtc.c +--- linux-3.18.10/scripts/dtc/dtc.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/dtc.c 2015-03-26 11:47:02.296245591 +0100 @@ -29,6 +29,7 @@ int minsize; /* Minimum blob size */ int padsize; /* Additional padding to blob */ @@ -125793,9 +126429,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/dtc.c linux-3.18.9/scripts/dtc/dtc.c if (! outf) die("Couldn't open output file %s: %s\n", outname, strerror(errno)); -diff -Nur linux-3.18.9.orig/scripts/dtc/dtc.h linux-3.18.9/scripts/dtc/dtc.h ---- linux-3.18.9.orig/scripts/dtc/dtc.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/dtc.h 2015-03-08 03:38:45.518040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/dtc.h linux-rpi/scripts/dtc/dtc.h +--- linux-3.18.10/scripts/dtc/dtc.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/dtc.h 2015-03-26 11:47:02.296245591 +0100 @@ -38,9 +38,9 @@ #include "util.h" @@ -125921,9 +126557,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/dtc.h linux-3.18.9/scripts/dtc/dtc.h /* Flattened trees */ -diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-lexer.l linux-3.18.9/scripts/dtc/dtc-lexer.l ---- linux-3.18.9.orig/scripts/dtc/dtc-lexer.l 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/dtc-lexer.l 2015-03-08 03:38:45.518040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/dtc-lexer.l linux-rpi/scripts/dtc/dtc-lexer.l +--- linux-3.18.10/scripts/dtc/dtc-lexer.l 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/dtc-lexer.l 2015-03-26 11:47:02.296245591 +0100 @@ -20,7 +20,6 @@ %option noyywrap nounput noinput never-interactive @@ -126061,9 +126697,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-lexer.l linux-3.18.9/scripts/dtc/dtc + + treesource_error = true; } -diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-lexer.lex.c_shipped linux-3.18.9/scripts/dtc/dtc-lexer.lex.c_shipped ---- linux-3.18.9.orig/scripts/dtc/dtc-lexer.lex.c_shipped 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/dtc-lexer.lex.c_shipped 2015-03-08 03:38:45.518040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/dtc-lexer.lex.c_shipped linux-rpi/scripts/dtc/dtc-lexer.lex.c_shipped +--- linux-3.18.10/scripts/dtc/dtc-lexer.lex.c_shipped 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/dtc-lexer.lex.c_shipped 2015-03-26 11:47:02.296245591 +0100 @@ -372,8 +372,8 @@ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; @@ -126918,9 +127554,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-lexer.lex.c_shipped linux-3.18.9/scr + treesource_error = true; } -diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.c_shipped linux-3.18.9/scripts/dtc/dtc-parser.tab.c_shipped ---- linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.c_shipped 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/dtc-parser.tab.c_shipped 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/dtc-parser.tab.c_shipped linux-rpi/scripts/dtc/dtc-parser.tab.c_shipped +--- linux-3.18.10/scripts/dtc/dtc-parser.tab.c_shipped 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/dtc-parser.tab.c_shipped 2015-03-26 11:47:02.296245591 +0100 @@ -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. */ @@ -129590,9 +130226,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.c_shipped linux-3.18.9/sc - return c; + ERROR(&yylloc, "%s", s); } -diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.h_shipped linux-3.18.9/scripts/dtc/dtc-parser.tab.h_shipped ---- linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.h_shipped 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/dtc-parser.tab.h_shipped 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/dtc-parser.tab.h_shipped linux-rpi/scripts/dtc/dtc-parser.tab.h_shipped +--- linux-3.18.10/scripts/dtc/dtc-parser.tab.h_shipped 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/dtc-parser.tab.h_shipped 2015-03-26 11:47:02.296245591 +0100 @@ -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. */ @@ -129764,9 +130400,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-parser.tab.h_shipped linux-3.18.9/sc -#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_DTC_PARSER_TAB_H_INCLUDED */ -diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-parser.y linux-3.18.9/scripts/dtc/dtc-parser.y ---- linux-3.18.9.orig/scripts/dtc/dtc-parser.y 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/dtc-parser.y 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/dtc-parser.y linux-rpi/scripts/dtc/dtc-parser.y +--- linux-3.18.10/scripts/dtc/dtc-parser.y 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/dtc-parser.y 2015-03-26 11:47:02.296245591 +0100 @@ -17,31 +17,28 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA @@ -130041,9 +130677,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/dtc-parser.y linux-3.18.9/scripts/dtc/dt - return c; + ERROR(&yylloc, "%s", s); } -diff -Nur linux-3.18.9.orig/scripts/dtc/flattree.c linux-3.18.9/scripts/dtc/flattree.c ---- linux-3.18.9.orig/scripts/dtc/flattree.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/flattree.c 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/flattree.c linux-rpi/scripts/dtc/flattree.c +--- linux-3.18.10/scripts/dtc/flattree.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/flattree.c 2015-03-26 11:47:02.300245594 +0100 @@ -261,7 +261,13 @@ { struct property *prop; @@ -130211,9 +130847,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/flattree.c linux-3.18.9/scripts/dtc/flat emit->endnode(etarget, tree->labels); } -diff -Nur linux-3.18.9.orig/scripts/dtc/fstree.c linux-3.18.9/scripts/dtc/fstree.c ---- linux-3.18.9.orig/scripts/dtc/fstree.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/fstree.c 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/fstree.c linux-rpi/scripts/dtc/fstree.c +--- linux-3.18.10/scripts/dtc/fstree.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/fstree.c 2015-03-26 11:47:02.300245594 +0100 @@ -37,26 +37,26 @@ tree = build_node(NULL, NULL); @@ -130262,9 +130898,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/fstree.c linux-3.18.9/scripts/dtc/fstree } closedir(d); -diff -Nur linux-3.18.9.orig/scripts/dtc/livetree.c linux-3.18.9/scripts/dtc/livetree.c ---- linux-3.18.9.orig/scripts/dtc/livetree.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/livetree.c 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/livetree.c linux-rpi/scripts/dtc/livetree.c +--- linux-3.18.10/scripts/dtc/livetree.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/livetree.c 2015-03-26 11:47:02.300245594 +0100 @@ -511,7 +511,9 @@ struct node *get_node_by_ref(struct node *tree, const char *ref) @@ -130276,9 +130912,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/livetree.c linux-3.18.9/scripts/dtc/live return get_node_by_path(tree, ref); else return get_node_by_label(tree, ref); -diff -Nur linux-3.18.9.orig/scripts/dtc/srcpos.c linux-3.18.9/scripts/dtc/srcpos.c ---- linux-3.18.9.orig/scripts/dtc/srcpos.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/srcpos.c 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/srcpos.c linux-rpi/scripts/dtc/srcpos.c +--- linux-3.18.10/scripts/dtc/srcpos.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/srcpos.c 2015-03-26 11:47:02.300245594 +0100 @@ -34,7 +34,7 @@ static struct search_path *search_path_head, **search_path_tail; @@ -130379,9 +131015,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/srcpos.c linux-3.18.9/scripts/dtc/srcpos va_end(va); } -diff -Nur linux-3.18.9.orig/scripts/dtc/srcpos.h linux-3.18.9/scripts/dtc/srcpos.h ---- linux-3.18.9.orig/scripts/dtc/srcpos.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/srcpos.h 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/srcpos.h linux-rpi/scripts/dtc/srcpos.h +--- linux-3.18.10/scripts/dtc/srcpos.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/srcpos.h 2015-03-26 11:47:02.300245594 +0100 @@ -21,6 +21,7 @@ #define _SRCPOS_H_ @@ -130418,9 +131054,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/srcpos.h linux-3.18.9/scripts/dtc/srcpos extern void srcpos_set_line(char *f, int l); -diff -Nur linux-3.18.9.orig/scripts/dtc/treesource.c linux-3.18.9/scripts/dtc/treesource.c ---- linux-3.18.9.orig/scripts/dtc/treesource.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/treesource.c 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/treesource.c linux-rpi/scripts/dtc/treesource.c +--- linux-3.18.10/scripts/dtc/treesource.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/treesource.c 2015-03-26 11:47:02.300245594 +0100 @@ -26,12 +26,12 @@ extern YYLTYPE yylloc; @@ -130475,9 +131111,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/treesource.c linux-3.18.9/scripts/dtc/tr if ((const void *)bp >= propend) break; fprintf(f, " "); -diff -Nur linux-3.18.9.orig/scripts/dtc/util.c linux-3.18.9/scripts/dtc/util.c ---- linux-3.18.9.orig/scripts/dtc/util.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/util.c 2015-03-08 03:38:45.522040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/util.c linux-rpi/scripts/dtc/util.c +--- linux-3.18.10/scripts/dtc/util.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/util.c 2015-03-26 11:47:02.300245594 +0100 @@ -39,11 +39,11 @@ char *xstrdup(const char *s) { @@ -130534,9 +131170,9 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/util.c linux-3.18.9/scripts/dtc/util.c printf(">"); } else { printf(" = ["); -diff -Nur linux-3.18.9.orig/scripts/dtc/util.h linux-3.18.9/scripts/dtc/util.h ---- linux-3.18.9.orig/scripts/dtc/util.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/util.h 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/util.h linux-rpi/scripts/dtc/util.h +--- linux-3.18.10/scripts/dtc/util.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/util.h 2015-03-26 11:47:02.300245594 +0100 @@ -2,6 +2,7 @@ #define _UTIL_H @@ -130562,15 +131198,15 @@ diff -Nur linux-3.18.9.orig/scripts/dtc/util.h linux-3.18.9/scripts/dtc/util.h /* * Parse an escaped character starting at index i in string s. The resulting -diff -Nur linux-3.18.9.orig/scripts/dtc/version_gen.h linux-3.18.9/scripts/dtc/version_gen.h ---- linux-3.18.9.orig/scripts/dtc/version_gen.h 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/scripts/dtc/version_gen.h 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/scripts/dtc/version_gen.h linux-rpi/scripts/dtc/version_gen.h +--- linux-3.18.10/scripts/dtc/version_gen.h 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/scripts/dtc/version_gen.h 2015-03-26 11:47:02.300245594 +0100 @@ -1 +1 @@ -#define DTC_VERSION "DTC 1.4.0-dirty" +#define DTC_VERSION "DTC 1.4.1-g36c70742" -diff -Nur linux-3.18.9.orig/sound/arm/bcm2835.c linux-3.18.9/sound/arm/bcm2835.c ---- linux-3.18.9.orig/sound/arm/bcm2835.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/arm/bcm2835.c 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/arm/bcm2835.c linux-rpi/sound/arm/bcm2835.c +--- linux-3.18.10/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/arm/bcm2835.c 2015-03-26 11:47:02.440245724 +0100 @@ -0,0 +1,420 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -130992,9 +131628,9 @@ diff -Nur linux-3.18.9.orig/sound/arm/bcm2835.c linux-3.18.9/sound/arm/bcm2835.c +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2835_alsa"); -diff -Nur linux-3.18.9.orig/sound/arm/bcm2835-ctl.c linux-3.18.9/sound/arm/bcm2835-ctl.c ---- linux-3.18.9.orig/sound/arm/bcm2835-ctl.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/arm/bcm2835-ctl.c 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/arm/bcm2835-ctl.c linux-rpi/sound/arm/bcm2835-ctl.c +--- linux-3.18.10/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/arm/bcm2835-ctl.c 2015-03-26 11:47:02.428245711 +0100 @@ -0,0 +1,323 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -131319,9 +131955,9 @@ diff -Nur linux-3.18.9.orig/sound/arm/bcm2835-ctl.c linux-3.18.9/sound/arm/bcm28 + } + return 0; +} -diff -Nur linux-3.18.9.orig/sound/arm/bcm2835.h linux-3.18.9/sound/arm/bcm2835.h ---- linux-3.18.9.orig/sound/arm/bcm2835.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/arm/bcm2835.h 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/arm/bcm2835.h linux-rpi/sound/arm/bcm2835.h +--- linux-3.18.10/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/arm/bcm2835.h 2015-03-26 11:47:02.440245724 +0100 @@ -0,0 +1,167 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -131490,9 +132126,9 @@ diff -Nur linux-3.18.9.orig/sound/arm/bcm2835.h linux-3.18.9/sound/arm/bcm2835.h +void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream); + +#endif /* __SOUND_ARM_BCM2835_H */ -diff -Nur linux-3.18.9.orig/sound/arm/bcm2835-pcm.c linux-3.18.9/sound/arm/bcm2835-pcm.c ---- linux-3.18.9.orig/sound/arm/bcm2835-pcm.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/arm/bcm2835-pcm.c 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/arm/bcm2835-pcm.c linux-rpi/sound/arm/bcm2835-pcm.c +--- linux-3.18.10/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/arm/bcm2835-pcm.c 2015-03-26 11:47:02.440245724 +0100 @@ -0,0 +1,552 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -132046,9 +132682,9 @@ diff -Nur linux-3.18.9.orig/sound/arm/bcm2835-pcm.c linux-3.18.9/sound/arm/bcm28 + + return 0; +} -diff -Nur linux-3.18.9.orig/sound/arm/bcm2835-vchiq.c linux-3.18.9/sound/arm/bcm2835-vchiq.c ---- linux-3.18.9.orig/sound/arm/bcm2835-vchiq.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/arm/bcm2835-vchiq.c 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/arm/bcm2835-vchiq.c linux-rpi/sound/arm/bcm2835-vchiq.c +--- linux-3.18.10/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/arm/bcm2835-vchiq.c 2015-03-26 11:47:02.440245724 +0100 @@ -0,0 +1,902 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -132952,9 +133588,9 @@ diff -Nur linux-3.18.9.orig/sound/arm/bcm2835-vchiq.c linux-3.18.9/sound/arm/bcm + +module_param(force_bulk, bool, 0444); +MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio"); -diff -Nur linux-3.18.9.orig/sound/arm/Kconfig linux-3.18.9/sound/arm/Kconfig ---- linux-3.18.9.orig/sound/arm/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/sound/arm/Kconfig 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/arm/Kconfig linux-rpi/sound/arm/Kconfig +--- linux-3.18.10/sound/arm/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/sound/arm/Kconfig 2015-03-26 11:47:02.428245711 +0100 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -132968,9 +133604,9 @@ diff -Nur linux-3.18.9.orig/sound/arm/Kconfig linux-3.18.9/sound/arm/Kconfig + endif # SND_ARM -diff -Nur linux-3.18.9.orig/sound/arm/Makefile linux-3.18.9/sound/arm/Makefile ---- linux-3.18.9.orig/sound/arm/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/sound/arm/Makefile 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/arm/Makefile linux-rpi/sound/arm/Makefile +--- linux-3.18.10/sound/arm/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/sound/arm/Makefile 2015-03-26 11:47:02.428245711 +0100 @@ -14,3 +14,8 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -132980,9 +133616,9 @@ diff -Nur linux-3.18.9.orig/sound/arm/Makefile linux-3.18.9/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-3.18.9.orig/sound/arm/vc_vchi_audioserv_defs.h linux-3.18.9/sound/arm/vc_vchi_audioserv_defs.h ---- linux-3.18.9.orig/sound/arm/vc_vchi_audioserv_defs.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/arm/vc_vchi_audioserv_defs.h 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/arm/vc_vchi_audioserv_defs.h linux-rpi/sound/arm/vc_vchi_audioserv_defs.h +--- linux-3.18.10/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/arm/vc_vchi_audioserv_defs.h 2015-03-26 11:47:02.440245724 +0100 @@ -0,0 +1,116 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -133100,9 +133736,9 @@ diff -Nur linux-3.18.9.orig/sound/arm/vc_vchi_audioserv_defs.h linux-3.18.9/soun +} VC_AUDIO_MSG_T; + +#endif // _VC_AUDIO_DEFS_H_ -diff -Nur linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.c linux-3.18.9/sound/soc/bcm/bcm2708-i2s.c ---- linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/bcm2708-i2s.c 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/soc/bcm/bcm2708-i2s.c linux-rpi/sound/soc/bcm/bcm2708-i2s.c +--- linux-3.18.10/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/bcm2708-i2s.c 2015-03-26 11:47:03.340246554 +0100 @@ -0,0 +1,1009 @@ +/* + * ALSA SoC I2S Audio Layer for Broadcom BCM2708 SoC @@ -134113,9 +134749,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.c linux-3.18.9/sound/soc/b +MODULE_DESCRIPTION("BCM2708 I2S interface"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.h linux-3.18.9/sound/soc/bcm/bcm2708-i2s.h ---- linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/bcm2708-i2s.h 2015-03-08 03:38:45.526040940 -0500 +diff -Nur linux-3.18.10/sound/soc/bcm/bcm2708-i2s.h linux-rpi/sound/soc/bcm/bcm2708-i2s.h +--- linux-3.18.10/sound/soc/bcm/bcm2708-i2s.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/bcm2708-i2s.h 2015-03-26 11:47:03.340246554 +0100 @@ -0,0 +1,35 @@ +/* + * I2S configuration for sound cards. @@ -134152,9 +134788,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/bcm2708-i2s.h linux-3.18.9/sound/soc/b +extern void bcm2708_i2s_set_gpio(int gpio); + +#endif -diff -Nur linux-3.18.9.orig/sound/soc/bcm/bcm2835-i2s.c linux-3.18.9/sound/soc/bcm/bcm2835-i2s.c ---- linux-3.18.9.orig/sound/soc/bcm/bcm2835-i2s.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/bcm2835-i2s.c 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/bcm/bcm2835-i2s.c linux-rpi/sound/soc/bcm/bcm2835-i2s.c +--- linux-3.18.10/sound/soc/bcm/bcm2835-i2s.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/bcm2835-i2s.c 2015-03-26 11:47:03.340246554 +0100 @@ -861,6 +861,7 @@ { .compatible = "brcm,bcm2835-i2s", }, {}, @@ -134163,9 +134799,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/bcm2835-i2s.c linux-3.18.9/sound/soc/b static struct platform_driver bcm2835_i2s_driver = { .probe = bcm2835_i2s_probe, -diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_amp.c linux-3.18.9/sound/soc/bcm/hifiberry_amp.c ---- linux-3.18.9.orig/sound/soc/bcm/hifiberry_amp.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/hifiberry_amp.c 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/bcm/hifiberry_amp.c linux-rpi/sound/soc/bcm/hifiberry_amp.c +--- linux-3.18.10/sound/soc/bcm/hifiberry_amp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/hifiberry_amp.c 2015-03-26 11:47:03.340246554 +0100 @@ -0,0 +1,127 @@ +/* + * ASoC Driver for HifiBerry AMP @@ -134294,9 +134930,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_amp.c linux-3.18.9/sound/soc +MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>"); +MODULE_DESCRIPTION("ASoC driver for HiFiBerry-AMP"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_dac.c linux-3.18.9/sound/soc/bcm/hifiberry_dac.c ---- linux-3.18.9.orig/sound/soc/bcm/hifiberry_dac.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/hifiberry_dac.c 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/bcm/hifiberry_dac.c linux-rpi/sound/soc/bcm/hifiberry_dac.c +--- linux-3.18.10/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/hifiberry_dac.c 2015-03-26 11:47:03.340246554 +0100 @@ -0,0 +1,122 @@ +/* + * ASoC Driver for HifiBerry DAC @@ -134420,9 +135056,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_dac.c linux-3.18.9/sound/soc +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_DESCRIPTION("ASoC Driver for HifiBerry DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_dacplus.c linux-3.18.9/sound/soc/bcm/hifiberry_dacplus.c ---- linux-3.18.9.orig/sound/soc/bcm/hifiberry_dacplus.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/hifiberry_dacplus.c 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/bcm/hifiberry_dacplus.c linux-rpi/sound/soc/bcm/hifiberry_dacplus.c +--- linux-3.18.10/sound/soc/bcm/hifiberry_dacplus.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/hifiberry_dacplus.c 2015-03-26 11:47:03.340246554 +0100 @@ -0,0 +1,141 @@ +/* + * ASoC Driver for HiFiBerry DAC+ @@ -134565,10 +135201,10 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_dacplus.c linux-3.18.9/sound +MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>"); +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_digi.c linux-3.18.9/sound/soc/bcm/hifiberry_digi.c ---- linux-3.18.9.orig/sound/soc/bcm/hifiberry_digi.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/hifiberry_digi.c 2015-03-08 03:38:45.530040940 -0500 -@@ -0,0 +1,203 @@ +diff -Nur linux-3.18.10/sound/soc/bcm/hifiberry_digi.c linux-rpi/sound/soc/bcm/hifiberry_digi.c +--- linux-3.18.10/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/hifiberry_digi.c 2015-03-26 11:47:03.340246554 +0100 +@@ -0,0 +1,223 @@ +/* + * ASoC Driver for HifiBerry Digi + * @@ -134645,24 +135281,41 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_digi.c linux-3.18.9/sound/so + + long mclk_freq=0; + int mclk_div=1; ++ int sampling_freq=1; + + int ret; + + samplerate = params_rate(params); + ++ if (samplerate<=96000) { ++ mclk_freq=samplerate*256; ++ mclk_div=WM8804_MCLKDIV_256FS; ++ } else { ++ mclk_freq=samplerate*128; ++ mclk_div=WM8804_MCLKDIV_128FS; ++ } ++ + switch (samplerate) { + case 32000: ++ sampling_freq=0x03; ++ break; + case 44100: ++ sampling_freq=0x00; ++ break; + case 48000: ++ sampling_freq=0x02; ++ break; + case 88200: ++ sampling_freq=0x08; ++ break; + case 96000: -+ mclk_freq=samplerate*256; -+ mclk_div=WM8804_MCLKDIV_256FS; ++ sampling_freq=0x0a; + break; + case 176400: ++ sampling_freq=0x0c; ++ break; + case 192000: -+ mclk_freq=samplerate*128; -+ mclk_div=WM8804_MCLKDIV_128FS; ++ sampling_freq=0x0e; + break; + default: + dev_err(substream->pcm->dev, @@ -134687,6 +135340,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_digi.c linux-3.18.9/sound/so + /* Power on */ + snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0); + ++ /* set sampling frequency status bits */ ++ snd_soc_update_bits(codec, WM8804_SPDTX4, 0x0f, sampling_freq); ++ + return snd_soc_dai_set_bclk_ratio(cpu_dai,64); +} + @@ -134772,10 +135428,10 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/hifiberry_digi.c linux-3.18.9/sound/so +MODULE_AUTHOR("Daniel Matuschek <info@crazy-audio.com>"); +MODULE_DESCRIPTION("ASoC Driver for HifiBerry Digi"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/bcm/iqaudio-dac.c linux-3.18.9/sound/soc/bcm/iqaudio-dac.c ---- linux-3.18.9.orig/sound/soc/bcm/iqaudio-dac.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/iqaudio-dac.c 2015-03-08 03:38:45.530040940 -0500 -@@ -0,0 +1,127 @@ +diff -Nur linux-3.18.10/sound/soc/bcm/iqaudio-dac.c linux-rpi/sound/soc/bcm/iqaudio-dac.c +--- linux-3.18.10/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/iqaudio-dac.c 2015-03-26 11:47:03.340246554 +0100 +@@ -0,0 +1,133 @@ +/* + * ASoC Driver for IQaudIO DAC + * @@ -134803,7 +135459,13 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/iqaudio-dac.c linux-3.18.9/sound/soc/b + +static int snd_rpi_iqaudio_dac_init(struct snd_soc_pcm_runtime *rtd) +{ -+// NOT USED struct snd_soc_codec *codec = rtd->codec; ++ int ret; ++ struct snd_soc_card *card = rtd->card; ++ struct snd_soc_codec *codec = rtd->codec; ++ ++ ret = snd_soc_limit_volume(codec, "Digital Playback Volume", 207); ++ if (ret < 0) ++ dev_warn(card->dev, "Failed to set volume limit: %d\n", ret); + + return 0; +} @@ -134903,10 +135565,10 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/iqaudio-dac.c linux-3.18.9/sound/soc/b +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/bcm/Kconfig linux-3.18.9/sound/soc/bcm/Kconfig ---- linux-3.18.9.orig/sound/soc/bcm/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/Kconfig 2015-03-08 03:38:45.530040940 -0500 -@@ -7,3 +7,56 @@ +diff -Nur linux-3.18.10/sound/soc/bcm/Kconfig linux-rpi/sound/soc/bcm/Kconfig +--- linux-3.18.10/sound/soc/bcm/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/Kconfig 2015-03-26 11:47:03.340246554 +0100 +@@ -7,3 +7,63 @@ Say Y or M if you want to add support for codecs attached to the BCM2835 I2S interface. You will also need to select the audio interfaces to support below. @@ -134957,16 +135619,23 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/Kconfig linux-3.18.9/sound/soc/bcm/Kco + help + Say Y or M if you want to add support for RPi-DAC. + ++config SND_BCM2708_SOC_RPI_PROTO ++ tristate "Support for Rpi-PROTO" ++ depends on SND_BCM2708_SOC_I2S ++ select SND_SOC_WM8731 ++ help ++ Say Y or M if you want to add support for Audio Codec Board PROTO (WM8731). ++ +config SND_BCM2708_SOC_IQAUDIO_DAC + tristate "Support for IQaudIO-DAC" + depends on SND_BCM2708_SOC_I2S + select SND_SOC_PCM512x_I2C + help + Say Y or M if you want to add support for IQaudIO-DAC. -diff -Nur linux-3.18.9.orig/sound/soc/bcm/Makefile linux-3.18.9/sound/soc/bcm/Makefile ---- linux-3.18.9.orig/sound/soc/bcm/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/Makefile 2015-03-08 03:38:45.530040940 -0500 -@@ -3,3 +3,22 @@ +diff -Nur linux-3.18.10/sound/soc/bcm/Makefile linux-rpi/sound/soc/bcm/Makefile +--- linux-3.18.10/sound/soc/bcm/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/Makefile 2015-03-26 11:47:03.340246554 +0100 +@@ -3,3 +3,24 @@ obj-$(CONFIG_SND_BCM2835_SOC_I2S) += snd-soc-bcm2835-i2s.o @@ -134981,6 +135650,7 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/Makefile linux-3.18.9/sound/soc/bcm/Ma +snd-soc-hifiberry-digi-objs := hifiberry_digi.o +snd-soc-hifiberry-amp-objs := hifiberry_amp.o +snd-soc-rpi-dac-objs := rpi-dac.o ++snd-soc-rpi-proto-objs := rpi-proto.o +snd-soc-iqaudio-dac-objs := iqaudio-dac.o + +obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o @@ -134988,10 +135658,11 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/Makefile linux-3.18.9/sound/soc/bcm/Ma +obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o +obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.o +obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o ++obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o +obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o -diff -Nur linux-3.18.9.orig/sound/soc/bcm/rpi-dac.c linux-3.18.9/sound/soc/bcm/rpi-dac.c ---- linux-3.18.9.orig/sound/soc/bcm/rpi-dac.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/bcm/rpi-dac.c 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/bcm/rpi-dac.c linux-rpi/sound/soc/bcm/rpi-dac.c +--- linux-3.18.10/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/rpi-dac.c 2015-03-26 11:47:03.340246554 +0100 @@ -0,0 +1,97 @@ +/* + * ASoC Driver for RPi-DAC. @@ -135090,9 +135761,165 @@ diff -Nur linux-3.18.9.orig/sound/soc/bcm/rpi-dac.c linux-3.18.9/sound/soc/bcm/r +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_DESCRIPTION("ASoC Driver for RPi-DAC"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/codecs/Kconfig linux-3.18.9/sound/soc/codecs/Kconfig ---- linux-3.18.9.orig/sound/soc/codecs/Kconfig 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/sound/soc/codecs/Kconfig 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/bcm/rpi-proto.c linux-rpi/sound/soc/bcm/rpi-proto.c +--- linux-3.18.10/sound/soc/bcm/rpi-proto.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/bcm/rpi-proto.c 2015-03-26 11:47:03.340246554 +0100 +@@ -0,0 +1,152 @@ ++/* ++ * ASoC driver for PROTO AudioCODEC (with a WM8731) ++ * connected to a Raspberry Pi ++ * ++ * Author: Florian Meier, <koalo@koalo.de> ++ * Copyright 2013 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/module.h> ++#include <linux/platform_device.h> ++ ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/soc.h> ++#include <sound/jack.h> ++ ++#include "../codecs/wm8731.h" ++ ++static const unsigned int wm8731_rates_12288000[] = { ++ 8000, 32000, 48000, 96000, ++}; ++ ++static struct snd_pcm_hw_constraint_list wm8731_constraints_12288000 = { ++ .list = wm8731_rates_12288000, ++ .count = ARRAY_SIZE(wm8731_rates_12288000), ++}; ++ ++static int snd_rpi_proto_startup(struct snd_pcm_substream *substream) ++{ ++ /* Setup constraints, because there is a 12.288 MHz XTAL on the board */ ++ snd_pcm_hw_constraint_list(substream->runtime, 0, ++ SNDRV_PCM_HW_PARAM_RATE, ++ &wm8731_constraints_12288000); ++ return 0; ++} ++ ++static int snd_rpi_proto_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *codec_dai = rtd->codec_dai; ++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; ++ int sysclk = 12288000; /* This is fixed on this board */ ++ ++ /* Set proto bclk */ ++ int ret = snd_soc_dai_set_bclk_ratio(cpu_dai,32*2); ++ if (ret < 0){ ++ dev_err(substream->pcm->dev, ++ "Failed to set BCLK ratio %d\n", ret); ++ return ret; ++ } ++ ++ /* Set proto sysclk */ ++ ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, ++ sysclk, SND_SOC_CLOCK_IN); ++ if (ret < 0) { ++ dev_err(substream->pcm->dev, ++ "Failed to set WM8731 SYSCLK: %d\n", ret); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++/* machine stream operations */ ++static struct snd_soc_ops snd_rpi_proto_ops = { ++ .startup = snd_rpi_proto_startup, ++ .hw_params = snd_rpi_proto_hw_params, ++}; ++ ++static struct snd_soc_dai_link snd_rpi_proto_dai[] = { ++{ ++ .name = "WM8731", ++ .stream_name = "WM8731 HiFi", ++ .cpu_dai_name = "bcm2708-i2s.0", ++ .codec_dai_name = "wm8731-hifi", ++ .platform_name = "bcm2708-i2s.0", ++ .codec_name = "wm8731.1-001a", ++ .dai_fmt = SND_SOC_DAIFMT_I2S ++ | SND_SOC_DAIFMT_NB_NF ++ | SND_SOC_DAIFMT_CBM_CFM, ++ .ops = &snd_rpi_proto_ops, ++}, ++}; ++ ++/* audio machine driver */ ++static struct snd_soc_card snd_rpi_proto = { ++ .name = "snd_rpi_proto", ++ .dai_link = snd_rpi_proto_dai, ++ .num_links = ARRAY_SIZE(snd_rpi_proto_dai), ++}; ++ ++static int snd_rpi_proto_probe(struct platform_device *pdev) ++{ ++ int ret = 0; ++ ++ snd_rpi_proto.dev = &pdev->dev; ++ ++ if (pdev->dev.of_node) { ++ struct device_node *i2s_node; ++ struct snd_soc_dai_link *dai = &snd_rpi_proto_dai[0]; ++ i2s_node = of_parse_phandle(pdev->dev.of_node, ++ "i2s-controller", 0); ++ ++ if (i2s_node) { ++ dai->cpu_dai_name = NULL; ++ dai->cpu_of_node = i2s_node; ++ dai->platform_name = NULL; ++ dai->platform_of_node = i2s_node; ++ } ++ } ++ ++ ret = snd_soc_register_card(&snd_rpi_proto); ++ if (ret) { ++ dev_err(&pdev->dev, ++ "snd_soc_register_card() failed: %d\n", ret); ++ } ++ ++ return ret; ++} ++ ++ ++static int snd_rpi_proto_remove(struct platform_device *pdev) ++{ ++ return snd_soc_unregister_card(&snd_rpi_proto); ++} ++ ++static const struct of_device_id snd_rpi_proto_of_match[] = { ++ { .compatible = "rpi,rpi-proto", }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(of, snd_rpi_proto_of_match); ++ ++static struct platform_driver snd_rpi_proto_driver = { ++ .driver = { ++ .name = "snd-rpi-proto", ++ .owner = THIS_MODULE, ++ .of_match_table = snd_rpi_proto_of_match, ++ }, ++ .probe = snd_rpi_proto_probe, ++ .remove = snd_rpi_proto_remove, ++}; ++ ++module_platform_driver(snd_rpi_proto_driver); ++ ++MODULE_AUTHOR("Florian Meier"); ++MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)"); ++MODULE_LICENSE("GPL"); +diff -Nur linux-3.18.10/sound/soc/codecs/Kconfig linux-rpi/sound/soc/codecs/Kconfig +--- linux-3.18.10/sound/soc/codecs/Kconfig 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/sound/soc/codecs/Kconfig 2015-03-26 11:47:03.360246573 +0100 @@ -80,6 +80,8 @@ select SND_SOC_PCM512x_I2C if I2C select SND_SOC_PCM512x_SPI if SPI_MASTER @@ -135133,9 +135960,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/codecs/Kconfig linux-3.18.9/sound/soc/code config SND_SOC_TLV320AIC23 tristate -diff -Nur linux-3.18.9.orig/sound/soc/codecs/Makefile linux-3.18.9/sound/soc/codecs/Makefile ---- linux-3.18.9.orig/sound/soc/codecs/Makefile 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/sound/soc/codecs/Makefile 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/codecs/Makefile linux-rpi/sound/soc/codecs/Makefile +--- linux-3.18.10/sound/soc/codecs/Makefile 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/sound/soc/codecs/Makefile 2015-03-26 11:47:03.360246573 +0100 @@ -74,6 +74,8 @@ snd-soc-pcm512x-spi-objs := pcm512x-spi.o snd-soc-rl6231-objs := rl6231.o @@ -135170,9 +135997,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/codecs/Makefile linux-3.18.9/sound/soc/cod 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-3.18.9.orig/sound/soc/codecs/pcm1794a.c linux-3.18.9/sound/soc/codecs/pcm1794a.c ---- linux-3.18.9.orig/sound/soc/codecs/pcm1794a.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/codecs/pcm1794a.c 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/codecs/pcm1794a.c linux-rpi/sound/soc/codecs/pcm1794a.c +--- linux-3.18.10/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/codecs/pcm1794a.c 2015-03-26 11:47:03.480246684 +0100 @@ -0,0 +1,62 @@ +/* + * Driver for the PCM1794A codec @@ -135236,9 +136063,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/codecs/pcm1794a.c linux-3.18.9/sound/soc/c +MODULE_DESCRIPTION("ASoC PCM1794A codec driver"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/codecs/pcm5102a.c linux-3.18.9/sound/soc/codecs/pcm5102a.c ---- linux-3.18.9.orig/sound/soc/codecs/pcm5102a.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/codecs/pcm5102a.c 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/codecs/pcm5102a.c linux-rpi/sound/soc/codecs/pcm5102a.c +--- linux-3.18.10/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/codecs/pcm5102a.c 2015-03-26 11:47:03.480246684 +0100 @@ -0,0 +1,70 @@ +/* + * Driver for the PCM5102A codec @@ -135310,23 +136137,24 @@ diff -Nur linux-3.18.9.orig/sound/soc/codecs/pcm5102a.c linux-3.18.9/sound/soc/c +MODULE_DESCRIPTION("ASoC PCM5102A codec driver"); +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/codecs/pcm512x.c linux-3.18.9/sound/soc/codecs/pcm512x.c ---- linux-3.18.9.orig/sound/soc/codecs/pcm512x.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/sound/soc/codecs/pcm512x.c 2015-03-08 03:38:45.530040940 -0500 -@@ -259,8 +259,8 @@ - pcm512x_ramp_step_text); - +diff -Nur linux-3.18.10/sound/soc/codecs/pcm512x.c linux-rpi/sound/soc/codecs/pcm512x.c +--- linux-3.18.10/sound/soc/codecs/pcm512x.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/sound/soc/codecs/pcm512x.c 2015-03-26 11:47:03.480246684 +0100 +@@ -261,9 +261,9 @@ static const struct snd_kcontrol_new pcm512x_controls[] = { --SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2, -- PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv), -+SOC_DOUBLE_R_RANGE_TLV("PCM", PCM512x_DIGITAL_VOLUME_2, -+ PCM512x_DIGITAL_VOLUME_3, 0, 40, 255, 1, digital_tlv), - SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL, + SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2, + PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv), +-SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL, ++SOC_DOUBLE_TLV("Analogue Playback Volume", PCM512x_ANALOG_GAIN_CTRL, PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv), - SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, -diff -Nur linux-3.18.9.orig/sound/soc/codecs/tas5713.c linux-3.18.9/sound/soc/codecs/tas5713.c ---- linux-3.18.9.orig/sound/soc/codecs/tas5713.c 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/codecs/tas5713.c 2015-03-08 03:38:45.530040940 -0500 +-SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, ++SOC_DOUBLE_TLV("Analogue Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST, + PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv), + SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT, + PCM512x_RQMR_SHIFT, 1, 1), +diff -Nur linux-3.18.10/sound/soc/codecs/tas5713.c linux-rpi/sound/soc/codecs/tas5713.c +--- linux-3.18.10/sound/soc/codecs/tas5713.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/codecs/tas5713.c 2015-03-26 11:47:03.568246766 +0100 @@ -0,0 +1,369 @@ +/* + * ASoC Driver for TAS5713 @@ -135697,9 +136525,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/codecs/tas5713.c linux-3.18.9/sound/soc/co +MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>"); +MODULE_DESCRIPTION("ASoC driver for TAS5713"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-3.18.9.orig/sound/soc/codecs/tas5713.h linux-3.18.9/sound/soc/codecs/tas5713.h ---- linux-3.18.9.orig/sound/soc/codecs/tas5713.h 1969-12-31 18:00:00.000000000 -0600 -+++ linux-3.18.9/sound/soc/codecs/tas5713.h 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/codecs/tas5713.h linux-rpi/sound/soc/codecs/tas5713.h +--- linux-3.18.10/sound/soc/codecs/tas5713.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/sound/soc/codecs/tas5713.h 2015-03-26 11:47:03.568246766 +0100 @@ -0,0 +1,210 @@ +/* + * ASoC Driver for TAS5713 @@ -135911,9 +136739,9 @@ diff -Nur linux-3.18.9.orig/sound/soc/codecs/tas5713.h linux-3.18.9/sound/soc/co + + +#endif /* _TAS5713_H */ -diff -Nur linux-3.18.9.orig/sound/soc/codecs/wm8804.c linux-3.18.9/sound/soc/codecs/wm8804.c ---- linux-3.18.9.orig/sound/soc/codecs/wm8804.c 2015-03-06 16:53:42.000000000 -0600 -+++ linux-3.18.9/sound/soc/codecs/wm8804.c 2015-03-08 03:38:45.530040940 -0500 +diff -Nur linux-3.18.10/sound/soc/codecs/wm8804.c linux-rpi/sound/soc/codecs/wm8804.c +--- linux-3.18.10/sound/soc/codecs/wm8804.c 2015-03-24 02:05:12.000000000 +0100 ++++ linux-rpi/sound/soc/codecs/wm8804.c 2015-03-26 11:47:03.752246937 +0100 @@ -278,6 +278,7 @@ blen = 0x1; break; diff --git a/target/arm/bcm28xx/patches/3.18.10/0001-i2s-allow-to-enable-ALSA-MMAP.patch b/target/arm/bcm28xx/patches/3.18.10/0001-i2s-allow-to-enable-ALSA-MMAP.patch new file mode 100644 index 000000000..2df6ea512 --- /dev/null +++ b/target/arm/bcm28xx/patches/3.18.10/0001-i2s-allow-to-enable-ALSA-MMAP.patch @@ -0,0 +1,54 @@ +From d017ad0179e407a81ed2423f7620d46584470ad4 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <wbrodkorb@conet.de> +Date: Thu, 26 Mar 2015 13:00:07 +0100 +Subject: [PATCH] i2s: allow to enable ALSA MMAP + +For some ALSA plugins like dmix MMAP is required. +Allow to enable it via a module parameter called use_mmap. + +Signed-off-by: Waldemar Brodkorb <wbrodkorb@conet.de> +--- + sound/soc/bcm/bcm2708-i2s.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/sound/soc/bcm/bcm2708-i2s.c b/sound/soc/bcm/bcm2708-i2s.c +index 7570e50..3d3692f 100644 +--- a/sound/soc/bcm/bcm2708-i2s.c ++++ b/sound/soc/bcm/bcm2708-i2s.c +@@ -171,6 +171,11 @@ static const unsigned int bcm2708_clk_freq[BCM2708_CLK_SRC_HDMI+1] = { + /* I2S pin configuration */ + static int bcm2708_i2s_gpio=BCM2708_I2S_GPIO_AUTO; + ++static bool use_mmap = 0; ++module_param(use_mmap, bool, S_IRUGO); ++MODULE_PARM_DESC(use_mmap, "Use MMAP"); ++ ++ + /* General device struct */ + struct bcm2708_i2s_dev { + struct device *dev; +@@ -874,7 +879,7 @@ static const struct snd_soc_component_driver bcm2708_i2s_component = { + .name = "bcm2708-i2s-comp", + }; + +-static const struct snd_pcm_hardware bcm2708_pcm_hardware = { ++static struct snd_pcm_hardware bcm2708_pcm_hardware = { + .info = SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_JOINT_DUPLEX, + .formats = SNDRV_PCM_FMTBIT_S16_LE | +@@ -966,6 +971,12 @@ static int bcm2708_i2s_probe(struct platform_device *pdev) + return ret; + } + ++ if (use_mmap) { ++ printk("Enable ALSA MMAP support for I2S\n"); ++ bcm2708_pcm_hardware.info |= SNDRV_PCM_INFO_MMAP; ++ bcm2708_pcm_hardware.info |= SNDRV_PCM_INFO_MMAP_VALID; ++ } ++ + ret = snd_dmaengine_pcm_register(&pdev->dev, + &bcm2708_dmaengine_pcm_config, + SND_DMAENGINE_PCM_FLAG_COMPAT); +-- +1.9.1 + diff --git a/target/arm/bcm28xx/patches/3.18.9/0001-add-support-for-rpi-proto-hardware.patch b/target/arm/bcm28xx/patches/3.18.9/0001-add-support-for-rpi-proto-hardware.patch deleted file mode 100644 index d2c72cdd5..000000000 --- a/target/arm/bcm28xx/patches/3.18.9/0001-add-support-for-rpi-proto-hardware.patch +++ /dev/null @@ -1,282 +0,0 @@ -diff -Nur linux-rpi/arch/arm/boot/dts/Makefile linux-rpi-rpi-proto/arch/arm/boot/dts/Makefile ---- linux-rpi/arch/arm/boot/dts/Makefile 2015-02-09 04:39:42.000000000 +0100 -+++ linux-rpi-rpi-proto/arch/arm/boot/dts/Makefile 2015-02-09 04:59:22.000000000 +0100 -@@ -71,6 +71,7 @@ - dtb-$(RPI_DT_OVERLAYS) += hifiberry-amp-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += iqaudio-dac-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += iqaudio-dacplus-overlay.dtb -+dtb-$(RPI_DT_OVERLAYS) += rpi-proto-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += lirc-rpi-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += pcf2127-rtc-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += pcf8523-rtc-overlay.dtb -diff -Nur linux-rpi/arch/arm/boot/dts/rpi-proto-overlay.dts linux-rpi-rpi-proto/arch/arm/boot/dts/rpi-proto-overlay.dts ---- linux-rpi/arch/arm/boot/dts/rpi-proto-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-rpi-proto/arch/arm/boot/dts/rpi-proto-overlay.dts 2015-02-09 04:58:32.000000000 +0100 -@@ -0,0 +1,39 @@ -+// Definitions for Rpi-Proto -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "brcm,bcm2708"; -+ -+ fragment@0 { -+ target = <&sound>; -+ __overlay__ { -+ compatible = "rpi,rpi-proto"; -+ i2s-controller = <&i2s>; -+ status = "okay"; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&i2s>; -+ __overlay__ { -+ status = "okay"; -+ }; -+ }; -+ -+ fragment@2 { -+ target = <&i2c1>; -+ __overlay__ { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ status = "okay"; -+ -+ wm8731@1a { -+ #sound-dai-cells = <0>; -+ compatible = "wlf,wm8731"; -+ reg = <0x1a>; -+ status = "okay"; -+ }; -+ }; -+ }; -+}; -diff -Nur linux-rpi/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-rpi-proto/arch/arm/mach-bcm2708/bcm2708.c ---- linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2015-02-09 04:39:42.000000000 +0100 -+++ linux-rpi-rpi-proto/arch/arm/mach-bcm2708/bcm2708.c 2015-02-09 04:58:32.000000000 +0100 -@@ -703,6 +703,21 @@ - }; - #endif - -+#if defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO) || defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO_MODULE) -+static struct platform_device snd_rpi_proto_device = { -+ .name = "snd-rpi-proto", -+ .id = 0, -+ .num_resources = 0, -+}; -+ -+static struct i2c_board_info __initdata snd_wm8731_i2c_devices[] = { -+ { -+ I2C_BOARD_INFO("wm8731", 0x1a) -+ }, -+}; -+ -+#endif -+ - #if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE) - static struct platform_device snd_rpi_dac_device = { - .name = "snd-rpi-dac", -@@ -922,6 +937,11 @@ - i2c_register_board_info_dt(1, snd_tas5713_i2c_devices, ARRAY_SIZE(snd_tas5713_i2c_devices)); - #endif - -+#if defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO) || defined(CONFIG_SND_BCM2708_SOC_RPI_PROTO_MODULE) -+ bcm_register_device_dt(&snd_rpi_proto_device); -+ i2c_register_board_info_dt(1, snd_wm8731_i2c_devices, ARRAY_SIZE(snd_wm8731_i2c_devices)); -+#endif -+ - #if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE) - bcm_register_device_dt(&snd_rpi_dac_device); - bcm_register_device_dt(&snd_pcm1794a_codec_device); -diff -Nur linux-rpi/sound/soc/bcm/Kconfig linux-rpi-rpi-proto/sound/soc/bcm/Kconfig ---- linux-rpi/sound/soc/bcm/Kconfig 2015-02-09 04:40:48.000000000 +0100 -+++ linux-rpi-rpi-proto/sound/soc/bcm/Kconfig 2015-02-09 04:58:32.000000000 +0100 -@@ -54,6 +54,14 @@ - help - Say Y or M if you want to add support for RPi-DAC. - -+config SND_BCM2708_SOC_RPI_PROTO -+ tristate "Support for Rpi-PROTO" -+ depends on SND_BCM2708_SOC_I2S -+ select SND_SOC_WM8731 -+ help -+ Say Y if you want to add support for Audio Codec Board - -+ PROTO (WM8731) -+ - config SND_BCM2708_SOC_IQAUDIO_DAC - tristate "Support for IQaudIO-DAC" - depends on SND_BCM2708_SOC_I2S -diff -Nur linux-rpi/sound/soc/bcm/Makefile linux-rpi-rpi-proto/sound/soc/bcm/Makefile ---- linux-rpi/sound/soc/bcm/Makefile 2015-02-09 04:40:48.000000000 +0100 -+++ linux-rpi-rpi-proto/sound/soc/bcm/Makefile 2015-02-09 04:58:32.000000000 +0100 -@@ -14,6 +14,7 @@ - snd-soc-hifiberry-digi-objs := hifiberry_digi.o - snd-soc-hifiberry-amp-objs := hifiberry_amp.o - snd-soc-rpi-dac-objs := rpi-dac.o -+snd-soc-rpi-proto-objs := rpi-proto.o - snd-soc-iqaudio-dac-objs := iqaudio-dac.o - - obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o -@@ -21,4 +22,5 @@ - obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o - obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.o - obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o -+obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o - obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o -diff -Nur linux-rpi/sound/soc/bcm/rpi-proto.c linux-rpi-rpi-proto/sound/soc/bcm/rpi-proto.c ---- linux-rpi/sound/soc/bcm/rpi-proto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-rpi-proto/sound/soc/bcm/rpi-proto.c 2015-02-09 04:58:32.000000000 +0100 -@@ -0,0 +1,152 @@ -+/* -+ * ASoC driver for PROTO AudioCODEC (with a WM8731) -+ * connected to a Raspberry Pi -+ * -+ * Author: Florian Meier, <koalo@koalo.de> -+ * Copyright 2013 -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/module.h> -+#include <linux/platform_device.h> -+ -+#include <sound/core.h> -+#include <sound/pcm.h> -+#include <sound/soc.h> -+#include <sound/jack.h> -+ -+#include "../codecs/wm8731.h" -+ -+static const unsigned int wm8731_rates_12288000[] = { -+ 8000, 32000, 48000, 96000, -+}; -+ -+static struct snd_pcm_hw_constraint_list wm8731_constraints_12288000 = { -+ .list = wm8731_rates_12288000, -+ .count = ARRAY_SIZE(wm8731_rates_12288000), -+}; -+ -+static int snd_rpi_proto_startup(struct snd_pcm_substream *substream) -+{ -+ /* Setup constraints, because there is a 12.288 MHz XTAL on the board */ -+ snd_pcm_hw_constraint_list(substream->runtime, 0, -+ SNDRV_PCM_HW_PARAM_RATE, -+ &wm8731_constraints_12288000); -+ return 0; -+} -+ -+static int snd_rpi_proto_hw_params(struct snd_pcm_substream *substream, -+ struct snd_pcm_hw_params *params) -+{ -+ struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_dai *codec_dai = rtd->codec_dai; -+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai; -+ int sysclk = 12288000; /* This is fixed on this board */ -+ -+ /* Set proto bclk */ -+ int ret = snd_soc_dai_set_bclk_ratio(cpu_dai,32*2); -+ if (ret < 0){ -+ dev_err(substream->pcm->dev, -+ "Failed to set BCLK ratio %d\n", ret); -+ return ret; -+ } -+ -+ /* Set proto sysclk */ -+ ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, -+ sysclk, SND_SOC_CLOCK_IN); -+ if (ret < 0) { -+ dev_err(substream->pcm->dev, -+ "Failed to set WM8731 SYSCLK: %d\n", ret); -+ return ret; -+ } -+ -+ return 0; -+} -+ -+/* machine stream operations */ -+static struct snd_soc_ops snd_rpi_proto_ops = { -+ .startup = snd_rpi_proto_startup, -+ .hw_params = snd_rpi_proto_hw_params, -+}; -+ -+static struct snd_soc_dai_link snd_rpi_proto_dai[] = { -+{ -+ .name = "WM8731", -+ .stream_name = "WM8731 HiFi", -+ .cpu_dai_name = "bcm2708-i2s.0", -+ .codec_dai_name = "wm8731-hifi", -+ .platform_name = "bcm2708-i2s.0", -+ .codec_name = "wm8731.1-001a", -+ .dai_fmt = SND_SOC_DAIFMT_I2S -+ | SND_SOC_DAIFMT_NB_NF -+ | SND_SOC_DAIFMT_CBM_CFM, -+ .ops = &snd_rpi_proto_ops, -+}, -+}; -+ -+/* audio machine driver */ -+static struct snd_soc_card snd_rpi_proto = { -+ .name = "snd_rpi_proto", -+ .dai_link = snd_rpi_proto_dai, -+ .num_links = ARRAY_SIZE(snd_rpi_proto_dai), -+}; -+ -+static int snd_rpi_proto_probe(struct platform_device *pdev) -+{ -+ int ret = 0; -+ -+ snd_rpi_proto.dev = &pdev->dev; -+ -+ if (pdev->dev.of_node) { -+ struct device_node *i2s_node; -+ struct snd_soc_dai_link *dai = &snd_rpi_proto_dai[0]; -+ i2s_node = of_parse_phandle(pdev->dev.of_node, -+ "i2s-controller", 0); -+ -+ if (i2s_node) { -+ dai->cpu_dai_name = NULL; -+ dai->cpu_of_node = i2s_node; -+ dai->platform_name = NULL; -+ dai->platform_of_node = i2s_node; -+ } -+ } -+ -+ ret = snd_soc_register_card(&snd_rpi_proto); -+ if (ret) { -+ dev_err(&pdev->dev, -+ "snd_soc_register_card() failed: %d\n", ret); -+ } -+ -+ return ret; -+} -+ -+ -+static int snd_rpi_proto_remove(struct platform_device *pdev) -+{ -+ return snd_soc_unregister_card(&snd_rpi_proto); -+} -+ -+static const struct of_device_id snd_rpi_proto_of_match[] = { -+ { .compatible = "rpi,rpi-proto", }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, snd_rpi_proto_of_match); -+ -+static struct platform_driver snd_rpi_proto_driver = { -+ .driver = { -+ .name = "snd-rpi-proto", -+ .owner = THIS_MODULE, -+ .of_match_table = snd_rpi_proto_of_match, -+ }, -+ .probe = snd_rpi_proto_probe, -+ .remove = snd_rpi_proto_remove, -+}; -+ -+module_platform_driver(snd_rpi_proto_driver); -+ -+MODULE_AUTHOR("Florian Meier"); -+MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)"); -+MODULE_LICENSE("GPL"); diff --git a/target/arm/bcm28xx/patches/3.18.9/0002-enable-MMAP-by-default-allow-overide-via-use_mmap.patch b/target/arm/bcm28xx/patches/3.18.9/0002-enable-MMAP-by-default-allow-overide-via-use_mmap.patch deleted file mode 100644 index a476a7825..000000000 --- a/target/arm/bcm28xx/patches/3.18.9/0002-enable-MMAP-by-default-allow-overide-via-use_mmap.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nur linux-3.18.6.orig/sound/soc/bcm/bcm2708-i2s.c linux-3.18.6/sound/soc/bcm/bcm2708-i2s.c ---- linux-3.18.6.orig/sound/soc/bcm/bcm2708-i2s.c 2015-02-12 12:00:42.809186343 +0100 -+++ linux-3.18.6/sound/soc/bcm/bcm2708-i2s.c 2015-02-12 13:35:35.929213859 +0100 -@@ -171,6 +171,11 @@ - /* I2S pin configuration */ - static int bcm2708_i2s_gpio=BCM2708_I2S_GPIO_AUTO; - -+static bool use_mmap = 1; -+module_param(use_mmap, bool, S_IRUGO); -+MODULE_PARM_DESC(use_mmap, "Use MMAP"); -+ -+ - /* General device struct */ - struct bcm2708_i2s_dev { - struct device *dev; -@@ -874,7 +879,7 @@ - .name = "bcm2708-i2s-comp", - }; - --static const struct snd_pcm_hardware bcm2708_pcm_hardware = { -+static struct snd_pcm_hardware bcm2708_pcm_hardware = { - .info = SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_JOINT_DUPLEX, - .formats = SNDRV_PCM_FMTBIT_S16_LE | -@@ -966,6 +971,12 @@ - return ret; - } - -+ if (use_mmap) { -+ printk("Enable ALSA MMAP support for I2S\n"); -+ bcm2708_pcm_hardware.info |= SNDRV_PCM_INFO_MMAP; -+ bcm2708_pcm_hardware.info |= SNDRV_PCM_INFO_MMAP_VALID; -+ } -+ - ret = snd_dmaengine_pcm_register(&pdev->dev, - &bcm2708_dmaengine_pcm_config, - SND_DMAENGINE_PCM_FLAG_COMPAT); |