diff options
author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-02-02 11:19:24 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-02-02 11:19:24 +0100 |
commit | d06f6986779f3e8c46762d8e26b704264ecfb66f (patch) | |
tree | 43d8215c1fc42171cf1eee7aea1f211aea4253c8 /target | |
parent | 186658b5f1b1abc823e909e0f9825693b8d44876 (diff) |
update to linux kernel 3.18.5, refresh raspberry patch set
Diffstat (limited to 'target')
-rw-r--r-- | target/arm/raspberry-pi/patches/3.18.5/0000-raspberry-pi.patch (renamed from target/arm/raspberry-pi/patches/3.18.4/raspberry-pi.patch) | 8276 | ||||
-rw-r--r-- | target/arm/raspberry-pi/patches/3.18.5/0001-add-support-for-rpi-proto-hardware.patch | 287 | ||||
-rw-r--r-- | target/arm/raspberry-pi/patches/3.18.5/0002-allow-to-control-volume-for-each-channel.patch | 26 | ||||
-rw-r--r-- | target/config/Config.in.kernelversion.choice | 6 | ||||
-rw-r--r-- | target/config/Config.in.kernelversion.default | 2 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/bsd-compatibility.patch (renamed from target/linux/patches/3.18.4/bsd-compatibility.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/cleankernel.patch (renamed from target/linux/patches/3.18.4/cleankernel.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/cris-header.patch (renamed from target/linux/patches/3.18.4/cris-header.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/defaults.patch (renamed from target/linux/patches/3.18.4/defaults.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.18.4/export-symbol-for-exmap.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/gemalto.patch (renamed from target/linux/patches/3.18.4/gemalto.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/initramfs-nosizelimit.patch (renamed from target/linux/patches/3.18.4/initramfs-nosizelimit.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/lemote-rfkill.patch (renamed from target/linux/patches/3.18.4/lemote-rfkill.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/microblaze-axi.patch (renamed from target/linux/patches/3.18.4/microblaze-axi.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/microblaze-ethernet.patch (renamed from target/linux/patches/3.18.4/microblaze-ethernet.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/mkpiggy.patch (renamed from target/linux/patches/3.18.4/mkpiggy.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/mtd-rootfs.patch (renamed from target/linux/patches/3.18.4/mtd-rootfs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/nfsv3-tcp.patch (renamed from target/linux/patches/3.18.4/nfsv3-tcp.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/non-static.patch (renamed from target/linux/patches/3.18.4/non-static.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/patch-fblogo (renamed from target/linux/patches/3.18.4/patch-fblogo) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/patch-yaffs2 (renamed from target/linux/patches/3.18.4/patch-yaffs2) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.18.4/ppc64-missing-zlib.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/relocs.patch (renamed from target/linux/patches/3.18.4/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/sgidefs.patch (renamed from target/linux/patches/3.18.4/sgidefs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/sortext.patch (renamed from target/linux/patches/3.18.4/sortext.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/startup.patch (renamed from target/linux/patches/3.18.4/startup.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/wlan-cf.patch (renamed from target/linux/patches/3.18.4/wlan-cf.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/3.18.5/xargs.patch (renamed from target/linux/patches/3.18.4/xargs.patch) | 0 | ||||
-rw-r--r-- | target/m68k/qemu-m68k/patches/3.18.5/m68k-coldfire-fec.patch (renamed from target/m68k/qemu-m68k/patches/3.18.4/m68k-coldfire-fec.patch) | 0 | ||||
-rw-r--r-- | target/m68k/qemu-m68k/patches/3.18.5/qemu-coldfire.patch (renamed from target/m68k/qemu-m68k/patches/3.18.4/qemu-coldfire.patch) | 0 | ||||
-rw-r--r-- | target/mips64/lemote-yeelong/patches/3.18.5/sm7xx-fb.patch (renamed from target/mips64/lemote-yeelong/patches/3.18.4/sm7xx-fb.patch) | 0 |
31 files changed, 7210 insertions, 1387 deletions
diff --git a/target/arm/raspberry-pi/patches/3.18.4/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.18.5/0000-raspberry-pi.patch index 4543ea066..ecfb3256b 100644 --- a/target/arm/raspberry-pi/patches/3.18.4/raspberry-pi.patch +++ b/target/arm/raspberry-pi/patches/3.18.5/0000-raspberry-pi.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708.dtsi linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708.dtsi ---- linux-3.18.3/arch/arm/boot/dts/bcm2708.dtsi 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708.dtsi 2015-01-19 14:30:16.166226125 +0100 +diff -Nur linux-3.18.5/arch/arm/boot/dts/bcm2708.dtsi linux-rpi/arch/arm/boot/dts/bcm2708.dtsi +--- linux-3.18.5/arch/arm/boot/dts/bcm2708.dtsi 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/bcm2708.dtsi 2015-02-02 09:28:02.514056428 +0100 @@ -0,0 +1,110 @@ +/include/ "skeleton.dtsi" + @@ -19,7 +19,7 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708.dtsi linux-rpi-3.18.x/arch/arm/ + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; -+ ranges = <0x7e000000 0x20000000 0x02000000>; ++ ranges = <0x7e000000 0x20000000 0x01000000>; + + intc: interrupt-controller { + compatible = "brcm,bcm2708-armctrl-ic"; @@ -112,9 +112,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708.dtsi linux-rpi-3.18.x/arch/arm/ + }; + }; +}; -diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708-rpi-b.dts ---- linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708-rpi-b.dts 2015-01-19 14:30:16.166226125 +0100 +diff -Nur linux-3.18.5/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b.dts +--- linux-3.18.5/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-02-02 09:28:02.514056428 +0100 @@ -0,0 +1,101 @@ +/dts-v1/; + @@ -217,9 +217,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b.dts linux-rpi-3.18.x/arch + act_led_trigger = <&act_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts ---- linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts 2015-01-19 14:30:16.166226125 +0100 +diff -Nur linux-3.18.5/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts +--- linux-3.18.5/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-02-02 09:28:02.514056428 +0100 @@ -0,0 +1,101 @@ +/dts-v1/; + @@ -322,9 +322,78 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts linux-rpi-3.18.x + act_led_trigger = <&act_led>,"linux,default-trigger"; + }; +}; -diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-dac-overlay.dts ---- linux-3.18.3/arch/arm/boot/dts/hifiberry-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-dac-overlay.dts 2015-01-19 14:30:16.170226125 +0100 +diff -Nur linux-3.18.5/arch/arm/boot/dts/ds1307-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/ds1307-rtc-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.514056428 +0100 +@@ -0,0 +1,22 @@ ++// Definitions for DS1307 Real Time Clock ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2708"; ++ ++ fragment@0 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ ds1307@68 { ++ compatible = "maxim,ds1307"; ++ reg = <0x68>; ++ status = "okay"; ++ }; ++ }; ++ }; ++}; +diff -Nur linux-3.18.5/arch/arm/boot/dts/hifiberry-amp-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-amp-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.518056428 +0100 +@@ -0,0 +1,39 @@ ++// Definitions for HiFiBerry Amp/Amp+ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2708"; ++ ++ fragment@0 { ++ target = <&sound>; ++ __overlay__ { ++ compatible = "hifiberry,hifiberry-amp"; ++ 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"; ++ ++ tas5713@1b { ++ #sound-dai-cells = <0>; ++ compatible = "ti,tas5713"; ++ reg = <0x1b>; ++ status = "okay"; ++ }; ++ }; ++ }; ++}; +diff -Nur linux-3.18.5/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dac-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.518056428 +0100 @@ -0,0 +1,34 @@ +// Definitions for HiFiBerry DAC +/dts-v1/; @@ -360,9 +429,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-dac-overlay.dts linux-rpi-3.1 + }; + }; +}; -diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts ---- linux-3.18.3/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts 2015-01-19 14:30:16.170226125 +0100 +diff -Nur linux-3.18.5/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.518056428 +0100 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry DAC+ +/dts-v1/; @@ -403,9 +472,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-dacplus-overlay.dts linux-rpi + }; + }; +}; -diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-digi-overlay.dts ---- linux-3.18.3/arch/arm/boot/dts/hifiberry-digi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/hifiberry-digi-overlay.dts 2015-01-19 14:30:16.170226125 +0100 +diff -Nur linux-3.18.5/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi/arch/arm/boot/dts/hifiberry-digi-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.518056428 +0100 @@ -0,0 +1,39 @@ +// Definitions for HiFiBerry Digi +/dts-v1/; @@ -446,9 +515,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/hifiberry-digi-overlay.dts linux-rpi-3. + }; + }; +}; -diff -Nur linux-3.18.3/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/iqaudio-dac-overlay.dts ---- linux-3.18.3/arch/arm/boot/dts/iqaudio-dac-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/iqaudio-dac-overlay.dts 2015-01-19 14:30:16.178226125 +0100 +diff -Nur linux-3.18.5/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dac-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.526056428 +0100 @@ -0,0 +1,39 @@ +// Definitions for IQaudIO DAC +/dts-v1/; @@ -489,9 +558,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/iqaudio-dac-overlay.dts linux-rpi-3.18. + }; + }; +}; -diff -Nur linux-3.18.3/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts ---- linux-3.18.3/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts 2015-01-19 14:30:16.178226125 +0100 +diff -Nur linux-3.18.5/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.526056428 +0100 @@ -0,0 +1,39 @@ +// Definitions for IQaudIO DAC+ +/dts-v1/; @@ -532,9 +601,9 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/iqaudio-dacplus-overlay.dts linux-rpi-3 + }; + }; +}; -diff -Nur linux-3.18.3/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi-3.18.x/arch/arm/boot/dts/lirc-rpi-overlay.dts ---- linux-3.18.3/arch/arm/boot/dts/lirc-rpi-overlay.dts 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/lirc-rpi-overlay.dts 2015-01-19 14:30:16.182226125 +0100 +diff -Nur linux-3.18.5/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi/arch/arm/boot/dts/lirc-rpi-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.526056428 +0100 @@ -0,0 +1,57 @@ +// Definitions for lirc-rpi module +/dts-v1/; @@ -593,30 +662,195 @@ diff -Nur linux-3.18.3/arch/arm/boot/dts/lirc-rpi-overlay.dts linux-rpi-3.18.x/a + debug = <&lirc_rpi>,"rpi,debug:0"; + }; +}; -diff -Nur linux-3.18.3/arch/arm/boot/dts/Makefile linux-rpi-3.18.x/arch/arm/boot/dts/Makefile ---- linux-3.18.3/arch/arm/boot/dts/Makefile 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/boot/dts/Makefile 2015-01-19 14:30:16.162226125 +0100 -@@ -53,6 +53,8 @@ +diff -Nur linux-3.18.5/arch/arm/boot/dts/Makefile linux-rpi/arch/arm/boot/dts/Makefile +--- linux-3.18.5/arch/arm/boot/dts/Makefile 2015-01-30 02:41:03.000000000 +0100 ++++ linux-rpi/arch/arm/boot/dts/Makefile 2015-02-02 09:28:02.506056428 +0100 +@@ -53,6 +53,20 @@ dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb +dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b.dtb +dtb-$(CONFIG_BCM2708_DT) += bcm2708-rpi-b-plus.dtb ++dtb-$(CONFIG_BCM2708_DT) += hifiberry-dac-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += hifiberry-dacplus-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += hifiberry-digi-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += hifiberry-amp-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += iqaudio-dac-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += iqaudio-dacplus-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += lirc-rpi-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += pcf8523-rtc-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += pps-gpio-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += ds1307-rtc-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += w1-gpio-overlay.dtb ++dtb-$(CONFIG_BCM2708_DT) += w1-gpio-pullup-overlay.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb -@@ -519,6 +521,7 @@ +@@ -519,6 +533,12 @@ targets += dtbs dtbs_install targets += $(dtb-y) + ++endif ++ ++# Enable fixups to support overlays on BCM2708 platforms ++ifeq ($(CONFIG_BCM2708_DT),y) ++ DTC_FLAGS ?= -@ endif # *.dtb used to be generated in the directory above. Clean out the -diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/arm/configs/bcmrpi_defconfig ---- linux-3.18.3/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/configs/bcmrpi_defconfig 2015-01-19 14:30:16.198226124 +0100 -@@ -0,0 +1,1123 @@ +diff -Nur linux-3.18.5/arch/arm/boot/dts/pcf8523-rtc-overlay.dts linux-rpi/arch/arm/boot/dts/pcf8523-rtc-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.534056428 +0100 +@@ -0,0 +1,22 @@ ++// Definitions for PCF8523 Real Time Clock ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2708"; ++ ++ fragment@0 { ++ target = <&i2c1>; ++ __overlay__ { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ pcf8523@68 { ++ compatible = "nxp,pcf8523"; ++ reg = <0x68>; ++ status = "okay"; ++ }; ++ }; ++ }; ++}; +diff -Nur linux-3.18.5/arch/arm/boot/dts/pps-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/pps-gpio-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.534056428 +0100 +@@ -0,0 +1,34 @@ ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2708"; ++ fragment@0 { ++ target-path = "/"; ++ __overlay__ { ++ pps: pps { ++ compatible = "pps-gpio"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pps_pins>; ++ gpios = <&gpio 18 0>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&gpio>; ++ __overlay__ { ++ pps_pins: pps_pins { ++ brcm,pins = <18>; ++ brcm,function = <0>; // in ++ brcm,pull = <0>; // off ++ }; ++ }; ++ }; ++ ++ __overrides__ { ++ gpiopin = <&pps>,"gpios:4", ++ <&pps_pins>,"brcm,pins:0"; ++ }; ++}; +diff -Nur linux-3.18.5/arch/arm/boot/dts/w1-gpio-overlay.dts linux-rpi/arch/arm/boot/dts/w1-gpio-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.542056428 +0100 +@@ -0,0 +1,37 @@ ++// Definitions for lirc-rpi module ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2708"; ++ ++ fragment@0 { ++ target-path = "/"; ++ __overlay__ { ++ ++ w1: onewire@0 { ++ compatible = "w1-gpio"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&w1_pins>; ++ gpios = <&gpio 4 0>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&gpio>; ++ __overlay__ { ++ w1_pins: w1_pins { ++ brcm,pins = <4>; ++ brcm,function = <0>; // in (initially) ++ brcm,pull = <0>; // off ++ }; ++ }; ++ }; ++ ++ __overrides__ { ++ gpiopin = <&w1>,"gpios:4", ++ <&w1_pins>,"brcm,pins:0"; ++ }; ++}; +diff -Nur linux-3.18.5/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts linux-rpi/arch/arm/boot/dts/w1-gpio-pullup-overlay.dts +--- linux-3.18.5/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-02-02 09:28:02.542056428 +0100 +@@ -0,0 +1,39 @@ ++// Definitions for lirc-rpi module ++/dts-v1/; ++/plugin/; ++ ++/ { ++ compatible = "brcm,bcm2708"; ++ ++ fragment@0 { ++ target-path = "/"; ++ __overlay__ { ++ ++ w1: onewire@0 { ++ compatible = "w1-gpio"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&w1_pins>; ++ gpios = <&gpio 4 0>, <&gpio 5 1>; ++ status = "okay"; ++ }; ++ }; ++ }; ++ ++ fragment@1 { ++ target = <&gpio>; ++ __overlay__ { ++ w1_pins: w1_pins { ++ brcm,pins = <4 5>; ++ brcm,function = <0 1>; // in out ++ brcm,pull = <0 0>; // off off ++ }; ++ }; ++ }; ++ ++ __overrides__ { ++ gpiopin = <&w1>,"gpios:4", ++ <&w1_pins>,"brcm,pins:0"; ++ pullup = <&w1>,"gpios:16", ++ <&w1_pins>,"brcm,pins:4"; ++ }; ++}; +diff -Nur linux-3.18.5/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig +--- linux-3.18.5/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2015-02-02 09:28:02.546056428 +0100 +@@ -0,0 +1,1144 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_PHYS_OFFSET=0 +# CONFIG_LOCALVERSION_AUTO is not set @@ -827,13 +1061,16 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_IP_VS_FTP=m +CONFIG_IP_VS_PE_SIP=m +CONFIG_NF_CONNTRACK_IPV4=m -+CONFIG_NF_NAT_IPV4=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m ++CONFIG_IP_NF_NAT=m ++CONFIG_IP_NF_TARGET_MASQUERADE=m ++CONFIG_IP_NF_TARGET_NETMAP=m ++CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m @@ -842,7 +1079,6 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m +CONFIG_NF_CONNTRACK_IPV6=m -+CONFIG_NF_NAT_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m @@ -857,6 +1093,9 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m ++CONFIG_IP6_NF_NAT=m ++CONFIG_IP6_NF_TARGET_MASQUERADE=m ++CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1098,6 +1337,8 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_B43=m +# CONFIG_B43_PHY_N is not set +CONFIG_B43LEGACY=m ++CONFIG_BRCMFMAC=m ++CONFIG_BRCMFMAC_USB=y +CONFIG_HOSTAP=m +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m @@ -1138,6 +1379,7 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_UINPUT=m ++CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_CMA3000=m +CONFIG_SERIO=m @@ -1159,10 +1401,14 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_BCM_VC_SM=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=m ++CONFIG_I2C_MUX=m +CONFIG_I2C_BCM2708=m +CONFIG_SPI=y +CONFIG_SPI_BCM2708=m +CONFIG_SPI_SPIDEV=y ++CONFIG_PPS=m ++CONFIG_PPS_CLIENT_LDISC=m ++CONFIG_PPS_CLIENT_GPIO=m +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_ARIZONA=m +CONFIG_W1=m @@ -1335,6 +1581,7 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_RADIO_SI4713=m ++CONFIG_I2C_SI4713=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_SHARK=m @@ -1346,6 +1593,15 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m +CONFIG_RADIO_WL128X=m ++# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set ++CONFIG_VIDEO_UDA1342=m ++CONFIG_VIDEO_SONY_BTF_MPX=m ++CONFIG_VIDEO_TVP5150=m ++CONFIG_VIDEO_TW2804=m ++CONFIG_VIDEO_TW9903=m ++CONFIG_VIDEO_TW9906=m ++CONFIG_VIDEO_OV7640=m ++CONFIG_VIDEO_MT9V011=m +CONFIG_FB=y +CONFIG_FB_BCM2708=y +# CONFIG_BACKLIGHT_GENERIC is not set @@ -1394,6 +1650,7 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_HID_DRAGONRISE=m +CONFIG_HID_EMS_FF=m +CONFIG_HID_ELECOM=m ++CONFIG_HID_ELO=m +CONFIG_HID_EZKEY=m +CONFIG_HID_HOLTEK=m +CONFIG_HID_KEYTOUCH=m @@ -1653,6 +1910,7 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y ++CONFIG_NFS_SWAP=y +CONFIG_ROOT_NFS=y +CONFIG_NFS_FSCACHE=y +CONFIG_NFSD=m @@ -1719,7 +1977,6 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_KGDB=y +CONFIG_KGDB_KDB=y +CONFIG_KDB_KEYBOARD=y -+CONFIG_STRICT_DEVMEM=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_CRYPTD=m @@ -1727,8 +1984,6 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_XCBC=m -+CONFIG_CRYPTO_MD5=y -+CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m @@ -1740,9 +1995,9 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.18.x/arch/a +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.18.x/arch/arm/configs/bcmrpi_quick_defconfig ---- linux-3.18.3/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/configs/bcmrpi_quick_defconfig 2015-01-19 14:30:16.198226124 +0100 +diff -Nur linux-3.18.5/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig +--- linux-3.18.5/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig 2015-02-02 09:28:02.546056428 +0100 @@ -0,0 +1,197 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_LOCALVERSION="-quick" @@ -1941,9 +2196,9 @@ diff -Nur linux-3.18.3/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.18.x/ +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.18.3/arch/arm/include/asm/dma-mapping.h linux-rpi-3.18.x/arch/arm/include/asm/dma-mapping.h ---- linux-3.18.3/arch/arm/include/asm/dma-mapping.h 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/include/asm/dma-mapping.h 2015-01-19 14:30:16.206226124 +0100 +diff -Nur linux-3.18.5/arch/arm/include/asm/dma-mapping.h linux-rpi/arch/arm/include/asm/dma-mapping.h +--- linux-3.18.5/arch/arm/include/asm/dma-mapping.h 2015-01-30 02:41:03.000000000 +0100 ++++ linux-rpi/arch/arm/include/asm/dma-mapping.h 2015-02-02 09:28:02.558056428 +0100 @@ -58,37 +58,21 @@ #ifndef __arch_pfn_to_dma static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn) @@ -1983,9 +2238,9 @@ diff -Nur linux-3.18.3/arch/arm/include/asm/dma-mapping.h linux-rpi-3.18.x/arch/ return (dma_addr_t)__virt_to_bus((unsigned long)(addr)); } -diff -Nur linux-3.18.3/arch/arm/include/asm/irqflags.h linux-rpi-3.18.x/arch/arm/include/asm/irqflags.h ---- linux-3.18.3/arch/arm/include/asm/irqflags.h 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/include/asm/irqflags.h 2015-01-19 14:27:12.494231582 +0100 +diff -Nur linux-3.18.5/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/include/asm/irqflags.h +--- linux-3.18.5/arch/arm/include/asm/irqflags.h 2015-01-30 02:41:03.000000000 +0100 ++++ linux-rpi/arch/arm/include/asm/irqflags.h 2015-02-02 09:28:02.558056428 +0100 @@ -145,12 +145,22 @@ } @@ -2012,9 +2267,9 @@ diff -Nur linux-3.18.3/arch/arm/include/asm/irqflags.h linux-rpi-3.18.x/arch/arm : : "r" (flags) : "memory", "cc"); -diff -Nur linux-3.18.3/arch/arm/include/asm/string.h linux-rpi-3.18.x/arch/arm/include/asm/string.h ---- linux-3.18.3/arch/arm/include/asm/string.h 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/include/asm/string.h 2015-01-19 14:27:12.498231582 +0100 +diff -Nur linux-3.18.5/arch/arm/include/asm/string.h linux-rpi/arch/arm/include/asm/string.h +--- linux-3.18.5/arch/arm/include/asm/string.h 2015-01-30 02:41:03.000000000 +0100 ++++ linux-rpi/arch/arm/include/asm/string.h 2015-02-02 09:28:02.562056428 +0100 @@ -24,6 +24,11 @@ #define __HAVE_ARCH_MEMSET extern void * memset(void *, int, __kernel_size_t); @@ -2027,9 +2282,9 @@ diff -Nur linux-3.18.3/arch/arm/include/asm/string.h linux-rpi-3.18.x/arch/arm/i extern void __memzero(void *ptr, __kernel_size_t n); #define memset(p,v,n) \ -diff -Nur linux-3.18.3/arch/arm/include/asm/uaccess.h linux-rpi-3.18.x/arch/arm/include/asm/uaccess.h ---- linux-3.18.3/arch/arm/include/asm/uaccess.h 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/include/asm/uaccess.h 2015-01-19 14:30:16.210226124 +0100 +diff -Nur linux-3.18.5/arch/arm/include/asm/uaccess.h linux-rpi/arch/arm/include/asm/uaccess.h +--- linux-3.18.5/arch/arm/include/asm/uaccess.h 2015-01-30 02:41:03.000000000 +0100 ++++ linux-rpi/arch/arm/include/asm/uaccess.h 2015-02-02 09:28:02.562056428 +0100 @@ -475,6 +475,7 @@ #ifdef CONFIG_MMU @@ -2038,9 +2293,9 @@ diff -Nur linux-3.18.3/arch/arm/include/asm/uaccess.h linux-rpi-3.18.x/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.3/arch/arm/Kconfig linux-rpi-3.18.x/arch/arm/Kconfig ---- linux-3.18.3/arch/arm/Kconfig 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/Kconfig 2015-01-19 14:30:16.158226125 +0100 +diff -Nur linux-3.18.5/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig +--- linux-3.18.5/arch/arm/Kconfig 2015-01-30 02:41:03.000000000 +0100 ++++ linux-rpi/arch/arm/Kconfig 2015-02-02 09:28:02.506056428 +0100 @@ -381,6 +381,23 @@ This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. @@ -2073,9 +2328,9 @@ diff -Nur linux-3.18.3/arch/arm/Kconfig linux-rpi-3.18.x/arch/arm/Kconfig source "arch/arm/mach-zynq/Kconfig" -diff -Nur linux-3.18.3/arch/arm/Kconfig.debug linux-rpi-3.18.x/arch/arm/Kconfig.debug ---- linux-3.18.3/arch/arm/Kconfig.debug 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/Kconfig.debug 2015-01-19 14:30:16.158226125 +0100 +diff -Nur linux-3.18.5/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug +--- linux-3.18.5/arch/arm/Kconfig.debug 2015-01-30 02:41:03.000000000 +0100 ++++ linux-rpi/arch/arm/Kconfig.debug 2015-02-02 09:28:02.506056428 +0100 @@ -985,6 +985,14 @@ options; the platform specific options are deprecated and will be soon removed. @@ -2091,9 +2346,9 @@ diff -Nur linux-3.18.3/arch/arm/Kconfig.debug linux-rpi-3.18.x/arch/arm/Kconfig. endchoice config DEBUG_EXYNOS_UART -diff -Nur linux-3.18.3/arch/arm/kernel/fiqasm.S linux-rpi-3.18.x/arch/arm/kernel/fiqasm.S ---- linux-3.18.3/arch/arm/kernel/fiqasm.S 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/kernel/fiqasm.S 2015-01-19 14:30:16.210226124 +0100 +diff -Nur linux-3.18.5/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S +--- linux-3.18.5/arch/arm/kernel/fiqasm.S 2015-01-30 02:41:03.000000000 +0100 ++++ linux-rpi/arch/arm/kernel/fiqasm.S 2015-02-02 09:28:02.566056428 +0100 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 ret lr @@ -2102,9 +2357,9 @@ diff -Nur linux-3.18.3/arch/arm/kernel/fiqasm.S linux-rpi-3.18.x/arch/arm/kernel +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-3.18.3/arch/arm/kernel/process.c linux-rpi-3.18.x/arch/arm/kernel/process.c ---- linux-3.18.3/arch/arm/kernel/process.c 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/kernel/process.c 2015-01-19 14:30:16.214226124 +0100 +diff -Nur linux-3.18.5/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c +--- linux-3.18.5/arch/arm/kernel/process.c 2015-01-30 02:41:03.000000000 +0100 ++++ linux-rpi/arch/arm/kernel/process.c 2015-02-02 09:28:02.570056428 +0100 @@ -166,6 +166,16 @@ } #endif @@ -2122,9 +2377,9 @@ diff -Nur linux-3.18.3/arch/arm/kernel/process.c linux-rpi-3.18.x/arch/arm/kerne /* * Called by kexec, immediately prior to machine_kexec(). * -diff -Nur linux-3.18.3/arch/arm/lib/arm-mem.h linux-rpi-3.18.x/arch/arm/lib/arm-mem.h ---- linux-3.18.3/arch/arm/lib/arm-mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/lib/arm-mem.h 2015-01-19 14:27:12.506231582 +0100 +diff -Nur linux-3.18.5/arch/arm/lib/arm-mem.h linux-rpi/arch/arm/lib/arm-mem.h +--- linux-3.18.5/arch/arm/lib/arm-mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/lib/arm-mem.h 2015-02-02 09:28:02.574056428 +0100 @@ -0,0 +1,159 @@ +/* +Copyright (c) 2013, Raspberry Pi Foundation @@ -2285,9 +2540,9 @@ diff -Nur linux-3.18.3/arch/arm/lib/arm-mem.h linux-rpi-3.18.x/arch/arm/lib/arm- + .endif +92: +.endm -diff -Nur linux-3.18.3/arch/arm/lib/copy_from_user.S linux-rpi-3.18.x/arch/arm/lib/copy_from_user.S ---- linux-3.18.3/arch/arm/lib/copy_from_user.S 2015-01-16 16:04:08.000000000 +0100 -+++ linux-rpi-3.18.x/arch/arm/lib/copy_from_user.S 2015-01-19 14:27:12.506231582 +0100 +diff -Nur linux-3.18.5/arch/arm/lib/copy_from_user.S linux-rpi/arch/ar |