diff options
| -rw-r--r-- | target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch | 2085 |
1 files changed, 970 insertions, 1115 deletions
diff --git a/target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch b/target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch index b075978cf..41a1d43cf 100644 --- a/target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch +++ b/target/arm/raspberry-pi/patches/3.15.6/raspberrypi.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig ---- linux-3.15.4/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.15.6/arch/arm/configs/bcmrpi_cutdown_defconfig +--- linux-3.15.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-07-25 15:20:15.964620686 +0200 @@ -0,0 +1,503 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -505,9 +505,9 @@ diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi/arch/ +CONFIG_SPI=y +CONFIG_SPI_MASTER=y +CONFIG_SPI_BCM2708=m -diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/configs/bcmrpi_defconfig ---- linux-3.15.4/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_defconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/configs/bcmrpi_defconfig linux-3.15.6/arch/arm/configs/bcmrpi_defconfig +--- linux-3.15.6.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/configs/bcmrpi_defconfig 2014-07-25 15:20:15.968620714 +0200 @@ -0,0 +1,1099 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +# CONFIG_LOCALVERSION_AUTO is not set @@ -1608,9 +1608,9 @@ diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_defconfig linux-rpi/arch/arm/conf +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig ---- linux-3.15.4/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_emergency_defconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.15.6/arch/arm/configs/bcmrpi_emergency_defconfig +--- linux-3.15.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/configs/bcmrpi_emergency_defconfig 2014-07-25 15:20:15.972620744 +0200 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2144,9 +2144,9 @@ diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi/arc +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig ---- linux-3.15.4/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/configs/bcmrpi_quick_defconfig 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.15.6/arch/arm/configs/bcmrpi_quick_defconfig +--- linux-3.15.6.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/configs/bcmrpi_quick_defconfig 2014-07-25 15:20:15.972620744 +0200 @@ -0,0 +1,197 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_LOCALVERSION="-quick" @@ -2345,9 +2345,9 @@ diff -Nur linux-3.15.4/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi/arch/ar +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.15.4/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/include/asm/irqflags.h ---- linux-3.15.4/arch/arm/include/asm/irqflags.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/include/asm/irqflags.h 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/include/asm/irqflags.h linux-3.15.6/arch/arm/include/asm/irqflags.h +--- linux-3.15.6.orig/arch/arm/include/asm/irqflags.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/include/asm/irqflags.h 2014-07-25 15:20:15.972620744 +0200 @@ -145,12 +145,22 @@ } @@ -2374,9 +2374,9 @@ diff -Nur linux-3.15.4/arch/arm/include/asm/irqflags.h linux-rpi/arch/arm/includ : : "r" (flags) : "memory", "cc"); -diff -Nur linux-3.15.4/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig ---- linux-3.15.4/arch/arm/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/Kconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/Kconfig linux-3.15.6/arch/arm/Kconfig +--- linux-3.15.6.orig/arch/arm/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/Kconfig 2014-07-25 15:20:16.256622767 +0200 @@ -384,6 +384,24 @@ This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. @@ -2410,9 +2410,9 @@ diff -Nur linux-3.15.4/arch/arm/Kconfig linux-rpi/arch/arm/Kconfig source "arch/arm/mach-zynq/Kconfig" -diff -Nur linux-3.15.4/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug ---- linux-3.15.4/arch/arm/Kconfig.debug 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/Kconfig.debug 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/Kconfig.debug linux-3.15.6/arch/arm/Kconfig.debug +--- linux-3.15.6.orig/arch/arm/Kconfig.debug 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/Kconfig.debug 2014-07-25 15:20:16.260622796 +0200 @@ -916,6 +916,14 @@ options; the platform specific options are deprecated and will be soon removed. @@ -2428,9 +2428,9 @@ diff -Nur linux-3.15.4/arch/arm/Kconfig.debug linux-rpi/arch/arm/Kconfig.debug endchoice config DEBUG_EXYNOS_UART -diff -Nur linux-3.15.4/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm.S ---- linux-3.15.4/arch/arm/kernel/fiqasm.S 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/kernel/fiqasm.S 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/kernel/fiqasm.S linux-3.15.6/arch/arm/kernel/fiqasm.S +--- linux-3.15.6.orig/arch/arm/kernel/fiqasm.S 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/kernel/fiqasm.S 2014-07-25 15:20:16.260622796 +0200 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 mov pc, lr @@ -2439,9 +2439,9 @@ diff -Nur linux-3.15.4/arch/arm/kernel/fiqasm.S linux-rpi/arch/arm/kernel/fiqasm +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-3.15.4/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/process.c ---- linux-3.15.4/arch/arm/kernel/process.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/kernel/process.c 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/kernel/process.c linux-3.15.6/arch/arm/kernel/process.c +--- linux-3.15.6.orig/arch/arm/kernel/process.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/kernel/process.c 2014-07-25 15:20:16.260622796 +0200 @@ -171,6 +171,16 @@ } #endif @@ -2459,9 +2459,9 @@ diff -Nur linux-3.15.4/arch/arm/kernel/process.c linux-rpi/arch/arm/kernel/proce /* * Called by kexec, immediately prior to machine_kexec(). * -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.15.4/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.15.6/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/armctrl.c 2014-07-25 15:20:16.260622796 +0200 @@ -0,0 +1,219 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2682,9 +2682,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/armctrl.c linux-rpi/arch/arm/mach-b + init_FIQ(FIQ_START); + return 0; +} -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.15.4/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/armctrl.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.15.6/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/armctrl.h 2014-07-25 15:20:16.264622825 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2713,9 +2713,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/armctrl.h linux-rpi/arch/arm/mach-b + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.c 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.15.6/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/bcm2708.c 2014-07-25 15:20:16.264622825 +0200 @@ -0,0 +1,1031 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3748,9 +3748,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.c linux-rpi/arch/arm/mach-b +module_param(reboot_part, uint, 0644); +module_param(w1_gpio_pin, uint, 0644); +module_param(w1_gpio_pullup, uint, 0644); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.15.4/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-06-29 11:34:17.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.15.6/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-07-25 15:20:16.268622853 +0200 @@ -0,0 +1,361 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4113,9 +4113,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi/arch/arm/m + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/bcm2708.h 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.15.6/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/bcm2708.h 2014-07-25 15:20:16.268622853 +0200 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4166,9 +4166,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/bcm2708.h linux-rpi/arch/arm/mach-b +} + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bcm2708/clock.c ---- linux-3.15.4/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/clock.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/clock.c linux-3.15.6/arch/arm/mach-bcm2708/clock.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/clock.c 2014-07-25 15:20:16.268622853 +0200 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4231,9 +4231,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/clock.c linux-rpi/arch/arm/mach-bcm + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bcm2708/clock.h ---- linux-3.15.4/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/clock.h 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/clock.h linux-3.15.6/arch/arm/mach-bcm2708/clock.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/clock.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4259,9 +4259,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/clock.h linux-rpi/arch/arm/mach-bcm +struct clk { + unsigned long rate; +}; -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm2708/dma.c ---- linux-3.15.4/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/dma.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/dma.c linux-3.15.6/arch/arm/mach-bcm2708/dma.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/dma.c 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,407 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4670,9 +4670,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/dma.c linux-rpi/arch/arm/mach-bcm27 +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5093,9 +5093,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rp +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5157,9 +5157,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi/ +}; + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5168,9 +5168,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi/arc +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.15.4/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-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.15.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5194,9 +5194,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rp + .endm + +#include <debug/pl01x.S> -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/dma.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,90 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -5288,9 +5288,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi/arch/a + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.15.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -5361,9 +5361,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rp +1020: @ EQ will be set if no irqs pending + + .endm -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/frc.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5403,9 +5403,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi/arch/a +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.15.4/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-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-07-25 15:20:16.272622882 +0200 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -5424,9 +5424,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi/arch/ +#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-07-25 15:20:16.456624194 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -5456,9 +5456,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi/a +#include <mach/platform.h> + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/io.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -5487,9 +5487,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi/arch/ar +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.15.4/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-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,197 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5688,9 +5688,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi/arch/ +#define NR_IRQS (HARD_IRQS+FIQ_IRQS+GPIO_IRQS+SPARE_IRQS) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/memory.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -5749,9 +5749,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi/arc +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET)) + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/platform.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,228 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -5981,9 +5981,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi/a +#endif + +/* END */ -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/power.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6011,9 +6011,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi/arch +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/system.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6053,9 +6053,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi/arc +} + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/timex.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6080,9 +6080,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi/arch + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.15.4/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-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-07-25 15:20:16.524624679 +0200 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6168,9 +6168,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.15.4/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-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-07-25 15:20:16.528624707 +0200 @@ -0,0 +1,141 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -6313,9 +6313,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi/arch/ +#define DEVICE_FILE_NAME "char_dev" + +#endif -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.15.4/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-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-07-25 15:20:16.528624707 +0200 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -6352,9 +6352,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi/arc +#endif + +#endif /* VC_MEM_H */ -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-07-25 15:20:16.528624707 +0200 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -6376,9 +6376,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi/ar + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xe8000000) -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm2708/Kconfig ---- linux-3.15.4/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Kconfig 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/Kconfig linux-3.15.6/arch/arm/mach-bcm2708/Kconfig +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/Kconfig 2014-07-25 15:20:16.548624850 +0200 @@ -0,0 +1,41 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -6421,9 +6421,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/Kconfig linux-rpi/arch/arm/mach-bcm + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bcm2708/Makefile ---- linux-3.15.4/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/Makefile linux-3.15.6/arch/arm/mach-bcm2708/Makefile +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/Makefile 2014-07-25 15:20:16.548624850 +0200 @@ -0,0 +1,7 @@ +# +# Makefile for the linux kernel. @@ -6432,16 +6432,16 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/Makefile linux-rpi/arch/arm/mach-bc +obj-$(CONFIG_MACH_BCM2708) += clock.o 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.15.4/arch/arm/mach-bcm2708/Makefile.boot linux-rpi/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.15.4/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/Makefile.boot 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.15.6/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/Makefile.boot 2014-07-25 15:20:16.548624850 +0200 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm2708/power.c ---- linux-3.15.4/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/power.c 2014-04-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/power.c linux-3.15.6/arch/arm/mach-bcm2708/power.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/power.c 2014-07-25 15:20:16.548624850 +0200 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -6637,9 +6637,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/power.c linux-rpi/arch/arm/mach-bcm +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2708/vcio.c ---- linux-3.15.4/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi/arch/arm/mach-bcm2708/vcio.c 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/vcio.c linux-3.15.6/arch/arm/mach-bcm2708/vcio.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/vcio.c 2014-07-25 15:20:16.552624878 +0200 @@ -0,0 +1,474 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -7115,9 +7115,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/vcio.c linux-rpi/arch/arm/mach-bcm2 +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.15.4/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-13 17:32:40.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.15.6/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.15.6.orig/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.15.6/arch/arm/mach-bcm2708/vc_mem.c 2014-07-25 15:20:16.552624878 +0200 @@ -0,0 +1,432 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7551,9 +7551,9 @@ diff -Nur linux-3.15.4/arch/arm/mach-bcm2708/vc_mem.c linux-rpi/arch/arm/mach-bc +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); + -diff -Nur linux-3.15.4/arch/arm/Makefile linux-rpi/arch/arm/Makefile ---- linux-3.15.4/arch/arm/Makefile 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/Makefile 2014-07-07 10:44:57.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/Makefile linux-3.15.6/arch/arm/Makefile +--- linux-3.15.6.orig/arch/arm/Makefile 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/Makefile 2014-07-25 15:20:16.552624878 +0200 @@ -143,6 +143,7 @@ # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 @@ -7562,9 +7562,9 @@ diff -Nur linux-3.15.4/arch/arm/Makefile linux-rpi/arch/arm/Makefile machine-$(CONFIG_ARCH_BERLIN) += berlin machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx -diff -Nur linux-3.15.4/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig ---- linux-3.15.4/arch/arm/mm/Kconfig 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/mm/Kconfig 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mm/Kconfig linux-3.15.6/arch/arm/mm/Kconfig +--- linux-3.15.6.orig/arch/arm/mm/Kconfig 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/mm/Kconfig 2014-07-25 15:20:16.552624878 +0200 @@ -358,7 +358,7 @@ # ARMv6 @@ -7574,9 +7574,9 @@ diff -Nur linux-3.15.4/arch/arm/mm/Kconfig linux-rpi/arch/arm/mm/Kconfig select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6 -diff -Nur linux-3.15.4/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S ---- linux-3.15.4/arch/arm/mm/proc-v6.S 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/mm/proc-v6.S 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/mm/proc-v6.S linux-3.15.6/arch/arm/mm/proc-v6.S +--- linux-3.15.6.orig/arch/arm/mm/proc-v6.S 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/mm/proc-v6.S 2014-07-25 15:20:16.556624907 +0200 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -7600,9 +7600,9 @@ diff -Nur linux-3.15.4/arch/arm/mm/proc-v6.S linux-rpi/arch/arm/mm/proc-v6.S mov pc, lr ENTRY(cpu_v6_dcache_clean_area) -diff -Nur linux-3.15.4/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-types ---- linux-3.15.4/arch/arm/tools/mach-types 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/arm/tools/mach-types 2014-04-13 17:32:41.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/arm/tools/mach-types linux-3.15.6/arch/arm/tools/mach-types +--- linux-3.15.6.orig/arch/arm/tools/mach-types 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/arm/tools/mach-types 2014-07-25 15:20:16.556624907 +0200 @@ -522,6 +522,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -7611,9 +7611,9 @@ diff -Nur linux-3.15.4/arch/arm/tools/mach-types linux-rpi/arch/arm/tools/mach-t ag5evm MACH_AG5EVM AG5EVM 3189 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207 -diff -Nur linux-3.15.4/arch/mips/include/asm/sigcontext.h linux-rpi/arch/mips/include/asm/sigcontext.h ---- linux-3.15.4/arch/mips/include/asm/sigcontext.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/include/asm/sigcontext.h 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/include/asm/sigcontext.h linux-3.15.6/arch/mips/include/asm/sigcontext.h +--- linux-3.15.6.orig/arch/mips/include/asm/sigcontext.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/include/asm/sigcontext.h 2014-07-25 15:20:16.556624907 +0200 @@ -32,6 +32,8 @@ __u32 sc_lo2; __u32 sc_hi3; @@ -7623,9 +7623,9 @@ diff -Nur linux-3.15.4/arch/mips/include/asm/sigcontext.h linux-rpi/arch/mips/in }; #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */ #endif /* _ASM_SIGCONTEXT_H */ -diff -Nur linux-3.15.4/arch/mips/include/uapi/asm/sigcontext.h linux-rpi/arch/mips/include/uapi/asm/sigcontext.h ---- linux-3.15.4/arch/mips/include/uapi/asm/sigcontext.h 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/include/uapi/asm/sigcontext.h 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/include/uapi/asm/sigcontext.h linux-3.15.6/arch/mips/include/uapi/asm/sigcontext.h +--- linux-3.15.6.orig/arch/mips/include/uapi/asm/sigcontext.h 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/include/uapi/asm/sigcontext.h 2014-07-25 15:20:16.556624907 +0200 @@ -12,6 +12,10 @@ #include <linux/types.h> #include <asm/sgidefs.h> @@ -7655,9 +7655,9 @@ diff -Nur linux-3.15.4/arch/mips/include/uapi/asm/sigcontext.h linux-rpi/arch/mi }; -diff -Nur linux-3.15.4/arch/mips/kernel/asm-offsets.c linux-rpi/arch/mips/kernel/asm-offsets.c ---- linux-3.15.4/arch/mips/kernel/asm-offsets.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/asm-offsets.c 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/asm-offsets.c linux-3.15.6/arch/mips/kernel/asm-offsets.c +--- linux-3.15.6.orig/arch/mips/kernel/asm-offsets.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/asm-offsets.c 2014-07-25 15:20:16.968627845 +0200 @@ -295,6 +295,7 @@ OFFSET(SC_LO2, sigcontext, sc_lo2); OFFSET(SC_HI3, sigcontext, sc_hi3); @@ -7682,9 +7682,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/asm-offsets.c linux-rpi/arch/mips/kernel BLANK(); } #endif -diff -Nur linux-3.15.4/arch/mips/kernel/irq-msc01.c linux-rpi/arch/mips/kernel/irq-msc01.c ---- linux-3.15.4/arch/mips/kernel/irq-msc01.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/irq-msc01.c 2014-04-13 17:32:42.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/irq-msc01.c linux-3.15.6/arch/mips/kernel/irq-msc01.c +--- linux-3.15.6.orig/arch/mips/kernel/irq-msc01.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/irq-msc01.c 2014-07-25 15:20:17.368630696 +0200 @@ -131,7 +131,7 @@ board_bind_eic_interrupt = &msc_bind_eic_interrupt; @@ -7694,9 +7694,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/irq-msc01.c linux-rpi/arch/mips/kernel/i int n = imp->im_irq; switch (imp->im_type) { -diff -Nur linux-3.15.4/arch/mips/kernel/r4k_fpu.S linux-rpi/arch/mips/kernel/r4k_fpu.S ---- linux-3.15.4/arch/mips/kernel/r4k_fpu.S 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/r4k_fpu.S 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/r4k_fpu.S linux-3.15.6/arch/mips/kernel/r4k_fpu.S +--- linux-3.15.6.orig/arch/mips/kernel/r4k_fpu.S 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/r4k_fpu.S 2014-07-25 15:20:17.368630696 +0200 @@ -13,6 +13,7 @@ * Copyright (C) 1999, 2001 Silicon Graphics, Inc. */ @@ -7924,9 +7924,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/r4k_fpu.S linux-rpi/arch/mips/kernel/r4k .set reorder .type fault@function -diff -Nur linux-3.15.4/arch/mips/kernel/signal32.c linux-rpi/arch/mips/kernel/signal32.c ---- linux-3.15.4/arch/mips/kernel/signal32.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/signal32.c 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/signal32.c linux-3.15.6/arch/mips/kernel/signal32.c +--- linux-3.15.6.orig/arch/mips/kernel/signal32.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/signal32.c 2014-07-25 15:20:17.368630696 +0200 @@ -30,6 +30,7 @@ #include <asm/sim.h> #include <asm/ucontext.h> @@ -8084,9 +8084,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/signal32.c linux-rpi/arch/mips/kernel/si lose_fpu(0); } -diff -Nur linux-3.15.4/arch/mips/kernel/signal.c linux-rpi/arch/mips/kernel/signal.c ---- linux-3.15.4/arch/mips/kernel/signal.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kernel/signal.c 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kernel/signal.c linux-3.15.6/arch/mips/kernel/signal.c +--- linux-3.15.6.orig/arch/mips/kernel/signal.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kernel/signal.c 2014-07-25 15:20:17.368630696 +0200 @@ -31,6 +31,7 @@ #include <linux/bitops.h> #include <asm/cacheflush.h> @@ -8268,9 +8268,9 @@ diff -Nur linux-3.15.4/arch/mips/kernel/signal.c linux-rpi/arch/mips/kernel/sign lose_fpu(0); } -diff -Nur linux-3.15.4/arch/mips/kvm/kvm_mips.c linux-rpi/arch/mips/kvm/kvm_mips.c ---- linux-3.15.4/arch/mips/kvm/kvm_mips.c 2014-07-07 03:59:25.000000000 +0200 -+++ linux-rpi/arch/mips/kvm/kvm_mips.c 2014-07-07 10:44:58.000000000 +0200 +diff -Nur linux-3.15.6.orig/arch/mips/kvm/kvm_mips.c linux-3.15.6/arch/mips/kvm/kvm_mips.c +--- linux-3.15.6.orig/arch/mips/kvm/kvm_mips.c 2014-07-18 01:23:31.000000000 +0200 ++++ linux-3.15.6/arch/mips/kvm/kvm_mips.c 2014-07-25 15:20:17.368630696 +0200 |