diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-24 17:12:26 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-24 17:12:26 +0200 |
commit | d5bcfc9feb6a785ee9bf068cf001cb34f9b133c3 (patch) | |
tree | dc799ede8f15fc9a6e313efd78cdd30019d6e367 /target/arm | |
parent | 94c82fcf15415a015b602a58a26880bb0ad97da4 (diff) |
update 3.10 kernel
Diffstat (limited to 'target/arm')
-rw-r--r-- | target/arm/cubox-i/patches/3.10.37/solidrun-cubox-i.patch (renamed from target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch) | 0 | ||||
-rw-r--r-- | target/arm/raspberry-pi/patches/3.10.37/raspberry-pi.patch (renamed from target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch) | 1559 |
2 files changed, 781 insertions, 778 deletions
diff --git a/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch b/target/arm/cubox-i/patches/3.10.37/solidrun-cubox-i.patch index 87c955bdf..87c955bdf 100644 --- a/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch +++ b/target/arm/cubox-i/patches/3.10.37/solidrun-cubox-i.patch diff --git a/target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.10.37/raspberry-pi.patch index bb50393a9..c5d39e244 100644 --- a/target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch +++ b/target/arm/raspberry-pi/patches/3.10.37/raspberry-pi.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_cutdown_defconfig ---- linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig +--- linux-3.10.37/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-04-24 15:35:00.717527267 +0200 @@ -0,0 +1,504 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -506,10 +506,10 @@ diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1 +CONFIG_SPI_MASTER=y +CONFIG_SPI_BCM2708=m + -diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_defconfig ---- linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/configs/bcmrpi_defconfig 2014-04-13 17:32:40.000000000 +0200 -@@ -0,0 +1,1098 @@ +diff -Nur linux-3.10.37/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig +--- linux-3.10.37/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2014-04-24 15:35:00.717527267 +0200 +@@ -0,0 +1,1101 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SYSVIPC=y @@ -994,6 +994,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig linux-3.10.36/arc +CONFIG_AR5523=m +CONFIG_B43=m +CONFIG_B43LEGACY=m ++CONFIG_BRCMFMAC=m ++# CONFIG_BRCMFMAC_SDIO is not set ++CONFIG_BRCMFMAC_USB=y +CONFIG_HOSTAP=m +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m @@ -1608,9 +1611,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig linux-3.10.36/arc +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_quick_defconfig ---- linux-3.10.36.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/configs/bcmrpi_quick_defconfig 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig +--- linux-3.10.37/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig 2014-04-24 15:35:00.717527267 +0200 @@ -0,0 +1,197 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_LOCALVERSION="-quick" @@ -1809,9 +1812,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.10. +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.10.36.orig/arch/arm/include/asm/fiq.h linux-3.10.36/arch/arm/include/asm/fiq.h ---- linux-3.10.36.orig/arch/arm/include/asm/fiq.h 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/include/asm/fiq.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/include/asm/fiq.h linux-rpi/arch/arm/include/asm/fiq.h +--- linux-3.10.37/arch/arm/include/asm/fiq.h 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/include/asm/fiq.h 2014-04-24 15:35:00.733527446 +0200 @@ -42,6 +42,7 @@ /* helpers defined in fiqasm.S: */ extern void __set_fiq_regs(unsigned long const *regs); @@ -1820,9 +1823,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/include/asm/fiq.h linux-3.10.36/arch/arm/i static inline void set_fiq_regs(struct pt_regs const *regs) { -diff -Nur linux-3.10.36.orig/arch/arm/Kconfig linux-3.10.36/arch/arm/Kconfig ---- linux-3.10.36.orig/arch/arm/Kconfig 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/Kconfig 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig +--- linux-3.10.37/arch/arm/Kconfig 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/Kconfig 2014-04-24 15:35:00.677526821 +0200 @@ -361,6 +361,24 @@ This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. @@ -1856,9 +1859,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/Kconfig linux-3.10.36/arch/arm/Kconfig source "arch/arm/mach-zynq/Kconfig" -diff -Nur linux-3.10.36.orig/arch/arm/Kconfig.debug linux-3.10.36/arch/arm/Kconfig.debug ---- linux-3.10.36.orig/arch/arm/Kconfig.debug 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/Kconfig.debug 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug +--- linux-3.10.37/arch/arm/Kconfig.debug 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/Kconfig.debug 2014-04-24 15:35:00.677526821 +0200 @@ -519,6 +519,14 @@ For more details about semihosting, please see chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd. @@ -1874,9 +1877,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/Kconfig.debug linux-3.10.36/arch/arm/Kconf endchoice config DEBUG_EXYNOS_UART -diff -Nur linux-3.10.36.orig/arch/arm/kernel/armksyms.c linux-3.10.36/arch/arm/kernel/armksyms.c ---- linux-3.10.36.orig/arch/arm/kernel/armksyms.c 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/kernel/armksyms.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/kernel/armksyms.c linux-rpi/arch/arm/kernel/armksyms.c +--- linux-3.10.37/arch/arm/kernel/armksyms.c 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/kernel/armksyms.c 2014-04-24 15:35:00.745527579 +0200 @@ -156,3 +156,7 @@ #ifdef CONFIG_ARM_PATCH_PHYS_VIRT EXPORT_SYMBOL(__pv_phys_offset); @@ -1885,9 +1888,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/kernel/armksyms.c linux-3.10.36/arch/arm/k +extern void v6wbi_flush_kern_tlb_range(void); +EXPORT_SYMBOL(v6wbi_flush_kern_tlb_range); + -diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiqasm.S linux-3.10.36/arch/arm/kernel/fiqasm.S ---- linux-3.10.36.orig/arch/arm/kernel/fiqasm.S 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/kernel/fiqasm.S 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S +--- linux-3.10.37/arch/arm/kernel/fiqasm.S 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/kernel/fiqasm.S 2014-04-24 15:35:00.749527624 +0200 @@ -25,6 +25,9 @@ ENTRY(__set_fiq_regs) mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE @@ -1906,9 +1909,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiqasm.S linux-3.10.36/arch/arm/ker +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiq.c linux-3.10.36/arch/arm/kernel/fiq.c ---- linux-3.10.36.orig/arch/arm/kernel/fiq.c 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/kernel/fiq.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/kernel/fiq.c linux-rpi/arch/arm/kernel/fiq.c +--- linux-3.10.37/arch/arm/kernel/fiq.c 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/kernel/fiq.c 2014-04-24 15:35:00.749527624 +0200 @@ -84,17 +84,14 @@ void set_fiq_handler(void *start, unsigned int length) @@ -1938,9 +1941,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiq.c linux-3.10.36/arch/arm/kernel EXPORT_SYMBOL(claim_fiq); EXPORT_SYMBOL(release_fiq); EXPORT_SYMBOL(enable_fiq); -diff -Nur linux-3.10.36.orig/arch/arm/kernel/process.c linux-3.10.36/arch/arm/kernel/process.c ---- linux-3.10.36.orig/arch/arm/kernel/process.c 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/kernel/process.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c +--- linux-3.10.37/arch/arm/kernel/process.c 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/kernel/process.c 2014-04-24 15:35:00.753527668 +0200 @@ -174,7 +174,7 @@ default_idle(); } @@ -1950,9 +1953,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/kernel/process.c linux-3.10.36/arch/arm/ke int __init reboot_setup(char *str) { -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.10.36/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/armctrl.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.10.37/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,219 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2173,9 +2176,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.10.36/arch/ + init_FIQ(FIQ_START); + return 0; +} -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.10.36/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/armctrl.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.10.37/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2204,9 +2207,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.10.36/arch/ + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.10.37/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,1036 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3244,9 +3247,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.10.36/arch/ +module_param(disk_led_active_low, uint, 0644); +module_param(reboot_part, uint, 0644); +module_param(w1_gpio_pin, uint, 0644); -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.10.36/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.10.37/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,361 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -3609,9 +3612,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.10.36/ + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.10.37/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -3664,9 +3667,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.10.36/arch/ +} + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.c linux-3.10.36/arch/arm/mach-bcm2708/clock.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/clock.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bcm2708/clock.c +--- linux-3.10.37/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/clock.c 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -3729,9 +3732,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.c linux-3.10.36/arch/ar + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.h linux-3.10.36/arch/arm/mach-bcm2708/clock.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/clock.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bcm2708/clock.h +--- linux-3.10.37/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/clock.h 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -3757,9 +3760,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.h linux-3.10.36/arch/ar +struct clk { + unsigned long rate; +}; -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dma.c linux-3.10.36/arch/arm/mach-bcm2708/dma.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/dma.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c +--- linux-3.10.37/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/dma.c 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,407 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4168,9 +4171,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dma.c linux-3.10.36/arch/arm/ +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.10.36/arch/arm/mach-bcm2708/dmaer.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/dmaer.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/dmaer.c linux-rpi/arch/arm/mach-bcm2708/dmaer.c +--- linux-3.10.37/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/dmaer.c 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,887 @@ +#include <linux/init.h> +#include <linux/sched.h> @@ -5059,9 +5062,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.10.36/arch/ar +module_init(dmaer_init); +module_exit(dmaer_exit); + -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5482,9 +5485,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h li +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5546,9 +5549,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linu +}; + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5557,9 +5560,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3 +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.10.36/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5583,9 +5586,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S li + .endm + +#include <asm/hardware/debug-pl01x.S> -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/dma.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,90 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -5677,9 +5680,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.10 + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.10.36/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -5750,9 +5753,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S li +1020: @ EQ will be set if no irqs pending + + .endm -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/frc.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5792,9 +5795,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.10 +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,18 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -5814,9 +5817,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.1 + +#endif + -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -5846,9 +5849,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux +#include <mach/platform.h> + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/io.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -5877,9 +5880,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.10. +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -6080,9 +6083,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.1 + + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/memory.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -6141,9 +6144,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3 +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/platform.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,228 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6373,9 +6376,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux +#endif + +/* END */ -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/power.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6403,9 +6406,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3. +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/system.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6445,9 +6448,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3 +} + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/timex.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6472,9 +6475,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3. + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,85 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6561,9 +6564,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h lin + */ +#define arch_decomp_wdog() + -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,141 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -6706,9 +6709,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.1 +#define DEVICE_FILE_NAME "char_dev" + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,36 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -6746,9 +6749,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3 + +#endif /* VC_MEM_H */ + -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_support.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_support.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_support.h +--- linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_support.h 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,69 @@ +#ifndef _VC_SUPPORT_H_ +#define _VC_SUPPORT_H_ @@ -6819,9 +6822,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h lin + unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5); + +#endif -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.10.37/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 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -6843,9 +6846,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux- + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xe8000000) -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Kconfig linux-3.10.36/arch/arm/mach-bcm2708/Kconfig ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/Kconfig 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig +--- linux-3.10.37/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/Kconfig 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,49 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -6896,9 +6899,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Kconfig linux-3.10.36/arch/ar + Enable DMA helper for accelerating X composition + +endmenu -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile linux-3.10.36/arch/arm/mach-bcm2708/Makefile ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/Makefile 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile +--- linux-3.10.37/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/Makefile 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,11 @@ +# +# Makefile for the linux kernel. @@ -6911,16 +6914,16 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile linux-3.10.36/arch/a +obj-$(CONFIG_BCM2708_DMAER) += dmaer_master.o +dmaer_master-objs := dmaer.o vc_support.o + -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.10.36/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/Makefile.boot 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.10.37/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/Makefile.boot 2014-04-24 15:35:00.773527891 +0200 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/power.c linux-3.10.36/arch/arm/mach-bcm2708/power.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/power.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm2708/power.c +--- linux-3.10.37/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/power.c 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -7116,9 +7119,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/power.c linux-3.10.36/arch/ar +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vcio.c linux-3.10.36/arch/arm/mach-bcm2708/vcio.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/vcio.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2708/vcio.c +--- linux-3.10.37/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/vcio.c 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,474 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -7594,9 +7597,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vcio.c linux-3.10.36/arch/arm +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.10.36/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/vc_mem.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.10.37/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/vc_mem.c 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,432 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -8030,9 +8033,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.10.36/arch/a +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); + -diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_support.c linux-3.10.36/arch/arm/mach-bcm2708/vc_support.c ---- linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.36/arch/arm/mach-bcm2708/vc_support.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mach-bcm2708/vc_support.c linux-rpi/arch/arm/mach-bcm2708/vc_support.c +--- linux-3.10.37/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi/arch/arm/mach-bcm2708/vc_support.c 2014-04-24 15:35:00.777527936 +0200 @@ -0,0 +1,319 @@ +/* + * vc_support.c @@ -8353,9 +8356,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_support.c linux-3.10.36/ar + } +} + -diff -Nur linux-3.10.36.orig/arch/arm/Makefile linux-3.10.36/arch/arm/Makefile ---- linux-3.10.36.orig/arch/arm/Makefile 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/Makefile 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/Makefile linux-rpi/arch/arm/Makefile +--- linux-3.10.37/arch/arm/Makefile 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/Makefile 2014-04-24 15:35:00.677526821 +0200 @@ -139,6 +139,7 @@ # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 @@ -8364,9 +8367,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/Makefile linux-3.10.36/arch/arm/Makefile machine-$(CONFIG_ARCH_BCM2835) += bcm2835 machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx -diff -Nur linux-3.10.36.orig/arch/arm/mm/Kconfig linux-3.10.36/arch/arm/mm/Kconfig ---- linux-3.10.36.orig/arch/arm/mm/Kconfig 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/mm/Kconfig 2014-04-13 17:32:41.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig +--- linux-3.10.37/arch/arm/mm/Kconfig 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/mm/Kconfig 2014-04-24 15:35:00.965530031 +0200 @@ -358,7 +358,7 @@ # ARMv6 @@ -8376,9 +8379,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mm/Kconfig linux-3.10.36/arch/arm/mm/Kconf select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6 -diff -Nur linux-3.10.36.orig/arch/arm/mm/proc-v6.S linux-3.10.36/arch/arm/mm/proc-v6.S ---- linux-3.10.36.orig/arch/arm/mm/proc-v6.S 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/mm/proc-v6.S 2014-04-13 17:32:41.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S +--- linux-3.10.37/arch/arm/mm/proc-v6.S 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/mm/proc-v6.S 2014-04-24 15:35:00.969530076 +0200 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -8402,9 +8405,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/mm/proc-v6.S linux-3.10.36/arch/arm/mm/pro mov pc, lr ENTRY(cpu_v6_dcache_clean_area) -diff -Nur linux-3.10.36.orig/arch/arm/tools/mach-types linux-3.10.36/arch/arm/tools/mach-types ---- linux-3.10.36.orig/arch/arm/tools/mach-types 2014-04-03 21:01:22.000000000 +0200 -+++ linux-3.10.36/arch/arm/tools/mach-types 2014-04-13 17:32:41.000000000 +0200 +diff -Nur linux-3.10.37/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types +--- linux-3.10.37/arch/arm/tools/mach-types 2014-04-14 15:42:31.000000000 +0200 ++++ linux-rpi/arch/arm/tools/mach-types 2014-04-24 15:35:00.985530254 +0200 @@ -522,6 +522,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -8413,9 +8416,9 @@ diff -Nur linux-3.10.36.orig/arch/arm/tools/mach-types linux-3.10.36/arch/arm/to ag5evm MACH_AG5EVM AG5EVM 3189 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3 |