diff --git a/packages/linux/patches/linux-3.2.19-601-RPi_support-0.1.patch b/packages/linux/patches/linux-3.2.19-601-RPi_support-0.1.patch index a363732401..d7a2fab414 100644 --- a/packages/linux/patches/linux-3.2.19-601-RPi_support-0.1.patch +++ b/packages/linux/patches/linux-3.2.19-601-RPi_support-0.1.patch @@ -1,6 +1,6 @@ -diff -Naur linux-3.2.18/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.2.18.patch/arch/arm/configs/bcmrpi_cutdown_defconfig ---- linux-3.2.18/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-05-29 22:56:49.599670436 +0200 +diff -Naur linux-3.2.19/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.2.19.patch/arch/arm/configs/bcmrpi_cutdown_defconfig +--- linux-3.2.19/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-06-10 05:51:05.255409323 +0200 @@ -0,0 +1,494 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -496,9 +496,9 @@ diff -Naur linux-3.2.18/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.2.18.p +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.2.18/arch/arm/configs/bcmrpi_defconfig linux-3.2.18.patch/arch/arm/configs/bcmrpi_defconfig ---- linux-3.2.18/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/configs/bcmrpi_defconfig 2012-05-29 22:56:49.600670455 +0200 +diff -Naur linux-3.2.19/arch/arm/configs/bcmrpi_defconfig linux-3.2.19.patch/arch/arm/configs/bcmrpi_defconfig +--- linux-3.2.19/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/configs/bcmrpi_defconfig 2012-06-10 05:51:05.255409323 +0200 @@ -0,0 +1,530 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -1030,9 +1030,9 @@ diff -Naur linux-3.2.18/arch/arm/configs/bcmrpi_defconfig linux-3.2.18.patch/arc +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.2.18/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.2.18.patch/arch/arm/configs/bcmrpi_emergency_defconfig ---- linux-3.2.18/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/configs/bcmrpi_emergency_defconfig 2012-05-29 22:56:49.608670609 +0200 +diff -Naur linux-3.2.19/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.2.19.patch/arch/arm/configs/bcmrpi_emergency_defconfig +--- linux-3.2.19/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/configs/bcmrpi_emergency_defconfig 2012-06-10 05:51:05.263409483 +0200 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -1566,9 +1566,9 @@ diff -Naur linux-3.2.18/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.2.18 +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.2.18/arch/arm/Kconfig linux-3.2.18.patch/arch/arm/Kconfig ---- linux-3.2.18/arch/arm/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/arch/arm/Kconfig 2012-05-29 22:56:49.716672680 +0200 +diff -Naur linux-3.2.19/arch/arm/Kconfig linux-3.2.19.patch/arch/arm/Kconfig +--- linux-3.2.19/arch/arm/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/arch/arm/Kconfig 2012-06-10 05:51:05.334410914 +0200 @@ -955,6 +955,21 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -1599,9 +1599,9 @@ diff -Naur linux-3.2.18/arch/arm/Kconfig linux-3.2.18.patch/arch/arm/Kconfig # Definitions to make life easier config ARCH_ACORN -diff -Naur linux-3.2.18/arch/arm/Kconfig.debug linux-3.2.18.patch/arch/arm/Kconfig.debug ---- linux-3.2.18/arch/arm/Kconfig.debug 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/arch/arm/Kconfig.debug 2012-05-29 22:56:49.719672737 +0200 +diff -Naur linux-3.2.19/arch/arm/Kconfig.debug linux-3.2.19.patch/arch/arm/Kconfig.debug +--- linux-3.2.19/arch/arm/Kconfig.debug 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/arch/arm/Kconfig.debug 2012-06-10 05:51:05.334410914 +0200 @@ -247,6 +247,14 @@ their output to the standard serial port on the RealView PB1176 platform. @@ -1617,9 +1617,9 @@ diff -Naur linux-3.2.18/arch/arm/Kconfig.debug linux-3.2.18.patch/arch/arm/Kconf endchoice config EARLY_PRINTK -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/armctrl.c linux-3.2.18.patch/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.2.18/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/armctrl.c 2012-05-29 22:56:49.373666104 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/armctrl.c linux-3.2.19.patch/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.2.19/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/armctrl.c 2012-06-10 05:51:05.042405026 +0200 @@ -0,0 +1,399 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2020,9 +2020,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/armctrl.c linux-3.2.18.patch/arch/ + armctrl_pm_register(base, irq_start, resume_sources); + return 0; +} -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/armctrl.h linux-3.2.18.patch/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.2.18/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/armctrl.h 2012-05-29 22:56:49.373666104 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/armctrl.h linux-3.2.19.patch/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.2.19/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/armctrl.h 2012-06-10 05:51:05.042405026 +0200 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2051,9 +2051,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/armctrl.h linux-3.2.18.patch/arch/ + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.18.patch/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.2.18/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/bcm2708.c 2012-05-29 22:56:49.744673217 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.19.patch/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.2.19/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/bcm2708.c 2012-06-10 05:51:05.360411439 +0200 @@ -0,0 +1,749 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -2804,9 +2804,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/bcm2708.c linux-3.2.18.patch/arch/ + &bcm2708_timer,.init_machine = + bcm2708_init, MACHINE_END module_param(boardrev, uint, 0644); +module_param(serial, uint, 0644); -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.2.18.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.2.18/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-05-29 22:56:49.375666142 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.2.19.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.2.19/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-06-10 05:51:05.044405066 +0200 @@ -0,0 +1,323 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -3131,9 +3131,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.2.18.patch/ +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); + -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/bcm2708.h linux-3.2.18.patch/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.2.18/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/bcm2708.h 2012-05-29 22:56:49.375666142 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/bcm2708.h linux-3.2.19.patch/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.2.19/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/bcm2708.h 2012-06-10 05:51:05.044405066 +0200 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -3186,9 +3186,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/bcm2708.h linux-3.2.18.patch/arch/ +} + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/clock.c linux-3.2.18.patch/arch/arm/mach-bcm2708/clock.c ---- linux-3.2.18/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/clock.c 2012-05-29 22:56:49.376666161 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/clock.c linux-3.2.19.patch/arch/arm/mach-bcm2708/clock.c +--- linux-3.2.19/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/clock.c 2012-06-10 05:51:05.045405086 +0200 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -3251,9 +3251,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/clock.c linux-3.2.18.patch/arch/ar + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/clock.h linux-3.2.18.patch/arch/arm/mach-bcm2708/clock.h ---- linux-3.2.18/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/clock.h 2012-05-29 22:56:49.376666161 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/clock.h linux-3.2.19.patch/arch/arm/mach-bcm2708/clock.h +--- linux-3.2.19/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/clock.h 2012-06-10 05:51:05.045405086 +0200 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -3279,9 +3279,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/clock.h linux-3.2.18.patch/arch/ar +struct clk { + unsigned long rate; +}; -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/dma.c linux-3.2.18.patch/arch/arm/mach-bcm2708/dma.c ---- linux-3.2.18/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/dma.c 2012-05-29 22:56:49.377666180 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/dma.c linux-3.2.19.patch/arch/arm/mach-bcm2708/dma.c +--- linux-3.2.19/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/dma.c 2012-06-10 05:51:05.046405107 +0200 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -3680,9 +3680,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/dma.c linux-3.2.18.patch/arch/arm/ +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-05-29 22:56:49.378666199 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-06-10 05:51:05.047405128 +0200 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -4103,9 +4103,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3 +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-05-29 22:56:49.379666218 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-06-10 05:51:05.048405149 +0200 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -4167,9 +4167,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.2 +}; + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-05-29 22:56:49.379666218 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-06-10 05:51:05.048405149 +0200 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -4178,9 +4178,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.2.18 +#define __clk_put(clk) do { } while (0) + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-05-29 22:56:49.720672757 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-06-10 05:51:05.336410955 +0200 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -4204,9 +4204,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3 + .endm + +#include -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/dma.h 2012-05-29 22:56:49.380666237 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/dma.h 2012-06-10 05:51:05.049405169 +0200 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -4292,9 +4292,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.2.18.pa + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-05-29 22:56:49.381666256 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-06-10 05:51:05.049405169 +0200 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -4365,9 +4365,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3 +1020: @ EQ will be set if no irqs pending + + .endm -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/frc.h 2012-05-29 22:56:49.381666256 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/frc.h 2012-06-10 05:51:05.050405189 +0200 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -4407,9 +4407,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.2.18.pa +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-05-29 22:56:49.382666275 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-06-10 05:51:05.050405189 +0200 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -4459,9 +4459,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.2.18.p +#endif /* CONFIG_GPIOLIB */ + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-05-29 22:56:49.382666275 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-06-10 05:51:05.050405189 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -4491,9 +4491,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.2. +#include + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/io.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/io.h 2012-05-29 22:56:49.382666275 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/io.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/io.h 2012-06-10 05:51:05.051405209 +0200 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -4523,9 +4523,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/io.h linux-3.2.18.pat +#define __mem_pci(a) (a) + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-05-29 22:56:49.383666294 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-06-10 05:51:05.052405229 +0200 @@ -0,0 +1,190 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -4717,9 +4717,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.2.18.p +#define NR_IRQS (64 + 21) + +#endif /* _BCM2708_IRQS_H_ */ -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/memory.h 2012-05-29 22:56:49.720672757 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/memory.h 2012-06-10 05:51:05.336410955 +0200 @@ -0,0 +1,64 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -4785,9 +4785,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.2.18 +#define CONSISTENT_DMA_SIZE 0x00200000 + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/platform.h 2012-05-29 22:56:49.741673160 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/platform.h 2012-06-10 05:51:05.357411379 +0200 @@ -0,0 +1,213 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -5002,9 +5002,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.2. +#endif + +/* END */ -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/power.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/power.h 2012-05-29 22:56:49.386666352 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/power.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/power.h 2012-06-10 05:51:05.055405289 +0200 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -5032,9 +5032,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/power.h linux-3.2.18. +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/system.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/system.h 2012-05-29 22:56:49.386666352 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/system.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/system.h 2012-06-10 05:51:05.055405289 +0200 @@ -0,0 +1,53 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -5089,9 +5089,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/system.h linux-3.2.18 +} + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/timex.h 2012-05-29 22:56:49.387666372 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/timex.h 2012-06-10 05:51:05.055405289 +0200 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -5116,9 +5116,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.2.18. + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-05-29 22:56:49.694672258 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-06-10 05:51:05.303410289 +0200 @@ -0,0 +1,84 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -5204,9 +5204,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3. + * nothing to do + */ +#define arch_decomp_wdog() -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-05-29 22:56:49.388666392 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-06-10 05:51:05.057405329 +0200 @@ -0,0 +1,42 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -5250,9 +5250,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.2.18.p +extern int /*rc*/ bcm_mailbox_write(unsigned chan, uint32_t data28); + +#endif -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-05-29 22:56:49.591670283 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-06-10 05:51:05.246409140 +0200 @@ -0,0 +1,35 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -5289,9 +5289,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.2.18 + +#endif /* VC_MEM_H */ + -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.2.18/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-05-29 22:56:49.388666392 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.2.19/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-06-10 05:51:05.057405329 +0200 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -5313,9 +5313,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.2.1 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xd8000000) -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/Kconfig linux-3.2.18.patch/arch/arm/mach-bcm2708/Kconfig ---- linux-3.2.18/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/Kconfig 2012-05-29 22:56:49.518668883 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/Kconfig linux-3.2.19.patch/arch/arm/mach-bcm2708/Kconfig +--- linux-3.2.19/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/Kconfig 2012-06-10 05:51:05.208408374 +0200 @@ -0,0 +1,32 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -5349,9 +5349,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/Kconfig linux-3.2.18.patch/arch/ar + Do not allow ARM to use GPU's L2 cache. Requires disable_l2cache in config.txt. + +endmenu -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/Makefile linux-3.2.18.patch/arch/arm/mach-bcm2708/Makefile ---- linux-3.2.18/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/Makefile 2012-05-29 22:56:49.364665931 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/Makefile linux-3.2.19.patch/arch/arm/mach-bcm2708/Makefile +--- linux-3.2.19/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/Makefile 2012-06-10 05:51:05.041405006 +0200 @@ -0,0 +1,8 @@ +# +# Makefile for the linux kernel. @@ -5361,16 +5361,16 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/Makefile linux-3.2.18.patch/arch/a +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o + -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/Makefile.boot linux-3.2.18.patch/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.2.18/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/Makefile.boot 2012-05-29 22:56:49.372666084 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/Makefile.boot linux-3.2.19.patch/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.2.19/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/Makefile.boot 2012-06-10 05:51:05.041405006 +0200 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/power.c linux-3.2.18.patch/arch/arm/mach-bcm2708/power.c ---- linux-3.2.18/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/power.c 2012-05-29 22:56:49.745673236 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/power.c linux-3.2.19.patch/arch/arm/mach-bcm2708/power.c +--- linux-3.2.19/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/power.c 2012-06-10 05:51:05.366411559 +0200 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -5388,7 +5388,6 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/power.c linux-3.2.18.patch/arch/ar +#include +#include +#include -+#include +#include +#include +#include @@ -5471,6 +5470,7 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/power.c linux-3.2.18.patch/arch/ar + bcm_mailbox_write(MBOX_CHAN_POWER, + global_request << 4); + ++ /* Wait for a response during power-up */ + if (global_request & ~g_state.global_request) { + rc = bcm_mailbox_read(MBOX_CHAN_POWER, + &actual); @@ -5485,14 +5485,14 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/power.c linux-3.2.18.patch/arch/ar + + if (rc == 0) { + if (actual != global_request) { -+ printk(KERN_INFO -+ "%s: Fail: prev global %x, new global %x, actual %x request %x, others_request %x\n", ++ printk(KERN_ERR ++ "%s: prev global %x, new global %x, actual %x, request %x, others_request %x\n", + __func__, + g_state.global_request, + global_request, actual, request, others_request); + /* A failure */ -+ // BUG_ON((others_request & actual) -+ // != others_request); ++ BUG_ON((others_request & actual) ++ != others_request); + request &= actual; + rc = -EIO; + } @@ -5566,9 +5566,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/power.c linux-3.2.18.patch/arch/ar +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/vcio.c linux-3.2.18.patch/arch/arm/mach-bcm2708/vcio.c ---- linux-3.2.18/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/vcio.c 2012-05-29 22:56:49.725672853 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/vcio.c linux-3.2.19.patch/arch/arm/mach-bcm2708/vcio.c +--- linux-3.2.19/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/vcio.c 2012-06-10 05:51:05.341411055 +0200 @@ -0,0 +1,308 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -5878,9 +5878,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/vcio.c linux-3.2.18.patch/arch/arm +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/vc_mem.c linux-3.2.18.patch/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.2.18/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/arch/arm/mach-bcm2708/vc_mem.c 2012-05-29 22:56:49.594670341 +0200 +diff -Naur linux-3.2.19/arch/arm/mach-bcm2708/vc_mem.c linux-3.2.19.patch/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.2.19/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/arch/arm/mach-bcm2708/vc_mem.c 2012-06-10 05:51:05.250409220 +0200 @@ -0,0 +1,466 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -6348,9 +6348,9 @@ diff -Naur linux-3.2.18/arch/arm/mach-bcm2708/vc_mem.c linux-3.2.18.patch/arch/a +module_exit(vc_mem_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Naur linux-3.2.18/arch/arm/Makefile linux-3.2.18.patch/arch/arm/Makefile ---- linux-3.2.18/arch/arm/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/arch/arm/Makefile 2012-05-29 22:56:49.334665354 +0200 +diff -Naur linux-3.2.19/arch/arm/Makefile linux-3.2.19.patch/arch/arm/Makefile +--- linux-3.2.19/arch/arm/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/arch/arm/Makefile 2012-06-10 05:51:05.015404482 +0200 @@ -198,6 +198,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -6359,9 +6359,9 @@ diff -Naur linux-3.2.18/arch/arm/Makefile linux-3.2.18.patch/arch/arm/Makefile # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -diff -Naur linux-3.2.18/arch/arm/mm/alignment.c linux-3.2.18.patch/arch/arm/mm/alignment.c ---- linux-3.2.18/arch/arm/mm/alignment.c 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/arch/arm/mm/alignment.c 2012-05-29 22:56:49.392666468 +0200 +diff -Naur linux-3.2.19/arch/arm/mm/alignment.c linux-3.2.19.patch/arch/arm/mm/alignment.c +--- linux-3.2.19/arch/arm/mm/alignment.c 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/arch/arm/mm/alignment.c 2012-06-10 05:51:05.061405409 +0200 @@ -855,9 +855,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -6376,9 +6376,9 @@ diff -Naur linux-3.2.18/arch/arm/mm/alignment.c linux-3.2.18.patch/arch/arm/mm/a default: goto bad; -diff -Naur linux-3.2.18/arch/arm/mm/Kconfig linux-3.2.18.patch/arch/arm/mm/Kconfig ---- linux-3.2.18/arch/arm/mm/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/arch/arm/mm/Kconfig 2012-05-29 22:56:49.392666468 +0200 +diff -Naur linux-3.2.19/arch/arm/mm/Kconfig linux-3.2.19.patch/arch/arm/mm/Kconfig +--- linux-3.2.19/arch/arm/mm/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/arch/arm/mm/Kconfig 2012-06-10 05:51:05.060405389 +0200 @@ -390,7 +390,7 @@ # ARMv6 @@ -6388,9 +6388,9 @@ diff -Naur linux-3.2.18/arch/arm/mm/Kconfig linux-3.2.18.patch/arch/arm/mm/Kconf select CPU_32v6 select CPU_ABRT_EV6 select CPU_PABRT_V6 -diff -Naur linux-3.2.18/arch/arm/mm/proc-v6.S linux-3.2.18.patch/arch/arm/mm/proc-v6.S ---- linux-3.2.18/arch/arm/mm/proc-v6.S 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/arch/arm/mm/proc-v6.S 2012-05-29 22:56:49.393666487 +0200 +diff -Naur linux-3.2.19/arch/arm/mm/proc-v6.S linux-3.2.19.patch/arch/arm/mm/proc-v6.S +--- linux-3.2.19/arch/arm/mm/proc-v6.S 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/arch/arm/mm/proc-v6.S 2012-06-10 05:51:05.061405409 +0200 @@ -70,10 +70,19 @@ * * IRQs are already disabled. @@ -6414,10 +6414,10 @@ diff -Naur linux-3.2.18/arch/arm/mm/proc-v6.S linux-3.2.18.patch/arch/arm/mm/pro mov pc, lr ENTRY(cpu_v6_dcache_clean_area) -diff -Naur linux-3.2.18/drivers/i2c/busses/i2c-bcm2708.c linux-3.2.18.patch/drivers/i2c/busses/i2c-bcm2708.c ---- linux-3.2.18/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/i2c/busses/i2c-bcm2708.c 2012-05-29 22:56:49.748673293 +0200 -@@ -0,0 +1,380 @@ +diff -Naur linux-3.2.19/drivers/i2c/busses/i2c-bcm2708.c linux-3.2.19.patch/drivers/i2c/busses/i2c-bcm2708.c +--- linux-3.2.19/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/i2c/busses/i2c-bcm2708.c 2012-06-10 05:51:05.365411539 +0200 +@@ -0,0 +1,379 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers + * @@ -6549,6 +6549,18 @@ diff -Naur linux-3.2.18/drivers/i2c/busses/i2c-bcm2708.c linux-3.2.18.patch/driv + bcm2708_wr(bi, BSC_S, BSC_S_CLKT | BSC_S_ERR | BSC_S_DONE); +} + ++static inline void bcm2708_bsc_fifo_drain(struct bcm2708_i2c *bi) ++{ ++ while ((bcm2708_rd(bi, BSC_S) & BSC_S_RXD) && (bi->pos < bi->msg->len)) ++ bi->msg->buf[bi->pos++] = bcm2708_rd(bi, BSC_FIFO); ++} ++ ++static inline void bcm2708_bsc_fifo_fill(struct bcm2708_i2c *bi) ++{ ++ while ((bcm2708_rd(bi, BSC_S) & BSC_S_TXD) && (bi->pos < bi->msg->len)) ++ bcm2708_wr(bi, BSC_FIFO, bi->msg->buf[bi->pos++]); ++} ++ +static inline void bcm2708_bsc_setup(struct bcm2708_i2c *bi) +{ + unsigned long bus_hz; @@ -6572,13 +6584,11 @@ diff -Naur linux-3.2.18/drivers/i2c/busses/i2c-bcm2708.c linux-3.2.18.patch/driv +static irqreturn_t bcm2708_i2c_interrupt(int irq, void *dev_id) +{ + struct bcm2708_i2c *bi = dev_id; -+ bool handled = false; ++ bool handled = true; + u32 s; -+ struct i2c_msg *msg = bi->msg; + + spin_lock(&bi->lock); + -+ handled = true; + s = bcm2708_rd(bi, BSC_S); + + if (s & (BSC_S_CLKT | BSC_S_ERR)) { @@ -6590,11 +6600,8 @@ diff -Naur linux-3.2.18/drivers/i2c/busses/i2c-bcm2708.c linux-3.2.18.patch/driv + } else if (s & BSC_S_DONE) { + bi->nmsgs--; + -+ /* drain the RX FIFO */ -+ while (s & BSC_S_RXD) { -+ msg->buf[bi->pos++] = bcm2708_rd(bi, BSC_FIFO); -+ s = bcm2708_rd(bi, BSC_S); -+ }; ++ if (bi->msg->flags & I2C_M_RD) ++ bcm2708_bsc_fifo_drain(bi); + + bcm2708_bsc_reset(bi); + @@ -6608,17 +6615,9 @@ diff -Naur linux-3.2.18/drivers/i2c/busses/i2c-bcm2708.c linux-3.2.18.patch/driv + complete(&bi->done); + } + } else if (s & BSC_S_TXW) { -+ /* fill the TX FIFO */ -+ do { -+ bcm2708_wr(bi, BSC_FIFO, msg->buf[bi->pos++]); -+ s = bcm2708_rd(bi, BSC_S); -+ } while (s & BSC_S_TXD); ++ bcm2708_bsc_fifo_fill(bi); + } else if (s & BSC_S_RXR) { -+ /* drain the RX FIFO */ -+ do { -+ msg->buf[bi->pos++] = bcm2708_rd(bi, BSC_FIFO); -+ s = bcm2708_rd(bi, BSC_S); -+ } while (s & BSC_S_RXD); ++ bcm2708_bsc_fifo_drain(bi); + } else { + handled = false; + } @@ -6798,9 +6797,9 @@ diff -Naur linux-3.2.18/drivers/i2c/busses/i2c-bcm2708.c linux-3.2.18.patch/driv +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Naur linux-3.2.18/drivers/i2c/busses/Kconfig linux-3.2.18.patch/drivers/i2c/busses/Kconfig ---- linux-3.2.18/drivers/i2c/busses/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/i2c/busses/Kconfig 2012-05-29 22:56:49.742673179 +0200 +diff -Naur linux-3.2.19/drivers/i2c/busses/Kconfig linux-3.2.19.patch/drivers/i2c/busses/Kconfig +--- linux-3.2.19/drivers/i2c/busses/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/i2c/busses/Kconfig 2012-06-10 05:51:05.358411399 +0200 @@ -308,6 +308,14 @@ This driver can also be built as a module. If so, the module will be called i2c-au1550. @@ -6816,9 +6815,9 @@ diff -Naur linux-3.2.18/drivers/i2c/busses/Kconfig linux-3.2.18.patch/drivers/i2 config I2C_BLACKFIN_TWI tristate "Blackfin TWI I2C support" depends on BLACKFIN -diff -Naur linux-3.2.18/drivers/i2c/busses/Makefile linux-3.2.18.patch/drivers/i2c/busses/Makefile ---- linux-3.2.18/drivers/i2c/busses/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/i2c/busses/Makefile 2012-05-29 22:56:49.742673179 +0200 +diff -Naur linux-3.2.19/drivers/i2c/busses/Makefile linux-3.2.19.patch/drivers/i2c/busses/Makefile +--- linux-3.2.19/drivers/i2c/busses/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/i2c/busses/Makefile 2012-06-10 05:51:05.358411399 +0200 @@ -30,6 +30,7 @@ # Embedded system I2C/SMBus host controller drivers obj-$(CONFIG_I2C_AT91) += i2c-at91.o @@ -6827,9 +6826,9 @@ diff -Naur linux-3.2.18/drivers/i2c/busses/Makefile linux-3.2.18.patch/drivers/i obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o obj-$(CONFIG_I2C_CPM) += i2c-cpm.o obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o -diff -Naur linux-3.2.18/drivers/misc/Kconfig linux-3.2.18.patch/drivers/misc/Kconfig ---- linux-3.2.18/drivers/misc/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/misc/Kconfig 2012-05-29 22:56:49.413666870 +0200 +diff -Naur linux-3.2.19/drivers/misc/Kconfig linux-3.2.19.patch/drivers/misc/Kconfig +--- linux-3.2.19/drivers/misc/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/misc/Kconfig 2012-06-10 05:51:05.129406780 +0200 @@ -508,5 +508,6 @@ source "drivers/misc/lis3lv02d/Kconfig" source "drivers/misc/carma/Kconfig" @@ -6837,17 +6836,17 @@ diff -Naur linux-3.2.18/drivers/misc/Kconfig linux-3.2.18.patch/drivers/misc/Kco +source "drivers/misc/vc04_services/Kconfig" endif # MISC_DEVICES -diff -Naur linux-3.2.18/drivers/misc/Makefile linux-3.2.18.patch/drivers/misc/Makefile ---- linux-3.2.18/drivers/misc/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/misc/Makefile 2012-05-29 22:56:49.414666889 +0200 +diff -Naur linux-3.2.19/drivers/misc/Makefile linux-3.2.19.patch/drivers/misc/Makefile +--- linux-3.2.19/drivers/misc/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/misc/Makefile 2012-06-10 05:51:05.129406780 +0200 @@ -48,3 +48,4 @@ obj-y += carma/ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ +obj-y += vc04_services/ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-05-29 22:56:49.529669095 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-06-10 05:51:05.220408616 +0200 @@ -0,0 +1,309 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7158,9 +7157,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/connections/co +#endif /* CONNECTION_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-05-29 22:56:49.530669114 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-06-10 05:51:05.220408616 +0200 @@ -0,0 +1,186 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7348,9 +7347,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/message_driver +#endif // _VCHI_MESSAGE_H_ + +/****************************** End of file ***********************************/ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-05-29 22:56:49.532669152 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-06-10 05:51:05.222408656 +0200 @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7566,9 +7565,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h lin +#endif /* VCHI_CFG_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-05-29 22:56:49.532669152 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-06-10 05:51:05.223408676 +0200 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7626,9 +7625,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_cfg_inter +//#define VCHI_RX_NANOLOCKS + +#endif /*VCHI_CFG_INTERNAL_H_*/ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-05-29 22:56:49.533669171 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-06-10 05:51:05.223408676 +0200 @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -7782,9 +7781,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_common.h + + +#endif // VCHI_COMMON_H_ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-05-29 22:56:49.531669133 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-06-10 05:51:05.221408636 +0200 @@ -0,0 +1,347 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8133,9 +8132,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3 +#endif /* VCHI_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-05-29 22:56:49.479668136 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-06-10 05:51:05.176407729 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -8164,9 +8163,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linu +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-05-29 22:56:49.533669171 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-06-10 05:51:05.224408696 +0200 @@ -0,0 +1,512 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8680,9 +8679,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 + kfree(pagelist); +} + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-05-29 22:56:49.416666927 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-06-10 05:51:05.131406821 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -8711,9 +8710,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283 +#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1 + +#endif /* VCHIQ_2835_H */ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-05-29 22:56:49.602670495 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-06-10 05:51:05.257409363 +0200 @@ -0,0 +1,1912 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -10627,9 +10626,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm +module_exit(vchiq_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-05-29 22:56:49.536669228 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-06-10 05:51:05.226408736 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -10749,9 +10748,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm + + +#endif /* VCHIQ_ARM_H */ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-05-29 22:56:49.420667004 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-06-10 05:51:05.135406903 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -10796,9 +10795,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-05-29 22:56:49.420667004 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-06-10 05:51:05.135406903 +0200 @@ -0,0 +1,101 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -10901,9 +10900,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con +} + +EXPORT_SYMBOL( vchiq_add_connected_callback ); -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-05-29 22:56:49.420667004 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-06-10 05:51:05.136406923 +0200 @@ -0,0 +1,32 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -10937,9 +10936,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con + +#endif /* VCHIQ_CONNECTED_H */ + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-05-29 22:56:49.603670514 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-06-10 05:51:05.259409403 +0200 @@ -0,0 +1,2717 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -13658,9 +13657,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor + } + return status; +} -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-05-29 22:56:49.604670533 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-06-10 05:51:05.259409403 +0200 @@ -0,0 +1,506 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -14168,9 +14167,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor +vchiq_platform_conn_state_changed(VCHIQ_STATE_T* state, VCHIQ_CONNSTATE_T oldstate, VCHIQ_CONNSTATE_T newstate); + +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-05-29 22:56:49.415666908 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-06-10 05:51:05.131406821 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -14199,9 +14198,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h l + +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-05-29 22:56:49.540669306 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-06-10 05:51:05.230408818 +0200 @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -14358,9 +14357,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if. +extern VCHIQ_STATUS_T vchiq_dump_phys_mem( VCHIQ_SERVICE_HANDLE_T service, void *ptr, size_t num_bytes ); + +#endif /* VCHIQ_IF_H */ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-05-29 22:56:49.604670533 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-06-10 05:51:05.260409423 +0200 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -14467,9 +14466,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioc +#define VCHIQ_IOC_MAX 15 + +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-05-29 22:56:49.427667139 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-06-10 05:51:05.143407063 +0200 @@ -0,0 +1,297 @@ +/***************************************************************************** +* Copyright 2001 - 2011 Broadcom Corporation. All rights reserved. @@ -14768,9 +14767,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ker +EXPORT_SYMBOL(vchiq_open_service); +EXPORT_SYMBOL(vchiq_add_service_params); +EXPORT_SYMBOL(vchiq_open_service_params); -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-05-29 22:56:49.541669325 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib.c 2012-06-10 05:51:05.231408838 +0200 @@ -0,0 +1,1628 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -16400,9 +16399,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_lib + free_msgbufs = buf; + vcos_mutex_unlock(&vchiq_lib_mutex); +} -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-05-29 22:56:49.430667196 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-06-10 05:51:05.145407103 +0200 @@ -0,0 +1,45 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -16449,9 +16448,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_mem +VCHIQ_STATUS_T vchiq_memdrv_initialise(void); + +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-05-29 22:56:49.430667196 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-06-10 05:51:05.146407123 +0200 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -16496,9 +16495,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pag +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-05-29 22:56:49.542669344 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-06-10 05:51:05.232408858 +0200 @@ -0,0 +1,1001 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17501,9 +17500,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shi +EXPORT_SYMBOL(vchi_service_use); +EXPORT_SYMBOL(vchi_service_release); +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-05-29 22:56:49.433667253 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-06-10 05:51:05.148407163 +0200 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17602,9 +17601,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti + + return header; +} -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-05-29 22:56:49.433667253 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-06-10 05:51:05.148407163 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -17653,9 +17652,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti + +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-05-29 22:56:49.434667272 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_cmd.c 2012-06-10 05:51:05.149407184 +0200 @@ -0,0 +1,681 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -18338,9 +18337,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_c + return VCOS_SUCCESS; +} + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-05-29 22:56:49.486668269 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_common.h 2012-06-10 05:51:05.176407729 +0200 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -18429,9 +18428,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_c +VCOSPRE_ void VCOSPOST_ vcos_timer_init(void); +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-05-29 22:56:49.487668288 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_blockpool.h 2012-06-10 05:51:05.177407749 +0200 @@ -0,0 +1,271 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -18704,9 +18703,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif +#endif /* VCOS_GENERIC_BLOCKPOOL_H */ + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-05-29 22:56:49.487668288 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.c 2012-06-10 05:51:05.178407769 +0200 @@ -0,0 +1,311 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19019,9 +19018,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +} + +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-05-29 22:56:49.488668308 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_event_flags.h 2012-06-10 05:51:05.178407769 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19141,9 +19140,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-05-29 22:56:49.488668308 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_named_sem.h 2012-06-10 05:51:05.179407789 +0200 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19237,9 +19236,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-05-29 22:56:49.489668328 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_quickslow_mutex.h 2012-06-10 05:51:05.179407789 +0200 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19327,9 +19326,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-05-29 22:56:49.489668328 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_reentrant_mtx.h 2012-06-10 05:51:05.179407789 +0200 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19417,9 +19416,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-05-29 22:56:49.490668348 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_generic_tls.h 2012-06-10 05:51:05.180407809 +0200 @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19576,9 +19575,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_g +#endif + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-05-29 22:56:49.490668348 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_joinable_thread_from_plain.h 2012-06-10 05:51:05.180407809 +0200 @@ -0,0 +1,214 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19794,9 +19793,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_j +} +#endif +#endif /* VCOS_JOINABLE_THREAD_FROM_PLAIN_H */ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-05-29 22:56:49.491668367 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_latch_from_sem.h 2012-06-10 05:51:05.181407829 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19857,9 +19856,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_l + +#endif /* VCOS_INLINE_BODIES */ + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-05-29 22:56:49.491668367 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_logcat.c 2012-06-10 05:51:05.182407849 +0200 @@ -0,0 +1,560 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20421,9 +20420,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_l + } +} + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-05-29 22:56:49.492668386 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.c 2012-06-10 05:51:05.182407849 +0200 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20509,9 +20508,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + _vcos_platform_free(h->ptr); +} + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-05-29 22:56:49.492668386 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mem_from_malloc.h 2012-06-10 05:51:05.183407869 +0200 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20578,9 +20577,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_m +#endif /* VCOS_INLINE_BODIES */ + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-05-29 22:56:49.493668405 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_mutexes_are_reentrant.h 2012-06-10 05:51:05.183407869 +0200 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20661,9 +20660,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_m + + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-05-29 22:56:49.493668405 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/generic/vcos_thread_reaper.h 2012-06-10 05:51:05.184407889 +0200 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20711,9 +20710,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/generic/vcos_t +#endif + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-05-29 22:56:49.493668405 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/stdint.h 2012-06-10 05:51:05.184407889 +0200 @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -20746,9 +20745,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/st +#include /* includes integer types */ + +#endif /* _VCOS_PLATFORM_LINUX_STDINT_H */ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-05-29 22:56:49.494668424 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel.c 2012-06-10 05:51:05.185407909 +0200 @@ -0,0 +1,627 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -21377,9 +21376,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +EXPORT_SYMBOL( vcos_verify_bkpts_enabled ); + +EXPORT_SYMBOL( vcos_strdup ); -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-05-29 22:56:49.444667465 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_cfg.c 2012-06-10 05:51:05.160407405 +0200 @@ -0,0 +1,332 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -21713,9 +21712,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + +EXPORT_SYMBOL_GPL( vcos_cfg_get_proc_entry ); + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-05-29 22:56:49.495668443 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_linuxkernel_misc.c 2012-06-10 05:51:05.185407909 +0200 @@ -0,0 +1,111 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -21828,9 +21827,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + +// END ######################################################################### +// ############################################################################# -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-05-29 22:56:49.445667484 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_mod_init.c 2012-06-10 05:51:05.160407405 +0200 @@ -0,0 +1,64 @@ +/***************************************************************************** +* Copyright 2006 - 2008 Broadcom Corporation. All rights reserved. @@ -21896,9 +21895,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +MODULE_LICENSE( "GPL" ); +MODULE_VERSION( "1.0" ); + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-05-29 22:56:49.495668443 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform.h 2012-06-10 05:51:05.186407930 +0200 @@ -0,0 +1,507 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -22407,9 +22406,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + +#endif /* VCOS_PLATFORM_H */ + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-05-29 22:56:49.715672661 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_platform_types.h 2012-06-10 05:51:05.333410894 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -22470,9 +22469,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +#define PRIx64 "llx" + +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-05-29 22:56:49.447667522 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.c 2012-06-10 05:51:05.162407447 +0200 @@ -0,0 +1,129 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -22603,9 +22602,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc + + return *vcos_thread_storage; +} -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-05-29 22:56:49.447667522 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/linuxkernel/vcos_thread_map.h 2012-06-10 05:51:05.163407467 +0200 @@ -0,0 +1,39 @@ +/***************************************************************************** +* Copyright 2009 - 2010 Broadcom Corporation. All rights reserved. @@ -22646,9 +22645,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/linuxkernel/vc +VCOS_THREAD_T *vcos_kthread_current(void); + +#endif /*VCOS_THREAD_MAP_H */ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_assert.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-05-29 22:56:49.497668481 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_assert.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_assert.h 2012-06-10 05:51:05.187407951 +0200 @@ -0,0 +1,280 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -22930,9 +22929,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_assert.h +#endif + +#endif /* VCOS_ASSERT_H */ -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-05-29 22:56:49.497668481 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_atomic_flags.h 2012-06-10 05:51:05.188407972 +0200 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23017,9 +23016,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_atomic_fl +#endif + +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-05-29 22:56:49.498668500 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_build_info.h 2012-06-10 05:51:05.188407972 +0200 @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23044,9 +23043,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_build_inf +const char *vcos_get_build_time( void ); +const char *vcos_get_build_date( void ); + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-05-29 22:56:49.450667579 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h 2012-06-10 05:51:05.165407507 +0200 @@ -0,0 +1,113 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -23161,9 +23160,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_cfg.h lin +#endif +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-05-29 22:56:49.450667579 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h 2012-06-10 05:51:05.166407527 +0200 @@ -0,0 +1,98 @@ +/***************************************************************************** +* Copyright 2009 - 2011 Broadcom Corporation. All rights reserved. @@ -23263,9 +23262,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_cmd.h lin + +#endif /* VCOS_CMD_H */ + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-05-29 22:56:49.498668500 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h 2012-06-10 05:51:05.188407972 +0200 @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23307,9 +23306,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_ctype.h l + +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-05-29 22:56:49.498668500 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h 2012-06-10 05:51:05.189407992 +0200 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23391,9 +23390,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_dlfcn.h l +#endif + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-05-29 22:56:49.499668519 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_event_flags.h 2012-06-10 05:51:05.190408012 +0200 @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23504,9 +23503,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_event_fla + +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_event.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_event.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-05-29 22:56:49.499668519 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_event.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_event.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_event.h 2012-06-10 05:51:05.189407992 +0200 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23616,9 +23615,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_event.h l +#endif + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-05-29 22:56:49.496668462 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos.h 2012-06-10 05:51:05.187407951 +0200 @@ -0,0 +1,212 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23832,9 +23831,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos.h linux-3 + +#endif /* VCOS_H */ + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_init.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_init.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-05-29 22:56:49.500668538 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_init.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_init.h 2012-06-10 05:51:05.190408012 +0200 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -23890,9 +23889,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_init.h li +} +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_logging.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-05-29 22:56:49.500668538 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_logging.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_logging.h 2012-06-10 05:51:05.191408032 +0200 @@ -0,0 +1,290 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24184,9 +24183,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_logging.h +#endif /* VCOS_LOGGING_H */ + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-05-29 22:56:49.501668557 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_thread.h 2012-06-10 05:51:05.191408032 +0200 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24306,9 +24305,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_lowlevel_ +#endif +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-05-29 22:56:49.501668557 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_mem.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_mem.h 2012-06-10 05:51:05.192408052 +0200 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24402,9 +24401,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_mem.h lin +#endif + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-05-29 22:56:49.502668576 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue.h 2012-06-10 05:51:05.192408052 +0200 @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24574,9 +24573,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_msgqueue. +#endif + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-05-29 22:56:49.502668576 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h 2012-06-10 05:51:05.193408072 +0200 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24681,9 +24680,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_mutex.h l +} +#endif +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_once.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_once.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-05-29 22:56:49.503668595 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_once.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_once.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_once.h 2012-06-10 05:51:05.193408072 +0200 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24738,9 +24737,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_once.h li +#endif +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-05-29 22:56:49.503668595 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_semaphore.h 2012-06-10 05:51:05.194408092 +0200 @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24868,9 +24867,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_semaphore +#endif +#endif + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-05-29 22:56:49.504668614 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h 2012-06-10 05:51:05.194408092 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -24906,9 +24905,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_stdbool.h +#endif /* __cplusplus */ + +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-05-29 22:56:49.504668614 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h 2012-06-10 05:51:05.195408112 +0200 @@ -0,0 +1,203 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25113,9 +25112,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_stdint.h +#endif /* VCOS_STDINT_H */ + + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_string.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_string.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-05-29 22:56:49.505668634 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_string.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_string.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_string.h 2012-06-10 05:51:05.195408112 +0200 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25201,9 +25200,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_string.h +} +#endif +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-05-29 22:56:49.506668654 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread_attr.h 2012-06-10 05:51:05.196408132 +0200 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25292,9 +25291,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_thread_at +} +#endif +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_thread.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-05-29 22:56:49.505668634 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_thread.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_thread.h 2012-06-10 05:51:05.196408132 +0200 @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25566,9 +25565,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_thread.h +} +#endif +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_timer.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-05-29 22:56:49.506668654 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_timer.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_timer.h 2012-06-10 05:51:05.197408152 +0200 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25676,9 +25675,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_timer.h l +} +#endif +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_types.h linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h ---- linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_types.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-05-29 22:56:49.506668654 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_types.h linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h +--- linux-3.2.19/drivers/misc/vc04_services/interface/vcos/vcos_types.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/interface/vcos/vcos_types.h 2012-06-10 05:51:05.197408152 +0200 @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -25891,9 +25890,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/interface/vcos/vcos_types.h l +typedef vcos_fourcc_t FOURCC_T; + +#endif -diff -Naur linux-3.2.18/drivers/misc/vc04_services/Kconfig linux-3.2.18.patch/drivers/misc/vc04_services/Kconfig ---- linux-3.2.18/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/Kconfig 2012-05-29 22:56:49.414666889 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/Kconfig linux-3.2.19.patch/drivers/misc/vc04_services/Kconfig +--- linux-3.2.19/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/Kconfig 2012-06-10 05:51:05.129406780 +0200 @@ -0,0 +1,7 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -25902,9 +25901,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/Kconfig linux-3.2.18.patch/dr + help + Helper for communication for VideoCore. + -diff -Naur linux-3.2.18/drivers/misc/vc04_services/Makefile linux-3.2.18.patch/drivers/misc/vc04_services/Makefile ---- linux-3.2.18/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/misc/vc04_services/Makefile 2012-05-29 22:56:49.528669076 +0200 +diff -Naur linux-3.2.19/drivers/misc/vc04_services/Makefile linux-3.2.19.patch/drivers/misc/vc04_services/Makefile +--- linux-3.2.19/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/misc/vc04_services/Makefile 2012-06-10 05:51:05.219408596 +0200 @@ -0,0 +1,21 @@ +obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o + @@ -25927,9 +25926,9 @@ diff -Naur linux-3.2.18/drivers/misc/vc04_services/Makefile linux-3.2.18.patch/d + + + -diff -Naur linux-3.2.18/drivers/mmc/card/block.c linux-3.2.18.patch/drivers/mmc/card/block.c ---- linux-3.2.18/drivers/mmc/card/block.c 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/mmc/card/block.c 2012-05-29 22:56:49.746673255 +0200 +diff -Naur linux-3.2.19/drivers/mmc/card/block.c linux-3.2.19.patch/drivers/mmc/card/block.c +--- linux-3.2.19/drivers/mmc/card/block.c 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/mmc/card/block.c 2012-06-10 05:51:05.363411499 +0200 @@ -1062,6 +1062,16 @@ if (brq->data.blocks > 1) { @@ -25947,9 +25946,9 @@ diff -Naur linux-3.2.18/drivers/mmc/card/block.c linux-3.2.18.patch/drivers/mmc/ * After a read error, we redo the request one sector * at a time in order to accurately determine which * sectors can be read successfully. -diff -Naur linux-3.2.18/drivers/mmc/host/bcm2708_mci.c linux-3.2.18.patch/drivers/mmc/host/bcm2708_mci.c ---- linux-3.2.18/drivers/mmc/host/bcm2708_mci.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/mmc/host/bcm2708_mci.c 2012-05-29 22:56:49.395666525 +0200 +diff -Naur linux-3.2.19/drivers/mmc/host/bcm2708_mci.c linux-3.2.19.patch/drivers/mmc/host/bcm2708_mci.c +--- linux-3.2.19/drivers/mmc/host/bcm2708_mci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/mmc/host/bcm2708_mci.c 2012-06-10 05:51:05.064405470 +0200 @@ -0,0 +1,889 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -26840,9 +26839,9 @@ diff -Naur linux-3.2.18/drivers/mmc/host/bcm2708_mci.c linux-3.2.18.patch/driver +MODULE_DESCRIPTION("BCM2708 Multimedia Card Interface driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2708_mci"); -diff -Naur linux-3.2.18/drivers/mmc/host/bcm2708_mci.h linux-3.2.18.patch/drivers/mmc/host/bcm2708_mci.h ---- linux-3.2.18/drivers/mmc/host/bcm2708_mci.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/mmc/host/bcm2708_mci.h 2012-05-29 22:56:49.396666544 +0200 +diff -Naur linux-3.2.19/drivers/mmc/host/bcm2708_mci.h linux-3.2.19.patch/drivers/mmc/host/bcm2708_mci.h +--- linux-3.2.19/drivers/mmc/host/bcm2708_mci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/mmc/host/bcm2708_mci.h 2012-06-10 05:51:05.065405491 +0200 @@ -0,0 +1,101 @@ +/* + * linux/drivers/mmc/host/bcm2708_mci.c - Broadcom BCM2708 MCI driver @@ -26945,9 +26944,9 @@ diff -Naur linux-3.2.18/drivers/mmc/host/bcm2708_mci.h linux-3.2.18.patch/driver + kunmap_atomic(buffer, KM_BIO_SRC_IRQ); +// local_irq_restore(*flags); +} -diff -Naur linux-3.2.18/drivers/mmc/host/Kconfig linux-3.2.18.patch/drivers/mmc/host/Kconfig ---- linux-3.2.18/drivers/mmc/host/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/mmc/host/Kconfig 2012-05-29 22:56:49.394666506 +0200 +diff -Naur linux-3.2.19/drivers/mmc/host/Kconfig linux-3.2.19.patch/drivers/mmc/host/Kconfig +--- linux-3.2.19/drivers/mmc/host/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/mmc/host/Kconfig 2012-06-10 05:51:05.062405429 +0200 @@ -229,6 +229,27 @@ YMMV. @@ -26991,9 +26990,9 @@ diff -Naur linux-3.2.18/drivers/mmc/host/Kconfig linux-3.2.18.patch/drivers/mmc/ config MMC_ATMELMCI_DMA bool "Atmel MCI DMA support" -diff -Naur linux-3.2.18/drivers/mmc/host/Makefile linux-3.2.18.patch/drivers/mmc/host/Makefile ---- linux-3.2.18/drivers/mmc/host/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/mmc/host/Makefile 2012-05-29 22:56:49.394666506 +0200 +diff -Naur linux-3.2.19/drivers/mmc/host/Makefile linux-3.2.19.patch/drivers/mmc/host/Makefile +--- linux-3.2.19/drivers/mmc/host/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/mmc/host/Makefile 2012-06-10 05:51:05.063405449 +0200 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -27010,10 +27009,10 @@ diff -Naur linux-3.2.18/drivers/mmc/host/Makefile linux-3.2.18.patch/drivers/mmc obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o obj-$(CONFIG_MMC_DW) += dw_mmc.o obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o -diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/drivers/mmc/host/sdhci-bcm2708.c ---- linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-05-29 22:56:49.727672891 +0200 -@@ -0,0 +1,1555 @@ +diff -Naur linux-3.2.19/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.19.patch/drivers/mmc/host/sdhci-bcm2708.c +--- linux-3.2.19/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-06-10 05:51:05.367411579 +0200 +@@ -0,0 +1,1466 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 + * Copyright (c) 2010 Broadcom @@ -27042,9 +27041,7 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv +#include +#include +#include -+#include +#include -+#include + +#include +#include @@ -27089,9 +27086,6 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv + +#define BCM2708_SDHCI_SLEEP_TIMEOUT 1000 /* msecs */ + -+/* Mhz clock that the EMMC core is running at. Should match the platform clockman settings */ -+#define BCM2708_EMMC_CLOCK_FREQ 80000000 -+ +#define POWER_OFF 0 +#define POWER_LAZY_OFF 1 +#define POWER_ON 2 @@ -27246,12 +27240,7 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv + +static void sdhci_bcm2708_raw_writel(struct sdhci_host *host, u32 val, int reg) +{ -+ u32 ier; -+ +#if USE_SPACED_WRITES_2CLK -+ static bool timeout_disabled = false; -+ unsigned int ns_2clk = 0; -+ + /* The Arasan has a bugette whereby it may lose the content of + * successive writes to registers that are within two SD-card clock + * cycles of each other (a clock domain crossing problem). @@ -27263,7 +27252,7 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv + /* host->clock is the clock freq in Hz */ + static hptime_t last_write_hpt; + hptime_t now = hptime(); -+ ns_2clk = 2000000000/host->clock; ++ unsigned int ns_2clk = 2000000000/host->clock; + + if (now == last_write_hpt || now == last_write_hpt+1) { + /* we can't guarantee any significant time has @@ -27279,27 +27268,6 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv + } + last_write_hpt = now; + } -+#if USE_SOFTWARE_TIMEOUTS -+ /* The Arasan is clocked for timeouts using the SD clock which is too -+ * fast for ERASE commands and causes issues. So we disable timeouts -+ * for ERASE */ -+ if (host->cmd != NULL && host->cmd->opcode == MMC_ERASE && -+ reg == (SDHCI_COMMAND & ~3)) { -+ mod_timer(&host->timer, -+ jiffies + SOFTWARE_ERASE_TIMEOUT_SEC * HZ); -+ ier = readl(host->ioaddr + SDHCI_SIGNAL_ENABLE); -+ ier &= ~SDHCI_INT_DATA_TIMEOUT; -+ writel(ier, host->ioaddr + SDHCI_SIGNAL_ENABLE); -+ timeout_disabled = true; -+ udelay((ns_2clk+1000-1)/1000); -+ } else if (timeout_disabled) { -+ ier = readl(host->ioaddr + SDHCI_SIGNAL_ENABLE); -+ ier |= SDHCI_INT_DATA_TIMEOUT; -+ writel(ier, host->ioaddr + SDHCI_SIGNAL_ENABLE); -+ timeout_disabled = false; -+ udelay((ns_2clk+1000-1)/1000); -+ } -+#endif + writel(val, host->ioaddr + reg); +#else + void __iomem * regaddr = host->ioaddr + reg; @@ -27375,68 +27343,14 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv + +static unsigned int sdhci_bcm2708_get_max_clock(struct sdhci_host *host) +{ -+ return 20000000; // this value is in Hz (20MHz) ++ return 100000000; // this value is in Hz (100MHz/4) +} + +static unsigned int sdhci_bcm2708_get_timeout_clock(struct sdhci_host *host) +{ -+ if(host->clock) -+ return (host->clock / 1000); // this value is in kHz (100MHz) -+ else -+ return (sdhci_bcm2708_get_max_clock(host) / 1000); ++ return 100000; // this value is in kHz (100MHz/4) +} + -+static void sdhci_bcm2708_set_clock(struct sdhci_host *host, unsigned int clock) -+{ -+ int div = 0; -+ u16 clk = 0; -+ unsigned long timeout; -+ -+ if (clock == host->clock) -+ return; -+ -+ sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); -+ -+ if (clock == 0) -+ goto out; -+ -+ if (BCM2708_EMMC_CLOCK_FREQ <= clock) -+ div = 1; -+ else { -+ for (div = 2; div < SDHCI_MAX_DIV_SPEC_300; div += 2) { -+ if ((BCM2708_EMMC_CLOCK_FREQ / div) <= clock) -+ break; -+ } -+ } -+ -+ DBG( "desired SD clock: %d, actual: %d\n", -+ clock, BCM2708_EMMC_CLOCK_FREQ / div); -+ -+ clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT; -+ clk |= ((div & SDHCI_DIV_HI_MASK) >> SDHCI_DIV_MASK_LEN) -+ << SDHCI_DIVIDER_HI_SHIFT; -+ clk |= SDHCI_CLOCK_INT_EN; -+ -+ sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); -+ -+ timeout = 20; -+ while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) -+ & SDHCI_CLOCK_INT_STABLE)) { -+ if (timeout == 0) { -+ printk(KERN_ERR "%s: Internal clock never " -+ "stabilised.\n", mmc_hostname(host->mmc)); -+ return; -+ } -+ timeout--; -+ mdelay(1); -+ } -+ -+ clk |= SDHCI_CLOCK_CARD_EN; -+ sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); -+out: -+ host->clock = clock; -+ } -+ +/*****************************************************************************\ + * * + * DMA Operation * @@ -28324,7 +28238,7 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv +#error The BCM2708 SDHCI driver needs CONFIG_MMC_SDHCI_IO_ACCESSORS to be set +#endif + //.enable_dma = NULL, -+ .set_clock = sdhci_bcm2708_set_clock, ++ //.set_clock = NULL, + .get_max_clock = sdhci_bcm2708_get_max_clock, + //.get_min_clock = NULL, + .get_timeout_clock = sdhci_bcm2708_get_timeout_clock, @@ -28388,9 +28302,7 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv + host->irq = platform_get_irq(pdev, 0); + + host->quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | -+ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | -+ SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | -+ SDHCI_QUIRK_NONSTANDARD_CLOCK; ++ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK; +#ifdef CONFIG_MMC_SDHCI_BCM2708_DMA + host->flags = SDHCI_USE_PLATDMA; +#endif @@ -28457,8 +28369,6 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv + host_priv->cb_base, (unsigned)host_priv->cb_handle, + host_priv->dma_chan, host_priv->dma_chan_base, + host_priv->dma_irq); -+ -+ host->mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; +#endif + + ret = sdhci_add_host(host); @@ -28569,9 +28479,9 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch/driv +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:"DRIVER_NAME); + -diff -Naur linux-3.2.18/drivers/mmc/host/sdhci.c linux-3.2.18.patch/drivers/mmc/host/sdhci.c ---- linux-3.2.18/drivers/mmc/host/sdhci.c 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/mmc/host/sdhci.c 2012-05-29 22:56:49.729672929 +0200 +diff -Naur linux-3.2.19/drivers/mmc/host/sdhci.c linux-3.2.19.patch/drivers/mmc/host/sdhci.c +--- linux-3.2.19/drivers/mmc/host/sdhci.c 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/mmc/host/sdhci.c 2012-06-10 05:51:05.368411600 +0200 @@ -27,6 +27,7 @@ #include @@ -29098,20 +29008,17 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci.c linux-3.2.18.patch/drivers/mmc/ host->flags |= SDHCI_AUTO_CMD23; DBG("%s: Auto-CMD23 available\n", mmc_hostname(mmc)); } else { -@@ -2821,6 +2927,12 @@ +@@ -2821,6 +2927,9 @@ mmc->caps |= MMC_CAP_MAX_CURRENT_200; } -+ if(host->ops->voltage_broken) { -+ ocr_avail |= MMC_VDD_32_33 | MMC_VDD_33_34; -+ // Cannot support UHS modes is we are stuck at 3.3V; -+ mmc->caps &= ~(MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_DDR50); -+ } ++ if(host->ops->voltage_broken) ++ ocr_avail |= MMC_VDD_29_30 | MMC_VDD_30_31; + mmc->ocr_avail = ocr_avail; mmc->ocr_avail_sdio = ocr_avail; if (host->ocr_avail_sdio) -@@ -2953,6 +3065,7 @@ +@@ -2953,6 +3062,7 @@ pr_info("%s: SDHCI controller on %s [%s] using %s\n", mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)), @@ -29119,9 +29026,9 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci.c linux-3.2.18.patch/drivers/mmc/ (host->flags & SDHCI_USE_ADMA) ? "ADMA" : (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"); -diff -Naur linux-3.2.18/drivers/mmc/host/sdhci.h linux-3.2.18.patch/drivers/mmc/host/sdhci.h ---- linux-3.2.18/drivers/mmc/host/sdhci.h 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/mmc/host/sdhci.h 2012-05-29 22:56:49.723672815 +0200 +diff -Naur linux-3.2.19/drivers/mmc/host/sdhci.h linux-3.2.19.patch/drivers/mmc/host/sdhci.h +--- linux-3.2.19/drivers/mmc/host/sdhci.h 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/mmc/host/sdhci.h 2012-06-10 05:51:05.340411035 +0200 @@ -273,6 +273,25 @@ void (*platform_reset_enter)(struct sdhci_host *host, u8 mask); void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); @@ -29178,9 +29085,9 @@ diff -Naur linux-3.2.18/drivers/mmc/host/sdhci.h linux-3.2.18.patch/drivers/mmc/ #ifdef CONFIG_PM_RUNTIME extern int sdhci_runtime_suspend_host(struct sdhci_host *host); extern int sdhci_runtime_resume_host(struct sdhci_host *host); -diff -Naur linux-3.2.18/drivers/net/usb/smsc95xx.c linux-3.2.18.patch/drivers/net/usb/smsc95xx.c ---- linux-3.2.18/drivers/net/usb/smsc95xx.c 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/net/usb/smsc95xx.c 2012-05-29 22:56:49.713672623 +0200 +diff -Naur linux-3.2.19/drivers/net/usb/smsc95xx.c linux-3.2.19.patch/drivers/net/usb/smsc95xx.c +--- linux-3.2.19/drivers/net/usb/smsc95xx.c 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/net/usb/smsc95xx.c 2012-06-10 05:51:05.331410854 +0200 @@ -46,6 +46,7 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -29268,9 +29175,9 @@ diff -Naur linux-3.2.18/drivers/net/usb/smsc95xx.c linux-3.2.18.patch/drivers/ne return 0; } -diff -Naur linux-3.2.18/drivers/spi/Kconfig linux-3.2.18.patch/drivers/spi/Kconfig ---- linux-3.2.18/drivers/spi/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/spi/Kconfig 2012-05-29 22:56:49.734673027 +0200 +diff -Naur linux-3.2.19/drivers/spi/Kconfig linux-3.2.19.patch/drivers/spi/Kconfig +--- linux-3.2.19/drivers/spi/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/spi/Kconfig 2012-06-10 05:51:05.351411257 +0200 @@ -74,6 +74,14 @@ This selects a driver for the Atmel SPI Controller, present on many AT32 (AVR32) and AT91 (ARM) chips. @@ -29286,9 +29193,9 @@ diff -Naur linux-3.2.18/drivers/spi/Kconfig linux-3.2.18.patch/drivers/spi/Kconf config SPI_BFIN tristate "SPI controller driver for ADI Blackfin5xx" depends on BLACKFIN -diff -Naur linux-3.2.18/drivers/spi/Makefile linux-3.2.18.patch/drivers/spi/Makefile ---- linux-3.2.18/drivers/spi/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/spi/Makefile 2012-05-29 22:56:49.735673046 +0200 +diff -Naur linux-3.2.19/drivers/spi/Makefile linux-3.2.19.patch/drivers/spi/Makefile +--- linux-3.2.19/drivers/spi/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/spi/Makefile 2012-06-10 05:51:05.351411257 +0200 @@ -14,6 +14,7 @@ obj-$(CONFIG_SPI_ATMEL) += spi-atmel.o obj-$(CONFIG_SPI_ATH79) += spi-ath79.o @@ -29297,9 +29204,9 @@ diff -Naur linux-3.2.18/drivers/spi/Makefile linux-3.2.18.patch/drivers/spi/Make obj-$(CONFIG_SPI_BFIN) += spi-bfin5xx.o obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o -diff -Naur linux-3.2.18/drivers/spi/spi-bcm2708.c linux-3.2.18.patch/drivers/spi/spi-bcm2708.c ---- linux-3.2.18/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/spi/spi-bcm2708.c 2012-05-29 22:56:49.747673274 +0200 +diff -Naur linux-3.2.19/drivers/spi/spi-bcm2708.c linux-3.2.19.patch/drivers/spi/spi-bcm2708.c +--- linux-3.2.19/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/spi/spi-bcm2708.c 2012-06-10 05:51:05.363411499 +0200 @@ -0,0 +1,579 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -29880,9 +29787,9 @@ diff -Naur linux-3.2.18/drivers/spi/spi-bcm2708.c linux-3.2.18.patch/drivers/spi +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Naur linux-3.2.18/drivers/usb/core/generic.c linux-3.2.18.patch/drivers/usb/core/generic.c ---- linux-3.2.18/drivers/usb/core/generic.c 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/usb/core/generic.c 2012-05-29 22:56:49.225663265 +0200 +diff -Naur linux-3.2.19/drivers/usb/core/generic.c linux-3.2.19.patch/drivers/usb/core/generic.c +--- linux-3.2.19/drivers/usb/core/generic.c 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/usb/core/generic.c 2012-06-10 05:51:04.877401700 +0200 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -29891,9 +29798,9 @@ diff -Naur linux-3.2.18/drivers/usb/core/generic.c linux-3.2.18.patch/drivers/us } return i; } -diff -Naur linux-3.2.18/drivers/usb/core/hub.c linux-3.2.18.patch/drivers/usb/core/hub.c ---- linux-3.2.18/drivers/usb/core/hub.c 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/usb/core/hub.c 2012-05-29 22:56:49.227663303 +0200 +diff -Naur linux-3.2.19/drivers/usb/core/hub.c linux-3.2.19.patch/drivers/usb/core/hub.c +--- linux-3.2.19/drivers/usb/core/hub.c 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/usb/core/hub.c 2012-06-10 05:51:04.879401740 +0200 @@ -1075,6 +1075,8 @@ INIT_WORK(&hub->tt.clear_work, hub_tt_work); switch (hdev->descriptor.bDeviceProtocol) { @@ -29972,7 +29879,7 @@ diff -Naur linux-3.2.18/drivers/usb/core/hub.c linux-3.2.18.patch/drivers/usb/co goto fail; } fail: -@@ -2977,7 +3007,9 @@ +@@ -2981,7 +3011,9 @@ buf->bMaxPacketSize0 = 0; r = usb_control_msg(udev, usb_rcvaddr0pipe(), USB_REQ_GET_DESCRIPTOR, USB_DIR_IN, @@ -29983,7 +29890,7 @@ diff -Naur linux-3.2.18/drivers/usb/core/hub.c linux-3.2.18.patch/drivers/usb/co buf, GET_DESCRIPTOR_BUFSIZE, initial_descriptor_timeout); switch (buf->bMaxPacketSize0) { -@@ -3423,8 +3455,10 @@ +@@ -3427,8 +3459,10 @@ release_devnum(udev); hub_free_dev(udev); usb_put_dev(udev); @@ -29996,9 +29903,9 @@ diff -Naur linux-3.2.18/drivers/usb/core/hub.c linux-3.2.18.patch/drivers/usb/co } if (hub->hdev->parent || !hcd->driver->port_handed_over || -diff -Naur linux-3.2.18/drivers/usb/core/message.c linux-3.2.18.patch/drivers/usb/core/message.c ---- linux-3.2.18/drivers/usb/core/message.c 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/usb/core/message.c 2012-05-29 22:56:49.229663341 +0200 +diff -Naur linux-3.2.19/drivers/usb/core/message.c linux-3.2.19.patch/drivers/usb/core/message.c +--- linux-3.2.19/drivers/usb/core/message.c 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/usb/core/message.c 2012-06-10 05:51:04.880401760 +0200 @@ -1837,6 +1837,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -30085,9 +29992,9 @@ diff -Naur linux-3.2.18/drivers/usb/core/message.c linux-3.2.18.patch/drivers/us /* Now that all the interfaces are set up, register them * to trigger binding of drivers to interfaces. probe() -diff -Naur linux-3.2.18/drivers/usb/core/otg_whitelist.h linux-3.2.18.patch/drivers/usb/core/otg_whitelist.h ---- linux-3.2.18/drivers/usb/core/otg_whitelist.h 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/usb/core/otg_whitelist.h 2012-05-29 22:56:49.229663341 +0200 +diff -Naur linux-3.2.19/drivers/usb/core/otg_whitelist.h linux-3.2.19.patch/drivers/usb/core/otg_whitelist.h +--- linux-3.2.19/drivers/usb/core/otg_whitelist.h 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/usb/core/otg_whitelist.h 2012-06-10 05:51:04.881401780 +0200 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -30303,9 +30210,9 @@ diff -Naur linux-3.2.18/drivers/usb/core/otg_whitelist.h linux-3.2.18.patch/driv #endif } -diff -Naur linux-3.2.18/drivers/usb/gadget/file_storage.c linux-3.2.18.patch/drivers/usb/gadget/file_storage.c ---- linux-3.2.18/drivers/usb/gadget/file_storage.c 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/usb/gadget/file_storage.c 2012-05-29 22:56:49.232663398 +0200 +diff -Naur linux-3.2.19/drivers/usb/gadget/file_storage.c linux-3.2.19.patch/drivers/usb/gadget/file_storage.c +--- linux-3.2.19/drivers/usb/gadget/file_storage.c 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/usb/gadget/file_storage.c 2012-06-10 05:51:04.884401840 +0200 @@ -573,8 +573,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -30433,9 +30340,9 @@ diff -Naur linux-3.2.18/drivers/usb/gadget/file_storage.c linux-3.2.18.patch/dri /* Allocate the request and buffer for endpoint 0 */ fsg->ep0req = req = usb_ep_alloc_request(fsg->ep0, GFP_KERNEL); if (!req) -diff -Naur linux-3.2.18/drivers/usb/gadget/Kconfig linux-3.2.18.patch/drivers/usb/gadget/Kconfig ---- linux-3.2.18/drivers/usb/gadget/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/usb/gadget/Kconfig 2012-05-29 22:56:49.605670552 +0200 +diff -Naur linux-3.2.19/drivers/usb/gadget/Kconfig linux-3.2.19.patch/drivers/usb/gadget/Kconfig +--- linux-3.2.19/drivers/usb/gadget/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/usb/gadget/Kconfig 2012-06-10 05:51:05.261409443 +0200 @@ -552,6 +552,12 @@ depends on USB_GADGET depends on USB_GADGET_DUALSPEED @@ -30449,9 +30356,9 @@ diff -Naur linux-3.2.18/drivers/usb/gadget/Kconfig linux-3.2.18.patch/drivers/us # # USB Gadget Drivers # -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_cc.c ---- linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-05-29 22:56:49.264664013 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_cc.c +--- linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-06-10 05:51:04.887401901 +0200 @@ -0,0 +1,506 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.c $ @@ -30959,9 +30866,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.2.18.p + + return retval; +} -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_cc.h ---- linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-05-29 22:56:49.264664013 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_cc.h +--- linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-06-10 05:51:04.888401922 +0200 @@ -0,0 +1,209 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_cc.h $ @@ -31172,9 +31079,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.2.18.p + +#endif /* _DWC_CC_H_ */ + -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c ---- linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-05-29 22:56:49.609670628 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c +--- linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-06-10 05:51:05.264409503 +0200 @@ -0,0 +1,1138 @@ +#include "dwc_cc.h" +#include "dwc_notifier.h" @@ -32314,9 +32221,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_common_linux.c linu + DWC_WAITQ_TRIGGER(wq); +} +EXPORT_SYMBOL(DWC_WAITQ_ABORT); -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_list.h ---- linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_list.h 2012-05-29 22:56:49.270664127 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_list.h +--- linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_list.h 2012-06-10 05:51:04.893402022 +0200 @@ -0,0 +1,616 @@ +/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ +/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ @@ -32934,9 +32841,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.2.18 +} while (0) + +#endif /* !_SYS_QUEUE_H_ */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_mem.c ---- linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-05-29 22:56:49.270664127 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_mem.c +--- linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-06-10 05:51:04.893402022 +0200 @@ -0,0 +1,172 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -33110,9 +33017,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.2.18. +} + +#endif /* DEBUG_MEMORY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c ---- linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-05-29 22:56:49.272664166 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c +--- linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-06-10 05:51:04.895402062 +0200 @@ -0,0 +1,256 @@ +#include "dwc_notifier.h" +#include "dwc_list.h" @@ -33370,9 +33277,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3. + } +} + -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h ---- linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-05-29 22:56:49.273664186 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h +--- linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-06-10 05:51:04.933402829 +0200 @@ -0,0 +1,112 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -33486,9 +33393,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3. +void dwc_notify(dwc_notifier_t *notifier, char *notification, void *notification_data); + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_os.h ---- linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/dwc_os.h 2012-05-29 22:56:49.520668921 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_os.h +--- linux-3.2.19/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/dwc_os.h 2012-06-10 05:51:05.210408414 +0200 @@ -0,0 +1,925 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port/dwc_os.h $ @@ -34415,9 +34322,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.2.18.p + * threading should be able to be implemented with the defined behavior. + * + */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/Makefile linux-3.2.18.patch/drivers/usb/host/dwc_common_port/Makefile ---- linux-3.2.18/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/Makefile 2012-05-29 22:56:49.608670609 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/Makefile linux-3.2.19.patch/drivers/usb/host/dwc_common_port/Makefile +--- linux-3.2.19/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/Makefile 2012-06-10 05:51:05.264409503 +0200 @@ -0,0 +1,46 @@ +# +# Makefile for DWC_common library @@ -34465,9 +34372,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/Makefile linux-3.2.18.p +clean: + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.2.18.patch/drivers/usb/host/dwc_common_port/Makefile.linux ---- linux-3.2.18/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/Makefile.linux 2012-05-29 22:56:49.257663878 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.2.19.patch/drivers/usb/host/dwc_common_port/Makefile.linux +--- linux-3.2.19/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/Makefile.linux 2012-06-10 05:51:04.886401880 +0200 @@ -0,0 +1,36 @@ +# +# Makefile for DWC_common library @@ -34505,9 +34412,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/Makefile.linux linux-3. +clean: + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + -diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/usb.h linux-3.2.18.patch/drivers/usb/host/dwc_common_port/usb.h ---- linux-3.2.18/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_common_port/usb.h 2012-05-29 22:56:49.276664243 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_common_port/usb.h linux-3.2.19.patch/drivers/usb/host/dwc_common_port/usb.h +--- linux-3.2.19/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_common_port/usb.h 2012-06-10 05:51:04.944403050 +0200 @@ -0,0 +1,850 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35359,9 +35266,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_common_port/usb.h linux-3.2.18.patc + + +#endif /* _USB_H_ */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dummy_audio.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dummy_audio.c 2012-05-29 22:56:49.280664319 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dummy_audio.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dummy_audio.c 2012-06-10 05:51:04.950403172 +0200 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -36938,9 +36845,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.2.18.patc + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-05-29 22:56:49.281664338 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-06-10 05:51:04.950403172 +0200 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -37084,9 +36991,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.2.18.p +typedef struct cfi_string cfi_string_t; + +#endif -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-05-29 22:56:49.283664376 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-06-10 05:51:04.952403212 +0200 @@ -0,0 +1,1316 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -38404,9 +38311,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.2.18.pat + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-05-29 22:56:49.284664396 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-06-10 05:51:04.953403232 +0200 @@ -0,0 +1,88 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -38496,9 +38403,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.2.18.pat +#endif + ); +#endif -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-05-29 22:56:49.286664436 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-06-10 05:51:04.955403272 +0200 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -40376,9 +40283,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.2.18.patc +} + +#endif //DWC_UTE_CFI -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-05-29 22:56:49.287664455 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-06-10 05:51:04.956403292 +0200 @@ -0,0 +1,319 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -40699,9 +40606,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.2.18.patc +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-05-29 22:56:49.295664607 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-06-10 05:51:04.975403676 +0200 @@ -0,0 +1,5410 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -46113,9 +46020,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.2.18.patc +{ + return dwc_read_reg32(&core_if->core_global_regs->hptxfsiz); +} -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-05-29 22:56:49.297664645 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-06-10 05:51:04.977403717 +0200 @@ -0,0 +1,1143 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -47260,9 +47167,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.2.18.patc + void *_p); + +#endif -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-05-29 22:56:49.298664664 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-06-10 05:51:04.979403757 +0200 @@ -0,0 +1,846 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -48110,9 +48017,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.2.18 + } + return retval; +} -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-05-29 22:56:49.300664702 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-06-10 05:51:04.980403777 +0200 @@ -0,0 +1,641 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -48755,9 +48662,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.2.18. +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-05-29 22:56:49.300664702 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-06-10 05:51:04.980403777 +0200 @@ -0,0 +1,113 @@ +/* ========================================================================== + * @@ -48872,9 +48779,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.2.18.patc + +#endif /*DEBUG*/ +#endif -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-05-29 22:56:49.303664762 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-06-10 05:51:04.983403837 +0200 @@ -0,0 +1,1577 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -50453,9 +50360,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.2.18.p + + +*/ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-05-29 22:56:49.303664762 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-06-10 05:51:04.983403837 +0200 @@ -0,0 +1,101 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -50558,9 +50465,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.2.18.p +#endif + +#endif -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-05-29 22:56:49.598670417 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-06-10 05:51:05.253409281 +0200 @@ -0,0 +1,3334 @@ + +/* ========================================================================== @@ -53896,9 +53803,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.2.18.patc +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-05-29 22:56:49.311664914 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-06-10 05:51:04.991403998 +0200 @@ -0,0 +1,1106 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -55006,9 +54913,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.2.18 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-05-29 22:56:49.672671836 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-06-10 05:51:05.283409886 +0200 @@ -0,0 +1,804 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -55814,9 +55721,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.2.18.patc +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-05-29 22:56:49.312664933 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-06-10 05:51:04.992404018 +0200 @@ -0,0 +1,393 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -56211,9 +56118,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.2.18.p + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-05-29 22:56:49.315664990 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-06-10 05:51:04.995404078 +0200 @@ -0,0 +1,2065 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -58280,9 +58187,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.2.18 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-05-29 22:56:49.724672834 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-06-10 05:51:05.340411035 +0200 @@ -0,0 +1,848 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_linux.c $ @@ -59132,9 +59039,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.2.1 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-05-29 22:56:49.317665028 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-06-10 05:51:04.998404140 +0200 @@ -0,0 +1,732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -59868,9 +59775,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.2.1 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-05-29 22:56:49.320665088 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-06-10 05:51:05.001404200 +0200 @@ -0,0 +1,2067 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -61939,9 +61846,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.2.18.patc +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-05-29 22:56:49.321665107 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-06-10 05:51:05.001404200 +0200 @@ -0,0 +1,216 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -62159,9 +62066,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.2.18.patc +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-05-29 22:56:49.321665107 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-06-10 05:51:05.002404220 +0200 @@ -0,0 +1,333 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -62496,9 +62403,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.2.18.p +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-05-29 22:56:49.327665221 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-06-10 05:51:05.008404340 +0200 @@ -0,0 +1,4077 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -66577,9 +66484,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.2.18 +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-05-29 22:56:49.329665259 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-06-10 05:51:05.010404382 +0200 @@ -0,0 +1,1288 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -67869,9 +67776,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.2.1 +EXPORT_SYMBOL(usb_gadget_unregister_driver); + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h ---- linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-05-29 22:56:49.332665316 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h +--- linux-3.2.19/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-06-10 05:51:05.013404442 +0200 @@ -0,0 +1,2237 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -70110,9 +70017,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.2.18.pat +} pcgcctl_data_t; + +#endif -diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/Makefile linux-3.2.18.patch/drivers/usb/host/dwc_otg/Makefile ---- linux-3.2.18/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/usb/host/dwc_otg/Makefile 2012-05-29 22:56:49.520668921 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/dwc_otg/Makefile linux-3.2.19.patch/drivers/usb/host/dwc_otg/Makefile +--- linux-3.2.19/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/usb/host/dwc_otg/Makefile 2012-06-10 05:51:05.211408434 +0200 @@ -0,0 +1,80 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -70194,9 +70101,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/dwc_otg/Makefile linux-3.2.18.patch/dri + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions + +endif -diff -Naur linux-3.2.18/drivers/usb/host/Kconfig linux-3.2.18.patch/drivers/usb/host/Kconfig ---- linux-3.2.18/drivers/usb/host/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/usb/host/Kconfig 2012-05-29 22:56:49.233663418 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/Kconfig linux-3.2.19.patch/drivers/usb/host/Kconfig +--- linux-3.2.19/drivers/usb/host/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/usb/host/Kconfig 2012-06-10 05:51:04.885401860 +0200 @@ -556,6 +556,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -70217,9 +70124,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/Kconfig linux-3.2.18.patch/drivers/usb/ config USB_IMX21_HCD tristate "i.MX21 HCD support" depends on USB && ARM && ARCH_MXC -diff -Naur linux-3.2.18/drivers/usb/host/Makefile linux-3.2.18.patch/drivers/usb/host/Makefile ---- linux-3.2.18/drivers/usb/host/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/usb/host/Makefile 2012-05-29 22:56:49.233663418 +0200 +diff -Naur linux-3.2.19/drivers/usb/host/Makefile linux-3.2.19.patch/drivers/usb/host/Makefile +--- linux-3.2.19/drivers/usb/host/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/usb/host/Makefile 2012-06-10 05:51:04.885401860 +0200 @@ -33,6 +33,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -70229,9 +70136,9 @@ diff -Naur linux-3.2.18/drivers/usb/host/Makefile linux-3.2.18.patch/drivers/usb obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o -diff -Naur linux-3.2.18/drivers/usb/Makefile linux-3.2.18.patch/drivers/usb/Makefile ---- linux-3.2.18/drivers/usb/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/usb/Makefile 2012-05-29 22:56:49.225663265 +0200 +diff -Naur linux-3.2.19/drivers/usb/Makefile linux-3.2.19.patch/drivers/usb/Makefile +--- linux-3.2.19/drivers/usb/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/usb/Makefile 2012-06-10 05:51:04.876401680 +0200 @@ -23,6 +23,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -70240,9 +70147,9 @@ diff -Naur linux-3.2.18/drivers/usb/Makefile linux-3.2.18.patch/drivers/usb/Make obj-$(CONFIG_USB_IMX21_HCD) += host/ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ -diff -Naur linux-3.2.18/drivers/video/bcm2708_fb.c linux-3.2.18.patch/drivers/video/bcm2708_fb.c ---- linux-3.2.18/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/video/bcm2708_fb.c 2012-05-29 22:56:49.726672872 +0200 +diff -Naur linux-3.2.19/drivers/video/bcm2708_fb.c linux-3.2.19.patch/drivers/video/bcm2708_fb.c +--- linux-3.2.19/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/video/bcm2708_fb.c 2012-06-10 05:51:05.342411075 +0200 @@ -0,0 +1,473 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -70717,9 +70624,9 @@ diff -Naur linux-3.2.18/drivers/video/bcm2708_fb.c linux-3.2.18.patch/drivers/vi +MODULE_PARM_DESC(fbwidth, "Width of ARM Framebuffer"); +MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer"); +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); -diff -Naur linux-3.2.18/drivers/video/Kconfig linux-3.2.18.patch/drivers/video/Kconfig ---- linux-3.2.18/drivers/video/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/video/Kconfig 2012-05-29 22:56:49.405666718 +0200 +diff -Naur linux-3.2.19/drivers/video/Kconfig linux-3.2.19.patch/drivers/video/Kconfig +--- linux-3.2.19/drivers/video/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/video/Kconfig 2012-06-10 05:51:05.121406620 +0200 @@ -312,6 +312,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -70741,9 +70648,9 @@ diff -Naur linux-3.2.18/drivers/video/Kconfig linux-3.2.18.patch/drivers/video/K config FB_ARMCLCD tristate "ARM PrimeCell PL110 support" depends on FB && ARM && ARM_AMBA -diff -Naur linux-3.2.18/drivers/video/logo/logo_linux_clut224.ppm linux-3.2.18.patch/drivers/video/logo/logo_linux_clut224.ppm ---- linux-3.2.18/drivers/video/logo/logo_linux_clut224.ppm 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/video/logo/logo_linux_clut224.ppm 2012-05-29 22:56:49.412666851 +0200 +diff -Naur linux-3.2.19/drivers/video/logo/logo_linux_clut224.ppm linux-3.2.19.patch/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.2.19/drivers/video/logo/logo_linux_clut224.ppm 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/video/logo/logo_linux_clut224.ppm 2012-06-10 05:51:05.127406740 +0200 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -73230,9 +73137,9 @@ diff -Naur linux-3.2.18/drivers/video/logo/logo_linux_clut224.ppm linux-3.2.18.p +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 -diff -Naur linux-3.2.18/drivers/video/Makefile linux-3.2.18.patch/drivers/video/Makefile ---- linux-3.2.18/drivers/video/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/video/Makefile 2012-05-29 22:56:49.406666737 +0200 +diff -Naur linux-3.2.19/drivers/video/Makefile linux-3.2.19.patch/drivers/video/Makefile +--- linux-3.2.19/drivers/video/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/video/Makefile 2012-06-10 05:51:05.121406620 +0200 @@ -96,6 +96,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -73241,9 +73148,9 @@ diff -Naur linux-3.2.18/drivers/video/Makefile linux-3.2.18.patch/drivers/video/ obj-$(CONFIG_FB_68328) += 68328fb.o obj-$(CONFIG_FB_GBE) += gbefb.o obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o -diff -Naur linux-3.2.18/drivers/watchdog/bcm2708_wdog.c linux-3.2.18.patch/drivers/watchdog/bcm2708_wdog.c ---- linux-3.2.18/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/drivers/watchdog/bcm2708_wdog.c 2012-05-29 22:56:49.404666698 +0200 +diff -Naur linux-3.2.19/drivers/watchdog/bcm2708_wdog.c linux-3.2.19.patch/drivers/watchdog/bcm2708_wdog.c +--- linux-3.2.19/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/drivers/watchdog/bcm2708_wdog.c 2012-06-10 05:51:05.119406580 +0200 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -73630,9 +73537,9 @@ diff -Naur linux-3.2.18/drivers/watchdog/bcm2708_wdog.c linux-3.2.18.patch/drive +MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_LICENSE("GPL"); + -diff -Naur linux-3.2.18/drivers/watchdog/Kconfig linux-3.2.18.patch/drivers/watchdog/Kconfig ---- linux-3.2.18/drivers/watchdog/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/watchdog/Kconfig 2012-05-29 22:56:49.402666658 +0200 +diff -Naur linux-3.2.19/drivers/watchdog/Kconfig linux-3.2.19.patch/drivers/watchdog/Kconfig +--- linux-3.2.19/drivers/watchdog/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/watchdog/Kconfig 2012-06-10 05:51:05.111406415 +0200 @@ -343,6 +343,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -73646,9 +73553,9 @@ diff -Naur linux-3.2.18/drivers/watchdog/Kconfig linux-3.2.18.patch/drivers/watc # AVR32 Architecture config AT32AP700X_WDT -diff -Naur linux-3.2.18/drivers/watchdog/Makefile linux-3.2.18.patch/drivers/watchdog/Makefile ---- linux-3.2.18/drivers/watchdog/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/drivers/watchdog/Makefile 2012-05-29 22:56:49.403666678 +0200 +diff -Naur linux-3.2.19/drivers/watchdog/Makefile linux-3.2.19.patch/drivers/watchdog/Makefile +--- linux-3.2.19/drivers/watchdog/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/drivers/watchdog/Makefile 2012-06-10 05:51:05.112406435 +0200 @@ -53,6 +53,7 @@ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -73657,9 +73564,9 @@ diff -Naur linux-3.2.18/drivers/watchdog/Makefile linux-3.2.18.patch/drivers/wat # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o -diff -Naur linux-3.2.18/include/linux/mmc/sdhci.h linux-3.2.18.patch/include/linux/mmc/sdhci.h ---- linux-3.2.18/include/linux/mmc/sdhci.h 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/include/linux/mmc/sdhci.h 2012-05-29 22:56:49.401666639 +0200 +diff -Naur linux-3.2.19/include/linux/mmc/sdhci.h linux-3.2.19.patch/include/linux/mmc/sdhci.h +--- linux-3.2.19/include/linux/mmc/sdhci.h 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/include/linux/mmc/sdhci.h 2012-06-10 05:51:05.071405611 +0200 @@ -121,6 +121,7 @@ #define SDHCI_AUTO_CMD23 (1<<7) /* Auto CMD23 support */ #define SDHCI_PV_ENABLED (1<<8) /* Preset value enabled */ @@ -73676,9 +73583,9 @@ diff -Naur linux-3.2.18/include/linux/mmc/sdhci.h linux-3.2.18.patch/include/lin struct mmc_data *data; /* Current data request */ unsigned int data_early:1; /* Data finished before cmd */ -diff -Naur linux-3.2.18/sound/arm/bcm2835.c linux-3.2.18.patch/sound/arm/bcm2835.c ---- linux-3.2.18/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/sound/arm/bcm2835.c 2012-05-29 22:56:49.714672642 +0200 +diff -Naur linux-3.2.19/sound/arm/bcm2835.c linux-3.2.19.patch/sound/arm/bcm2835.c +--- linux-3.2.19/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/sound/arm/bcm2835.c 2012-06-10 05:51:05.332410874 +0200 @@ -0,0 +1,424 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -74104,9 +74011,9 @@ diff -Naur linux-3.2.18/sound/arm/bcm2835.c linux-3.2.18.patch/sound/arm/bcm2835 +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2835_alsa"); -diff -Naur linux-3.2.18/sound/arm/bcm2835-ctl.c linux-3.2.18.patch/sound/arm/bcm2835-ctl.c ---- linux-3.2.18/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/sound/arm/bcm2835-ctl.c 2012-05-29 22:56:49.584670149 +0200 +diff -Naur linux-3.2.19/sound/arm/bcm2835-ctl.c linux-3.2.19.patch/sound/arm/bcm2835-ctl.c +--- linux-3.2.19/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/sound/arm/bcm2835-ctl.c 2012-06-10 05:51:05.240409019 +0200 @@ -0,0 +1,172 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -74280,9 +74187,9 @@ diff -Naur linux-3.2.18/sound/arm/bcm2835-ctl.c linux-3.2.18.patch/sound/arm/bcm + } + return 0; +} -diff -Naur linux-3.2.18/sound/arm/bcm2835.h linux-3.2.18.patch/sound/arm/bcm2835.h ---- linux-3.2.18/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/sound/arm/bcm2835.h 2012-05-29 22:56:49.593670322 +0200 +diff -Naur linux-3.2.19/sound/arm/bcm2835.h linux-3.2.19.patch/sound/arm/bcm2835.h +--- linux-3.2.19/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/sound/arm/bcm2835.h 2012-06-10 05:51:05.249409200 +0200 @@ -0,0 +1,242 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -74526,9 +74433,9 @@ diff -Naur linux-3.2.18/sound/arm/bcm2835.h linux-3.2.18.patch/sound/arm/bcm2835 +void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream); + +#endif /* __SOUND_ARM_BCM2835_H */ -diff -Naur linux-3.2.18/sound/arm/bcm2835-pcm.c linux-3.2.18.patch/sound/arm/bcm2835-pcm.c ---- linux-3.2.18/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/sound/arm/bcm2835-pcm.c 2012-05-29 22:56:49.592670302 +0200 +diff -Naur linux-3.2.19/sound/arm/bcm2835-pcm.c linux-3.2.19.patch/sound/arm/bcm2835-pcm.c +--- linux-3.2.19/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/sound/arm/bcm2835-pcm.c 2012-06-10 05:51:05.247409160 +0200 @@ -0,0 +1,424 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -74954,9 +74861,9 @@ diff -Naur linux-3.2.18/sound/arm/bcm2835-pcm.c linux-3.2.18.patch/sound/arm/bcm + + return 0; +} -diff -Naur linux-3.2.18/sound/arm/bcm2835-vchiq.c linux-3.2.18.patch/sound/arm/bcm2835-vchiq.c ---- linux-3.2.18/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/sound/arm/bcm2835-vchiq.c 2012-05-29 22:56:49.595670360 +0200 +diff -Naur linux-3.2.19/sound/arm/bcm2835-vchiq.c linux-3.2.19.patch/sound/arm/bcm2835-vchiq.c +--- linux-3.2.19/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/sound/arm/bcm2835-vchiq.c 2012-06-10 05:51:05.250409220 +0200 @@ -0,0 +1,818 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -75776,9 +75683,9 @@ diff -Naur linux-3.2.18/sound/arm/bcm2835-vchiq.c linux-3.2.18.patch/sound/arm/b + atomic_sub(count, &alsa_stream->retrieved); + return count; +} -diff -Naur linux-3.2.18/sound/arm/Kconfig linux-3.2.18.patch/sound/arm/Kconfig ---- linux-3.2.18/sound/arm/Kconfig 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/sound/arm/Kconfig 2012-05-29 22:56:49.569669862 +0200 +diff -Naur linux-3.2.19/sound/arm/Kconfig linux-3.2.19.patch/sound/arm/Kconfig +--- linux-3.2.19/sound/arm/Kconfig 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/sound/arm/Kconfig 2012-06-10 05:51:05.233408878 +0200 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -75792,9 +75699,9 @@ diff -Naur linux-3.2.18/sound/arm/Kconfig linux-3.2.18.patch/sound/arm/Kconfig + endif # SND_ARM -diff -Naur linux-3.2.18/sound/arm/Makefile linux-3.2.18.patch/sound/arm/Makefile ---- linux-3.2.18/sound/arm/Makefile 2012-05-20 23:56:54.000000000 +0200 -+++ linux-3.2.18.patch/sound/arm/Makefile 2012-05-29 22:56:49.726672872 +0200 +diff -Naur linux-3.2.19/sound/arm/Makefile linux-3.2.19.patch/sound/arm/Makefile +--- linux-3.2.19/sound/arm/Makefile 2012-05-31 01:44:12.000000000 +0200 ++++ linux-3.2.19.patch/sound/arm/Makefile 2012-06-10 05:51:05.342411075 +0200 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -75805,9 +75712,9 @@ diff -Naur linux-3.2.18/sound/arm/Makefile linux-3.2.18.patch/sound/arm/Makefile + +EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 + -diff -Naur linux-3.2.18/sound/arm/vc_vchi_audioserv_defs.h linux-3.2.18.patch/sound/arm/vc_vchi_audioserv_defs.h ---- linux-3.2.18/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.2.18.patch/sound/arm/vc_vchi_audioserv_defs.h 2012-05-29 22:56:49.591670283 +0200 +diff -Naur linux-3.2.19/sound/arm/vc_vchi_audioserv_defs.h linux-3.2.19.patch/sound/arm/vc_vchi_audioserv_defs.h +--- linux-3.2.19/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.2.19.patch/sound/arm/vc_vchi_audioserv_defs.h 2012-06-10 05:51:05.246409140 +0200 @@ -0,0 +1,112 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. diff --git a/packages/linux/patches/linux-3.2.19-602-RPi_support_fixes-0.1.patch b/packages/linux/patches/linux-3.2.19-602-RPi_support_fixes-0.1.patch deleted file mode 100644 index 93e53b4a46..0000000000 --- a/packages/linux/patches/linux-3.2.19-602-RPi_support_fixes-0.1.patch +++ /dev/null @@ -1,191 +0,0 @@ -diff -Naur linux-3.2.18.patch/arch/arm/mach-bcm2708/power.c linux-3.2.18.patch1/arch/arm/mach-bcm2708/power.c -diff -Naur linux-3.2.18.patch/arch/arm/mach-bcm2708/power.c.orig linux-3.2.18.patch1/arch/arm/mach-bcm2708/power.c.orig -diff -Naur linux-3.2.18.patch/arch/arm/mach-bcm2708/power.c.rej linux-3.2.18.patch1/arch/arm/mach-bcm2708/power.c.rej -diff -Naur linux-3.2.18.patch/drivers/mmc/host/sdhci-bcm2708.c linux-3.2.18.patch1/drivers/mmc/host/sdhci-bcm2708.c ---- linux-3.2.18.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-05-29 22:56:49.727672891 +0200 -+++ linux-3.2.18.patch1/drivers/mmc/host/sdhci-bcm2708.c 2012-05-30 01:47:10.213442208 +0200 -@@ -26,9 +26,7 @@ - #include - #include - #include --#include - #include --#include - - #include - #include -@@ -73,9 +71,6 @@ - - #define BCM2708_SDHCI_SLEEP_TIMEOUT 1000 /* msecs */ - --/* Mhz clock that the EMMC core is running at. Should match the platform clockman settings */ --#define BCM2708_EMMC_CLOCK_FREQ 80000000 -- - #define POWER_OFF 0 - #define POWER_LAZY_OFF 1 - #define POWER_ON 2 -@@ -233,9 +228,6 @@ - u32 ier; - - #if USE_SPACED_WRITES_2CLK -- static bool timeout_disabled = false; -- unsigned int ns_2clk = 0; -- - /* The Arasan has a bugette whereby it may lose the content of - * successive writes to registers that are within two SD-card clock - * cycles of each other (a clock domain crossing problem). -@@ -247,7 +239,7 @@ - /* host->clock is the clock freq in Hz */ - static hptime_t last_write_hpt; - hptime_t now = hptime(); -- ns_2clk = 2000000000/host->clock; -+ unsigned int ns_2clk = 2000000000/host->clock; - - if (now == last_write_hpt || now == last_write_hpt+1) { - /* we can't guarantee any significant time has -@@ -263,27 +255,6 @@ - } - last_write_hpt = now; - } --#if USE_SOFTWARE_TIMEOUTS -- /* The Arasan is clocked for timeouts using the SD clock which is too -- * fast for ERASE commands and causes issues. So we disable timeouts -- * for ERASE */ -- if (host->cmd != NULL && host->cmd->opcode == MMC_ERASE && -- reg == (SDHCI_COMMAND & ~3)) { -- mod_timer(&host->timer, -- jiffies + SOFTWARE_ERASE_TIMEOUT_SEC * HZ); -- ier = readl(host->ioaddr + SDHCI_SIGNAL_ENABLE); -- ier &= ~SDHCI_INT_DATA_TIMEOUT; -- writel(ier, host->ioaddr + SDHCI_SIGNAL_ENABLE); -- timeout_disabled = true; -- udelay((ns_2clk+1000-1)/1000); -- } else if (timeout_disabled) { -- ier = readl(host->ioaddr + SDHCI_SIGNAL_ENABLE); -- ier |= SDHCI_INT_DATA_TIMEOUT; -- writel(ier, host->ioaddr + SDHCI_SIGNAL_ENABLE); -- timeout_disabled = false; -- udelay((ns_2clk+1000-1)/1000); -- } --#endif - writel(val, host->ioaddr + reg); - #else - void __iomem * regaddr = host->ioaddr + reg; -@@ -359,68 +330,14 @@ - - static unsigned int sdhci_bcm2708_get_max_clock(struct sdhci_host *host) - { -- return 20000000; // this value is in Hz (20MHz) -+ return 100000000; // this value is in Hz (100MHz/4) - } - - static unsigned int sdhci_bcm2708_get_timeout_clock(struct sdhci_host *host) - { -- if(host->clock) -- return (host->clock / 1000); // this value is in kHz (100MHz) -- else -- return (sdhci_bcm2708_get_max_clock(host) / 1000); -+ return 100000; // this value is in kHz (100MHz/4) - } - --static void sdhci_bcm2708_set_clock(struct sdhci_host *host, unsigned int clock) --{ -- int div = 0; -- u16 clk = 0; -- unsigned long timeout; -- -- if (clock == host->clock) -- return; -- -- sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); -- -- if (clock == 0) -- goto out; -- -- if (BCM2708_EMMC_CLOCK_FREQ <= clock) -- div = 1; -- else { -- for (div = 2; div < SDHCI_MAX_DIV_SPEC_300; div += 2) { -- if ((BCM2708_EMMC_CLOCK_FREQ / div) <= clock) -- break; -- } -- } -- -- DBG( "desired SD clock: %d, actual: %d\n", -- clock, BCM2708_EMMC_CLOCK_FREQ / div); -- -- clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT; -- clk |= ((div & SDHCI_DIV_HI_MASK) >> SDHCI_DIV_MASK_LEN) -- << SDHCI_DIVIDER_HI_SHIFT; -- clk |= SDHCI_CLOCK_INT_EN; -- -- sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); -- -- timeout = 20; -- while (!((clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL)) -- & SDHCI_CLOCK_INT_STABLE)) { -- if (timeout == 0) { -- printk(KERN_ERR "%s: Internal clock never " -- "stabilised.\n", mmc_hostname(host->mmc)); -- return; -- } -- timeout--; -- mdelay(1); -- } -- -- clk |= SDHCI_CLOCK_CARD_EN; -- sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); --out: -- host->clock = clock; -- } -- - /*****************************************************************************\ - * * - * DMA Operation * -@@ -1308,7 +1225,7 @@ - #error The BCM2708 SDHCI driver needs CONFIG_MMC_SDHCI_IO_ACCESSORS to be set - #endif - //.enable_dma = NULL, -- .set_clock = sdhci_bcm2708_set_clock, -+ //.set_clock = NULL, - .get_max_clock = sdhci_bcm2708_get_max_clock, - //.get_min_clock = NULL, - .get_timeout_clock = sdhci_bcm2708_get_timeout_clock, -@@ -1372,9 +1289,7 @@ - host->irq = platform_get_irq(pdev, 0); - - host->quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | -- SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | -- SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | -- SDHCI_QUIRK_NONSTANDARD_CLOCK; -+ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK; - #ifdef CONFIG_MMC_SDHCI_BCM2708_DMA - host->flags = SDHCI_USE_PLATDMA; - #endif -@@ -1441,8 +1356,6 @@ - host_priv->cb_base, (unsigned)host_priv->cb_handle, - host_priv->dma_chan, host_priv->dma_chan_base, - host_priv->dma_irq); -- -- host->mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; - #endif - - ret = sdhci_add_host(host); -diff -Naur linux-3.2.18.patch/drivers/mmc/host/sdhci.c linux-3.2.18.patch1/drivers/mmc/host/sdhci.c ---- linux-3.2.18.patch/drivers/mmc/host/sdhci.c 2012-05-29 22:56:49.729672929 +0200 -+++ linux-3.2.18.patch1/drivers/mmc/host/sdhci.c 2012-05-30 01:39:05.363004871 +0200 -@@ -2927,11 +2927,8 @@ - mmc->caps |= MMC_CAP_MAX_CURRENT_200; - } - -- if(host->ops->voltage_broken) { -- ocr_avail |= MMC_VDD_32_33 | MMC_VDD_33_34; -- // Cannot support UHS modes is we are stuck at 3.3V; -- mmc->caps &= ~(MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_DDR50); -- } -+ if(host->ops->voltage_broken) -+ ocr_avail |= MMC_VDD_29_30 | MMC_VDD_30_31; - - mmc->ocr_avail = ocr_avail; - mmc->ocr_avail_sdio = ocr_avail; -diff -Naur linux-3.2.18.patch/drivers/mmc/host/sdhci.c.orig linux-3.2.18.patch1/drivers/mmc/host/sdhci.c.orig