From f8fe6a6ef7b89db9d0994228fd936f1092ce37c5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Dec 2012 21:13:38 +0100 Subject: [PATCH 1/3] linux: update RPi support patch Signed-off-by: Stephan Raue --- ...inux-3.6.11-601-RPi_support-197d15b.patch} | 2758 ++++++++++------- 1 file changed, 1583 insertions(+), 1175 deletions(-) rename packages/linux/patches/{linux-3.6.11-601-RPi_support-523029f.patch => linux-3.6.11-601-RPi_support-197d15b.patch} (95%) diff --git a/packages/linux/patches/linux-3.6.11-601-RPi_support-523029f.patch b/packages/linux/patches/linux-3.6.11-601-RPi_support-197d15b.patch similarity index 95% rename from packages/linux/patches/linux-3.6.11-601-RPi_support-523029f.patch rename to packages/linux/patches/linux-3.6.11-601-RPi_support-197d15b.patch index c4a581af63..fed9df7178 100644 --- a/packages/linux/patches/linux-3.6.11-601-RPi_support-523029f.patch +++ b/packages/linux/patches/linux-3.6.11-601-RPi_support-197d15b.patch @@ -1,6 +1,6 @@ -diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig ---- linux-3.6.9/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-12-08 07:27:47.998682255 +0100 +diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig +--- linux-3.6.11/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-12-19 16:01:29.437339342 +0100 @@ -0,0 +1,546 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_LOCALVERSION="-cutdown" @@ -548,10 +548,10 @@ diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6.y +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig ---- linux-3.6.9/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig 2012-12-08 07:27:47.988682311 +0100 -@@ -0,0 +1,1052 @@ +diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig +--- linux-3.6.11/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_defconfig 2012-12-19 16:01:29.434339361 +0100 +@@ -0,0 +1,1054 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -879,6 +879,7 @@ diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/ar +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_CFG80211=m ++CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=m +CONFIG_MAC80211_RC_PID=y +CONFIG_MAC80211_MESH=y @@ -1427,6 +1428,7 @@ diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/ar +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_BCM2708=y +CONFIG_MMC_SDHCI_BCM2708_DMA=y ++CONFIG_MMC_SPI=m +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m @@ -1604,9 +1606,9 @@ diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.y/arch/ar +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig ---- linux-3.6.9/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig 2012-12-08 07:27:47.990682300 +0100 +diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig +--- linux-3.6.11/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_emergency_defconfig 2012-12-19 16:01:29.431339382 +0100 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2140,9 +2142,9 @@ diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3.6 +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig ---- linux-3.6.9/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig 2012-12-08 07:27:47.992682288 +0100 +diff -Naur linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig +--- linux-3.6.11/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/configs/bcmrpi_quick_defconfig 2012-12-19 16:01:29.423339436 +0100 @@ -0,0 +1,298 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y @@ -2442,9 +2444,9 @@ diff -Naur linux-3.6.9/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.y/a +CONFIG_CRC7=m +CONFIG_LIBCRC32C=y +CONFIG_AVERAGE=y -diff -Naur linux-3.6.9/arch/arm/include/asm/fiq.h linux-rpi-3.6.y/arch/arm/include/asm/fiq.h ---- linux-3.6.9/arch/arm/include/asm/fiq.h 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/include/asm/fiq.h 2012-12-08 07:27:48.137681473 +0100 +diff -Naur linux-3.6.11/arch/arm/include/asm/fiq.h linux-rpi-3.6.y/arch/arm/include/asm/fiq.h +--- linux-3.6.11/arch/arm/include/asm/fiq.h 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/include/asm/fiq.h 2012-12-19 16:01:29.474339093 +0100 @@ -42,6 +42,7 @@ /* helpers defined in fiqasm.S: */ extern void __set_fiq_regs(unsigned long const *regs); @@ -2453,10 +2455,10 @@ diff -Naur linux-3.6.9/arch/arm/include/asm/fiq.h linux-rpi-3.6.y/arch/arm/inclu static inline void set_fiq_regs(struct pt_regs const *regs) { -diff -Naur linux-3.6.9/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig ---- linux-3.6.9/arch/arm/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Kconfig 2012-12-08 07:27:48.065681878 +0100 -@@ -998,6 +998,23 @@ +diff -Naur linux-3.6.11/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig +--- linux-3.6.11/arch/arm/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig 2012-12-19 16:01:29.489338992 +0100 +@@ -999,6 +999,23 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -2480,7 +2482,7 @@ diff -Naur linux-3.6.9/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig config ARCH_VT8500 bool "VIA/WonderMedia 85xx" select CPU_ARM926T -@@ -1132,6 +1149,7 @@ +@@ -1133,6 +1150,7 @@ source "arch/arm/mach-vt8500/Kconfig" source "arch/arm/mach-w90x900/Kconfig" @@ -2488,9 +2490,9 @@ diff -Naur linux-3.6.9/arch/arm/Kconfig linux-rpi-3.6.y/arch/arm/Kconfig # Definitions to make life easier config ARCH_ACORN -diff -Naur linux-3.6.9/arch/arm/Kconfig.debug linux-rpi-3.6.y/arch/arm/Kconfig.debug ---- linux-3.6.9/arch/arm/Kconfig.debug 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Kconfig.debug 2012-12-08 07:27:47.517684960 +0100 +diff -Naur linux-3.6.11/arch/arm/Kconfig.debug linux-rpi-3.6.y/arch/arm/Kconfig.debug +--- linux-3.6.11/arch/arm/Kconfig.debug 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/Kconfig.debug 2012-12-19 16:01:29.661337835 +0100 @@ -371,6 +371,14 @@ For more details about semihosting, please see chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd. @@ -2506,9 +2508,9 @@ diff -Naur linux-3.6.9/arch/arm/Kconfig.debug linux-rpi-3.6.y/arch/arm/Kconfig.d endchoice config EARLY_PRINTK -diff -Naur linux-3.6.9/arch/arm/kernel/fiqasm.S linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S ---- linux-3.6.9/arch/arm/kernel/fiqasm.S 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S 2012-12-08 07:27:47.500685056 +0100 +diff -Naur linux-3.6.11/arch/arm/kernel/fiqasm.S linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S +--- linux-3.6.11/arch/arm/kernel/fiqasm.S 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiqasm.S 2012-12-19 16:01:29.088341687 +0100 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 mov pc, lr @@ -2517,9 +2519,9 @@ diff -Naur linux-3.6.9/arch/arm/kernel/fiqasm.S linux-rpi-3.6.y/arch/arm/kernel/ +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Naur linux-3.6.9/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fiq.c ---- linux-3.6.9/arch/arm/kernel/fiq.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/kernel/fiq.c 2012-12-08 07:27:47.496685078 +0100 +diff -Naur linux-3.6.11/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fiq.c +--- linux-3.6.11/arch/arm/kernel/fiq.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/kernel/fiq.c 2012-12-19 16:01:29.098341619 +0100 @@ -137,6 +137,7 @@ EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ @@ -2528,9 +2530,9 @@ diff -Naur linux-3.6.9/arch/arm/kernel/fiq.c linux-rpi-3.6.y/arch/arm/kernel/fiq EXPORT_SYMBOL(claim_fiq); EXPORT_SYMBOL(release_fiq); EXPORT_SYMBOL(enable_fiq); -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c ---- linux-3.6.9/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c 2012-12-08 07:27:47.925682666 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c +--- linux-3.6.11/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.c 2012-12-19 16:01:28.757343912 +0100 @@ -0,0 +1,227 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2759,9 +2761,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.y/arch/arm/ + init_FIQ(FIQ_START); + return 0; +} -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h ---- linux-3.6.9/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h 2012-12-08 07:27:47.924682671 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h +--- linux-3.6.11/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/armctrl.h 2012-12-19 16:01:28.758343905 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2790,10 +2792,10 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.y/arch/arm/ + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c ---- linux-3.6.9/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c 2012-12-08 07:27:47.925682666 +0100 -@@ -0,0 +1,951 @@ +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c +--- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.c 2012-12-19 16:01:28.757343912 +0100 +@@ -0,0 +1,949 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c + * @@ -3719,9 +3721,7 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm/ + * context. Increase size of atomic coherent pool to make sure such + * the allocations won't fail. + */ -+#if !defined(CONFIG_BCM_VC_CMA) -+ init_dma_coherent_pool_size(SZ_2M); -+#endif ++ init_dma_coherent_pool_size(SZ_4M); +} + +static void __init board_reserve(void) @@ -3745,9 +3745,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.y/arch/arm/ +module_param(boardrev, uint, 0644); +module_param(serial, uint, 0644); +module_param(uart_clock, uint, 0644); -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c ---- linux-3.6.9/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-12-08 07:27:47.926682660 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c +--- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-12-19 16:01:28.757343912 +0100 @@ -0,0 +1,339 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4088,9 +4088,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.y/arch + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h ---- linux-3.6.9/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h 2012-12-08 07:27:47.929682643 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h +--- linux-3.6.11/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/bcm2708.h 2012-12-19 16:01:28.757343912 +0100 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4143,9 +4143,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.y/arch/arm/ +} + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c ---- linux-3.6.9/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c 2012-12-08 07:27:47.924682671 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c +--- linux-3.6.11/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.c 2012-12-19 16:01:28.756343919 +0100 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4208,9 +4208,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.y/arch/arm/ma + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h ---- linux-3.6.9/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h 2012-12-08 07:27:47.925682666 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h +--- linux-3.6.11/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/clock.h 2012-12-19 16:01:28.757343912 +0100 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4236,9 +4236,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.y/arch/arm/ma +struct clk { + unsigned long rate; +}; -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S ---- linux-3.6.9/arch/arm/mach-bcm2708/delay.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S 2012-12-08 07:27:47.925682666 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S +--- linux-3.6.11/arch/arm/mach-bcm2708/delay.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/delay.S 2012-12-19 16:01:28.758343905 +0100 @@ -0,0 +1,20 @@ +/* + * linux/arch/arm/lib/delay.S @@ -4260,9 +4260,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.y/arch/arm/ma + bhi bcm2708_delay + mov pc, lr +ENDPROC(bcm2708_delay) -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c ---- linux-3.6.9/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c 2012-12-08 07:27:47.924682671 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c +--- linux-3.6.11/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dma.c 2012-12-19 16:01:28.758343905 +0100 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4661,9 +4661,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.y/arch/arm/mach +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c ---- linux-3.6.9/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c 2012-12-08 07:27:47.924682671 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c +--- linux-3.6.11/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/dmaer.c 2012-12-19 16:01:28.763343872 +0100 @@ -0,0 +1,755 @@ +#include +#include @@ -5420,9 +5420,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.y/arch/arm/ma +module_init(dmaer_init); +module_exit(dmaer_exit); + -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-12-08 07:27:47.927682654 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-12-19 16:01:28.760343891 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5843,9 +5843,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rp +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-12-08 07:27:47.928682648 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-12-19 16:01:28.762343879 +0100 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5907,9 +5907,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi- +}; + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-12-08 07:27:47.928682648 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-12-19 16:01:28.761343885 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5918,9 +5918,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.6 +#define __clk_put(clk) do { } while (0) + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-12-08 07:27:47.927682654 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-12-19 16:01:28.760343891 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5944,9 +5944,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rp + .endm + +#include -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h 2012-12-08 07:27:47.927682654 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/dma.h 2012-12-19 16:01:28.760343891 +0100 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -6032,9 +6032,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.y/ + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-12-08 07:27:47.928682648 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-12-19 16:01:28.762343879 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -6105,9 +6105,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rp +1020: @ EQ will be set if no irqs pending + + .endm -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h 2012-12-08 07:27:47.928682648 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/frc.h 2012-12-19 16:01:28.760343891 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6147,9 +6147,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.y/ +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-12-08 07:27:47.928682648 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-12-19 16:01:28.762343879 +0100 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -6199,9 +6199,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6.y + +#endif + -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-12-08 07:27:47.926682660 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-12-19 16:01:28.761343885 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -6231,9 +6231,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3 +#include + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h 2012-12-08 07:27:47.927682654 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/io.h 2012-12-19 16:01:28.762343879 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -6263,9 +6263,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.y/a +#define __mem_pci(a) (a) + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-12-08 07:27:47.926682660 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-12-19 16:01:28.759343898 +0100 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -6466,9 +6466,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6.y + + +#endif /* _BCM2708_IRQS_H_ */ -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h 2012-12-08 07:27:47.927682654 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/memory.h 2012-12-19 16:01:28.760343891 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -6527,9 +6527,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.6 +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET)) + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h 2012-12-08 07:27:47.926682660 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/platform.h 2012-12-19 16:01:28.761343885 +0100 @@ -0,0 +1,225 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6756,9 +6756,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3 +#endif + +/* END */ -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h 2012-12-08 07:27:47.927682654 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/power.h 2012-12-19 16:01:28.761343885 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6786,9 +6786,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6. +extern int bcm_power_close(BCM_POWER_HANDLE_T handle); + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h 2012-12-08 07:27:47.929682643 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/system.h 2012-12-19 16:01:28.759343898 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6828,9 +6828,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.6 +} + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h 2012-12-08 07:27:47.929682643 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/timex.h 2012-12-19 16:01:28.762343879 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6855,9 +6855,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6. + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-12-08 07:27:47.928682648 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-12-19 16:01:28.761343885 +0100 @@ -0,0 +1,85 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6944,9 +6944,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi + */ +#define arch_decomp_wdog() + -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-12-08 07:27:47.928682648 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-12-19 16:01:28.760343891 +0100 @@ -0,0 +1,141 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h @@ -7089,9 +7089,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6.y +#define DEVICE_FILE_NAME "char_dev" + +#endif -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-12-08 07:27:47.926682660 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-12-19 16:01:28.762343879 +0100 @@ -0,0 +1,36 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7129,9 +7129,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.6 + +#endif /* VC_MEM_H */ + -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h ---- linux-3.6.9/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-12-08 07:27:47.927682654 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h +--- linux-3.6.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-12-19 16:01:28.759343898 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -7153,9 +7153,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3. + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#define VMALLOC_END (0xe8000000) -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig ---- linux-3.6.9/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig 2012-12-08 07:27:47.925682666 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig +--- linux-3.6.11/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Kconfig 2012-12-19 16:01:28.763343872 +0100 @@ -0,0 +1,41 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 @@ -7198,9 +7198,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.y/arch/arm/ma + Enable DMA helper for accelerating X composition + +endmenu -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile ---- linux-3.6.9/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile 2012-12-08 07:27:47.924682671 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile +--- linux-3.6.11/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile 2012-12-19 16:01:28.756343919 +0100 @@ -0,0 +1,9 @@ +# +# Makefile for the linux kernel. @@ -7211,16 +7211,16 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.y/arch/arm/m +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o +obj-$(CONFIG_BCM2708_DMAER) += dmaer.o + -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/Makefile.boot linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot ---- linux-3.6.9/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot 2012-12-08 07:27:47.925682666 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/Makefile.boot linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot +--- linux-3.6.11/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/Makefile.boot 2012-12-19 16:01:28.763343872 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c ---- linux-3.6.9/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c 2012-12-08 07:27:47.925682666 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c +--- linux-3.6.11/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/power.c 2012-12-19 16:01:28.756343919 +0100 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -7416,9 +7416,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.y/arch/arm/ma +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c ---- linux-3.6.9/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c 2012-12-08 07:27:47.925682666 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c +--- linux-3.6.11/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vcio.c 2012-12-19 16:01:28.758343905 +0100 @@ -0,0 +1,471 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c @@ -7891,9 +7891,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.y/arch/arm/mac +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c ---- linux-3.6.9/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c 2012-12-08 07:27:47.924682671 +0100 +diff -Naur linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c +--- linux-3.6.11/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mach-bcm2708/vc_mem.c 2012-12-19 16:01:28.756343919 +0100 @@ -0,0 +1,458 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -8353,9 +8353,9 @@ diff -Naur linux-3.6.9/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.y/arch/arm/m +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); + -diff -Naur linux-3.6.9/arch/arm/Makefile linux-rpi-3.6.y/arch/arm/Makefile ---- linux-3.6.9/arch/arm/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/Makefile 2012-12-08 07:27:47.517684960 +0100 +diff -Naur linux-3.6.11/arch/arm/Makefile linux-rpi-3.6.y/arch/arm/Makefile +--- linux-3.6.11/arch/arm/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/Makefile 2012-12-19 16:01:28.997342298 +0100 @@ -198,6 +198,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -8364,9 +8364,9 @@ diff -Naur linux-3.6.9/arch/arm/Makefile linux-rpi-3.6.y/arch/arm/Makefile # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -diff -Naur linux-3.6.9/arch/arm/mm/alignment.c linux-rpi-3.6.y/arch/arm/mm/alignment.c ---- linux-3.6.9/arch/arm/mm/alignment.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/alignment.c 2012-12-08 07:27:47.941682576 +0100 +diff -Naur linux-3.6.11/arch/arm/mm/alignment.c linux-rpi-3.6.y/arch/arm/mm/alignment.c +--- linux-3.6.11/arch/arm/mm/alignment.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/alignment.c 2012-12-19 16:01:28.938342695 +0100 @@ -856,9 +856,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -8381,9 +8381,9 @@ diff -Naur linux-3.6.9/arch/arm/mm/alignment.c linux-rpi-3.6.y/arch/arm/mm/align default: goto bad; -diff -Naur linux-3.6.9/arch/arm/mm/Kconfig linux-rpi-3.6.y/arch/arm/mm/Kconfig ---- linux-3.6.9/arch/arm/mm/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/Kconfig 2012-12-08 07:27:47.942682570 +0100 +diff -Naur linux-3.6.11/arch/arm/mm/Kconfig linux-rpi-3.6.y/arch/arm/mm/Kconfig +--- linux-3.6.11/arch/arm/mm/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/Kconfig 2012-12-19 16:01:28.950342615 +0100 @@ -354,7 +354,7 @@ # ARMv6 @@ -8393,9 +8393,9 @@ diff -Naur linux-3.6.9/arch/arm/mm/Kconfig linux-rpi-3.6.y/arch/arm/mm/Kconfig select CPU_32v6 select CPU_ABRT_EV6 select CPU_PABRT_V6 -diff -Naur linux-3.6.9/arch/arm/mm/proc-v6.S linux-rpi-3.6.y/arch/arm/mm/proc-v6.S ---- linux-3.6.9/arch/arm/mm/proc-v6.S 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/mm/proc-v6.S 2012-12-08 07:27:47.944682558 +0100 +diff -Naur linux-3.6.11/arch/arm/mm/proc-v6.S linux-rpi-3.6.y/arch/arm/mm/proc-v6.S +--- linux-3.6.11/arch/arm/mm/proc-v6.S 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/mm/proc-v6.S 2012-12-19 16:01:28.949342622 +0100 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -8419,9 +8419,9 @@ diff -Naur linux-3.6.9/arch/arm/mm/proc-v6.S linux-rpi-3.6.y/arch/arm/mm/proc-v6 mov pc, lr ENTRY(cpu_v6_dcache_clean_area) -diff -Naur linux-3.6.9/arch/arm/tools/mach-types linux-rpi-3.6.y/arch/arm/tools/mach-types ---- linux-3.6.9/arch/arm/tools/mach-types 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/arch/arm/tools/mach-types 2012-12-08 07:27:48.100681681 +0100 +diff -Naur linux-3.6.11/arch/arm/tools/mach-types linux-rpi-3.6.y/arch/arm/tools/mach-types +--- linux-3.6.11/arch/arm/tools/mach-types 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/arch/arm/tools/mach-types 2012-12-19 16:01:29.250340598 +0100 @@ -519,6 +519,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -8430,9 +8430,9 @@ diff -Naur linux-3.6.9/arch/arm/tools/mach-types linux-rpi-3.6.y/arch/arm/tools/ ag5evm MACH_AG5EVM AG5EVM 3189 tsunagi MACH_TSUNAGI TSUNAGI 3197 ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206 -diff -Naur linux-3.6.9/drivers/char/broadcom/Kconfig linux-rpi-3.6.y/drivers/char/broadcom/Kconfig ---- linux-3.6.9/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/Kconfig 2012-12-08 07:27:55.935636470 +0100 +diff -Naur linux-3.6.11/drivers/char/broadcom/Kconfig linux-rpi-3.6.y/drivers/char/broadcom/Kconfig +--- linux-3.6.11/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Kconfig 2012-12-19 16:01:42.541249979 +0100 @@ -0,0 +1,18 @@ +# +# Broadcom char driver config @@ -8452,15 +8452,15 @@ diff -Naur linux-3.6.9/drivers/char/broadcom/Kconfig linux-rpi-3.6.y/drivers/cha + help + Helper for videocore CMA access. + -diff -Naur linux-3.6.9/drivers/char/broadcom/Makefile linux-rpi-3.6.y/drivers/char/broadcom/Makefile ---- linux-3.6.9/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/Makefile 2012-12-08 07:27:55.934636476 +0100 +diff -Naur linux-3.6.11/drivers/char/broadcom/Makefile linux-rpi-3.6.y/drivers/char/broadcom/Makefile +--- linux-3.6.11/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/Makefile 2012-12-19 16:01:42.541249979 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ + -diff -Naur linux-3.6.9/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile ---- linux-3.6.9/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile 2012-12-08 07:27:55.934636476 +0100 +diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile +--- linux-3.6.11/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/Makefile 2012-12-19 16:01:42.540249986 +0100 @@ -0,0 +1,15 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs +EXTRA_CFLAGS += -Werror @@ -8477,23 +8477,42 @@ diff -Naur linux-3.6.9/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.y/dri + +vc-cma-objs := vc_cma.o + -diff -Naur linux-3.6.9/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c ---- linux-3.6.9/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c 2012-12-08 07:27:55.934636476 +0100 -@@ -0,0 +1,1126 @@ -+/***************************************************************************** -+* Copyright 2012 Broadcom Corporation. All rights reserved. -+* -+* Unless you and Broadcom execute a separate written software license -+* agreement governing use of this software, this software is licensed to you -+* under the terms of the GNU General Public License version 2, available at -+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). -+* -+* Notwithstanding the above, under no circumstances may you combine this -+* software in any way with any other Broadcom software provided under a -+* license other than the GPL, without Broadcom's express prior written -+* consent. -+*****************************************************************************/ +diff -Naur linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c +--- linux-3.6.11/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/char/broadcom/vc_cma/vc_cma.c 2012-12-19 16:01:42.541249979 +0100 +@@ -0,0 +1,1145 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ + +#include +#include @@ -9607,9 +9626,9 @@ diff -Naur linux-3.6.9/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.y/dri +module_exit(vc_cma_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Naur linux-3.6.9/drivers/char/Kconfig linux-rpi-3.6.y/drivers/char/Kconfig ---- linux-3.6.9/drivers/char/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/Kconfig 2012-12-08 07:27:55.956636352 +0100 +diff -Naur linux-3.6.11/drivers/char/Kconfig linux-rpi-3.6.y/drivers/char/Kconfig +--- linux-3.6.11/drivers/char/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/char/Kconfig 2012-12-19 16:01:42.559249859 +0100 @@ -585,6 +585,8 @@ source "drivers/s390/char/Kconfig" @@ -9619,9 +9638,9 @@ diff -Naur linux-3.6.9/drivers/char/Kconfig linux-rpi-3.6.y/drivers/char/Kconfig config MSM_SMD_PKT bool "Enable device interface for some SMD packet ports" default n -diff -Naur linux-3.6.9/drivers/char/Makefile linux-rpi-3.6.y/drivers/char/Makefile ---- linux-3.6.9/drivers/char/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/char/Makefile 2012-12-08 07:27:55.935636470 +0100 +diff -Naur linux-3.6.11/drivers/char/Makefile linux-rpi-3.6.y/drivers/char/Makefile +--- linux-3.6.11/drivers/char/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/char/Makefile 2012-12-19 16:01:42.531250046 +0100 @@ -63,3 +63,6 @@ js-rtc-y = rtc.o @@ -9629,9 +9648,9 @@ diff -Naur linux-3.6.9/drivers/char/Makefile linux-rpi-3.6.y/drivers/char/Makefi + +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ + -diff -Naur linux-3.6.9/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c ---- linux-3.6.9/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c 2012-12-08 07:27:55.293640082 +0100 +diff -Naur linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c +--- linux-3.6.11/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/bcm2835-cpufreq.c 2012-12-19 16:01:40.357265101 +0100 @@ -0,0 +1,239 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -9872,9 +9891,9 @@ diff -Naur linux-3.6.9/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.y/drivers +module_init(bcm2835_cpufreq_module_init); +module_exit(bcm2835_cpufreq_module_exit); + -diff -Naur linux-3.6.9/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm ---- linux-3.6.9/drivers/cpufreq/Kconfig.arm 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm 2012-12-08 07:27:55.295640070 +0100 +diff -Naur linux-3.6.11/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm +--- linux-3.6.11/drivers/cpufreq/Kconfig.arm 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Kconfig.arm 2012-12-19 16:01:40.362265068 +0100 @@ -76,3 +76,12 @@ help This adds the CPUFreq driver for Samsung EXYNOS5250 @@ -9888,9 +9907,9 @@ diff -Naur linux-3.6.9/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.y/drivers/cpufr + + If in doubt, say N. + -diff -Naur linux-3.6.9/drivers/cpufreq/Makefile linux-rpi-3.6.y/drivers/cpufreq/Makefile ---- linux-3.6.9/drivers/cpufreq/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/cpufreq/Makefile 2012-12-08 07:27:55.290640098 +0100 +diff -Naur linux-3.6.11/drivers/cpufreq/Makefile linux-rpi-3.6.y/drivers/cpufreq/Makefile +--- linux-3.6.11/drivers/cpufreq/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/cpufreq/Makefile 2012-12-19 16:01:40.356265108 +0100 @@ -48,6 +48,7 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o @@ -9899,9 +9918,9 @@ diff -Naur linux-3.6.9/drivers/cpufreq/Makefile linux-rpi-3.6.y/drivers/cpufreq/ ################################################################################## # PowerPC platform drivers -diff -Naur linux-3.6.9/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c ---- linux-3.6.9/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c 2012-12-08 07:27:56.313634344 +0100 +diff -Naur linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c +--- linux-3.6.11/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/bcm2835-hwmon.c 2012-12-19 16:01:40.394264853 +0100 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -10122,9 +10141,9 @@ diff -Naur linux-3.6.9/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.y/drivers/hwm +MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip"); + +module_platform_driver(bcm2835_hwmon_driver); -diff -Naur linux-3.6.9/drivers/hwmon/Kconfig linux-rpi-3.6.y/drivers/hwmon/Kconfig ---- linux-3.6.9/drivers/hwmon/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/Kconfig 2012-12-08 07:27:56.325634276 +0100 +diff -Naur linux-3.6.11/drivers/hwmon/Kconfig linux-rpi-3.6.y/drivers/hwmon/Kconfig +--- linux-3.6.11/drivers/hwmon/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Kconfig 2012-12-19 16:01:40.409264753 +0100 @@ -1411,6 +1411,16 @@ help Support for the A/D converter on MC13783 and MC13892 PMIC. @@ -10142,9 +10161,9 @@ diff -Naur linux-3.6.9/drivers/hwmon/Kconfig linux-rpi-3.6.y/drivers/hwmon/Kconf if ACPI comment "ACPI drivers" -diff -Naur linux-3.6.9/drivers/hwmon/Makefile linux-rpi-3.6.y/drivers/hwmon/Makefile ---- linux-3.6.9/drivers/hwmon/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/hwmon/Makefile 2012-12-08 07:27:56.304634395 +0100 +diff -Naur linux-3.6.11/drivers/hwmon/Makefile linux-rpi-3.6.y/drivers/hwmon/Makefile +--- linux-3.6.11/drivers/hwmon/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/hwmon/Makefile 2012-12-19 16:01:40.383264927 +0100 @@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -10153,9 +10172,9 @@ diff -Naur linux-3.6.9/drivers/hwmon/Makefile linux-rpi-3.6.y/drivers/hwmon/Make obj-$(CONFIG_PMBUS) += pmbus/ -diff -Naur linux-3.6.9/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c ---- linux-3.6.9/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c 2012-12-08 07:27:55.993636144 +0100 +diff -Naur linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c +--- linux-3.6.11/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/i2c-bcm2708.c 2012-12-19 16:01:40.516264034 +0100 @@ -0,0 +1,400 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -10557,9 +10576,9 @@ diff -Naur linux-3.6.9/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.y/drivers/ +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Naur linux-3.6.9/drivers/i2c/busses/Kconfig linux-rpi-3.6.y/drivers/i2c/busses/Kconfig ---- linux-3.6.9/drivers/i2c/busses/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/Kconfig 2012-12-08 07:27:56.000636104 +0100 +diff -Naur linux-3.6.11/drivers/i2c/busses/Kconfig linux-rpi-3.6.y/drivers/i2c/busses/Kconfig +--- linux-3.6.11/drivers/i2c/busses/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Kconfig 2012-12-19 16:01:40.526263966 +0100 @@ -314,6 +314,25 @@ This driver can also be built as a module. If so, the module will be called i2c-au1550. @@ -10586,9 +10605,9 @@ diff -Naur linux-3.6.9/drivers/i2c/busses/Kconfig linux-rpi-3.6.y/drivers/i2c/bu config I2C_BLACKFIN_TWI tristate "Blackfin TWI I2C support" depends on BLACKFIN -diff -Naur linux-3.6.9/drivers/i2c/busses/Makefile linux-rpi-3.6.y/drivers/i2c/busses/Makefile ---- linux-3.6.9/drivers/i2c/busses/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/i2c/busses/Makefile 2012-12-08 07:27:55.990636161 +0100 +diff -Naur linux-3.6.11/drivers/i2c/busses/Makefile linux-rpi-3.6.y/drivers/i2c/busses/Makefile +--- linux-3.6.11/drivers/i2c/busses/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/i2c/busses/Makefile 2012-12-19 16:01:40.514264047 +0100 @@ -30,6 +30,7 @@ # Embedded system I2C/SMBus host controller drivers obj-$(CONFIG_I2C_AT91) += i2c-at91.o @@ -10597,9 +10616,9 @@ diff -Naur linux-3.6.9/drivers/i2c/busses/Makefile linux-rpi-3.6.y/drivers/i2c/b 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.6.9/drivers/misc/Kconfig linux-rpi-3.6.y/drivers/misc/Kconfig ---- linux-3.6.9/drivers/misc/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/Kconfig 2012-12-08 07:27:55.425639339 +0100 +diff -Naur linux-3.6.11/drivers/misc/Kconfig linux-rpi-3.6.y/drivers/misc/Kconfig +--- linux-3.6.11/drivers/misc/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Kconfig 2012-12-19 16:01:45.299231452 +0100 @@ -517,4 +517,6 @@ source "drivers/misc/carma/Kconfig" source "drivers/misc/altera-stapl/Kconfig" @@ -10607,34 +10626,49 @@ diff -Naur linux-3.6.9/drivers/misc/Kconfig linux-rpi-3.6.y/drivers/misc/Kconfig +source "drivers/misc/vc04_services/Kconfig" endmenu + -diff -Naur linux-3.6.9/drivers/misc/Makefile linux-rpi-3.6.y/drivers/misc/Makefile ---- linux-3.6.9/drivers/misc/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/Makefile 2012-12-08 07:27:55.403639463 +0100 +diff -Naur linux-3.6.11/drivers/misc/Makefile linux-rpi-3.6.y/drivers/misc/Makefile +--- linux-3.6.11/drivers/misc/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/Makefile 2012-12-19 16:01:45.282231565 +0100 @@ -50,3 +50,4 @@ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ obj-$(CONFIG_INTEL_MEI) += mei/ +obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-12-08 07:27:55.405639452 +0100 -@@ -0,0 +1,313 @@ -+/* +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-12-19 16:01:45.312231365 +0100 +@@ -0,0 +1,328 @@ ++/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef CONNECTION_H_ @@ -10932,26 +10966,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/connections/con +#endif /* CONNECTION_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-12-08 07:27:55.405639452 +0100 -@@ -0,0 +1,189 @@ -+/* +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-12-19 16:01:45.312231365 +0100 +@@ -0,0 +1,204 @@ ++/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _VCHI_MESSAGE_H_ @@ -11125,26 +11174,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/message_drivers +#endif // _VCHI_MESSAGE_H_ + +/****************************** End of file ***********************************/ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-12-08 07:27:55.405639452 +0100 -@@ -0,0 +1,209 @@ -+/* +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-12-19 16:01:45.311231372 +0100 +@@ -0,0 +1,224 @@ ++/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHI_CFG_H_ @@ -11338,26 +11402,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linu +#endif /* VCHI_CFG_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-12-08 07:27:55.405639452 +0100 -@@ -0,0 +1,56 @@ -+/* +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-12-19 16:01:45.310231378 +0100 +@@ -0,0 +1,71 @@ ++/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHI_CFG_INTERNAL_H_ @@ -11398,26 +11477,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_cfg_intern +//#define VCHI_RX_NANOLOCKS + +#endif /*VCHI_CFG_INTERNAL_H_*/ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-12-08 07:27:55.405639452 +0100 -@@ -0,0 +1,148 @@ -+/* +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-12-19 16:01:45.310231378 +0100 +@@ -0,0 +1,163 @@ ++/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHI_COMMON_H_ @@ -11550,26 +11644,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_common.h l + + +#endif // VCHI_COMMON_H_ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-12-08 07:27:55.404639458 +0100 -@@ -0,0 +1,355 @@ -+/* +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-12-19 16:01:45.311231372 +0100 +@@ -0,0 +1,370 @@ ++/** + * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHI_H_ @@ -11909,26 +12018,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rp +#endif /* VCHI_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-12-08 07:27:55.404639458 +0100 -@@ -0,0 +1,27 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-12-19 16:01:45.311231372 +0100 +@@ -0,0 +1,42 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHI_MH_H_ @@ -11940,26 +12064,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-12-08 07:27:55.406639446 +0100 -@@ -0,0 +1,523 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-12-19 16:01:45.307231398 +0100 +@@ -0,0 +1,538 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include @@ -12467,26 +12606,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 + + kfree(pagelist); +} -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-12-08 07:27:55.407639440 +0100 -@@ -0,0 +1,27 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-12-19 16:01:45.309231384 +0100 +@@ -0,0 +1,42 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHIQ_2835_H @@ -12498,26 +12652,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 +#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1 + +#endif /* VCHIQ_2835_H */ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-12-08 07:27:55.407639440 +0100 -@@ -0,0 +1,2787 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-12-19 16:01:45.304231418 +0100 +@@ -0,0 +1,2802 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include @@ -15289,26 +15458,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. +module_exit(vchiq_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-12-08 07:27:55.406639446 +0100 -@@ -0,0 +1,197 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-12-19 16:01:45.310231378 +0100 +@@ -0,0 +1,212 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHIQ_ARM_H @@ -15490,52 +15674,82 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. + + +#endif /* VCHIQ_ARM_H */ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2012-12-08 07:27:55.407639440 +0100 -@@ -0,0 +1,22 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2012-12-19 16:01:45.306231405 +0100 +@@ -0,0 +1,37 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +const char *vchiq_get_build_hostname(void); +const char *vchiq_get_build_version(void); +const char *vchiq_get_build_time(void); +const char *vchiq_get_build_date(void); -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-12-08 07:27:55.407639440 +0100 -@@ -0,0 +1,45 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-12-19 16:01:45.307231398 +0100 +@@ -0,0 +1,60 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHIQ_CFG_H @@ -15565,23 +15779,42 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg. +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-12-08 07:27:55.408639434 +0100 -@@ -0,0 +1,100 @@ -+/***************************************************************************** -+* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. -+* -+* Unless you and Broadcom execute a separate written software license -+* agreement governing use of this software, this software is licensed to you -+* under the terms of the GNU General Public License version 2, available at -+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). -+* -+* Notwithstanding the above, under no circumstances may you combine this -+* software in any way with any other Broadcom software provided under a -+* license other than the GPL, without Broadcom's express prior written -+* consent. -+*****************************************************************************/ +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-12-19 16:01:45.308231391 +0100 +@@ -0,0 +1,119 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ + +#include "vchiq_connected.h" +#include "vchiq_core.h" @@ -15669,23 +15902,42 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn + mutex_unlock(&g_connected_mutex); +} +EXPORT_SYMBOL(vchiq_add_connected_callback); -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-12-08 07:27:55.407639440 +0100 -@@ -0,0 +1,32 @@ -+/***************************************************************************** -+* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. -+* -+* Unless you and Broadcom execute a separate written software license -+* agreement governing use of this software, this software is licensed to you -+* under the terms of the GNU General Public License version 2, available at -+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). -+* -+* Notwithstanding the above, under no circumstances may you combine this -+* software in any way with any other Broadcom software provided under a -+* license other than the GPL, without Broadcom's express prior written -+* consent. -+*****************************************************************************/ +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-12-19 16:01:45.309231384 +0100 +@@ -0,0 +1,51 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ + +#ifndef VCHIQ_CONNECTED_H +#define VCHIQ_CONNECTED_H @@ -15705,26 +15957,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn + +#endif /* VCHIQ_CONNECTED_H */ + -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-12-08 07:27:55.408639434 +0100 -@@ -0,0 +1,3700 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-12-19 16:01:45.305231412 +0100 +@@ -0,0 +1,3727 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "vchiq_core.h" @@ -15998,7 +16265,7 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core +} + +static void -+mark_service_closing(VCHIQ_SERVICE_T *service) ++mark_service_closing_internal(VCHIQ_SERVICE_T *service, int sh_thread) +{ + VCHIQ_STATE_T *state = service->state; + VCHIQ_SERVICE_QUOTA_T *service_quota; @@ -16008,14 +16275,26 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + /* Synchronise with other threads. */ + mutex_lock(&state->recycle_mutex); + mutex_unlock(&state->recycle_mutex); -+ mutex_lock(&state->slot_mutex); -+ mutex_unlock(&state->slot_mutex); ++ if (!sh_thread || (state->conn_state != VCHIQ_CONNSTATE_PAUSE_SENT)) { ++ /* If we're pausing then the slot_mutex is held until resume ++ * by the slot handler. Therefore don't try to acquire this ++ * mutex if we're the slot handler and in the pause sent state. ++ * We don't need to in this case anyway. */ ++ mutex_lock(&state->slot_mutex); ++ mutex_unlock(&state->slot_mutex); ++ } + + /* Unblock any sending thread. */ + service_quota = &state->service_quotas[service->localport]; + up(&service_quota->quota_event); +} + ++static void ++mark_service_closing(VCHIQ_SERVICE_T *service) ++{ ++ mark_service_closing_internal(service, 0); ++} ++ +static inline VCHIQ_STATUS_T +make_service_callback(VCHIQ_SERVICE_T *service, VCHIQ_REASON_T reason, + VCHIQ_HEADER_T *header, void *bulk_userdata) @@ -17346,7 +17625,7 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + state->id, (unsigned int)header, + remoteport, localport); + -+ mark_service_closing(service); ++ mark_service_closing_internal(service, 1); + + if (vchiq_close_service_internal(service, + 1/*close_recvd*/) == VCHIQ_RETRY) @@ -19409,26 +19688,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + numBytes = 0; + } +} -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-12-08 07:27:55.406639446 +0100 -@@ -0,0 +1,683 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-12-19 16:01:45.309231384 +0100 +@@ -0,0 +1,698 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHIQ_CORE_H @@ -20096,9 +20390,9 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + size_t numBytes); + +#endif -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2012-12-08 07:27:55.407639440 +0100 +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2012-12-19 16:01:45.307231398 +0100 @@ -0,0 +1,89 @@ +#!/usr/bin/perl -w + @@ -20189,26 +20483,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genv +EOF + + -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-12-08 07:27:55.405639452 +0100 -@@ -0,0 +1,26 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-12-19 16:01:45.304231418 +0100 +@@ -0,0 +1,41 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHIQ_VCHIQ_H @@ -20219,26 +20528,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h li + +#endif + -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-12-08 07:27:55.407639440 +0100 -@@ -0,0 +1,167 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-12-19 16:01:45.310231378 +0100 +@@ -0,0 +1,182 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHIQ_IF_H @@ -20390,26 +20714,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h + void *ptr, size_t num_bytes); + +#endif /* VCHIQ_IF_H */ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-12-08 07:27:55.406639446 +0100 -@@ -0,0 +1,114 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-12-19 16:01:45.306231405 +0100 +@@ -0,0 +1,129 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHIQ_IOCTLS_H @@ -20508,23 +20847,42 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioct +#define VCHIQ_IOC_MAX 15 + +#endif -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-12-08 07:27:55.408639434 +0100 -@@ -0,0 +1,424 @@ -+/***************************************************************************** -+* Copyright 2001 - 2011 Broadcom Corporation. All rights reserved. -+* -+* Unless you and Broadcom execute a separate written software license -+* agreement governing use of this software, this software is licensed to you -+* under the terms of the GNU General Public License version 2, available at -+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). -+* -+* Notwithstanding the above, under no circumstances may you combine this -+* software in any way with any other Broadcom software provided under a -+* license other than the GPL, without Broadcom's express prior written -+* consent. -+*****************************************************************************/ +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-12-19 16:01:45.308231391 +0100 +@@ -0,0 +1,443 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ + +/* ---- Include Files ---------------------------------------------------- */ + @@ -20936,23 +21294,42 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern + + return status; +} -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-12-08 07:27:55.407639440 +0100 -@@ -0,0 +1,52 @@ -+/***************************************************************************** -+* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. -+* -+* Unless you and Broadcom execute a separate written software license -+* agreement governing use of this software, this software is licensed to you -+* under the terms of the GNU General Public License version 2, available at -+* http://www.broadcom.com/licenses/GPLv2.php (the "GPL"). -+* -+* Notwithstanding the above, under no circumstances may you combine this -+* software in any way with any other Broadcom software provided under a -+* license other than the GPL, without Broadcom's express prior written -+* consent. -+*****************************************************************************/ +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-12-19 16:01:45.309231384 +0100 +@@ -0,0 +1,71 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ + +#ifndef VCHIQ_MEMDRV_H +#define VCHIQ_MEMDRV_H @@ -20992,26 +21369,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memd + const VCHIQ_PLATFORM_DATA_T * platform_data); + +#endif -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-12-08 07:27:55.408639434 +0100 -@@ -0,0 +1,43 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-12-19 16:01:45.308231391 +0100 +@@ -0,0 +1,58 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHIQ_PAGELIST_H @@ -21039,26 +21431,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_page +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2012-12-08 07:27:55.408639434 +0100 -@@ -0,0 +1,225 @@ -+/* -+ * Copyright (c) 2012 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2012-12-19 16:01:45.306231405 +0100 +@@ -0,0 +1,240 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + @@ -21268,26 +21675,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc + return proc_info.clients; +} + -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-12-08 07:27:55.407639440 +0100 -@@ -0,0 +1,787 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-12-19 16:01:45.308231391 +0100 +@@ -0,0 +1,802 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include +#include @@ -22059,26 +22481,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim + return ret; +} +EXPORT_SYMBOL(vchi_service_release); -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-12-08 07:27:55.407639440 +0100 -@@ -0,0 +1,105 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-12-19 16:01:45.307231398 +0100 +@@ -0,0 +1,120 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "vchiq_util.h" @@ -22168,26 +22605,41 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + + return header; +} -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-12-08 07:27:55.406639446 +0100 -@@ -0,0 +1,67 @@ -+/* -+ * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-12-19 16:01:45.306231405 +0100 +@@ -0,0 +1,82 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. + * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. + * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VCHIQ_UTIL_H @@ -22239,10 +22691,42 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + +#endif + -diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c ---- linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2012-12-08 07:27:55.408639434 +0100 -@@ -0,0 +1,27 @@ +diff -Naur linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c +--- linux-3.6.11/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2012-12-19 16:01:45.305231412 +0100 +@@ -0,0 +1,59 @@ ++/** ++ * Copyright (c) 2010-2012 Broadcom. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions, and the following disclaimer, ++ * without modification. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. The names of the above-listed copyright holders may not be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * ALTERNATIVELY, this software may be distributed under the terms of the ++ * GNU General Public License ("GPL") version 2, as published by the Free ++ * Software Foundation. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS ++ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR ++ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ++ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ +#include "vchiq_build_info.h" +#include + @@ -22270,9 +22754,9 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_vers +{ + return vchiq_build_time; +} -diff -Naur linux-3.6.9/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig ---- linux-3.6.9/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig 2012-12-08 07:27:55.404639458 +0100 +diff -Naur linux-3.6.11/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig +--- linux-3.6.11/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Kconfig 2012-12-19 16:01:45.312231365 +0100 @@ -0,0 +1,10 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -22284,9 +22768,9 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.y/driver + Defaults to Y when the Broadcom Videocore services + are included in the build, N otherwise. + -diff -Naur linux-3.6.9/drivers/misc/vc04_services/Makefile linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile ---- linux-3.6.9/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile 2012-12-08 07:27:55.404639458 +0100 +diff -Naur linux-3.6.11/drivers/misc/vc04_services/Makefile linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile +--- linux-3.6.11/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/misc/vc04_services/Makefile 2012-12-19 16:01:45.303231424 +0100 @@ -0,0 +1,18 @@ +ifeq ($(CONFIG_MACH_BCM2708),y) + @@ -22306,9 +22790,9 @@ diff -Naur linux-3.6.9/drivers/misc/vc04_services/Makefile linux-rpi-3.6.y/drive + +endif + -diff -Naur linux-3.6.9/drivers/mmc/card/block.c linux-rpi-3.6.y/drivers/mmc/card/block.c ---- linux-3.6.9/drivers/mmc/card/block.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/card/block.c 2012-12-08 07:27:55.977636234 +0100 +diff -Naur linux-3.6.11/drivers/mmc/card/block.c linux-rpi-3.6.y/drivers/mmc/card/block.c +--- linux-3.6.11/drivers/mmc/card/block.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/card/block.c 2012-12-19 16:01:42.682249032 +0100 @@ -1135,7 +1135,7 @@ brq->data.blocks = 1; } @@ -22318,9 +22802,9 @@ diff -Naur linux-3.6.9/drivers/mmc/card/block.c linux-rpi-3.6.y/drivers/mmc/card /* SPI multiblock writes terminate using a special * token, not a STOP_TRANSMISSION request. */ -diff -Naur linux-3.6.9/drivers/mmc/core/sd.c linux-rpi-3.6.y/drivers/mmc/core/sd.c ---- linux-3.6.9/drivers/mmc/core/sd.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/core/sd.c 2012-12-08 07:27:55.975636246 +0100 +diff -Naur linux-3.6.11/drivers/mmc/core/sd.c linux-rpi-3.6.y/drivers/mmc/core/sd.c +--- linux-3.6.11/drivers/mmc/core/sd.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/core/sd.c 2012-12-19 16:01:42.677249065 +0100 @@ -13,6 +13,8 @@ #include #include @@ -22479,9 +22963,9 @@ diff -Naur linux-3.6.9/drivers/mmc/core/sd.c linux-rpi-3.6.y/drivers/mmc/core/sd /* * Fetch and process SD Status register. -diff -Naur linux-3.6.9/drivers/mmc/host/Kconfig linux-rpi-3.6.y/drivers/mmc/host/Kconfig ---- linux-3.6.9/drivers/mmc/host/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/Kconfig 2012-12-08 07:27:55.969636278 +0100 +diff -Naur linux-3.6.11/drivers/mmc/host/Kconfig linux-rpi-3.6.y/drivers/mmc/host/Kconfig +--- linux-3.6.11/drivers/mmc/host/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Kconfig 2012-12-19 16:01:42.668249126 +0100 @@ -229,6 +229,27 @@ YMMV. @@ -22510,9 +22994,9 @@ diff -Naur linux-3.6.9/drivers/mmc/host/Kconfig linux-rpi-3.6.y/drivers/mmc/host config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP -diff -Naur linux-3.6.9/drivers/mmc/host/Makefile linux-rpi-3.6.y/drivers/mmc/host/Makefile ---- linux-3.6.9/drivers/mmc/host/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/Makefile 2012-12-08 07:27:55.960636330 +0100 +diff -Naur linux-3.6.11/drivers/mmc/host/Makefile linux-rpi-3.6.y/drivers/mmc/host/Makefile +--- linux-3.6.11/drivers/mmc/host/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/Makefile 2012-12-19 16:01:42.659249187 +0100 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -22521,9 +23005,9 @@ diff -Naur linux-3.6.9/drivers/mmc/host/Makefile linux-rpi-3.6.y/drivers/mmc/hos obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o obj-$(CONFIG_MMC_OMAP) += omap.o -diff -Naur linux-3.6.9/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c ---- linux-3.6.9/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c 2012-12-08 07:27:55.960636330 +0100 +diff -Naur linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c +--- linux-3.6.11/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci-bcm2708.c 2012-12-19 16:01:42.664249153 +0100 @@ -0,0 +1,1413 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 @@ -23938,9 +24422,9 @@ diff -Naur linux-3.6.9/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.y/drivers/ +MODULE_PARM_DESC(enable_llm, "Enable low-latency mode"); + + -diff -Naur linux-3.6.9/drivers/mmc/host/sdhci.c linux-rpi-3.6.y/drivers/mmc/host/sdhci.c ---- linux-3.6.9/drivers/mmc/host/sdhci.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.c 2012-12-08 07:27:55.972636262 +0100 +diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.c linux-rpi-3.6.y/drivers/mmc/host/sdhci.c +--- linux-3.6.11/drivers/mmc/host/sdhci.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.c 2012-12-19 16:01:42.662249166 +0100 @@ -28,6 +28,7 @@ #include #include @@ -24811,9 +25295,9 @@ diff -Naur linux-3.6.9/drivers/mmc/host/sdhci.c linux-rpi-3.6.y/drivers/mmc/host } sdhci_disable_card_detection(host); -diff -Naur linux-3.6.9/drivers/mmc/host/sdhci.h linux-rpi-3.6.y/drivers/mmc/host/sdhci.h ---- linux-3.6.9/drivers/mmc/host/sdhci.h 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.h 2012-12-08 07:27:55.968636284 +0100 +diff -Naur linux-3.6.11/drivers/mmc/host/sdhci.h linux-rpi-3.6.y/drivers/mmc/host/sdhci.h +--- linux-3.6.11/drivers/mmc/host/sdhci.h 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/mmc/host/sdhci.h 2012-12-19 16:01:42.669249119 +0100 @@ -275,6 +275,20 @@ void (*platform_reset_enter)(struct sdhci_host *host, u8 mask); void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); @@ -24874,9 +25358,9 @@ diff -Naur linux-3.6.9/drivers/mmc/host/sdhci.h linux-rpi-3.6.y/drivers/mmc/host + + #endif /* __SDHCI_HW_H */ -diff -Naur linux-3.6.9/drivers/net/usb/smsc95xx.c linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c ---- linux-3.6.9/drivers/net/usb/smsc95xx.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c 2012-12-08 07:27:55.002641718 +0100 +diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.c linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c +--- linux-3.6.11/drivers/net/usb/smsc95xx.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.c 2012-12-19 16:01:43.776241681 +0100 @@ -46,11 +46,23 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -25891,9 +26375,9 @@ diff -Naur linux-3.6.9/drivers/net/usb/smsc95xx.c linux-rpi-3.6.y/drivers/net/us .disconnect = usbnet_disconnect, .disable_hub_initiated_lpm = 1, }; -diff -Naur linux-3.6.9/drivers/net/usb/smsc95xx.h linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h ---- linux-3.6.9/drivers/net/usb/smsc95xx.h 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h 2012-12-08 07:27:54.999641735 +0100 +diff -Naur linux-3.6.11/drivers/net/usb/smsc95xx.h linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h +--- linux-3.6.11/drivers/net/usb/smsc95xx.h 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/smsc95xx.h 2012-12-19 16:01:43.772241707 +0100 @@ -63,6 +63,7 @@ #define INT_STS_TDFO_ (0x00001000) #define INT_STS_RXDF_ (0x00000800) @@ -25932,9 +26416,9 @@ diff -Naur linux-3.6.9/drivers/net/usb/smsc95xx.h linux-rpi-3.6.y/drivers/net/us #define COE_CR (0x130) #define Tx_COE_EN_ (0x00010000) -diff -Naur linux-3.6.9/drivers/net/usb/usbnet.c linux-rpi-3.6.y/drivers/net/usb/usbnet.c ---- linux-3.6.9/drivers/net/usb/usbnet.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/net/usb/usbnet.c 2012-12-08 07:27:55.000641730 +0100 +diff -Naur linux-3.6.11/drivers/net/usb/usbnet.c linux-rpi-3.6.y/drivers/net/usb/usbnet.c +--- linux-3.6.11/drivers/net/usb/usbnet.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/net/usb/usbnet.c 2012-12-19 16:01:43.769241728 +0100 @@ -359,10 +359,12 @@ void usbnet_defer_kevent (struct usbnet *dev, int work) { @@ -25951,176 +26435,11 @@ diff -Naur linux-3.6.9/drivers/net/usb/usbnet.c linux-rpi-3.6.y/drivers/net/usb/ } EXPORT_SYMBOL_GPL(usbnet_defer_kevent); -diff -Naur linux-3.6.9/drivers/net/wireless/Kconfig linux-rpi-3.6.y/drivers/net/wireless/Kconfig -diff -Naur linux-3.6.9/drivers/net/wireless/Makefile linux-rpi-3.6.y/drivers/net/wireless/Makefile -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/clean linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/clean -\ Kein Zeilenumbruch am Dateiende. -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_debug.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_io.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_iol.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_mp.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_recv.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_rf.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_security.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/hal_init.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/hal_init.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 -\ Kein Zeilenumbruch am Dateiende. -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/autoconf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/basic_types.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/basic_types.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/circ_buf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_conf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/drv_types.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_types.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ethernet.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/farray.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/farray.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/h2clbk.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192DETestHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DETestHWImg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/Hal8192DUTestHWImg.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/Hal8192DUTestHWImg.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/hal_init.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/hal_init.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ieee80211.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/if_ether.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/ip.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/nic_spec.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/osdep_intf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/osdep_service.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/osdep_service.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/pci_hal.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/pci_ops.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/pci_osintf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/recv_osdep.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_android.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_android.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_debug.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_event.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ht.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_io.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_iol.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_led.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mp.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_qos.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_recv.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_rf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_security.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_security.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_version.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_version.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/sdio_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_hal.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/sdio_ops_ce.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_ops_ce.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/sdio_ops.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_ops.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/sdio_ops_linux.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_ops_linux.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/sdio_ops_xp.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_ops_xp.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/sdio_osintf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sdio_osintf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/sta_info.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/usb_hal.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/usb_ops.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/usb_osintf.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/wifi.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/Kconfig -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/Makefile linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/Makefile -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/sdio_intf.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/sdio_intf.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c -diff -Naur linux-3.6.9/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi-3.6.y/drivers/net/wireless/rtl8192cu/wlan0dhcp -diff -Naur linux-3.6.9/drivers/spi/Kconfig linux-rpi-3.6.y/drivers/spi/Kconfig ---- linux-3.6.9/drivers/spi/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/Kconfig 2012-12-08 07:27:56.351634130 +0100 +diff -Naur linux-3.6.11/drivers/net/wireless/Kconfig linux-rpi-3.6.y/drivers/net/wireless/Kconfig +diff -Naur linux-3.6.11/drivers/net/wireless/Makefile linux-rpi-3.6.y/drivers/net/wireless/Makefile +diff -Naur linux-3.6.11/drivers/spi/Kconfig linux-rpi-3.6.y/drivers/spi/Kconfig +--- linux-3.6.11/drivers/spi/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Kconfig 2012-12-19 16:01:42.582249704 +0100 @@ -74,6 +74,14 @@ This selects a driver for the Atmel SPI Controller, present on many AT32 (AVR32) and AT91 (ARM) chips. @@ -26136,9 +26455,9 @@ diff -Naur linux-3.6.9/drivers/spi/Kconfig linux-rpi-3.6.y/drivers/spi/Kconfig config SPI_BFIN5XX tristate "SPI controller driver for ADI Blackfin5xx" depends on BLACKFIN -diff -Naur linux-3.6.9/drivers/spi/Makefile linux-rpi-3.6.y/drivers/spi/Makefile ---- linux-3.6.9/drivers/spi/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/Makefile 2012-12-08 07:27:56.341634186 +0100 +diff -Naur linux-3.6.11/drivers/spi/Makefile linux-rpi-3.6.y/drivers/spi/Makefile +--- linux-3.6.11/drivers/spi/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/spi/Makefile 2012-12-19 16:01:42.575249751 +0100 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_AU1550) += spi-au1550.o obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o @@ -26147,9 +26466,9 @@ diff -Naur linux-3.6.9/drivers/spi/Makefile linux-rpi-3.6.y/drivers/spi/Makefile obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o -diff -Naur linux-3.6.9/drivers/spi/spi-bcm2708.c linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c ---- linux-3.6.9/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c 2012-12-08 07:27:56.342634181 +0100 +diff -Naur linux-3.6.11/drivers/spi/spi-bcm2708.c linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c +--- linux-3.6.11/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/spi/spi-bcm2708.c 2012-12-19 16:01:42.575249751 +0100 @@ -0,0 +1,594 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -26745,12 +27064,12 @@ diff -Naur linux-3.6.9/drivers/spi/spi-bcm2708.c linux-rpi-3.6.y/drivers/spi/spi +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Naur linux-3.6.9/drivers/staging/media/lirc/Kconfig linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig -diff -Naur linux-3.6.9/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c -diff -Naur linux-3.6.9/drivers/staging/media/lirc/Makefile linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile -diff -Naur linux-3.6.9/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c ---- linux-3.6.9/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c 2012-12-08 07:27:55.865636864 +0100 +diff -Naur linux-3.6.11/drivers/staging/media/lirc/Kconfig linux-rpi-3.6.y/drivers/staging/media/lirc/Kconfig +diff -Naur linux-3.6.11/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.6.y/drivers/staging/media/lirc/lirc_rpi.c +diff -Naur linux-3.6.11/drivers/staging/media/lirc/Makefile linux-rpi-3.6.y/drivers/staging/media/lirc/Makefile +diff -Naur linux-3.6.11/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c +--- linux-3.6.11/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/bcm2835-thermal.c 2012-12-19 16:01:45.264231687 +0100 @@ -0,0 +1,208 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -26960,9 +27279,9 @@ diff -Naur linux-3.6.9/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.y/drivers +MODULE_DESCRIPTION("Thermal driver for bcm2835 chip"); + +module_platform_driver(bcm2835_thermal_driver); -diff -Naur linux-3.6.9/drivers/thermal/Kconfig linux-rpi-3.6.y/drivers/thermal/Kconfig ---- linux-3.6.9/drivers/thermal/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/Kconfig 2012-12-08 07:27:55.866636858 +0100 +diff -Naur linux-3.6.11/drivers/thermal/Kconfig linux-rpi-3.6.y/drivers/thermal/Kconfig +--- linux-3.6.11/drivers/thermal/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Kconfig 2012-12-19 16:01:45.264231687 +0100 @@ -27,3 +27,14 @@ help Enable this to plug the SPEAr thermal sensor driver into the Linux @@ -26978,9 +27297,9 @@ diff -Naur linux-3.6.9/drivers/thermal/Kconfig linux-rpi-3.6.y/drivers/thermal/K + +endif # THERMAL_BCM2835 + -diff -Naur linux-3.6.9/drivers/thermal/Makefile linux-rpi-3.6.y/drivers/thermal/Makefile ---- linux-3.6.9/drivers/thermal/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/thermal/Makefile 2012-12-08 07:27:55.865636864 +0100 +diff -Naur linux-3.6.11/drivers/thermal/Makefile linux-rpi-3.6.y/drivers/thermal/Makefile +--- linux-3.6.11/drivers/thermal/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/thermal/Makefile 2012-12-19 16:01:45.263231694 +0100 @@ -3,4 +3,5 @@ # @@ -26989,9 +27308,9 @@ diff -Naur linux-3.6.9/drivers/thermal/Makefile linux-rpi-3.6.y/drivers/thermal/ \ Kein Zeilenumbruch am Dateiende. +obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o +obj-$(CONFIG_THERMAL_BCM2835) += bcm2835-thermal.o -diff -Naur linux-3.6.9/drivers/usb/core/generic.c linux-rpi-3.6.y/drivers/usb/core/generic.c ---- linux-3.6.9/drivers/usb/core/generic.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/generic.c 2012-12-08 07:27:56.523633163 +0100 +diff -Naur linux-3.6.11/drivers/usb/core/generic.c linux-rpi-3.6.y/drivers/usb/core/generic.c +--- linux-3.6.11/drivers/usb/core/generic.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/generic.c 2012-12-19 16:01:45.087232876 +0100 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -27000,9 +27319,9 @@ diff -Naur linux-3.6.9/drivers/usb/core/generic.c linux-rpi-3.6.y/drivers/usb/co } return i; } -diff -Naur linux-3.6.9/drivers/usb/core/hub.c linux-rpi-3.6.y/drivers/usb/core/hub.c ---- linux-3.6.9/drivers/usb/core/hub.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/hub.c 2012-12-08 07:27:56.523633163 +0100 +diff -Naur linux-3.6.11/drivers/usb/core/hub.c linux-rpi-3.6.y/drivers/usb/core/hub.c +--- linux-3.6.11/drivers/usb/core/hub.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/hub.c 2012-12-19 16:01:45.089232862 +0100 @@ -25,7 +25,6 @@ #include #include @@ -27123,9 +27442,9 @@ diff -Naur linux-3.6.9/drivers/usb/core/hub.c linux-rpi-3.6.y/drivers/usb/core/h } if (hub->hdev->parent || !hcd->driver->port_handed_over || -diff -Naur linux-3.6.9/drivers/usb/core/message.c linux-rpi-3.6.y/drivers/usb/core/message.c ---- linux-3.6.9/drivers/usb/core/message.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/message.c 2012-12-08 07:27:56.520633180 +0100 +diff -Naur linux-3.6.11/drivers/usb/core/message.c linux-rpi-3.6.y/drivers/usb/core/message.c +--- linux-3.6.11/drivers/usb/core/message.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/message.c 2012-12-19 16:01:45.085232888 +0100 @@ -1877,6 +1877,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -27212,9 +27531,9 @@ diff -Naur linux-3.6.9/drivers/usb/core/message.c linux-rpi-3.6.y/drivers/usb/co /* Now that the interfaces are installed, re-enable LPM. */ usb_unlocked_enable_lpm(dev); -diff -Naur linux-3.6.9/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h ---- linux-3.6.9/drivers/usb/core/otg_whitelist.h 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h 2012-12-08 07:27:56.524633158 +0100 +diff -Naur linux-3.6.11/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h +--- linux-3.6.11/drivers/usb/core/otg_whitelist.h 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/core/otg_whitelist.h 2012-12-19 16:01:45.084232895 +0100 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -27430,9 +27749,9 @@ diff -Naur linux-3.6.9/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.y/drivers/ #endif } -diff -Naur linux-3.6.9/drivers/usb/gadget/file_storage.c linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c ---- linux-3.6.9/drivers/usb/gadget/file_storage.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c 2012-12-08 07:27:56.586632808 +0100 +diff -Naur linux-3.6.11/drivers/usb/gadget/file_storage.c linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c +--- linux-3.6.11/drivers/usb/gadget/file_storage.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/file_storage.c 2012-12-19 16:01:45.080232923 +0100 @@ -573,8 +573,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -27560,9 +27879,9 @@ diff -Naur linux-3.6.9/drivers/usb/gadget/file_storage.c linux-rpi-3.6.y/drivers /* 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.6.9/drivers/usb/gadget/Kconfig linux-rpi-3.6.y/drivers/usb/gadget/Kconfig ---- linux-3.6.9/drivers/usb/gadget/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/gadget/Kconfig 2012-12-08 07:27:56.590632786 +0100 +diff -Naur linux-3.6.11/drivers/usb/gadget/Kconfig linux-rpi-3.6.y/drivers/usb/gadget/Kconfig +--- linux-3.6.11/drivers/usb/gadget/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/gadget/Kconfig 2012-12-19 16:01:45.074232963 +0100 @@ -505,6 +505,12 @@ bool depends on USB_GADGET_DUALSPEED @@ -27576,9 +27895,9 @@ diff -Naur linux-3.6.9/drivers/usb/gadget/Kconfig linux-rpi-3.6.y/drivers/usb/ga # # USB Gadget Drivers # -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt ---- linux-3.6.9/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt 2012-12-08 07:27:56.500633292 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt +--- linux-3.6.11/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/changes.txt 2012-12-19 16:01:44.947233816 +0100 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -27754,9 +28073,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3. +A DWC_LIBMODULE #define has also been added. If this is not defined, then the +module code in dwc_common_linux.c is not compiled in. This allows linking the +library code directly into a driver module, instead of as a standalone module. -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg ---- linux-3.6.9/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2012-12-08 07:27:56.500633292 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg +--- linux-3.6.11/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2012-12-19 16:01:44.950233795 +0100 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -28028,9 +28347,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rp +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-12-08 07:27:56.497633309 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-12-19 16:01:44.948233809 +0100 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -28564,9 +28883,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6.y +} + +#endif /* DWC_CCLIB */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-12-08 07:27:56.501633286 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-12-19 16:01:44.953233776 +0100 @@ -0,0 +1,225 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -28793,9 +29112,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6.y + +#endif /* _DWC_CC_H_ */ + -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2012-12-08 07:27:56.499633298 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2012-12-19 16:01:44.952233782 +0100 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -30105,9 +30424,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux- +{ + return wq->pending; +} -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-12-08 07:27:56.499633298 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-12-19 16:01:44.949233802 +0100 @@ -0,0 +1,1421 @@ +#include +#include @@ -31530,9 +31849,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux +MODULE_LICENSE ("GPL"); + +#endif /* DWC_LIBMODULE */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2012-12-08 07:27:56.498633304 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2012-12-19 16:01:44.951233788 +0100 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -32809,9 +33128,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux- +{ + return wq->pending; +} -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-12-08 07:27:56.500633292 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-12-19 16:01:44.947233816 +0100 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -33121,9 +33440,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3 +} + +#endif /* DWC_CRYPTOLIB */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-12-08 07:27:56.501633286 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-12-19 16:01:44.952233782 +0100 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -33236,9 +33555,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3 +#endif + +#endif /* _DWC_CRYPTO_H_ */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-12-08 07:27:56.501633286 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-12-19 16:01:44.947233816 +0100 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -33531,9 +33850,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6.y +#endif /* !CONFIG_MACH_IPMATE */ + +#endif /* DWC_CRYPTOLIB */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-12-08 07:27:56.499633298 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-12-19 16:01:44.948233809 +0100 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -33641,9 +33960,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6.y +#endif + +#endif /* _DWC_DH_H_ */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h 2012-12-08 07:27:56.498633304 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_list.h 2012-12-19 16:01:44.949233802 +0100 @@ -0,0 +1,594 @@ +/* $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 $ */ @@ -34239,9 +34558,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.6 +#endif + +#endif /* _DWC_LIST_H_ */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-12-08 07:27:56.501633286 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-12-19 16:01:44.949233802 +0100 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -34488,9 +34807,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6. +} + +#endif /* DWC_DEBUG_MEMORY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-12-08 07:27:56.500633292 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-12-19 16:01:44.951233788 +0100 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -35128,9 +35447,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3 +#endif /* CONFIG_MACH_IPMATE */ + +#endif /*DWC_CRYPTOLIB */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-12-08 07:27:56.501633286 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-12-19 16:01:44.950233795 +0100 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -35166,9 +35485,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3 +#endif + +#endif /* _LINUX_BIGNUM_H */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-12-08 07:27:56.499633298 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-12-19 16:01:44.948233809 +0100 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -35489,9 +35808,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi +} + +#endif /* DWC_NOTIFYLIB */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-12-08 07:27:56.501633286 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-12-19 16:01:44.949233802 +0100 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -35615,9 +35934,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi +#endif + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h ---- linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h 2012-12-08 07:27:56.498633304 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h +--- linux-3.6.11/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/dwc_os.h 2012-12-19 16:01:44.951233788 +0100 @@ -0,0 +1,1260 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -36879,9 +37198,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6.y +#endif + +#endif /* _DWC_OS_H_ */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile ---- linux-3.6.9/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile 2012-12-08 07:27:56.497633309 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile +--- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile 2012-12-19 16:01:44.948233809 +0100 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -36941,9 +37260,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6.y + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd ---- linux-3.6.9/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2012-12-08 07:27:56.499633298 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd +--- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2012-12-19 16:01:44.952233782 +0100 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -36962,9 +37281,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi- + dwc_common_fbsd.c dwc_mem.c + +.include -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux ---- linux-3.6.9/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux 2012-12-08 07:27:56.498633304 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux +--- linux-3.6.11/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/Makefile.linux 2012-12-19 16:01:44.947233816 +0100 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -37015,9 +37334,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi + +clean: + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h ---- linux-3.6.9/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h 2012-12-08 07:27:56.501633286 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h +--- linux-3.6.11/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_common_port/usb.h 2012-12-19 16:01:44.952233782 +0100 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37965,9 +38284,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.y/dr +#endif + +#endif /* _USB_H_ */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg ---- linux-3.6.9/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2012-12-08 07:27:56.489633354 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg +--- linux-3.6.11/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2012-12-19 16:01:44.923233976 +0100 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -38193,9 +38512,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.y/ +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c 2012-12-08 07:27:56.486633371 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dummy_audio.c 2012-12-19 16:01:44.927233950 +0100 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -39772,9 +40091,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.y/dr + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-12-08 07:27:56.485633376 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-12-19 16:01:44.916234023 +0100 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -39918,9 +40237,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6.y +typedef struct cfi_string cfi_string_t; + +#endif -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2012-12-08 07:27:56.485633376 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2012-12-19 16:01:44.928233943 +0100 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -40776,9 +41095,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.y/dr +#endif + return 1; +} -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2012-12-08 07:27:56.484633382 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2012-12-19 16:01:44.915234030 +0100 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -40860,9 +41179,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.y/dr +extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if); + +#endif //__DWC_OTG_ADP_H__ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-12-08 07:27:56.483633388 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-12-19 16:01:44.921233990 +0100 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -42074,9 +42393,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.y/d + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-12-08 07:27:56.487633366 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-12-19 16:01:44.927233950 +0100 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -42167,9 +42486,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.y/d +#endif + ); +#endif -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-12-08 07:27:56.482633394 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-12-19 16:01:44.922233983 +0100 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -44047,9 +44366,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.y/dr +} + +#endif //DWC_UTE_CFI -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-12-08 07:27:56.485633376 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-12-19 16:01:44.923233976 +0100 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -44371,9 +44690,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.y/dr +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-12-08 07:27:56.482633394 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-12-19 16:01:44.929233936 +0100 @@ -0,0 +1,7151 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -51526,9 +51845,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.y/dr + dwc_otg_pcd_start_srp_timer(core_if); + return; +} -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-12-08 07:27:56.487633366 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-12-19 16:01:44.924233970 +0100 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -52994,9 +53313,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.y/dr +////////////////////////////////////////////////////////////////////// + +#endif -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-12-08 07:27:56.489633354 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-12-19 16:01:44.917234017 +0100 @@ -0,0 +1,1571 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -54569,9 +54888,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.6 + + return retval; +} -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-12-08 07:27:56.490633348 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-12-19 16:01:44.923233976 +0100 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -55278,9 +55597,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6. +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-12-08 07:27:56.490633348 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-12-19 16:01:44.916234023 +0100 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -55399,9 +55718,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.y/dr + +#endif /*DEBUG*/ +#endif -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-12-08 07:27:56.486633371 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-12-19 16:01:44.920233997 +0100 @@ -0,0 +1,1732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -55633,7 +55952,7 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6.y + .rx_thr_length = -1, + .pti_enable = -1, + .mpi_enable = -1, -+ .lpm_enable = -1, ++ .lpm_enable = 0, + .ic_usb_cap = -1, + .ahb_thr_ratio = -1, + .power_down = -1, @@ -57135,9 +57454,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6.y + + +*/ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-12-08 07:27:56.489633354 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-12-19 16:01:44.918234011 +0100 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -57225,9 +57544,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6.y +#endif + +#endif -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-12-08 07:27:56.487633366 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-12-19 16:01:44.922233983 +0100 @@ -0,0 +1,3498 @@ + +/* ========================================================================== @@ -60727,9 +61046,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.y/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-12-08 07:27:56.485633376 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-12-19 16:01:44.927233950 +0100 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -61863,9 +62182,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.6 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-12-08 07:27:56.483633388 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-12-19 16:01:44.914234037 +0100 @@ -0,0 +1,829 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -62696,9 +63015,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.y/dr +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-12-08 07:27:56.486633371 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-12-19 16:01:44.924233970 +0100 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -63117,9 +63436,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6.y + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-12-08 07:27:56.488633360 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-12-19 16:01:44.917234017 +0100 @@ -0,0 +1,2248 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -65369,9 +65688,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.6 + return retval; +} +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-12-08 07:27:56.489633354 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-12-19 16:01:44.914234037 +0100 @@ -0,0 +1,938 @@ + +/* ========================================================================== @@ -66311,9 +66630,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3. +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-12-08 07:27:56.486633371 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-12-19 16:01:44.916234023 +0100 @@ -0,0 +1,957 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -67272,9 +67591,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3. +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2012-12-08 07:27:56.490633348 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2012-12-19 16:01:44.916234023 +0100 @@ -0,0 +1,113 @@ +#include "dwc_otg_regs.h" +#include "dwc_otg_dbg.h" @@ -67389,9 +67708,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.6 + + return; +} -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2012-12-08 07:27:56.490633348 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2012-12-19 16:01:44.915234030 +0100 @@ -0,0 +1,36 @@ +#ifndef __DWC_OTG_MPHI_FIX_H__ +#define __DWC_OTG_MPHI_FIX_H__ @@ -67429,9 +67748,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.6 +#endif + +#endif -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2012-12-08 07:27:56.485633376 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2012-12-19 16:01:44.927233950 +0100 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -67621,9 +67940,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6.y + + +#endif /* _DWC_OS_DEP_H_ */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-12-08 07:27:56.487633366 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-12-19 16:01:44.918234011 +0100 @@ -0,0 +1,2708 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -70333,9 +70652,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.y/dr +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-12-08 07:27:56.484633382 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-12-19 16:01:44.920233997 +0100 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -70603,9 +70922,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.y/dr +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-12-08 07:27:56.485633376 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-12-19 16:01:44.915234030 +0100 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -70967,9 +71286,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6.y +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-12-08 07:27:56.488633360 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-12-19 16:01:44.919234004 +0100 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -76118,9 +76437,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.6 +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-12-08 07:27:56.490633348 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-12-19 16:01:44.925233964 +0100 @@ -0,0 +1,1374 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -77496,9 +77815,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3. +EXPORT_SYMBOL(usb_gadget_unregister_driver); + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h ---- linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-12-08 07:27:56.483633388 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h +--- linux-3.6.11/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-12-19 16:01:44.921233990 +0100 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -80050,9 +80369,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.y/d +} gpwrdn_data_t; + +#endif -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile ---- linux-3.6.9/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile 2012-12-08 07:27:56.483633388 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile +--- linux-3.6.11/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/Makefile 2012-12-19 16:01:44.915234030 +0100 @@ -0,0 +1,81 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -80135,9 +80454,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.y/drivers + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + +endif -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm ---- linux-3.6.9/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2012-12-08 07:27:56.484633382 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm +--- linux-3.6.11/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2012-12-19 16:01:44.926233957 +0100 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -80476,9 +80795,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3 +); + +1; -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile ---- linux-3.6.9/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile 2012-12-08 07:27:56.484633382 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile +--- linux-3.6.11/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/Makefile 2012-12-19 16:01:44.925233964 +0100 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -80496,9 +80815,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.y/dr + else echo "=======> $$test, FAILED" ; \ + fi \ + done -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl ---- linux-3.6.9/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2012-12-08 07:27:56.484633382 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl +--- linux-3.6.11/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2012-12-19 16:01:44.926233957 +0100 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -80633,9 +80952,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi + +test_main(); +0; -diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl ---- linux-3.6.9/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2012-12-08 07:27:56.484633382 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl +--- linux-3.6.11/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2012-12-19 16:01:44.926233957 +0100 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -80830,9 +81149,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.6 + +test_main(); +0; -diff -Naur linux-3.6.9/drivers/usb/host/Kconfig linux-rpi-3.6.y/drivers/usb/host/Kconfig ---- linux-3.6.9/drivers/usb/host/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/Kconfig 2012-12-08 07:27:56.513633219 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/Kconfig linux-rpi-3.6.y/drivers/usb/host/Kconfig +--- linux-3.6.11/drivers/usb/host/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Kconfig 2012-12-19 16:01:44.964233701 +0100 @@ -610,6 +610,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -80853,9 +81172,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/Kconfig linux-rpi-3.6.y/drivers/usb/host config USB_IMX21_HCD tristate "i.MX21 HCD support" depends on USB && ARM && ARCH_MXC -diff -Naur linux-3.6.9/drivers/usb/host/Makefile linux-rpi-3.6.y/drivers/usb/host/Makefile ---- linux-3.6.9/drivers/usb/host/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/host/Makefile 2012-12-08 07:27:56.480633405 +0100 +diff -Naur linux-3.6.11/drivers/usb/host/Makefile linux-rpi-3.6.y/drivers/usb/host/Makefile +--- linux-3.6.11/drivers/usb/host/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/host/Makefile 2012-12-19 16:01:44.939233870 +0100 @@ -37,6 +37,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -80865,9 +81184,9 @@ diff -Naur linux-3.6.9/drivers/usb/host/Makefile linux-rpi-3.6.y/drivers/usb/hos 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.6.9/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefile ---- linux-3.6.9/drivers/usb/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/usb/Makefile 2012-12-08 07:27:56.544633044 +0100 +diff -Naur linux-3.6.11/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefile +--- linux-3.6.11/drivers/usb/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/usb/Makefile 2012-12-19 16:01:44.990233527 +0100 @@ -25,6 +25,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -80876,9 +81195,9 @@ diff -Naur linux-3.6.9/drivers/usb/Makefile linux-rpi-3.6.y/drivers/usb/Makefile obj-$(CONFIG_USB_IMX21_HCD) += host/ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ -diff -Naur linux-3.6.9/drivers/video/bcm2708_fb.c linux-rpi-3.6.y/drivers/video/bcm2708_fb.c ---- linux-3.6.9/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/bcm2708_fb.c 2012-12-08 07:27:56.416633765 +0100 +diff -Naur linux-3.6.11/drivers/video/bcm2708_fb.c linux-rpi-3.6.y/drivers/video/bcm2708_fb.c +--- linux-3.6.11/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/video/bcm2708_fb.c 2012-12-19 16:01:42.339251336 +0100 @@ -0,0 +1,491 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -81371,9 +81690,9 @@ diff -Naur linux-3.6.9/drivers/video/bcm2708_fb.c linux-rpi-3.6.y/drivers/video/ +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.6.9/drivers/video/Kconfig linux-rpi-3.6.y/drivers/video/Kconfig ---- linux-3.6.9/drivers/video/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/Kconfig 2012-12-08 07:27:56.452633562 +0100 +diff -Naur linux-3.6.11/drivers/video/Kconfig linux-rpi-3.6.y/drivers/video/Kconfig +--- linux-3.6.11/drivers/video/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/video/Kconfig 2012-12-19 16:01:42.471250449 +0100 @@ -312,6 +312,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -81395,9 +81714,9 @@ diff -Naur linux-3.6.9/drivers/video/Kconfig linux-rpi-3.6.y/drivers/video/Kconf config FB_ARMCLCD tristate "ARM PrimeCell PL110 support" depends on FB && ARM && ARM_AMBA -diff -Naur linux-3.6.9/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm ---- linux-3.6.9/drivers/video/logo/logo_linux_clut224.ppm 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm 2012-12-08 07:27:56.436633652 +0100 +diff -Naur linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm +--- linux-3.6.11/drivers/video/logo/logo_linux_clut224.ppm 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/video/logo/logo_linux_clut224.ppm 2012-12-19 16:01:42.436250684 +0100 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -83884,9 +84203,9 @@ diff -Naur linux-3.6.9/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6.y +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.6.9/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Makefile ---- linux-3.6.9/drivers/video/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/video/Makefile 2012-12-08 07:27:56.389633916 +0100 +diff -Naur linux-3.6.11/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Makefile +--- linux-3.6.11/drivers/video/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/video/Makefile 2012-12-19 16:01:42.379251067 +0100 @@ -99,6 +99,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -83895,9 +84214,9 @@ diff -Naur linux-3.6.9/drivers/video/Makefile linux-rpi-3.6.y/drivers/video/Make obj-$(CONFIG_FB_68328) += 68328fb.o obj-$(CONFIG_FB_GBE) += gbefb.o obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o -diff -Naur linux-3.6.9/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c ---- linux-3.6.9/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c 2012-12-08 07:27:55.275640182 +0100 +diff -Naur linux-3.6.11/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c +--- linux-3.6.11/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/bcm2708_wdog.c 2012-12-19 16:01:45.831227879 +0100 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -84284,9 +84603,9 @@ diff -Naur linux-3.6.9/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.y/drivers/w +MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_LICENSE("GPL"); + -diff -Naur linux-3.6.9/drivers/watchdog/Kconfig linux-rpi-3.6.y/drivers/watchdog/Kconfig ---- linux-3.6.9/drivers/watchdog/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/Kconfig 2012-12-08 07:27:55.282640144 +0100 +diff -Naur linux-3.6.11/drivers/watchdog/Kconfig linux-rpi-3.6.y/drivers/watchdog/Kconfig +--- linux-3.6.11/drivers/watchdog/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Kconfig 2012-12-19 16:01:45.841227812 +0100 @@ -352,6 +352,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -84300,9 +84619,9 @@ diff -Naur linux-3.6.9/drivers/watchdog/Kconfig linux-rpi-3.6.y/drivers/watchdog # AVR32 Architecture config AT32AP700X_WDT -diff -Naur linux-3.6.9/drivers/watchdog/Makefile linux-rpi-3.6.y/drivers/watchdog/Makefile ---- linux-3.6.9/drivers/watchdog/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/drivers/watchdog/Makefile 2012-12-08 07:27:55.271640206 +0100 +diff -Naur linux-3.6.11/drivers/watchdog/Makefile linux-rpi-3.6.y/drivers/watchdog/Makefile +--- linux-3.6.11/drivers/watchdog/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/drivers/watchdog/Makefile 2012-12-19 16:01:45.823227932 +0100 @@ -52,6 +52,7 @@ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -84311,9 +84630,9 @@ diff -Naur linux-3.6.9/drivers/watchdog/Makefile linux-rpi-3.6.y/drivers/watchdo # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o -diff -Naur linux-3.6.9/include/linux/broadcom/vc_cma.h linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h ---- linux-3.6.9/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h 2012-12-08 07:27:56.880631154 +0100 +diff -Naur linux-3.6.11/include/linux/broadcom/vc_cma.h linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h +--- linux-3.6.11/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/include/linux/broadcom/vc_cma.h 2012-12-19 16:01:33.936309054 +0100 @@ -0,0 +1,30 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -84345,9 +84664,9 @@ diff -Naur linux-3.6.9/include/linux/broadcom/vc_cma.h linux-rpi-3.6.y/include/l + +#endif /* VC_CMA_H */ + -diff -Naur linux-3.6.9/include/linux/mmc/host.h linux-rpi-3.6.y/include/linux/mmc/host.h ---- linux-3.6.9/include/linux/mmc/host.h 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/mmc/host.h 2012-12-08 07:27:57.101629912 +0100 +diff -Naur linux-3.6.11/include/linux/mmc/host.h linux-rpi-3.6.y/include/linux/mmc/host.h +--- linux-3.6.11/include/linux/mmc/host.h 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/host.h 2012-12-19 16:01:33.884309402 +0100 @@ -257,6 +257,7 @@ #define MMC_CAP2_HC_ERASE_SZ (1 << 9) /* High-capacity erase size */ #define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10) /* Card-detect signal active high */ @@ -84356,9 +84675,9 @@ diff -Naur linux-3.6.9/include/linux/mmc/host.h linux-rpi-3.6.y/include/linux/mm mmc_pm_flag_t pm_caps; /* supported pm features */ unsigned int power_notify_type; -diff -Naur linux-3.6.9/include/linux/mmc/sdhci.h linux-rpi-3.6.y/include/linux/mmc/sdhci.h ---- linux-3.6.9/include/linux/mmc/sdhci.h 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/include/linux/mmc/sdhci.h 2012-12-08 07:27:57.102629906 +0100 +diff -Naur linux-3.6.11/include/linux/mmc/sdhci.h linux-rpi-3.6.y/include/linux/mmc/sdhci.h +--- linux-3.6.11/include/linux/mmc/sdhci.h 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/include/linux/mmc/sdhci.h 2012-12-19 16:01:33.887309383 +0100 @@ -93,6 +93,7 @@ #define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) @@ -84383,9 +84702,21 @@ diff -Naur linux-3.6.9/include/linux/mmc/sdhci.h linux-rpi-3.6.y/include/linux/m struct mmc_data *data; /* Current data request */ unsigned int data_early:1; /* Data finished before cmd */ -diff -Naur linux-3.6.9/kernel/module.c linux-rpi-3.6.y/kernel/module.c ---- linux-3.6.9/kernel/module.c 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/kernel/module.c 2012-12-08 07:27:43.888705639 +0100 +diff -Naur linux-3.6.11/include/net/bluetooth/hci.h linux-rpi-3.6.y/include/net/bluetooth/hci.h +--- linux-3.6.11/include/net/bluetooth/hci.h 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/include/net/bluetooth/hci.h 2012-12-19 16:01:34.503305216 +0100 +@@ -142,7 +142,7 @@ + #define HCI_DISCONN_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ + #define HCI_PAIRING_TIMEOUT msecs_to_jiffies(60000) /* 60 seconds */ + #define HCI_INIT_TIMEOUT msecs_to_jiffies(10000) /* 10 seconds */ +-#define HCI_CMD_TIMEOUT msecs_to_jiffies(1000) /* 1 second */ ++#define HCI_CMD_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ + #define HCI_ACL_TX_TIMEOUT msecs_to_jiffies(45000) /* 45 seconds */ + #define HCI_AUTO_OFF_TIMEOUT msecs_to_jiffies(2000) /* 2 seconds */ + +diff -Naur linux-3.6.11/kernel/module.c linux-rpi-3.6.y/kernel/module.c +--- linux-3.6.11/kernel/module.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/kernel/module.c 2012-12-19 16:01:32.978315492 +0100 @@ -2680,20 +2680,23 @@ memset(ptr, 0, mod->core_size); mod->module_core = ptr; @@ -84423,9 +84754,86 @@ diff -Naur linux-3.6.9/kernel/module.c linux-rpi-3.6.y/kernel/module.c /* Transfer each section which specifies SHF_ALLOC */ pr_debug("final section addresses:\n"); -diff -Naur linux-3.6.9/sound/arm/bcm2835.c linux-rpi-3.6.y/sound/arm/bcm2835.c ---- linux-3.6.9/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835.c 2012-12-08 07:27:44.393702798 +0100 +diff -Naur linux-3.6.11/net/core/skbuff.c linux-rpi-3.6.y/net/core/skbuff.c +--- linux-3.6.11/net/core/skbuff.c 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/net/core/skbuff.c 2012-12-19 16:01:33.247313683 +0100 +@@ -340,43 +340,57 @@ + EXPORT_SYMBOL(build_skb); + + struct netdev_alloc_cache { +- struct page *page; +- unsigned int offset; +- unsigned int pagecnt_bias; ++ struct page_frag frag; ++ /* we maintain a pagecount bias, so that we dont dirty cache line ++ * containing page->_count every time we allocate a fragment. ++ */ ++ unsigned int pagecnt_bias; + }; + static DEFINE_PER_CPU(struct netdev_alloc_cache, netdev_alloc_cache); + +-#define NETDEV_PAGECNT_BIAS (PAGE_SIZE / SMP_CACHE_BYTES) ++#define NETDEV_FRAG_PAGE_MAX_ORDER get_order(32768) ++#define NETDEV_FRAG_PAGE_MAX_SIZE (PAGE_SIZE << NETDEV_FRAG_PAGE_MAX_ORDER) ++#define NETDEV_PAGECNT_MAX_BIAS NETDEV_FRAG_PAGE_MAX_SIZE + + static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) + { + struct netdev_alloc_cache *nc; + void *data = NULL; ++ int order; + unsigned long flags; + + local_irq_save(flags); + nc = &__get_cpu_var(netdev_alloc_cache); +- if (unlikely(!nc->page)) { ++ if (unlikely(!nc->frag.page)) { + refill: +- nc->page = alloc_page(gfp_mask); +- if (unlikely(!nc->page)) +- goto end; ++ for (order = NETDEV_FRAG_PAGE_MAX_ORDER; ;) { ++ gfp_t gfp = gfp_mask; ++ ++ if (order) ++ gfp |= __GFP_COMP | __GFP_NOWARN; ++ nc->frag.page = alloc_pages(gfp, order); ++ if (likely(nc->frag.page)) ++ break; ++ if (--order < 0) ++ goto end; ++ } ++ nc->frag.size = PAGE_SIZE << order; + recycle: +- atomic_set(&nc->page->_count, NETDEV_PAGECNT_BIAS); +- nc->pagecnt_bias = NETDEV_PAGECNT_BIAS; +- nc->offset = 0; ++ atomic_set(&nc->frag.page->_count, NETDEV_PAGECNT_MAX_BIAS); ++ nc->pagecnt_bias = NETDEV_PAGECNT_MAX_BIAS; ++ nc->frag.offset = 0; + } + +- if (nc->offset + fragsz > PAGE_SIZE) { ++ if (nc->frag.offset + fragsz > nc->frag.size) { + /* avoid unnecessary locked operations if possible */ +- if ((atomic_read(&nc->page->_count) == nc->pagecnt_bias) || +- atomic_sub_and_test(nc->pagecnt_bias, &nc->page->_count)) ++ if ((atomic_read(&nc->frag.page->_count) == nc->pagecnt_bias) || ++ atomic_sub_and_test(nc->pagecnt_bias, &nc->frag.page->_count)) + goto recycle; + goto refill; + } + +- data = page_address(nc->page) + nc->offset; +- nc->offset += fragsz; ++ data = page_address(nc->frag.page) + nc->frag.offset; ++ nc->frag.offset += fragsz; + nc->pagecnt_bias--; + end: + local_irq_restore(flags); +diff -Naur linux-3.6.11/sound/arm/bcm2835.c linux-rpi-3.6.y/sound/arm/bcm2835.c +--- linux-3.6.11/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.c 2012-12-19 16:01:34.893302594 +0100 @@ -0,0 +1,413 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -84840,9 +85248,9 @@ diff -Naur linux-3.6.9/sound/arm/bcm2835.c linux-rpi-3.6.y/sound/arm/bcm2835.c +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2835_alsa"); -diff -Naur linux-3.6.9/sound/arm/bcm2835-ctl.c linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c ---- linux-3.6.9/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c 2012-12-08 07:27:44.393702798 +0100 +diff -Naur linux-3.6.11/sound/arm/bcm2835-ctl.c linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c +--- linux-3.6.11/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-ctl.c 2012-12-19 16:01:34.892302601 +0100 @@ -0,0 +1,200 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -85044,9 +85452,9 @@ diff -Naur linux-3.6.9/sound/arm/bcm2835-ctl.c linux-rpi-3.6.y/sound/arm/bcm2835 + } + return 0; +} -diff -Naur linux-3.6.9/sound/arm/bcm2835.h linux-rpi-3.6.y/sound/arm/bcm2835.h ---- linux-3.6.9/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835.h 2012-12-08 07:27:44.393702798 +0100 +diff -Naur linux-3.6.11/sound/arm/bcm2835.h linux-rpi-3.6.y/sound/arm/bcm2835.h +--- linux-3.6.11/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835.h 2012-12-19 16:01:34.890302615 +0100 @@ -0,0 +1,155 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -85203,9 +85611,9 @@ diff -Naur linux-3.6.9/sound/arm/bcm2835.h linux-rpi-3.6.y/sound/arm/bcm2835.h +void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream); + +#endif /* __SOUND_ARM_BCM2835_H */ -diff -Naur linux-3.6.9/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c ---- linux-3.6.9/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c 2012-12-08 07:27:44.393702798 +0100 +diff -Naur linux-3.6.11/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c +--- linux-3.6.11/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-pcm.c 2012-12-19 16:01:34.889302622 +0100 @@ -0,0 +1,408 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -85615,9 +86023,9 @@ diff -Naur linux-3.6.9/sound/arm/bcm2835-pcm.c linux-rpi-3.6.y/sound/arm/bcm2835 + + return 0; +} -diff -Naur linux-3.6.9/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c ---- linux-3.6.9/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c 2012-12-08 07:27:44.394702793 +0100 +diff -Naur linux-3.6.11/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c +--- linux-3.6.11/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/sound/arm/bcm2835-vchiq.c 2012-12-19 16:01:34.891302608 +0100 @@ -0,0 +1,826 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86445,9 +86853,9 @@ diff -Naur linux-3.6.9/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.y/sound/arm/bcm28 + atomic_sub(count, &alsa_stream->retrieved); + return count; +} -diff -Naur linux-3.6.9/sound/arm/Kconfig linux-rpi-3.6.y/sound/arm/Kconfig ---- linux-3.6.9/sound/arm/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/Kconfig 2012-12-08 07:27:44.394702793 +0100 +diff -Naur linux-3.6.11/sound/arm/Kconfig linux-rpi-3.6.y/sound/arm/Kconfig +--- linux-3.6.11/sound/arm/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/sound/arm/Kconfig 2012-12-19 16:01:34.892302601 +0100 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -86461,9 +86869,9 @@ diff -Naur linux-3.6.9/sound/arm/Kconfig linux-rpi-3.6.y/sound/arm/Kconfig + endif # SND_ARM -diff -Naur linux-3.6.9/sound/arm/Makefile linux-rpi-3.6.y/sound/arm/Makefile ---- linux-3.6.9/sound/arm/Makefile 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/Makefile 2012-12-08 07:27:44.392702804 +0100 +diff -Naur linux-3.6.11/sound/arm/Makefile linux-rpi-3.6.y/sound/arm/Makefile +--- linux-3.6.11/sound/arm/Makefile 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/sound/arm/Makefile 2012-12-19 16:01:34.890302615 +0100 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -86474,9 +86882,9 @@ diff -Naur linux-3.6.9/sound/arm/Makefile linux-rpi-3.6.y/sound/arm/Makefile + +EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 + -diff -Naur linux-3.6.9/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h ---- linux-3.6.9/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h 2012-12-08 07:27:44.393702798 +0100 +diff -Naur linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h +--- linux-3.6.11/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-rpi-3.6.y/sound/arm/vc_vchi_audioserv_defs.h 2012-12-19 16:01:34.892302601 +0100 @@ -0,0 +1,114 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86592,9 +87000,9 @@ diff -Naur linux-3.6.9/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.y/sound/ +} VC_AUDIO_MSG_T; + +#endif // _VC_AUDIO_DEFS_H_ -diff -Naur linux-3.6.9/sound/pci/Kconfig linux-rpi-3.6.y/sound/pci/Kconfig ---- linux-3.6.9/sound/pci/Kconfig 2012-12-03 20:39:49.000000000 +0100 -+++ linux-rpi-3.6.y/sound/pci/Kconfig 2012-12-08 07:27:44.501702191 +0100 +diff -Naur linux-3.6.11/sound/pci/Kconfig linux-rpi-3.6.y/sound/pci/Kconfig +--- linux-3.6.11/sound/pci/Kconfig 2012-12-17 18:27:45.000000000 +0100 ++++ linux-rpi-3.6.y/sound/pci/Kconfig 2012-12-19 16:01:35.041301600 +0100 @@ -2,8 +2,8 @@ config SND_TEA575X From 87a1134130911a967fb5043725eae5826e0817d9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Dec 2012 21:14:23 +0100 Subject: [PATCH 2/3] bcm2835-driver: update to bcm2835-driver-3bd073e Signed-off-by: Stephan Raue --- packages/graphics/bcm2835-driver/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/bcm2835-driver/meta b/packages/graphics/bcm2835-driver/meta index 6b29cc55a5..beee8bad35 100644 --- a/packages/graphics/bcm2835-driver/meta +++ b/packages/graphics/bcm2835-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="86ea2da" +PKG_VERSION="3bd073e" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" From b20cfcefae047c591c2c548d9f46068417e487cc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 19 Dec 2012 21:14:42 +0100 Subject: [PATCH 3/3] bcm2835-bootloader: update to bcm2835-bootloader-3bd073e Signed-off-by: Stephan Raue --- packages/tools/bcm2835-bootloader/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/meta b/packages/tools/bcm2835-bootloader/meta index ad09b80813..6127ac7e08 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="86ea2da" +PKG_VERSION="3bd073e" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree"