diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 17:13:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-11 17:13:27 +0100 |
| commit | 5e9198fbda131c3c3a1dde9091dfe9d935d28c5a (patch) | |
| tree | cc7f962216665b82cedb1da09cebc599adfd435e | |
| parent | 8f148a08f29ccb6c21f108549e20aa8e0bb04b79 (diff) | |
sync patch with upstream 3.13.y branch
| -rw-r--r-- | target/linux/patches/3.13.6/raspberry.patch | 7944 |
1 files changed, 1402 insertions, 6542 deletions
diff --git a/target/linux/patches/3.13.6/raspberry.patch b/target/linux/patches/3.13.6/raspberry.patch index 980740e8d..1e2050a44 100644 --- a/target/linux/patches/3.13.6/raspberry.patch +++ b/target/linux/patches/3.13.6/raspberry.patch @@ -1,6 +1,6 @@ -diff -Nur linux-3.13.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.13.6/arch/arm/configs/bcmrpi_cutdown_defconfig ---- linux-3.13.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig +--- linux-3.13.6/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,503 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -505,10 +505,10 @@ diff -Nur linux-3.13.6.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.13 +CONFIG_SPI=y +CONFIG_SPI_MASTER=y +CONFIG_SPI_BCM2708=m -diff -Nur linux-3.13.6.orig/arch/arm/configs/bcmrpi_defconfig linux-3.13.6/arch/arm/configs/bcmrpi_defconfig ---- linux-3.13.6.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/configs/bcmrpi_defconfig 2014-03-10 14:41:55.000000000 +0100 -@@ -0,0 +1,1088 @@ +diff -Nur linux-3.13.6/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig +--- linux-3.13.6/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig 2014-03-11 16:54:55.000000000 +0100 +@@ -0,0 +1,1089 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SYSVIPC=y @@ -901,6 +901,7 @@ diff -Nur linux-3.13.6.orig/arch/arm/configs/bcmrpi_defconfig linux-3.13.6/arch/ +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m ++CONFIG_CHR_DEV_SG=m +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_ISCSI_ATTRS=y +CONFIG_ISCSI_TCP=m @@ -1597,9 +1598,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/configs/bcmrpi_defconfig linux-3.13.6/arch/ +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.13.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.13.6/arch/arm/configs/bcmrpi_emergency_defconfig ---- linux-3.13.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/configs/bcmrpi_emergency_defconfig 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/configs/bcmrpi_emergency_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig +--- linux-3.13.6/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2133,9 +2134,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3. +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.13.6.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.13.6/arch/arm/configs/bcmrpi_quick_defconfig ---- linux-3.13.6.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/configs/bcmrpi_quick_defconfig 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/configs/bcmrpi_quick_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig +--- linux-3.13.6/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,197 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_LOCALVERSION="-quick" @@ -2334,9 +2335,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.13.6 +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Nur linux-3.13.6.orig/arch/arm/include/asm/fiq.h linux-3.13.6/arch/arm/include/asm/fiq.h ---- linux-3.13.6.orig/arch/arm/include/asm/fiq.h 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/include/asm/fiq.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/include/asm/fiq.h linux-raspberry-pi/arch/arm/include/asm/fiq.h +--- linux-3.13.6/arch/arm/include/asm/fiq.h 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/include/asm/fiq.h 2014-03-11 16:51:54.000000000 +0100 @@ -42,6 +42,7 @@ /* helpers defined in fiqasm.S: */ extern void __set_fiq_regs(unsigned long const *regs); @@ -2345,9 +2346,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/include/asm/fiq.h linux-3.13.6/arch/arm/inc static inline void set_fiq_regs(struct pt_regs const *regs) { -diff -Nur linux-3.13.6.orig/arch/arm/Kconfig linux-3.13.6/arch/arm/Kconfig ---- linux-3.13.6.orig/arch/arm/Kconfig 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/Kconfig 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/Kconfig linux-raspberry-pi/arch/arm/Kconfig +--- linux-3.13.6/arch/arm/Kconfig 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/Kconfig 2014-03-11 16:54:55.000000000 +0100 @@ -373,6 +373,24 @@ This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. @@ -2381,9 +2382,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/Kconfig linux-3.13.6/arch/arm/Kconfig source "arch/arm/mach-zynq/Kconfig" -diff -Nur linux-3.13.6.orig/arch/arm/Kconfig.debug linux-3.13.6/arch/arm/Kconfig.debug ---- linux-3.13.6.orig/arch/arm/Kconfig.debug 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/Kconfig.debug 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/Kconfig.debug linux-raspberry-pi/arch/arm/Kconfig.debug +--- linux-3.13.6/arch/arm/Kconfig.debug 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/Kconfig.debug 2014-03-11 16:54:55.000000000 +0100 @@ -882,6 +882,14 @@ options; the platform specific options are deprecated and will be soon removed. @@ -2399,9 +2400,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/Kconfig.debug linux-3.13.6/arch/arm/Kconfig endchoice config DEBUG_EXYNOS_UART -diff -Nur linux-3.13.6.orig/arch/arm/kernel/fiqasm.S linux-3.13.6/arch/arm/kernel/fiqasm.S ---- linux-3.13.6.orig/arch/arm/kernel/fiqasm.S 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/kernel/fiqasm.S 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/kernel/fiqasm.S linux-raspberry-pi/arch/arm/kernel/fiqasm.S +--- linux-3.13.6/arch/arm/kernel/fiqasm.S 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/kernel/fiqasm.S 2014-03-11 16:51:54.000000000 +0100 @@ -25,6 +25,9 @@ ENTRY(__set_fiq_regs) mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE @@ -2420,9 +2421,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/kernel/fiqasm.S linux-3.13.6/arch/arm/kerne +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Nur linux-3.13.6.orig/arch/arm/kernel/fiq.c linux-3.13.6/arch/arm/kernel/fiq.c ---- linux-3.13.6.orig/arch/arm/kernel/fiq.c 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/kernel/fiq.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/kernel/fiq.c linux-raspberry-pi/arch/arm/kernel/fiq.c +--- linux-3.13.6/arch/arm/kernel/fiq.c 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/kernel/fiq.c 2014-03-11 16:51:54.000000000 +0100 @@ -142,6 +142,7 @@ EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ @@ -2431,9 +2432,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/kernel/fiq.c linux-3.13.6/arch/arm/kernel/f EXPORT_SYMBOL(claim_fiq); EXPORT_SYMBOL(release_fiq); EXPORT_SYMBOL(enable_fiq); -diff -Nur linux-3.13.6.orig/arch/arm/kernel/process.c linux-3.13.6/arch/arm/kernel/process.c ---- linux-3.13.6.orig/arch/arm/kernel/process.c 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/kernel/process.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/kernel/process.c linux-raspberry-pi/arch/arm/kernel/process.c +--- linux-3.13.6/arch/arm/kernel/process.c 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/kernel/process.c 2014-03-11 16:54:55.000000000 +0100 @@ -176,6 +176,16 @@ default_idle(); } @@ -2451,9 +2452,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/kernel/process.c linux-3.13.6/arch/arm/kern /* * Called by kexec, immediately prior to machine_kexec(). * -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.13.6/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/armctrl.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/armctrl.c linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.13.6/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,219 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2674,9 +2675,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.13.6/arch/ar + init_FIQ(FIQ_START); + return 0; +} -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.13.6/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/armctrl.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/armctrl.h linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.13.6/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2705,9 +2706,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.13.6/arch/ar + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.13.6/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/bcm2708.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.13.6/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,1129 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3838,9 +3839,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.13.6/arch/ar +module_param(disk_led_gpio, uint, 0644); +module_param(disk_led_active_low, uint, 0644); +module_param(reboot_part, uint, 0644); -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.13.6/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.13.6/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,361 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4203,9 +4204,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.13.6/ar + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.13.6/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/bcm2708.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/bcm2708.h linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.13.6/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,49 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4256,9 +4257,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.13.6/arch/ar +} + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/clock.c linux-3.13.6/arch/arm/mach-bcm2708/clock.c ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/clock.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/clock.c linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c +--- linux-3.13.6/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4321,9 +4322,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/clock.c linux-3.13.6/arch/arm/ + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/clock.h linux-3.13.6/arch/arm/mach-bcm2708/clock.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/clock.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/clock.h linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h +--- linux-3.13.6/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4349,9 +4350,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/clock.h linux-3.13.6/arch/arm/ +struct clk { + unsigned long rate; +}; -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/dma.c linux-3.13.6/arch/arm/mach-bcm2708/dma.c ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/dma.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/dma.c linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c +--- linux-3.13.6/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,407 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4760,9 +4761,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/dma.c linux-3.13.6/arch/arm/ma +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5183,9 +5184,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h lin +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5247,9 +5248,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux +}; + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5258,9 +5259,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3. +#define __clk_put(clk) do { } while (0) + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.13.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5284,9 +5285,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S lin + .endm + +#include <debug/pl01x.S> -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/dma.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/dma.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,90 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -5378,9 +5379,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.13. + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.13.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -5451,9 +5452,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S lin +1020: @ EQ will be set if no irqs pending + + .endm -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/frc.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/frc.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5493,9 +5494,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.13. +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/gpio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -5514,9 +5515,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.13 +#define irq_to_gpio(x) ((x) - GPIO_IRQ_START) + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/hardware.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -5546,9 +5547,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux- +#include <mach/platform.h> + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/io.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/io.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/io.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -5577,9 +5578,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.13.6 +#define __io(a) __typesafe_io(a) + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/irqs.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -5780,9 +5781,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.13 + + +#endif /* _BCM2708_IRQS_H_ */ -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/memory.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/memory.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/memory.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -5841,9 +5842,9 @@ diff -Nur linux-3.13.6.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.13.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/platform.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/platform.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/platform.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,228 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6073,9 +6074,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux- +#endif + +/* END */ -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/power.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/power.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6103,9 +6104,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.1 +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/system.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/system.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/system.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6145,9 +6146,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3. +} + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/timex.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/timex.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/timex.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6172,9 +6173,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.1 + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6260,9 +6261,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linu + * nothing to do + */ +#define arch_decomp_wdog() -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vcio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,141 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -6405,9 +6406,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.13 +#define DEVICE_FILE_NAME "char_dev" + +#endif -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -6444,9 +6445,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3. +#endif + +#endif /* VC_MEM_H */ -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.13.6/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -6468,9 +6469,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xe8000000) -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/Kconfig linux-3.13.6/arch/arm/mach-bcm2708/Kconfig ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/Kconfig 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/Kconfig linux-raspberry-pi/arch/arm/mach-bcm2708/Kconfig +--- linux-3.13.6/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/Kconfig 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,41 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -6513,9 +6514,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/Kconfig linux-3.13.6/arch/arm/ + help + Binds spidev driver to the SPI0 master +endmenu -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/Makefile linux-3.13.6/arch/arm/mach-bcm2708/Makefile ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/Makefile 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/Makefile linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile +--- linux-3.13.6/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,7 @@ +# +# Makefile for the linux kernel. @@ -6524,16 +6525,16 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/Makefile linux-3.13.6/arch/arm +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.13.6.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.13.6/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/Makefile.boot 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/Makefile.boot linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.13.6/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile.boot 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/power.c linux-3.13.6/arch/arm/mach-bcm2708/power.c ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/power.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/power.c linux-raspberry-pi/arch/arm/mach-bcm2708/power.c +--- linux-3.13.6/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/power.c 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -6729,9 +6730,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/power.c linux-3.13.6/arch/arm/ +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/vcio.c linux-3.13.6/arch/arm/mach-bcm2708/vcio.c ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/vcio.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/vcio.c linux-raspberry-pi/arch/arm/mach-bcm2708/vcio.c +--- linux-3.13.6/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/vcio.c 2014-03-11 16:54:55.000000000 +0100 @@ -0,0 +1,474 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -7207,9 +7208,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/vcio.c linux-3.13.6/arch/arm/m +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.13.6/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.13.6.orig/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/arch/arm/mach-bcm2708/vc_mem.c 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mach-bcm2708/vc_mem.c linux-raspberry-pi/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.13.6/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mach-bcm2708/vc_mem.c 2014-03-11 16:51:54.000000000 +0100 @@ -0,0 +1,432 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7643,9 +7644,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.13.6/arch/arm +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); + -diff -Nur linux-3.13.6.orig/arch/arm/Makefile linux-3.13.6/arch/arm/Makefile ---- linux-3.13.6.orig/arch/arm/Makefile 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/Makefile 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/Makefile linux-raspberry-pi/arch/arm/Makefile +--- linux-3.13.6/arch/arm/Makefile 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/Makefile 2014-03-11 16:54:55.000000000 +0100 @@ -147,6 +147,7 @@ # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 @@ -7654,9 +7655,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/Makefile linux-3.13.6/arch/arm/Makefile machine-$(CONFIG_ARCH_BCM2835) += bcm2835 machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx -diff -Nur linux-3.13.6.orig/arch/arm/mm/Kconfig linux-3.13.6/arch/arm/mm/Kconfig ---- linux-3.13.6.orig/arch/arm/mm/Kconfig 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/mm/Kconfig 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mm/Kconfig linux-raspberry-pi/arch/arm/mm/Kconfig +--- linux-3.13.6/arch/arm/mm/Kconfig 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mm/Kconfig 2014-03-11 16:54:55.000000000 +0100 @@ -358,7 +358,7 @@ # ARMv6 @@ -7666,9 +7667,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mm/Kconfig linux-3.13.6/arch/arm/mm/Kconfig select CPU_32v6 select CPU_ABRT_EV6 select CPU_CACHE_V6 -diff -Nur linux-3.13.6.orig/arch/arm/mm/proc-v6.S linux-3.13.6/arch/arm/mm/proc-v6.S ---- linux-3.13.6.orig/arch/arm/mm/proc-v6.S 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/mm/proc-v6.S 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/mm/proc-v6.S linux-raspberry-pi/arch/arm/mm/proc-v6.S +--- linux-3.13.6/arch/arm/mm/proc-v6.S 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/mm/proc-v6.S 2014-03-11 16:54:55.000000000 +0100 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -7692,9 +7693,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/mm/proc-v6.S linux-3.13.6/arch/arm/mm/proc- mov pc, lr ENTRY(cpu_v6_dcache_clean_area) -diff -Nur linux-3.13.6.orig/arch/arm/tools/mach-types linux-3.13.6/arch/arm/tools/mach-types ---- linux-3.13.6.orig/arch/arm/tools/mach-types 2014-03-07 07:07:02.000000000 +0100 -+++ linux-3.13.6/arch/arm/tools/mach-types 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/arch/arm/tools/mach-types linux-raspberry-pi/arch/arm/tools/mach-types +--- linux-3.13.6/arch/arm/tools/mach-types 2014-03-07 07:07:02.000000000 +0100 ++++ linux-raspberry-pi/arch/arm/tools/mach-types 2014-03-11 16:51:56.000000000 +0100 @@ -522,6 +522,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -7703,9 +7704,9 @@ diff -Nur linux-3.13.6.orig/arch/arm/tools/mach-types linux-3.13.6/arch/arm/tool ag5evm MACH_AG5EVM AG5EVM 3189 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207 -diff -Nur linux-3.13.6.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-3.13.6/Documentation/video4linux/bcm2835-v4l2.txt ---- linux-3.13.6.orig/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/Documentation/video4linux/bcm2835-v4l2.txt 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/Documentation/video4linux/bcm2835-v4l2.txt linux-raspberry-pi/Documentation/video4linux/bcm2835-v4l2.txt +--- linux-3.13.6/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/Documentation/video4linux/bcm2835-v4l2.txt 2014-03-11 16:51:47.000000000 +0100 @@ -0,0 +1,60 @@ + +BCM2835 (aka Raspberry Pi) V4L2 driver @@ -7767,9 +7768,9 @@ diff -Nur linux-3.13.6.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-3.1 +List of available formats: + +$ v4l2-ctl --list-formats -diff -Nur linux-3.13.6.orig/drivers/char/broadcom/Kconfig linux-3.13.6/drivers/char/broadcom/Kconfig ---- linux-3.13.6.orig/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/drivers/char/broadcom/Kconfig 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/drivers/char/broadcom/Kconfig linux-raspberry-pi/drivers/char/broadcom/Kconfig +--- linux-3.13.6/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/drivers/char/broadcom/Kconfig 2014-03-11 16:54:56.000000000 +0100 @@ -0,0 +1,16 @@ +# +# Broadcom char driver config @@ -7787,14 +7788,14 @@ diff -Nur linux-3.13.6.orig/drivers/char/broadcom/Kconfig linux-3.13.6/drivers/c + help + Helper for videocore CMA access. + -diff -Nur linux-3.13.6.orig/drivers/char/broadcom/Makefile linux-3.13.6/drivers/char/broadcom/Makefile ---- linux-3.13.6.orig/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/drivers/char/broadcom/Makefile 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/drivers/char/broadcom/Makefile linux-raspberry-pi/drivers/char/broadcom/Makefile +--- linux-3.13.6/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/drivers/char/broadcom/Makefile 2014-03-11 16:54:56.000000000 +0100 @@ -0,0 +1 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ -diff -Nur linux-3.13.6.orig/drivers/char/broadcom/vc_cma/Makefile linux-3.13.6/drivers/char/broadcom/vc_cma/Makefile ---- linux-3.13.6.orig/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.13.6/drivers/char/broadcom/vc_cma/Makefile 2014-03-10 14:41:55.000000000 +0100 +diff -Nur linux-3.13.6/drivers/char/broadcom/vc_cma/Makefile linux-raspberry-pi/drivers/char/broadcom/vc_cma/Makefile +--- linux-3.13.6/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-raspberry-pi/drivers/char/broadcom/vc_cma/Makefile 2014-03-11 16:54:56.000000000 +0100 @@ -0,0 +1,14 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs +EXTRA_CFLAGS += -Werror @@ -7810,9 +7811,9 @@ diff -Nur linux-3.13.6.orig/drivers/char/broadcom/vc_cma/Makefile linux-3.13.6/d +obj-$(CONFIG_BCM_VC_CMA) += vc-cma.o + +vc-cma-objs := vc_cma.o -diff -Nur linux-3.13.6.orig/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.13.6/drivers/char/broadcom/vc_cma/vc_cma.c ---- linux-3.13.6.orig/drivers/char/broadcom/vc_cma/vc_cma.c 1970- |