From edf6bbab49eee7a200a82d8ee8e1475947c4a146 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Nov 2012 06:25:47 +0100 Subject: [PATCH 1/4] Revert "projects/RPi/linux: add CMA support" This reverts commit 5e634d6654091dd4acbea6756477beb0a6bc2f23. --- projects/RPi/linux/linux.arm.conf | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 89f9e03431..2351d2cf34 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -379,11 +379,9 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_COMPACTION is not set -CONFIG_MIGRATION=y # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y @@ -690,19 +688,7 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set # CONFIG_DMA_SHARED_BUFFER is not set -CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set - -# -# Default contiguous memory area size: -# -CONFIG_CMA_SIZE_MBYTES=16 -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_ALIGNMENT=8 -CONFIG_CMA_AREAS=7 +# CONFIG_CMA is not set # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set # CONFIG_PARPORT is not set @@ -1054,7 +1040,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set CONFIG_BRCM_CHAR_DRIVERS=y -CONFIG_BCM_VC_CMA=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_COMPAT is not set From 3d42326c471bdfbfdb78595054e04f6f68aa94b6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Nov 2012 06:26:06 +0100 Subject: [PATCH 2/4] Revert "linux: update RPi patches" This reverts commit dc50d9b2e8e48665f29ed0ab5d8cf998671dd53d. --- ...linux-3.6.7-601-RPi_support-29ab912.patch} | 2628 +++-------------- projects/RPi/linux/linux.arm.conf | 1 - 2 files changed, 461 insertions(+), 2168 deletions(-) rename packages/linux/patches/{linux-3.6.7-601-RPi_support-3c1dbe1.patch => linux-3.6.7-601-RPi_support-29ab912.patch} (96%) diff --git a/packages/linux/patches/linux-3.6.7-601-RPi_support-3c1dbe1.patch b/packages/linux/patches/linux-3.6.7-601-RPi_support-29ab912.patch similarity index 96% rename from packages/linux/patches/linux-3.6.7-601-RPi_support-3c1dbe1.patch rename to packages/linux/patches/linux-3.6.7-601-RPi_support-29ab912.patch index 5b4d99acea..e8353a6853 100644 --- a/packages/linux/patches/linux-3.6.7-601-RPi_support-3c1dbe1.patch +++ b/packages/linux/patches/linux-3.6.7-601-RPi_support-29ab912.patch @@ -1,6 +1,6 @@ -diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6.7/arch/arm/configs/bcmrpi_cutdown_defconfig +diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.6.7.patch/arch/arm/configs/bcmrpi_cutdown_defconfig --- linux-3.6.7/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-11-27 14:40:49.876961518 +0100 ++++ linux-3.6.7.patch/arch/arm/configs/bcmrpi_cutdown_defconfig 2012-11-18 20:53:34.980712692 +0100 @@ -0,0 +1,546 @@ +CONFIG_EXPERIMENTAL=y +CONFIG_LOCALVERSION="-cutdown" @@ -548,10 +548,10 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.6.7 +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/arm/configs/bcmrpi_defconfig +diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-3.6.7.patch/arch/arm/configs/bcmrpi_defconfig --- linux-3.6.7/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/configs/bcmrpi_defconfig 2012-11-27 14:40:49.781959568 +0100 -@@ -0,0 +1,1048 @@ ++++ linux-3.6.7.patch/arch/arm/configs/bcmrpi_defconfig 2012-11-18 20:53:34.981712711 +0100 +@@ -0,0 +1,948 @@ +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -565,8 +565,6 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_CGROUP_FREEZER=y @@ -587,13 +585,12 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y ++# CONFIG_BLK_DEV_BSG is not set +CONFIG_BLK_DEV_THROTTLING=y -+CONFIG_PARTITION_ADVANCED=y -+CONFIG_MAC_PARTITION=y -+CONFIG_EFI_PARTITION=y +CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_ARCH_BCM2708=y -+CONFIG_BCM2708_DMAER=m ++CONFIG_NO_HZ=y ++CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y +CONFIG_AEABI=y +CONFIG_UACCESS_WITH_MEMCPY=y @@ -601,7 +598,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_CC_STACKPROTECTOR=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" ++CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait" +CONFIG_KEXEC=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT=m @@ -736,6 +733,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m ++CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -759,6 +757,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m ++CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m @@ -860,6 +859,8 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_SIGMATEL_FIR=m +CONFIG_MCS_FIR=m +CONFIG_BT=m ++CONFIG_BT_L2CAP=y ++CONFIG_BT_SCO=y +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m @@ -884,14 +885,13 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_NFC_PN533=m +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y -+CONFIG_CMA=y -+CONFIG_CMA_DEBUG=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_DRBD=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_CDROM_PKTCDVD=m ++CONFIG_MISC_DEVICES=y +CONFIG_SCSI=y +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y @@ -899,8 +899,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +CONFIG_SCSI_MULTI_LUN=y -+CONFIG_SCSI_ISCSI_ATTRS=y -+CONFIG_ISCSI_TCP=m ++# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_MD=y +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m @@ -915,6 +914,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_MACVLAN=m +CONFIG_NETCONSOLE=m +CONFIG_TUN=m ++CONFIG_PHYLIB=m +CONFIG_MDIO_BITBANG=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m @@ -969,6 +969,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_B43_PHY_N=y +CONFIG_B43LEGACY=m +CONFIG_HOSTAP=m ++CONFIG_IWM=m +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_SDIO=m @@ -980,6 +981,8 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_UNKNOWN=y ++CONFIG_WL1251=m ++CONFIG_WL12XX_MENU=m +CONFIG_ZD1211RW=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m @@ -1015,8 +1018,6 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_TTY_PRINTK=y +# CONFIG_HW_RANDOM is not set +CONFIG_RAW_DRIVER=y -+CONFIG_BRCM_CHAR_DRIVERS=y -+CONFIG_BCM_VC_CMA=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_BCM2708=m @@ -1044,24 +1045,15 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_WATCHDOG=y +CONFIG_BCM2708_WDT=m +CONFIG_MEDIA_SUPPORT=m -+CONFIG_MEDIA_CAMERA_SUPPORT=y -+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -+CONFIG_MEDIA_RADIO_SUPPORT=y -+CONFIG_MEDIA_RC_SUPPORT=y -+CONFIG_MEDIA_CONTROLLER=y -+CONFIG_LIRC=m -+CONFIG_RC_DEVICES=y ++CONFIG_VIDEO_DEV=m ++CONFIG_DVB_CORE=m +CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_IMON=m +CONFIG_IR_MCEUSB=m +CONFIG_IR_REDRAT3=m +CONFIG_IR_STREAMZAP=m -+CONFIG_IR_IGUANA=m +CONFIG_RC_LOOPBACK=m -+CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_ATTACH=y -+CONFIG_VIDEO_VIVI=m +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m @@ -1072,7 +1064,6 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_USB_GSPCA_ETOMS=m +CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m -+CONFIG_USB_GSPCA_JL2005BCD=m +CONFIG_USB_GSPCA_KINECT=m +CONFIG_USB_GSPCA_KONICA=m +CONFIG_USB_GSPCA_MARS=m @@ -1103,37 +1094,31 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_USB_GSPCA_STV0680=m +CONFIG_USB_GSPCA_SUNPLUS=m +CONFIG_USB_GSPCA_T613=m -+CONFIG_USB_GSPCA_TOPRO=m +CONFIG_USB_GSPCA_TV8532=m +CONFIG_USB_GSPCA_VC032X=m +CONFIG_USB_GSPCA_VICAM=m +CONFIG_USB_GSPCA_XIRLINK_CIT=m +CONFIG_USB_GSPCA_ZC3XX=m -+CONFIG_USB_PWC=m -+CONFIG_VIDEO_CPIA2=m -+CONFIG_USB_ZR364XX=m -+CONFIG_USB_STKWEBCAM=m -+CONFIG_USB_S2255=m -+CONFIG_USB_SN9C102=m ++CONFIG_VIDEO_PVRUSB2=m ++CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m -+CONFIG_VIDEO_AU0828=m -+CONFIG_VIDEO_PVRUSB2=m -+CONFIG_VIDEO_HDPVR=m +CONFIG_VIDEO_TLG2300=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m -+CONFIG_VIDEO_TM6000=m -+CONFIG_VIDEO_TM6000_ALSA=m -+CONFIG_VIDEO_TM6000_DVB=m +CONFIG_VIDEO_USBVISION=m -+CONFIG_USB_MR800=m ++CONFIG_USB_ET61X251=m ++CONFIG_USB_SN9C102=m ++CONFIG_USB_PWC=m ++CONFIG_USB_ZR364XX=m ++CONFIG_USB_STKWEBCAM=m ++CONFIG_USB_S2255=m +CONFIG_USB_DSBR=m -+CONFIG_RADIO_SHARK=m -+CONFIG_RADIO_SHARK2=m -+CONFIG_USB_KEENE=m ++CONFIG_RADIO_SI470X=y ++CONFIG_USB_SI470X=m ++CONFIG_USB_MR800=m +CONFIG_DVB_USB=m +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m @@ -1163,97 +1148,17 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_EC168=m -+CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_MXL111SF=m -+CONFIG_DVB_USB_RTL28XXU=m -+CONFIG_DVB_USB_AF9035=m -+# CONFIG_DVB_STB0899 is not set -+# CONFIG_DVB_STB6100 is not set -+# CONFIG_DVB_STV090x is not set -+# CONFIG_DVB_STV6110x is not set -+# CONFIG_DVB_DRXK is not set -+# CONFIG_DVB_TDA18271C2DD is not set -+# CONFIG_DVB_CX24110 is not set -+# CONFIG_DVB_CX24123 is not set -+# CONFIG_DVB_MT312 is not set -+# CONFIG_DVB_ZL10036 is not set -+# CONFIG_DVB_ZL10039 is not set -+# CONFIG_DVB_S5H1420 is not set -+# CONFIG_DVB_STV0288 is not set -+# CONFIG_DVB_STB6000 is not set -+# CONFIG_DVB_STV0299 is not set -+# CONFIG_DVB_STV6110 is not set -+# CONFIG_DVB_STV0900 is not set -+# CONFIG_DVB_TDA8083 is not set -+# CONFIG_DVB_TDA10086 is not set -+# CONFIG_DVB_TDA8261 is not set -+# CONFIG_DVB_VES1X93 is not set -+# CONFIG_DVB_TUNER_ITD1000 is not set -+# CONFIG_DVB_TUNER_CX24113 is not set -+# CONFIG_DVB_TDA826X is not set -+# CONFIG_DVB_TUA6100 is not set -+# CONFIG_DVB_CX24116 is not set -+# CONFIG_DVB_SI21XX is not set -+# CONFIG_DVB_DS3000 is not set -+# CONFIG_DVB_MB86A16 is not set -+# CONFIG_DVB_TDA10071 is not set -+# CONFIG_DVB_SP8870 is not set -+# CONFIG_DVB_SP887X is not set -+# CONFIG_DVB_CX22700 is not set -+# CONFIG_DVB_CX22702 is not set -+# CONFIG_DVB_S5H1432 is not set -+# CONFIG_DVB_DRXD is not set -+# CONFIG_DVB_L64781 is not set -+# CONFIG_DVB_TDA1004X is not set -+# CONFIG_DVB_NXT6000 is not set -+# CONFIG_DVB_MT352 is not set -+# CONFIG_DVB_DIB7000M is not set -+# CONFIG_DVB_DIB7000P is not set -+# CONFIG_DVB_DIB9000 is not set -+# CONFIG_DVB_TDA10048 is not set -+# CONFIG_DVB_HD29L2 is not set -+# CONFIG_DVB_STV0367 is not set -+# CONFIG_DVB_CXD2820R is not set -+# CONFIG_DVB_VES1820 is not set -+# CONFIG_DVB_TDA10021 is not set -+# CONFIG_DVB_TDA10023 is not set -+# CONFIG_DVB_STV0297 is not set -+# CONFIG_DVB_NXT200X is not set -+# CONFIG_DVB_OR51211 is not set -+# CONFIG_DVB_OR51132 is not set -+# CONFIG_DVB_BCM3510 is not set -+# CONFIG_DVB_LGDT330X is not set -+# CONFIG_DVB_LGDT3305 is not set -+# CONFIG_DVB_LG2160 is not set -+# CONFIG_DVB_S5H1409 is not set -+# CONFIG_DVB_AU8522_DTV is not set -+# CONFIG_DVB_AU8522_V4L is not set -+# CONFIG_DVB_S5H1411 is not set -+# CONFIG_DVB_S921 is not set -+# CONFIG_DVB_DIB8000 is not set -+# CONFIG_DVB_MB86A20S is not set -+# CONFIG_DVB_PLL is not set -+# CONFIG_DVB_TUNER_DIB0070 is not set -+# CONFIG_DVB_TUNER_DIB0090 is not set -+# CONFIG_DVB_LNBP21 is not set -+# CONFIG_DVB_LNBP22 is not set -+# CONFIG_DVB_ISL6405 is not set -+# CONFIG_DVB_ISL6421 is not set -+# CONFIG_DVB_ISL6423 is not set -+# CONFIG_DVB_A8293 is not set -+# CONFIG_DVB_LGS8GL5 is not set -+# CONFIG_DVB_LGS8GXX is not set -+# CONFIG_DVB_ATBM8830 is not set -+# CONFIG_DVB_TDA665x is not set -+# CONFIG_DVB_IX2505V is not set -+# CONFIG_DVB_M88RS2000 is not set ++CONFIG_SMS_SIANO_MDTV=m ++CONFIG_SMS_USB_DRV=m ++CONFIG_DVB_B2C2_FLEXCOP=m ++CONFIG_DVB_B2C2_FLEXCOP_USB=m +CONFIG_FB=y +CONFIG_FB_BCM2708=y -+# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set @@ -1276,9 +1181,10 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_UA101=m +CONFIG_SND_USB_CAIAQ=m -+CONFIG_SND_USB_CAIAQ_INPUT=y +CONFIG_SND_USB_6FIRE=m +CONFIG_SOUND_PRIME=m ++CONFIG_HID_PID=y ++CONFIG_USB_HIDDEV=y +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_APPLE=m @@ -1309,6 +1215,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_HID_PANTHERLORD=m +CONFIG_HID_PETALYNX=m +CONFIG_HID_PICOLCD=m ++CONFIG_HID_QUANTA=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m @@ -1322,8 +1229,6 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_HID_WIIMOTE=m +CONFIG_HID_ZEROPLUS=m +CONFIG_HID_ZYDACRON=m -+CONFIG_HID_PID=y -+CONFIG_USB_HIDDEV=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_MON=m @@ -1364,7 +1269,6 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m -+CONFIG_USB_SERIAL_F81232=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m @@ -1373,7 +1277,6 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m -+CONFIG_USB_SERIAL_METRO=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m @@ -1397,7 +1300,6 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_SSU100=m -+CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_DEBUG=m +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m @@ -1423,7 +1325,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_BCM2708=y +CONFIG_MMC_SDHCI_BCM2708_DMA=y -+CONFIG_LEDS_GPIO=m ++CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m @@ -1463,14 +1365,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_W35UND=m +CONFIG_PRISM2_USB=m +CONFIG_R8712U=m -+CONFIG_STAGING_MEDIA=y -+CONFIG_LIRC_STAGING=y -+CONFIG_LIRC_IGORPLUGUSB=m -+CONFIG_LIRC_IMON=m -+CONFIG_LIRC_RPI=m -+CONFIG_LIRC_SASEM=m -+CONFIG_LIRC_SERIAL=m -+CONFIG_LIRC_TTUSBIR=m ++CONFIG_ZRAM=m +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y @@ -1519,6 +1414,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +CONFIG_NFS_FS=y ++CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_ROOT_NFS=y @@ -1532,6 +1428,9 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_CIFS_POSIX=y +CONFIG_9P_FS=m +CONFIG_9P_FS_POSIX_ACL=y ++CONFIG_PARTITION_ADVANCED=y ++CONFIG_MAC_PARTITION=y ++CONFIG_EFI_PARTITION=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m @@ -1578,6 +1477,7 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_LATENCYTOP=y ++CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_KPROBE_EVENT is not set +CONFIG_KGDB=y +CONFIG_KGDB_KDB=y @@ -1600,9 +1500,9 @@ diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.6.7/arch/ar +# CONFIG_CRYPTO_HW is not set +CONFIG_CRC_ITU_T=y +CONFIG_LIBCRC32C=y -diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3.6.7/arch/arm/configs/bcmrpi_emergency_defconfig +diff -Naur linux-3.6.7/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.6.7.patch/arch/arm/configs/bcmrpi_emergency_defconfig --- linux-3.6.7/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/configs/bcmrpi_emergency_defconfig 2012-11-27 14:40:49.769959321 +0100 ++++ linux-3.6.7.patch/arch/arm/configs/bcmrpi_emergency_defconfig 2012-11-18 20:53:34.988712844 +0100 @@ -0,0 +1,532 @@ +CONFIG_EXPERIMENTAL=y +# CONFIG_LOCALVERSION_AUTO is not set @@ -2136,311 +2036,9 @@ diff -Naur linux-3.6.7/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.7/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.6.7/arch/arm/configs/bcmrpi_quick_defconfig ---- linux-3.6.7/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/configs/bcmrpi_quick_defconfig 2012-11-27 14:40:49.894961887 +0100 -@@ -0,0 +1,298 @@ -+# CONFIG_ARM_PATCH_PHYS_VIRT is not set -+CONFIG_EXPERIMENTAL=y -+CONFIG_LOCALVERSION="-quick" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_SYSVIPC=y -+CONFIG_POSIX_MQUEUE=y -+CONFIG_BSD_PROCESS_ACCT=y -+CONFIG_BSD_PROCESS_ACCT_V3=y -+CONFIG_FHANDLE=y -+CONFIG_TASKSTATS=y -+CONFIG_TASK_DELAY_ACCT=y -+CONFIG_TASK_XACCT=y -+CONFIG_TASK_IO_ACCOUNTING=y -+CONFIG_AUDIT=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y -+CONFIG_CGROUP_FREEZER=y -+CONFIG_CGROUP_DEVICE=y -+CONFIG_CGROUP_CPUACCT=y -+CONFIG_RESOURCE_COUNTERS=y -+CONFIG_BLK_CGROUP=y -+CONFIG_NAMESPACES=y -+CONFIG_SCHED_AUTOGROUP=y -+CONFIG_RELAY=y -+CONFIG_EMBEDDED=y -+# CONFIG_COMPAT_BRK is not set -+CONFIG_SLAB=y -+CONFIG_PROFILING=y -+CONFIG_OPROFILE=m -+CONFIG_KPROBES=y -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+# CONFIG_BLK_DEV_BSG is not set -+CONFIG_BLK_DEV_THROTTLING=y -+CONFIG_PARTITION_ADVANCED=y -+CONFIG_MAC_PARTITION=y -+CONFIG_EFI_PARTITION=y -+CONFIG_CFQ_GROUP_IOSCHED=y -+CONFIG_ARCH_BCM2708=y -+# CONFIG_BCM2708_GPIO is not set -+# CONFIG_BCM2708_VCMEM is not set -+CONFIG_PREEMPT=y -+CONFIG_AEABI=y -+CONFIG_UACCESS_WITH_MEMCPY=y -+CONFIG_SECCOMP=y -+CONFIG_CC_STACKPROTECTOR=y -+CONFIG_ZBOOT_ROM_TEXT=0x0 -+CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" -+CONFIG_KEXEC=y -+CONFIG_CPU_FREQ=y -+CONFIG_CPU_FREQ_STAT=m -+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y -+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -+CONFIG_CPU_FREQ_GOV_USERSPACE=y -+CONFIG_CPU_FREQ_GOV_ONDEMAND=y -+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -+# CONFIG_ARM_BCM2835_CPUFREQ is not set -+CONFIG_CPU_IDLE=y -+CONFIG_VFP=y -+CONFIG_BINFMT_MISC=m -+CONFIG_NET=y -+CONFIG_PACKET=y -+CONFIG_UNIX=y -+CONFIG_XFRM_USER=y -+CONFIG_NET_KEY=m -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+CONFIG_IP_ADVANCED_ROUTER=y -+CONFIG_IP_MULTIPLE_TABLES=y -+CONFIG_IP_ROUTE_MULTIPATH=y -+CONFIG_IP_ROUTE_VERBOSE=y -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_RARP=y -+CONFIG_NET_IPIP=m -+CONFIG_SYN_COOKIES=y -+CONFIG_INET_AH=m -+CONFIG_INET_ESP=m -+CONFIG_INET_IPCOMP=m -+CONFIG_INET_XFRM_MODE_TRANSPORT=m -+CONFIG_INET_XFRM_MODE_TUNNEL=m -+CONFIG_INET_XFRM_MODE_BEET=m -+CONFIG_INET_LRO=m -+CONFIG_INET_DIAG=m -+# CONFIG_IPV6 is not set -+CONFIG_L2TP=m -+CONFIG_NET_PKTGEN=m -+# CONFIG_WIRELESS is not set -+CONFIG_WIMAX=m -+CONFIG_NET_9P=m -+CONFIG_NFC=m -+CONFIG_NFC_PN533=m -+CONFIG_DEVTMPFS=y -+CONFIG_DEVTMPFS_MOUNT=y -+CONFIG_BLK_DEV_LOOP=y -+CONFIG_BLK_DEV_CRYPTOLOOP=m -+CONFIG_BLK_DEV_NBD=m -+CONFIG_BLK_DEV_RAM=y -+CONFIG_CDROM_PKTCDVD=m -+CONFIG_EEPROM_93CX6=m -+# CONFIG_BCM2708_VCHIQ is not set -+CONFIG_SCSI=y -+# CONFIG_SCSI_PROC_FS is not set -+CONFIG_BLK_DEV_SD=y -+CONFIG_CHR_DEV_ST=m -+CONFIG_CHR_DEV_OSST=m -+CONFIG_BLK_DEV_SR=m -+CONFIG_SCSI_MULTI_LUN=y -+# CONFIG_SCSI_LOWLEVEL is not set -+CONFIG_NETDEVICES=y -+CONFIG_MII=y -+CONFIG_NETCONSOLE=m -+CONFIG_TUN=m -+CONFIG_PHYLIB=m -+CONFIG_MDIO_BITBANG=m -+CONFIG_SLIP=m -+CONFIG_SLIP_COMPRESSED=y -+# CONFIG_WLAN is not set -+CONFIG_INPUT_FF_MEMLESS=m -+CONFIG_INPUT_POLLDEV=m -+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -+CONFIG_INPUT_EVDEV=m -+# CONFIG_INPUT_KEYBOARD is not set -+# CONFIG_INPUT_MOUSE is not set -+# CONFIG_SERIO is not set -+CONFIG_VT_HW_CONSOLE_BINDING=y -+# CONFIG_LEGACY_PTYS is not set -+# CONFIG_DEVKMEM is not set -+CONFIG_SERIAL_AMBA_PL011=y -+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -+CONFIG_TTY_PRINTK=y -+# CONFIG_HW_RANDOM is not set -+CONFIG_RAW_DRIVER=y -+# CONFIG_HWMON is not set -+CONFIG_FB=y -+CONFIG_FB_BCM2708=y -+CONFIG_BACKLIGHT_LCD_SUPPORT=y -+CONFIG_FRAMEBUFFER_CONSOLE=y -+CONFIG_LOGO=y -+# CONFIG_LOGO_LINUX_MONO is not set -+# CONFIG_LOGO_LINUX_VGA16 is not set -+CONFIG_SOUND=y -+# CONFIG_USB_HID is not set -+CONFIG_USB=y -+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -+CONFIG_USB_DWCOTG=y -+CONFIG_USB_ACM=m -+CONFIG_USB_MDC800=m -+CONFIG_USB_MICROTEK=m -+CONFIG_MMC=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_PLTFM=y -+CONFIG_MMC_SDHCI_BCM2708=y -+CONFIG_MMC_SDHCI_BCM2708_DMA=y -+CONFIG_NEW_LEDS=y -+CONFIG_LEDS_CLASS=m -+CONFIG_LEDS_TRIGGERS=y -+CONFIG_LEDS_TRIGGER_TIMER=m -+CONFIG_LEDS_TRIGGER_HEARTBEAT=m -+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m -+CONFIG_UIO=m -+CONFIG_UIO_PDRV=m -+CONFIG_UIO_PDRV_GENIRQ=m -+# CONFIG_IOMMU_SUPPORT is not set -+CONFIG_EXT4_FS=y -+CONFIG_EXT4_FS_POSIX_ACL=y -+CONFIG_EXT4_FS_SECURITY=y -+CONFIG_REISERFS_FS=m -+CONFIG_REISERFS_FS_XATTR=y -+CONFIG_REISERFS_FS_POSIX_ACL=y -+CONFIG_REISERFS_FS_SECURITY=y -+CONFIG_JFS_FS=m -+CONFIG_JFS_POSIX_ACL=y -+CONFIG_JFS_SECURITY=y -+CONFIG_XFS_FS=m -+CONFIG_XFS_QUOTA=y -+CONFIG_XFS_POSIX_ACL=y -+CONFIG_XFS_RT=y -+CONFIG_GFS2_FS=m -+CONFIG_OCFS2_FS=m -+CONFIG_BTRFS_FS=m -+CONFIG_BTRFS_FS_POSIX_ACL=y -+CONFIG_NILFS2_FS=m -+CONFIG_AUTOFS4_FS=y -+CONFIG_FUSE_FS=m -+CONFIG_CUSE=m -+CONFIG_FSCACHE=y -+CONFIG_CACHEFILES=y -+CONFIG_ISO9660_FS=m -+CONFIG_JOLIET=y -+CONFIG_ZISOFS=y -+CONFIG_UDF_FS=m -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+CONFIG_FAT_DEFAULT_IOCHARSET="ascii" -+CONFIG_NTFS_FS=m -+CONFIG_TMPFS=y -+CONFIG_TMPFS_POSIX_ACL=y -+CONFIG_CONFIGFS_FS=y -+CONFIG_SQUASHFS=m -+CONFIG_SQUASHFS_XATTR=y -+CONFIG_SQUASHFS_LZO=y -+CONFIG_SQUASHFS_XZ=y -+CONFIG_NFS_FS=y -+CONFIG_NFS_V3_ACL=y -+CONFIG_NFS_V4=y -+CONFIG_ROOT_NFS=y -+CONFIG_NFS_FSCACHE=y -+CONFIG_NFSD=m -+CONFIG_NFSD_V3_ACL=y -+CONFIG_NFSD_V4=y -+CONFIG_CIFS=m -+CONFIG_CIFS_WEAK_PW_HASH=y -+CONFIG_CIFS_XATTR=y -+CONFIG_CIFS_POSIX=y -+CONFIG_9P_FS=m -+CONFIG_9P_FS_POSIX_ACL=y -+CONFIG_NLS_DEFAULT="utf8" -+CONFIG_NLS_CODEPAGE_437=y -+CONFIG_NLS_CODEPAGE_737=m -+CONFIG_NLS_CODEPAGE_775=m -+CONFIG_NLS_CODEPAGE_850=m -+CONFIG_NLS_CODEPAGE_852=m -+CONFIG_NLS_CODEPAGE_855=m -+CONFIG_NLS_CODEPAGE_857=m -+CONFIG_NLS_CODEPAGE_860=m -+CONFIG_NLS_CODEPAGE_861=m -+CONFIG_NLS_CODEPAGE_862=m -+CONFIG_NLS_CODEPAGE_863=m -+CONFIG_NLS_CODEPAGE_864=m -+CONFIG_NLS_CODEPAGE_865=m -+CONFIG_NLS_CODEPAGE_866=m -+CONFIG_NLS_CODEPAGE_869=m -+CONFIG_NLS_CODEPAGE_936=m -+CONFIG_NLS_CODEPAGE_950=m -+CONFIG_NLS_CODEPAGE_932=m -+CONFIG_NLS_CODEPAGE_949=m -+CONFIG_NLS_CODEPAGE_874=m -+CONFIG_NLS_ISO8859_8=m -+CONFIG_NLS_CODEPAGE_1250=m -+CONFIG_NLS_CODEPAGE_1251=m -+CONFIG_NLS_ASCII=y -+CONFIG_NLS_ISO8859_1=m -+CONFIG_NLS_ISO8859_2=m -+CONFIG_NLS_ISO8859_3=m -+CONFIG_NLS_ISO8859_4=m -+CONFIG_NLS_ISO8859_5=m -+CONFIG_NLS_ISO8859_6=m -+CONFIG_NLS_ISO8859_7=m -+CONFIG_NLS_ISO8859_9=m -+CONFIG_NLS_ISO8859_13=m -+CONFIG_NLS_ISO8859_14=m -+CONFIG_NLS_ISO8859_15=m -+CONFIG_NLS_KOI8_R=m -+CONFIG_NLS_KOI8_U=m -+CONFIG_PRINTK_TIME=y -+CONFIG_DEBUG_FS=y -+CONFIG_DETECT_HUNG_TASK=y -+CONFIG_TIMER_STATS=y -+# CONFIG_DEBUG_PREEMPT is not set -+CONFIG_DEBUG_MEMORY_INIT=y -+CONFIG_BOOT_PRINTK_DELAY=y -+CONFIG_LATENCYTOP=y -+# CONFIG_KPROBE_EVENT is not set -+CONFIG_KGDB=y -+CONFIG_KGDB_KDB=y -+CONFIG_KDB_KEYBOARD=y -+CONFIG_STRICT_DEVMEM=y -+CONFIG_DEBUG_LL=y -+CONFIG_DEBUG_BCM2708_UART0=y -+CONFIG_EARLY_PRINTK=y -+CONFIG_CRYPTO_SEQIV=m -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_XTS=m -+CONFIG_CRYPTO_HMAC=y -+CONFIG_CRYPTO_XCBC=m -+CONFIG_CRYPTO_MD5=y -+CONFIG_CRYPTO_MICHAEL_MIC=m -+CONFIG_CRYPTO_SHA1=y -+CONFIG_CRYPTO_SHA256=m -+CONFIG_CRYPTO_SHA512=m -+CONFIG_CRYPTO_TGR192=m -+CONFIG_CRYPTO_WP512=m -+CONFIG_CRYPTO_AES=m -+CONFIG_CRYPTO_CAST5=m -+CONFIG_CRYPTO_DES=y -+# CONFIG_CRYPTO_ANSI_CPRNG is not set -+# CONFIG_CRYPTO_HW is not set -+CONFIG_CRC_CCITT=m -+CONFIG_CRC_ITU_T=y -+CONFIG_CRC7=m -+CONFIG_LIBCRC32C=y -+CONFIG_AVERAGE=y -diff -Naur linux-3.6.7/arch/arm/include/asm/fiq.h linux-rpi-3.6.7/arch/arm/include/asm/fiq.h +diff -Naur linux-3.6.7/arch/arm/include/asm/fiq.h linux-3.6.7.patch/arch/arm/include/asm/fiq.h --- linux-3.6.7/arch/arm/include/asm/fiq.h 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/include/asm/fiq.h 2012-11-27 14:40:49.078945255 +0100 ++++ linux-3.6.7.patch/arch/arm/include/asm/fiq.h 2012-11-18 20:53:34.989712863 +0100 @@ -42,6 +42,7 @@ /* helpers defined in fiqasm.S: */ extern void __set_fiq_regs(unsigned long const *regs); @@ -2449,9 +2047,9 @@ diff -Naur linux-3.6.7/arch/arm/include/asm/fiq.h linux-rpi-3.6.7/arch/arm/inclu static inline void set_fiq_regs(struct pt_regs const *regs) { -diff -Naur linux-3.6.7/arch/arm/Kconfig linux-rpi-3.6.7/arch/arm/Kconfig +diff -Naur linux-3.6.7/arch/arm/Kconfig linux-3.6.7.patch/arch/arm/Kconfig --- linux-3.6.7/arch/arm/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/Kconfig 2012-11-27 14:40:50.456973272 +0100 ++++ linux-3.6.7.patch/arch/arm/Kconfig 2012-11-18 20:53:34.990712882 +0100 @@ -998,6 +998,23 @@ help Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). @@ -2484,9 +2082,9 @@ diff -Naur linux-3.6.7/arch/arm/Kconfig linux-rpi-3.6.7/arch/arm/Kconfig # Definitions to make life easier config ARCH_ACORN -diff -Naur linux-3.6.7/arch/arm/Kconfig.debug linux-rpi-3.6.7/arch/arm/Kconfig.debug +diff -Naur linux-3.6.7/arch/arm/Kconfig.debug linux-3.6.7.patch/arch/arm/Kconfig.debug --- linux-3.6.7/arch/arm/Kconfig.debug 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/Kconfig.debug 2012-11-27 14:40:49.433952481 +0100 ++++ linux-3.6.7.patch/arch/arm/Kconfig.debug 2012-11-18 20:53:34.991712901 +0100 @@ -371,6 +371,14 @@ For more details about semihosting, please see chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd. @@ -2502,9 +2100,9 @@ diff -Naur linux-3.6.7/arch/arm/Kconfig.debug linux-rpi-3.6.7/arch/arm/Kconfig.d endchoice config EARLY_PRINTK -diff -Naur linux-3.6.7/arch/arm/kernel/fiqasm.S linux-rpi-3.6.7/arch/arm/kernel/fiqasm.S +diff -Naur linux-3.6.7/arch/arm/kernel/fiqasm.S linux-3.6.7.patch/arch/arm/kernel/fiqasm.S --- linux-3.6.7/arch/arm/kernel/fiqasm.S 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/kernel/fiqasm.S 2012-11-27 14:40:49.207947893 +0100 ++++ linux-3.6.7.patch/arch/arm/kernel/fiqasm.S 2012-11-18 20:53:34.991712901 +0100 @@ -47,3 +47,7 @@ mov r0, r0 @ avoid hazard prior to ARMv4 mov pc, lr @@ -2513,9 +2111,9 @@ diff -Naur linux-3.6.7/arch/arm/kernel/fiqasm.S linux-rpi-3.6.7/arch/arm/kernel/ +ENTRY(__FIQ_Branch) + mov pc, r8 +ENDPROC(__FIQ_Branch) -diff -Naur linux-3.6.7/arch/arm/kernel/fiq.c linux-rpi-3.6.7/arch/arm/kernel/fiq.c +diff -Naur linux-3.6.7/arch/arm/kernel/fiq.c linux-3.6.7.patch/arch/arm/kernel/fiq.c --- linux-3.6.7/arch/arm/kernel/fiq.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/kernel/fiq.c 2012-11-27 14:40:49.228948326 +0100 ++++ linux-3.6.7.patch/arch/arm/kernel/fiq.c 2012-11-18 20:53:34.992712920 +0100 @@ -137,6 +137,7 @@ EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ @@ -2524,9 +2122,9 @@ diff -Naur linux-3.6.7/arch/arm/kernel/fiq.c linux-rpi-3.6.7/arch/arm/kernel/fiq EXPORT_SYMBOL(claim_fiq); EXPORT_SYMBOL(release_fiq); EXPORT_SYMBOL(enable_fiq); -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.7/arch/arm/mach-bcm2708/armctrl.c +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.c linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.c --- linux-3.6.7/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/armctrl.c 2012-11-27 14:40:43.620834196 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.c 2012-11-18 20:53:34.992712920 +0100 @@ -0,0 +1,227 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.c @@ -2755,9 +2353,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.6.7/arch/arm/ + init_FIQ(FIQ_START); + return 0; +} -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/armctrl.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.h linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.h --- linux-3.6.7/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/armctrl.h 2012-11-27 14:40:43.399829752 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/armctrl.h 2012-11-18 20:53:34.993712939 +0100 @@ -0,0 +1,27 @@ +/* + * linux/arch/arm/mach-bcm2708/armctrl.h @@ -2786,9 +2384,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.6.7/arch/arm/ + u32 armctrl_sources, u32 resume_sources); + +#endif -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.7/arch/arm/mach-bcm2708/bcm2708.c +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.c linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.c --- linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/bcm2708.c 2012-11-27 14:40:43.512832010 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.c 2012-11-18 20:53:34.994712958 +0100 @@ -0,0 +1,951 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.c @@ -3741,9 +3339,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.6.7/arch/arm/ +module_param(boardrev, uint, 0644); +module_param(serial, uint, 0644); +module_param(uart_clock, uint, 0644); -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.7/arch/arm/mach-bcm2708/bcm2708_gpio.c +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c --- linux-3.6.7/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-11-27 14:40:43.391829589 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708_gpio.c 2012-11-18 20:53:34.995712977 +0100 @@ -0,0 +1,339 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c @@ -4084,9 +3682,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.6.7/arch + +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_LICENSE("GPL"); -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/bcm2708.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.h linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.h --- linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/bcm2708.h 2012-11-27 14:40:43.512832010 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/bcm2708.h 2012-11-18 20:53:34.995712977 +0100 @@ -0,0 +1,51 @@ +/* + * linux/arch/arm/mach-bcm2708/bcm2708.h @@ -4139,9 +3737,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.6.7/arch/arm/ +} + +#endif -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.7/arch/arm/mach-bcm2708/clock.c +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.c linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.c --- linux-3.6.7/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/clock.c 2012-11-27 14:40:43.391829589 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.c 2012-11-18 20:53:34.996712996 +0100 @@ -0,0 +1,61 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.c @@ -4204,9 +3802,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.c linux-rpi-3.6.7/arch/arm/ma + return -EIO; +} +EXPORT_SYMBOL(clk_set_rate); -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/clock.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.h linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.h --- linux-3.6.7/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/clock.h 2012-11-27 14:40:43.391829589 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/clock.h 2012-11-18 20:53:34.996712996 +0100 @@ -0,0 +1,24 @@ +/* + * linux/arch/arm/mach-bcm2708/clock.h @@ -4232,9 +3830,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/clock.h linux-rpi-3.6.7/arch/arm/ma +struct clk { + unsigned long rate; +}; -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.7/arch/arm/mach-bcm2708/delay.S +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/delay.S linux-3.6.7.patch/arch/arm/mach-bcm2708/delay.S --- linux-3.6.7/arch/arm/mach-bcm2708/delay.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/delay.S 2012-11-27 14:40:43.400829772 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/delay.S 2012-11-18 20:53:34.996712996 +0100 @@ -0,0 +1,20 @@ +/* + * linux/arch/arm/lib/delay.S @@ -4256,9 +3854,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/delay.S linux-rpi-3.6.7/arch/arm/ma + bhi bcm2708_delay + mov pc, lr +ENDPROC(bcm2708_delay) -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.7/arch/arm/mach-bcm2708/dma.c +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/dma.c linux-3.6.7.patch/arch/arm/mach-bcm2708/dma.c --- linux-3.6.7/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/dma.c 2012-11-27 14:40:43.379829344 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/dma.c 2012-11-18 20:53:34.997713015 +0100 @@ -0,0 +1,397 @@ +/* + * linux/arch/arm/mach-bcm2708/dma.c @@ -4657,768 +4255,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/dma.c linux-rpi-3.6.7/arch/arm/mach +MODULE_LICENSE("GPL"); + +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.6.7/arch/arm/mach-bcm2708/dmaer.c ---- linux-3.6.7/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/dmaer.c 2012-11-27 14:40:43.413830040 +0100 -@@ -0,0 +1,755 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include -+ -+MODULE_LICENSE("Dual BSD/GPL"); -+ -+//#define inline -+ -+/***** TYPES ****/ -+#define PAGES_PER_LIST 500 -+struct PageList -+{ -+ struct page *m_pPages[PAGES_PER_LIST]; -+ unsigned int m_used; -+ struct PageList *m_pNext; -+}; -+ -+struct VmaPageList -+{ -+ //each vma has a linked list of pages associated with it -+ struct PageList *m_pPageHead; -+ struct PageList *m_pPageTail; -+ unsigned int m_refCount; -+}; -+struct DmaControlBlock -+{ -+ unsigned int m_transferInfo; -+ void __user *m_pSourceAddr; -+ void __user *m_pDestAddr; -+ unsigned int m_xferLen; -+ unsigned int m_tdStride; -+ struct DmaControlBlock *m_pNext; -+ unsigned int m_blank1, m_blank2; -+}; -+ -+/***** DEFINES ******/ -+//magic number defining the module -+#define DMA_MAGIC 0xdd -+ -+//do user virtual to physical translation of the CB chain -+#define DMA_PREPARE _IOWR(DMA_MAGIC, 0, struct DmaControlBlock *) -+ -+//kick the pre-prepared CB chain -+#define DMA_KICK _IOW(DMA_MAGIC, 1, struct DmaControlBlock *) -+ -+//prepare it, kick it, wait for it -+#define DMA_PREPARE_KICK_WAIT _IOWR(DMA_MAGIC, 2, struct DmaControlBlock *) -+ -+//prepare it, kick it, don't wait for it -+#define DMA_PREPARE_KICK _IOWR(DMA_MAGIC, 3, struct DmaControlBlock *) -+ -+//not currently implemented -+#define DMA_WAIT_ONE _IO(DMA_MAGIC, 4, struct DmaControlBlock *) -+ -+//wait on all kicked CB chains -+#define DMA_WAIT_ALL _IO(DMA_MAGIC, 5) -+ -+//in order to discover the largest AXI burst that should be programmed into the transfer params -+#define DMA_MAX_BURST _IO(DMA_MAGIC, 6) -+ -+//set the address range through which the user address is assumed to already by a physical address -+#define DMA_SET_MIN_PHYS _IOW(DMA_MAGIC, 7, unsigned long) -+#define DMA_SET_MAX_PHYS _IOW(DMA_MAGIC, 8, unsigned long) -+ -+#define VIRT_TO_BUS_CACHE_SIZE 8 -+ -+/***** FILE OPS *****/ -+static int Open(struct inode *pInode, struct file *pFile); -+static int Release(struct inode *pInode, struct file *pFile); -+static long Ioctl(struct file *pFile, unsigned int cmd, unsigned long arg); -+static ssize_t Read(struct file *pFile, char __user *pUser, size_t count, loff_t *offp); -+static int Mmap(struct file *pFile, struct vm_area_struct *pVma); -+ -+/***** VMA OPS ****/ -+static void VmaOpen(struct vm_area_struct *pVma); -+static void VmaClose(struct vm_area_struct *pVma); -+static int VmaFault(struct vm_area_struct *pVma, struct vm_fault *pVmf); -+ -+/**** GENERIC ****/ -+static int __init dmaer_init(void); -+static void __exit dmaer_exit(void); -+ -+/*** OPS ***/ -+static struct vm_operations_struct g_vmOps = { -+ .open = VmaOpen, -+ .close = VmaClose, -+ .fault = VmaFault, -+}; -+ -+static struct file_operations g_fOps = { -+ .owner = THIS_MODULE, -+ .llseek = 0, -+ .read = Read, -+ .write = 0, -+ .unlocked_ioctl = Ioctl, -+ .open = Open, -+ .release = Release, -+ .mmap = Mmap, -+}; -+ -+/***** GLOBALS ******/ -+static dev_t g_majorMinor; -+static atomic_t g_oneLock = ATOMIC_INIT(1); -+static struct cdev g_cDev; -+static int g_trackedPages = 0; -+static unsigned int *g_pDmaChanBase; -+static int g_dmaIrq; -+static int g_dmaChan; -+ -+static unsigned long g_virtAddr[VIRT_TO_BUS_CACHE_SIZE]; -+static unsigned long g_busAddr[VIRT_TO_BUS_CACHE_SIZE]; -+static unsigned long g_cbVirtAddr; -+static unsigned long g_cbBusAddr; -+static int g_cacheInsertAt; -+static int g_cacheHit, g_cacheMiss; -+ -+//off by default -+static void __user *g_pMinPhys = (void __user *)-1; -+static void __user *g_pMaxPhys = (void __user *)0; -+ -+/****** CACHE OPERATIONS ********/ -+static inline void FlushAddrCache(void) -+{ -+ int count = 0; -+ for (count = 0; count < VIRT_TO_BUS_CACHE_SIZE; count++) -+ g_virtAddr[count] = 0xffffffff; //never going to match as we always chop the bottom bits anyway -+ -+ g_cbVirtAddr = 0xffffffff; -+ -+ g_cacheInsertAt = 0; -+} -+ -+//translate from a user virtual address to a bus address by mapping the page -+//NB this won't lock a page in memory, so to avoid potential paging issues using kernel logical addresses -+static inline void __iomem *UserVirtualToBus(void __user *pUser) -+{ -+ int mapped; -+ struct page *pPage; -+ void *phys; -+ -+ //map it (requiring that the pointer points to something that does not hang off the page boundary) -+ mapped = get_user_pages(current, current->mm, -+ (unsigned long)pUser, 1, -+ 1, 0, -+ &pPage, -+ 0); -+ -+ if (mapped <= 0) //error -+ return 0; -+ -+ //get the arm physical address -+ phys = page_address(pPage) + offset_in_page(pUser); -+ page_cache_release(pPage); -+ -+ //and now the bus address -+ return (void __iomem *)__virt_to_bus(phys); -+} -+ -+static inline void __iomem *UserVirtualToBusViaCbCache(void __user *pUser) -+{ -+ unsigned long virtual_page = (unsigned long)pUser & ~4095; -+ unsigned long page_offset = (unsigned long)pUser & 4095; -+ unsigned long bus_addr; -+ -+ if (g_cbVirtAddr == virtual_page) -+ { -+ bus_addr = g_cbBusAddr + page_offset; -+ g_cacheHit++; -+ return (void __iomem *)bus_addr; -+ } -+ else -+ { -+ bus_addr = (unsigned long)UserVirtualToBus(pUser); -+ -+ if (!bus_addr) -+ return 0; -+ -+ g_cbVirtAddr = virtual_page; -+ g_cbBusAddr = bus_addr & ~4095; -+ g_cacheMiss++; -+ -+ return (void __iomem *)bus_addr; -+ } -+} -+ -+//do the same as above, by query our virt->bus cache -+static inline void __iomem *UserVirtualToBusViaCache(void __user *pUser) -+{ -+ int count; -+ //get the page and its offset -+ unsigned long virtual_page = (unsigned long)pUser & ~4095; -+ unsigned long page_offset = (unsigned long)pUser & 4095; -+ unsigned long bus_addr; -+ -+ if (pUser >= g_pMinPhys && pUser < g_pMaxPhys) -+ { -+// printk(KERN_DEBUG "user->phys passthrough on %p\n", pUser); -+ return (void __iomem *)__virt_to_bus(pUser); -+ } -+ -+ //check the cache for our entry -+ for (count = 0; count < VIRT_TO_BUS_CACHE_SIZE; count++) -+ if (g_virtAddr[count] == virtual_page) -+ { -+ bus_addr = g_busAddr[count] + page_offset; -+ g_cacheHit++; -+ return (void __iomem *)bus_addr; -+ } -+ -+ //not found, look up manually and then insert its page address -+ bus_addr = (unsigned long)UserVirtualToBus(pUser); -+ -+ if (!bus_addr) -+ return 0; -+ -+ g_virtAddr[g_cacheInsertAt] = virtual_page; -+ g_busAddr[g_cacheInsertAt] = bus_addr & ~4095; -+ -+ //round robin -+ g_cacheInsertAt++; -+ if (g_cacheInsertAt == VIRT_TO_BUS_CACHE_SIZE) -+ g_cacheInsertAt = 0; -+ -+ g_cacheMiss++; -+ -+ return (void __iomem *)bus_addr; -+} -+ -+/***** FILE OPERATIONS ****/ -+static int Open(struct inode *pInode, struct file *pFile) -+{ -+ printk(KERN_DEBUG "file opening\n"); -+ -+ //only one at a time -+ if (!atomic_dec_and_test(&g_oneLock)) -+ { -+ atomic_inc(&g_oneLock); -+ return -EBUSY; -+ } -+ -+ return 0; -+} -+ -+static int Release(struct inode *pInode, struct file *pFile) -+{ -+ printk(KERN_DEBUG "file closing, %d pages tracked\n", g_trackedPages); -+ if (g_trackedPages) -+ printk(KERN_ERR "we\'re leaking memory!\n"); -+ -+ atomic_inc(&g_oneLock); -+ return 0; -+} -+ -+static struct DmaControlBlock __user *DmaPrepare(struct DmaControlBlock __user *pUserCB, int *pError) -+{ -+ struct DmaControlBlock kernCB; -+ struct DmaControlBlock __user *pUNext; -+ void __iomem *pSourceBus, __iomem *pDestBus; -+ -+ -+ //get the control block into kernel memory so we can work on it -+ if (copy_from_user(&kernCB, pUserCB, sizeof(struct DmaControlBlock)) != 0) -+ { -+ printk(KERN_ERR "copy_from_user failed for user cb %p\n", pUserCB); -+ *pError = 1; -+ return 0; -+ } -+ -+ if (kernCB.m_pSourceAddr == 0 || kernCB.m_pDestAddr == 0) -+ { -+ printk(KERN_ERR "faulty source (%p) dest (%p) addresses for user cb %p\n", -+ kernCB.m_pSourceAddr, kernCB.m_pDestAddr, pUserCB); -+ *pError = 1; -+ return 0; -+ } -+ -+ pSourceBus = UserVirtualToBusViaCache(kernCB.m_pSourceAddr); -+ pDestBus = UserVirtualToBusViaCache(kernCB.m_pDestAddr); -+ -+ if (!pSourceBus || !pDestBus) -+ { -+ printk(KERN_ERR "virtual to bus translation failure for source/dest\n"); -+ *pError = 1; -+ return 0; -+ } -+ -+ //update the user structure with the new bus addresses -+ kernCB.m_pSourceAddr = pSourceBus; -+ kernCB.m_pDestAddr = pDestBus; -+ -+ //sort out the bus address for the next block -+ pUNext = kernCB.m_pNext; -+ -+ if (kernCB.m_pNext) -+ { -+ void __iomem *pNextBus; -+ pNextBus = UserVirtualToBusViaCbCache(kernCB.m_pNext); -+ -+ if (!pNextBus) -+ { -+ printk(KERN_ERR "virtual to bus translation failure for m_pNext\n"); -+ *pError = 1; -+ return 0; -+ } -+ -+ //update the pointer with the bus address -+ kernCB.m_pNext = pNextBus; -+ } -+ -+ //write it back to user space -+ if (copy_to_user(pUserCB, &kernCB, sizeof(struct DmaControlBlock)) != 0) -+ { -+ printk(KERN_ERR "copy_to_user failed for cb %p\n", pUserCB); -+ *pError = 1; -+ return 0; -+ } -+ -+ __cpuc_flush_dcache_area(pUserCB, 32); -+ -+ *pError = 0; -+ return pUNext; -+} -+ -+static int DmaKick(struct DmaControlBlock __user *pUserCB) -+{ -+ void __iomem *pBusCB; -+ -+ pBusCB = UserVirtualToBusViaCbCache(pUserCB); -+ if (!pBusCB) -+ { -+ printk(KERN_ERR "virtual to bus translation failure for cb\n"); -+ return 1; -+ } -+ -+ //flush_cache_all(); -+ -+ bcm_dma_start(g_pDmaChanBase, (dma_addr_t)pBusCB); -+ -+ return 0; -+} -+ -+static void DmaWaitAll(void) -+{ -+ int counter = 0; -+ volatile int inner_count; -+ volatile unsigned int cs; -+ //unsigned long time_before, time_after; -+ -+ //time_before = jiffies; -+ //bcm_dma_wait_idle(g_pDmaChanBase); -+ dsb(); -+ -+ cs = readl(g_pDmaChanBase); -+ -+ while ((cs & 1) == 1) -+ { -+ cs = readl(g_pDmaChanBase); -+ counter++; -+ -+ for (inner_count = 0; inner_count < 32; inner_count++); -+ -+ asm volatile ("MCR p15,0,r0,c7,c0,4 \n"); -+ //cpu_do_idle(); -+ if (counter >= 1000000) -+ { -+ printk(KERN_WARNING "DMA failed to finish in a timely fashion\n"); -+ break; -+ } -+ } -+ //time_after = jiffies; -+ //printk(KERN_DEBUG "done, counter %d, cs %08x", counter, cs); -+ //printk(KERN_DEBUG "took %ld jiffies, %d HZ\n", time_after - time_before, HZ); -+} -+ -+static long Ioctl(struct file *pFile, unsigned int cmd, unsigned long arg) -+{ -+ int error = 0; -+ //printk(KERN_DEBUG "ioctl cmd %x arg %lx\n", cmd, arg); -+ -+ switch (cmd) -+ { -+ case DMA_PREPARE: -+ case DMA_PREPARE_KICK: -+ case DMA_PREPARE_KICK_WAIT: -+ { -+ struct DmaControlBlock __user *pUCB = (struct DmaControlBlock *)arg; -+ int steps = 0; -+ //unsigned long start_time = jiffies; -+ -+ //flush our address cache -+ FlushAddrCache(); -+ -+// printk(KERN_DEBUG "dma prepare\n"); -+ -+ //do virtual to bus translation for each entry -+ do -+ { -+ pUCB = DmaPrepare(pUCB, &error); -+ } while (error == 0 && ++steps && pUCB); -+ //printk(KERN_DEBUG "prepare done in %d steps, %ld\n", steps, jiffies - start_time); -+ -+ //carry straight on if we want to kick too -+ if (cmd == DMA_PREPARE || error) -+ { -+// printk(KERN_DEBUG "falling out\n"); -+ break; -+ } -+ }; -+ case DMA_KICK: -+// printk(KERN_DEBUG "dma begin\n"); -+ -+ if (cmd == DMA_KICK) -+ FlushAddrCache(); -+ -+ DmaKick((struct DmaControlBlock __user *)arg); -+ -+ if (cmd != DMA_PREPARE_KICK_WAIT) -+ break; -+/* case DMA_WAIT_ONE: -+ //printk(KERN_DEBUG "dma wait one\n"); -+ break;*/ -+ case DMA_WAIT_ALL: -+ //printk(KERN_DEBUG "dma wait all\n"); -+ DmaWaitAll(); -+ break; -+ case DMA_MAX_BURST: -+ if (g_dmaChan == 0) -+ return 10; -+ else -+ return 5; -+ case DMA_SET_MIN_PHYS: -+ g_pMinPhys = (void __user *)arg; -+ printk("min/max user/phys bypass set to %p %p\n", g_pMinPhys, g_pMaxPhys); -+ break; -+ case DMA_SET_MAX_PHYS: -+ g_pMaxPhys = (void __user *)arg; -+ printk("min/max user/phys bypass set to %p %p\n", g_pMinPhys, g_pMaxPhys); -+ break; -+ default: -+ printk(KERN_DEBUG "unknown ioctl: %d\n", cmd); -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+static ssize_t Read(struct file *pFile, char __user *pUser, size_t count, loff_t *offp) -+{ -+ /*printk(KERN_DEBUG "file read pFile %p pUser %p count %ld offp %p\n", -+ pFile, pUser, count, offp); -+ printk(KERN_DEBUG "phys pFile %lx pUser %lx offp %lx\n", -+ __pa(pFile), __pa(pUser), __pa(offp)); -+ printk(KERN_DEBUG "bus pFile %lx pUser %lx offp %lx\n", -+ virt_to_bus(pFile), virt_to_bus(pUser), virt_to_bus(offp));*/ -+ return -EIO; -+} -+ -+static int Mmap(struct file *pFile, struct vm_area_struct *pVma) -+{ -+ struct PageList *pPages; -+ struct VmaPageList *pVmaList; -+ -+// printk(KERN_DEBUG "MMAP vma %p, length %ld (%s %d)\n", -+// pVma, pVma->vm_end - pVma->vm_start, -+// current->comm, current->pid); -+// printk(KERN_DEBUG "MMAP %p %d (tracked %d)\n", pVma, current->pid, g_trackedPages); -+ -+ //make a new page list -+ pPages = (struct PageList *)kmalloc(sizeof(struct PageList), GFP_KERNEL); -+ if (!pPages) -+ { -+ printk(KERN_ERR "couldn\'t allocate a new page list (%s %d)\n", -+ current->comm, current->pid); -+ return -ENOMEM; -+ } -+ -+ //clear the page list -+ pPages->m_used = 0; -+ pPages->m_pNext = 0; -+ -+ //insert our vma and new page list somewhere -+ if (!pVma->vm_private_data) -+ { -+ struct VmaPageList *pList; -+ -+// printk(KERN_DEBUG "new vma list, making new one (%s %d)\n", -+// current->comm, current->pid); -+ -+ //make a new vma list -+ pList = (struct VmaPageList *)kmalloc(sizeof(struct VmaPageList), GFP_KERNEL); -+ if (!pList) -+ { -+ printk(KERN_ERR "couldn\'t allocate vma page list (%s %d)\n", -+ current->comm, current->pid); -+ kfree(pPages); -+ return -ENOMEM; -+ } -+ -+ //clear this list -+ pVma->vm_private_data = (void *)pList; -+ pList->m_refCount = 0; -+ } -+ -+ pVmaList = (struct VmaPageList *)pVma->vm_private_data; -+ -+ //add it to the vma list -+ pVmaList->m_pPageHead = pPages; -+ pVmaList->m_pPageTail = pPages; -+ -+ pVma->vm_ops = &g_vmOps; -+ pVma->vm_flags |= VM_RESERVED; -+ -+ VmaOpen(pVma); -+ -+ return 0; -+} -+ -+/****** VMA OPERATIONS ******/ -+ -+static void VmaOpen(struct vm_area_struct *pVma) -+{ -+ struct VmaPageList *pVmaList; -+ -+// printk(KERN_DEBUG "vma open %p private %p (%s %d), %d live pages\n", pVma, pVma->vm_private_data, current->comm, current->pid, g_trackedPages); -+// printk(KERN_DEBUG "OPEN %p %d %ld pages (tracked pages %d)\n", -+// pVma, current->pid, (pVma->vm_end - pVma->vm_start) >> 12, -+// g_trackedPages); -+ -+ pVmaList = (struct VmaPageList *)pVma->vm_private_data; -+ -+ if (pVmaList) -+ { -+ pVmaList->m_refCount++; -+// printk(KERN_DEBUG "ref count is now %d\n", pVmaList->m_refCount); -+ } -+// else -+// printk(KERN_DEBUG "err, open but no vma page list\n"); -+} -+ -+static void VmaClose(struct vm_area_struct *pVma) -+{ -+ struct VmaPageList *pVmaList; -+ int freed = 0; -+ -+// printk(KERN_DEBUG "vma close %p private %p (%s %d)\n", pVma, pVma->vm_private_data, current->comm, current->pid); -+ -+ //find our vma in the list -+ pVmaList = (struct VmaPageList *)pVma->vm_private_data; -+ -+ //may be a fork -+ if (pVmaList) -+ { -+ struct PageList *pPages; -+ -+ pVmaList->m_refCount--; -+ -+ if (pVmaList->m_refCount == 0) -+ { -+// printk(KERN_DEBUG "found vma, freeing pages (%s %d)\n", -+// current->comm, current->pid); -+ -+ pPages = pVmaList->m_pPageHead; -+ -+ if (!pPages) -+ { -+ printk(KERN_ERR "no page list (%s %d)!\n", -+ current->comm, current->pid); -+ return; -+ } -+ -+ while (pPages) -+ { -+ struct PageList *next; -+ int count; -+ -+// printk(KERN_DEBUG "page list (%s %d)\n", -+// current->comm, current->pid); -+ -+ next = pPages->m_pNext; -+ for (count = 0; count < pPages->m_used; count++) -+ { -+// printk(KERN_DEBUG "freeing page %p (%s %d)\n", -+// pPages->m_pPages[count], -+// current->comm, current->pid); -+ __free_pages(pPages->m_pPages[count], 0); -+ g_trackedPages--; -+ freed++; -+ } -+ -+// printk(KERN_DEBUG "freeing page list (%s %d)\n", -+// current->comm, current->pid); -+ kfree(pPages); -+ pPages = next; -+ } -+ -+ //remove our vma from the list -+ kfree(pVmaList); -+ pVma->vm_private_data = 0; -+ } -+// else -+// printk(KERN_DEBUG "ref count is %d, not closing\n", pVmaList->m_refCount); -+ } -+ else -+ { -+// printk(KERN_ERR "uh-oh, vma %p not found (%s %d)!\n", pVma, current->comm, current->pid); -+// printk(KERN_ERR "CLOSE ERR\n"); -+ } -+ -+// printk(KERN_DEBUG "CLOSE %p %d %d pages (tracked pages %d)", -+// pVma, current->pid, freed, g_trackedPages); -+ -+// printk(KERN_DEBUG "%d pages open\n", g_trackedPages); -+} -+ -+static int VmaFault(struct vm_area_struct *pVma, struct vm_fault *pVmf) -+{ -+// printk(KERN_DEBUG "vma fault for vma %p private %p at offset %ld (%s %d)\n", pVma, pVma->vm_private_data, pVmf->pgoff, -+// current->comm, current->pid); -+ //printk(KERN_DEBUG "FAULT\n"); -+ pVmf->page = alloc_page(GFP_KERNEL); -+ /*if (pVmf->page) -+ printk(KERN_DEBUG "alloc page virtual %p\n", page_address(pVmf->page));*/ -+ -+ if (!pVmf->page) -+ { -+ printk(KERN_ERR "vma fault oom (%s %d)\n", current->comm, current->pid); -+ return VM_FAULT_OOM; -+ } -+ else -+ { -+ struct VmaPageList *pVmaList; -+ -+ get_page(pVmf->page); -+ g_trackedPages++; -+ -+ //find our vma in the list -+ pVmaList = (struct VmaPageList *)pVma->vm_private_data; -+ -+ if (pVmaList) -+ { -+// printk(KERN_DEBUG "vma found (%s %d)\n", current->comm, current->pid); -+ -+ if (pVmaList->m_pPageTail->m_used == PAGES_PER_LIST) -+ { -+// printk(KERN_DEBUG "making new page list (%s %d)\n", current->comm, current->pid); -+ //making a new page list -+ pVmaList->m_pPageTail->m_pNext = (struct PageList *)kmalloc(sizeof(struct PageList), GFP_KERNEL); -+ if (!pVmaList->m_pPageTail->m_pNext) -+ return -ENOMEM; -+ -+ //update the tail pointer -+ pVmaList->m_pPageTail = pVmaList->m_pPageTail->m_pNext; -+ pVmaList->m_pPageTail->m_used = 0; -+ pVmaList->m_pPageTail->m_pNext = 0; -+ } -+ -+// printk(KERN_DEBUG "adding page to list (%s %d)\n", current->comm, current->pid); -+ -+ pVmaList->m_pPageTail->m_pPages[pVmaList->m_pPageTail->m_used] = pVmf->page; -+ pVmaList->m_pPageTail->m_used++; -+ } -+ else -+ printk(KERN_ERR "returned page for vma we don\'t know %p (%s %d)\n", pVma, current->comm, current->pid); -+ -+ return 0; -+ } -+} -+ -+/****** GENERIC FUNCTIONS ******/ -+static int __init dmaer_init(void) -+{ -+ int result = alloc_chrdev_region(&g_majorMinor, 0, 1, "dmaer"); -+ if (result < 0) -+ { -+ printk(KERN_ERR "unable to get major device number\n"); -+ return result; -+ } -+ else -+ printk(KERN_DEBUG "major device number %d\n", MAJOR(g_majorMinor)); -+ -+ printk(KERN_DEBUG "vma list size %d, page list size %d, page size %ld\n", -+ sizeof(struct VmaPageList), sizeof(struct PageList), PAGE_SIZE); -+ -+ -+ //get a dma channel to work with -+ result = bcm_dma_chan_alloc(BCM_DMA_FEATURE_FAST, (void **)&g_pDmaChanBase, &g_dmaIrq); -+ //result = 0; -+ //g_pDmaChanBase = 0xce808000; -+ -+ if (result < 0) -+ { -+ printk(KERN_ERR "failed to allocate dma channel\n"); -+ cdev_del(&g_cDev); -+ unregister_chrdev_region(g_majorMinor, 1); -+ } -+ -+ //reset the channel -+ printk(KERN_DEBUG "allocated dma channel %d (%p), initial state %08x\n", result, g_pDmaChanBase, *g_pDmaChanBase); -+ *g_pDmaChanBase = 1 << 31; -+ printk(KERN_DEBUG "post-reset %08x\n", *g_pDmaChanBase); -+ -+ g_dmaChan = result; -+ -+ //clear the cache stats -+ g_cacheHit = 0; -+ g_cacheMiss = 0; -+ -+ //register our device - after this we are go go go -+ cdev_init(&g_cDev, &g_fOps); -+ g_cDev.owner = THIS_MODULE; -+ g_cDev.ops = &g_fOps; -+ -+ result = cdev_add(&g_cDev, g_majorMinor, 1); -+ if (result < 0) -+ { -+ printk(KERN_ERR "failed to add character device\n"); -+ unregister_chrdev_region(g_majorMinor, 1); -+ bcm_dma_chan_free(g_dmaChan); -+ return result; -+ } -+ -+ return 0; -+} -+ -+static void __exit dmaer_exit(void) -+{ -+ printk(KERN_INFO "closing dmaer device, cache stats: %d hits %d misses\n", g_cacheHit, g_cacheMiss); -+ //unregister the device -+ cdev_del(&g_cDev); -+ unregister_chrdev_region(g_majorMinor, 1); -+ //free the dma channel -+ bcm_dma_chan_free(g_dmaChan); -+} -+ -+MODULE_AUTHOR("Simon Hall"); -+module_init(dmaer_init); -+module_exit(dmaer_exit); -+ -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_control.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-11-27 14:40:43.616834116 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_control.h 2012-11-18 20:53:35.128715497 +0100 @@ -0,0 +1,419 @@ +/* + * linux/arch/arm/mach-bcm2708/arm_control.h @@ -5839,9 +4678,9 @@ diff -Naur linux-3.6.7/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.7/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_power.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-11-27 14:40:43.618834156 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/arm_power.h 2012-11-18 20:53:35.129715520 +0100 @@ -0,0 +1,60 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h @@ -5903,9 +4742,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi- +}; + +#endif -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/clkdev.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-11-27 14:40:43.605833892 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/clkdev.h 2012-11-18 20:53:35.129715520 +0100 @@ -0,0 +1,7 @@ +#ifndef __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H @@ -5914,9 +4753,9 @@ diff -Naur linux-3.6.7/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.7/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/debug-macro.S +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-11-27 14:40:43.617834136 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2012-11-18 20:53:35.130715541 +0100 @@ -0,0 +1,22 @@ +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S + * @@ -5940,9 +4779,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rp + .endm + +#include -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/dma.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/dma.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/dma.h 2012-11-27 14:40:43.618834156 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/dma.h 2012-11-18 20:53:35.130715541 +0100 @@ -0,0 +1,84 @@ +/* + * linux/arch/arm/mach-bcm2708/include/mach/dma.h @@ -6028,9 +4867,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.6.7/ + + +#endif /* _MACH_BCM2708_DMA_H */ -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/entry-macro.S +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-11-27 14:40:43.579833364 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2012-11-18 20:53:35.131715561 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-bcm2708/include/mach/entry-macro.S @@ -6101,9 +4940,9 @@ diff -Naur linux-3.6.7/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.7/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/frc.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/frc.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/frc.h 2012-11-27 14:40:43.617834136 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/frc.h 2012-11-18 20:53:35.132715579 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6143,9 +4982,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.6.7/ +extern unsigned long long frc_clock_ticks63(void); + +#endif -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/gpio.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/gpio.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-11-27 14:40:43.615834096 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/gpio.h 2012-11-18 20:53:35.132715579 +0100 @@ -0,0 +1,48 @@ +/* + * arch/arm/mach-bcm2708/include/mach/gpio.h @@ -6195,9 +5034,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.6.7 + +#endif + -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/hardware.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/hardware.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-11-27 14:40:43.616834116 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/hardware.h 2012-11-18 20:53:35.133715597 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/hardware.h @@ -6227,9 +5066,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3 +#include + +#endif -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/io.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/io.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/io.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/io.h 2012-11-27 14:40:43.615834096 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/io.h 2012-11-18 20:53:35.133715597 +0100 @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-bcm2708/include/mach/io.h @@ -6259,9 +5098,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.6.7/a +#define __mem_pci(a) (a) + +#endif -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/irqs.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/irqs.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-11-27 14:40:43.616834116 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/irqs.h 2012-11-18 20:53:35.134715615 +0100 @@ -0,0 +1,199 @@ +/* + * arch/arm/mach-bcm2708/include/mach/irqs.h @@ -6462,9 +5301,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.6.7 + + +#endif /* _BCM2708_IRQS_H_ */ -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/memory.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/memory.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/memory.h 2012-11-27 14:40:43.615834096 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/memory.h 2012-11-18 20:53:35.135715633 +0100 @@ -0,0 +1,57 @@ +/* + * arch/arm/mach-bcm2708/include/mach/memory.h @@ -6523,9 +5362,9 @@ diff -Naur linux-3.6.7/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.7/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/platform.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/platform.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/platform.h 2012-11-27 14:40:43.579833364 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/platform.h 2012-11-18 20:53:35.136715652 +0100 @@ -0,0 +1,225 @@ +/* + * arch/arm/mach-bcm2708/include/mach/platform.h @@ -6752,9 +5591,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3 +#endif + +/* END */ -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/power.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/power.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/power.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/power.h 2012-11-27 14:40:43.618834156 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/power.h 2012-11-18 20:53:35.136715652 +0100 @@ -0,0 +1,26 @@ +/* + * linux/arch/arm/mach-bcm2708/power.h @@ -6782,9 +5621,9 @@ diff -Naur linux-3.6.7/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.7/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/system.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/system.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/system.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/system.h 2012-11-27 14:40:43.565833082 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/system.h 2012-11-18 20:53:35.137715672 +0100 @@ -0,0 +1,38 @@ +/* + * arch/arm/mach-bcm2708/include/mach/system.h @@ -6824,9 +5663,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.6 +} + +#endif -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/timex.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/timex.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/timex.h 2012-11-27 14:40:43.580833383 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/timex.h 2012-11-18 20:53:35.137715672 +0100 @@ -0,0 +1,23 @@ +/* + * arch/arm/mach-bcm2708/include/mach/timex.h @@ -6851,9 +5690,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.6. + */ + +#define CLOCK_TICK_RATE (1000000) -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/uncompress.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-11-27 14:40:43.618834156 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/uncompress.h 2012-11-18 20:53:35.138715692 +0100 @@ -0,0 +1,85 @@ +/* + * arch/arm/mach-bcn2708/include/mach/uncompress.h @@ -6940,10 +5779,10 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi + */ +#define arch_decomp_wdog() + -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/vcio.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vcio.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-11-27 14:40:43.605833892 +0100 -@@ -0,0 +1,141 @@ ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vcio.h 2012-11-18 20:53:35.138715692 +0100 +@@ -0,0 +1,108 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vcio.h + * @@ -7051,43 +5890,10 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.6.7 +extern int /*rc*/ bcm_mailbox_write(unsigned chan, uint32_t data28); +extern int /*rc*/ bcm_mailbox_property(void *data, int size); + -+#include -+ -+/* -+ * The major device number. We can't rely on dynamic -+ * registration any more, because ioctls need to know -+ * it. -+ */ -+#define MAJOR_NUM 100 -+ -+/* -+ * Set the message of the device driver -+ */ -+#define IOCTL_MBOX_PROPERTY _IOWR(MAJOR_NUM, 0, char *) -+/* -+ * _IOWR means that we're creating an ioctl command -+ * number for passing information from a user process -+ * to the kernel module and from the kernel module to user process -+ * -+ * The first arguments, MAJOR_NUM, is the major device -+ * number we're using. -+ * -+ * The second argument is the number of the command -+ * (there could be several with different meanings). -+ * -+ * The third argument is the type we want to get from -+ * the process to the kernel. -+ */ -+ -+/* -+ * The name of the device file -+ */ -+#define DEVICE_FILE_NAME "char_dev" -+ +#endif -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/vc_mem.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-11-27 14:40:43.617834136 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2012-11-18 20:53:35.139715712 +0100 @@ -0,0 +1,36 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -7125,9 +5931,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.6 + +#endif /* VC_MEM_H */ + -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/vmalloc.h +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h --- linux-3.6.7/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-11-27 14:40:43.580833383 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2012-11-18 20:53:35.139715712 +0100 @@ -0,0 +1,20 @@ +/* + * arch/arm/mach-bcm2708/include/mach/vmalloc.h @@ -7149,10 +5955,10 @@ diff -Naur linux-3.6.7/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.7/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.7/arch/arm/mach-bcm2708/Kconfig +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Kconfig linux-3.6.7.patch/arch/arm/mach-bcm2708/Kconfig --- linux-3.6.7/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/Kconfig 2012-11-27 14:40:43.700835842 +0100 -@@ -0,0 +1,41 @@ ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/Kconfig 2012-11-18 20:53:35.140715731 +0100 +@@ -0,0 +1,34 @@ +menu "Broadcom BCM2708 Implementations" + depends on ARCH_BCM2708 + @@ -7186,18 +5992,11 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.6.7/arch/arm/ma + help + Do not allow ARM to use GPU's L2 cache. Requires disable_l2cache in config.txt. + -+config BCM2708_DMAER -+ tristate "BCM2708 DMA helper" -+ depends on MACH_BCM2708 -+ default n -+ help -+ Enable DMA helper for accelerating X composition -+ +endmenu -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.7/arch/arm/mach-bcm2708/Makefile +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Makefile linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile --- linux-3.6.7/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/Makefile 2012-11-27 14:40:43.619834176 +0100 -@@ -0,0 +1,9 @@ ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile 2012-11-18 20:53:35.140715731 +0100 +@@ -0,0 +1,8 @@ +# +# Makefile for the linux kernel. +# @@ -7205,18 +6004,17 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Makefile linux-rpi-3.6.7/arch/arm/m +obj-$(CONFIG_MACH_BCM2708) += clock.o bcm2708.o armctrl.o vcio.o power.o dma.o delay.o +obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o +obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o -+obj-$(CONFIG_BCM2708_DMAER) += dmaer.o + -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Makefile.boot linux-rpi-3.6.7/arch/arm/mach-bcm2708/Makefile.boot +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/Makefile.boot linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile.boot --- linux-3.6.7/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/Makefile.boot 2012-11-27 14:40:43.413830040 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/Makefile.boot 2012-11-18 20:53:35.141715749 +0100 @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.7/arch/arm/mach-bcm2708/power.c +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/power.c linux-3.6.7.patch/arch/arm/mach-bcm2708/power.c --- linux-3.6.7/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/power.c 2012-11-27 14:40:43.622834239 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/power.c 2012-11-18 20:53:35.141715749 +0100 @@ -0,0 +1,194 @@ +/* + * linux/arch/arm/mach-bcm2708/power.c @@ -7412,10 +6210,10 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/power.c linux-rpi-3.6.7/arch/arm/ma +MODULE_AUTHOR("Phil Elwell"); +MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_LICENSE("GPL"); -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.7/arch/arm/mach-bcm2708/vcio.c +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-3.6.7.patch/arch/arm/mach-bcm2708/vcio.c --- linux-3.6.7/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/vcio.c 2012-11-27 14:40:43.699835822 +0100 -@@ -0,0 +1,471 @@ ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/vcio.c 2012-11-18 20:53:35.142715768 +0100 +@@ -0,0 +1,338 @@ +/* + * linux/arch/arm/mach-bcm2708/vcio.c + * @@ -7455,9 +6253,6 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.7/arch/arm/mac +#include +#include + -+#include -+ -+ +#define DRIVER_NAME BCM_VCIO_DRIVER_NAME + +/* ---------------------------------------------------------------------- @@ -7637,33 +6432,6 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.7/arch/arm/mac + mbox_dev = dev; +} + -+static int mbox_copy_from_user(void *dst, const void *src, int size) -+{ -+ if ( (uint32_t)src < TASK_SIZE) -+ { -+ return copy_from_user(dst, src, size); -+ } -+ else -+ { -+ memcpy( dst, src, size ); -+ return 0; -+ } -+} -+ -+static int mbox_copy_to_user(void *dst, const void *src, int size) -+{ -+ if ( (uint32_t)dst < TASK_SIZE) -+ { -+ return copy_to_user(dst, src, size); -+ } -+ else -+ { -+ memcpy( dst, src, size ); -+ return 0; -+ } -+} -+ -+ +extern int bcm_mailbox_property(void *data, int size) +{ + uint32_t success; @@ -7675,7 +6443,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.7/arch/arm/mac + mem_kern = dma_alloc_coherent(NULL, PAGE_ALIGN(size), &mem_bus, GFP_ATOMIC); + if (mem_kern) { + /* create the message */ -+ mbox_copy_from_user(mem_kern, data, size); ++ memcpy(mem_kern, data, size); + + /* send the message */ + wmb(); @@ -7686,7 +6454,7 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.7/arch/arm/mac + if (s == 0) { + /* copy the response */ + rmb(); -+ mbox_copy_to_user(data, mem_kern, size); ++ memcpy(data, mem_kern, size); + } + dma_free_coherent(NULL, PAGE_ALIGN(size), mem_kern, mem_bus); + } else { @@ -7702,93 +6470,6 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.7/arch/arm/mac + * Platform Device for Mailbox + * -------------------------------------------------------------------- */ + -+/* -+ * Is the device open right now? Used to prevent -+ * concurent access into the same device -+ */ -+static int Device_Open = 0; -+ -+/* -+ * This is called whenever a process attempts to open the device file -+ */ -+static int device_open(struct inode *inode, struct file *file) -+{ -+ /* -+ * We don't want to talk to two processes at the same time -+ */ -+ if (Device_Open) -+ return -EBUSY; -+ -+ Device_Open++; -+ /* -+ * Initialize the message -+ */ -+ try_module_get(THIS_MODULE); -+ return 0; -+} -+ -+static int device_release(struct inode *inode, struct file *file) -+{ -+ /* -+ * We're now ready for our next caller -+ */ -+ Device_Open--; -+ -+ module_put(THIS_MODULE); -+ return 0; -+} -+ -+/* -+ * This function is called whenever a process tries to do an ioctl on our -+ * device file. We get two extra parameters (additional to the inode and file -+ * structures, which all device functions get): the number of the ioctl called -+ * and the parameter given to the ioctl function. -+ * -+ * If the ioctl is write or read/write (meaning output is returned to the -+ * calling process), the ioctl call returns the output of this function. -+ * -+ */ -+static long device_ioctl(struct file *file, /* see include/linux/fs.h */ -+ unsigned int ioctl_num, /* number and param for ioctl */ -+ unsigned long ioctl_param) -+{ -+ unsigned size; -+ /* -+ * Switch according to the ioctl called -+ */ -+ switch (ioctl_num) { -+ case IOCTL_MBOX_PROPERTY: -+ /* -+ * Receive a pointer to a message (in user space) and set that -+ * to be the device's message. Get the parameter given to -+ * ioctl by the process. -+ */ -+ mbox_copy_from_user(&size, (void *)ioctl_param, sizeof size); -+ return bcm_mailbox_property((void *)ioctl_param, size); -+ break; -+ default: -+ printk(KERN_ERR DRIVER_NAME "unknown ioctl: %d\n", ioctl_num); -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ -+/* Module Declarations */ -+ -+/* -+ * This structure will hold the functions to be called -+ * when a process does something to the device we -+ * created. Since a pointer to this structure is kept in -+ * the devices table, it can't be local to -+ * init_module. NULL is for unimplemented functios. -+ */ -+struct file_operations fops = { -+ .unlocked_ioctl = device_ioctl, -+ .open = device_open, -+ .release = device_release, /* a.k.a. close */ -+}; -+ +static int bcm_vcio_probe(struct platform_device *pdev) +{ + int ret = 0; @@ -7821,22 +6502,6 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.7/arch/arm/mac + __io_address(ARM_0_MAIL0_RD)); + } + } -+ -+ if (ret == 0) { -+ /* -+ * Register the character device -+ */ -+ ret = register_chrdev(MAJOR_NUM, DEVICE_FILE_NAME, &fops); -+ -+ /* -+ * Negative values signify an error -+ */ -+ if (ret < 0) { -+ printk(KERN_ERR DRIVER_NAME -+ "Failed registering the character device %d\n", ret); -+ return ret; -+ } -+ } + return ret; +} + @@ -7887,9 +6552,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.6.7/arch/arm/mac +MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm-mbox"); -diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.7/arch/arm/mach-bcm2708/vc_mem.c +diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vc_mem.c linux-3.6.7.patch/arch/arm/mach-bcm2708/vc_mem.c --- linux-3.6.7/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mach-bcm2708/vc_mem.c 2012-11-27 14:40:43.522832213 +0100 ++++ linux-3.6.7.patch/arch/arm/mach-bcm2708/vc_mem.c 2012-11-18 20:53:35.143715786 +0100 @@ -0,0 +1,458 @@ +/***************************************************************************** +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. @@ -8349,9 +7014,9 @@ diff -Naur linux-3.6.7/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.6.7/arch/arm/m +module_param(mem_size, uint, 0644); +module_param(mem_base, uint, 0644); + -diff -Naur linux-3.6.7/arch/arm/Makefile linux-rpi-3.6.7/arch/arm/Makefile +diff -Naur linux-3.6.7/arch/arm/Makefile linux-3.6.7.patch/arch/arm/Makefile --- linux-3.6.7/arch/arm/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/Makefile 2012-11-27 14:40:49.242948614 +0100 ++++ linux-3.6.7.patch/arch/arm/Makefile 2012-11-18 20:53:35.143715786 +0100 @@ -198,6 +198,7 @@ machine-$(CONFIG_MACH_SPEAR320) := spear3xx machine-$(CONFIG_MACH_SPEAR600) := spear6xx @@ -8360,9 +7025,9 @@ diff -Naur linux-3.6.7/arch/arm/Makefile linux-rpi-3.6.7/arch/arm/Makefile # Platform directory name. This list is sorted alphanumerically # by CONFIG_* macro name. -diff -Naur linux-3.6.7/arch/arm/mm/alignment.c linux-rpi-3.6.7/arch/arm/mm/alignment.c +diff -Naur linux-3.6.7/arch/arm/mm/alignment.c linux-3.6.7.patch/arch/arm/mm/alignment.c --- linux-3.6.7/arch/arm/mm/alignment.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mm/alignment.c 2012-11-27 14:40:46.195886604 +0100 ++++ linux-3.6.7.patch/arch/arm/mm/alignment.c 2012-11-18 20:53:35.144715804 +0100 @@ -856,9 +856,11 @@ case 0x08000000: /* ldm or stm, or thumb-2 32bit instruction */ if (thumb2_32b) @@ -8377,9 +7042,9 @@ diff -Naur linux-3.6.7/arch/arm/mm/alignment.c linux-rpi-3.6.7/arch/arm/mm/align default: goto bad; -diff -Naur linux-3.6.7/arch/arm/mm/Kconfig linux-rpi-3.6.7/arch/arm/mm/Kconfig +diff -Naur linux-3.6.7/arch/arm/mm/Kconfig linux-3.6.7.patch/arch/arm/mm/Kconfig --- linux-3.6.7/arch/arm/mm/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mm/Kconfig 2012-11-27 14:40:46.227887264 +0100 ++++ linux-3.6.7.patch/arch/arm/mm/Kconfig 2012-11-18 20:53:35.145715823 +0100 @@ -354,7 +354,7 @@ # ARMv6 @@ -8389,9 +7054,9 @@ diff -Naur linux-3.6.7/arch/arm/mm/Kconfig linux-rpi-3.6.7/arch/arm/mm/Kconfig select CPU_32v6 select CPU_ABRT_EV6 select CPU_PABRT_V6 -diff -Naur linux-3.6.7/arch/arm/mm/proc-v6.S linux-rpi-3.6.7/arch/arm/mm/proc-v6.S +diff -Naur linux-3.6.7/arch/arm/mm/proc-v6.S linux-3.6.7.patch/arch/arm/mm/proc-v6.S --- linux-3.6.7/arch/arm/mm/proc-v6.S 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/mm/proc-v6.S 2012-11-27 14:40:46.198886668 +0100 ++++ linux-3.6.7.patch/arch/arm/mm/proc-v6.S 2012-11-18 20:53:35.146715843 +0100 @@ -73,10 +73,19 @@ * * IRQs are already disabled. @@ -8415,9 +7080,9 @@ diff -Naur linux-3.6.7/arch/arm/mm/proc-v6.S linux-rpi-3.6.7/arch/arm/mm/proc-v6 mov pc, lr ENTRY(cpu_v6_dcache_clean_area) -diff -Naur linux-3.6.7/arch/arm/tools/mach-types linux-rpi-3.6.7/arch/arm/tools/mach-types +diff -Naur linux-3.6.7/arch/arm/tools/mach-types linux-3.6.7.patch/arch/arm/tools/mach-types --- linux-3.6.7/arch/arm/tools/mach-types 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/arch/arm/tools/mach-types 2012-11-27 14:40:45.273867745 +0100 ++++ linux-3.6.7.patch/arch/arm/tools/mach-types 2012-11-18 20:53:35.147715863 +0100 @@ -519,6 +519,7 @@ prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 paz00 MACH_PAZ00 PAZ00 3128 @@ -8426,9 +7091,9 @@ diff -Naur linux-3.6.7/arch/arm/tools/mach-types linux-rpi-3.6.7/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.7/drivers/char/broadcom/Kconfig linux-rpi-3.6.7/drivers/char/broadcom/Kconfig +diff -Naur linux-3.6.7/drivers/char/broadcom/Kconfig linux-3.6.7.patch/drivers/char/broadcom/Kconfig --- linux-3.6.7/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/char/broadcom/Kconfig 2012-11-27 14:39:18.011107176 +0100 ++++ linux-3.6.7.patch/drivers/char/broadcom/Kconfig 2012-11-18 20:53:35.147715863 +0100 @@ -0,0 +1,18 @@ +# +# Broadcom char driver config @@ -8448,15 +7113,15 @@ diff -Naur linux-3.6.7/drivers/char/broadcom/Kconfig linux-rpi-3.6.7/drivers/cha + help + Helper for videocore CMA access. + -diff -Naur linux-3.6.7/drivers/char/broadcom/Makefile linux-rpi-3.6.7/drivers/char/broadcom/Makefile +diff -Naur linux-3.6.7/drivers/char/broadcom/Makefile linux-3.6.7.patch/drivers/char/broadcom/Makefile --- linux-3.6.7/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/char/broadcom/Makefile 2012-11-27 14:39:18.011107176 +0100 ++++ linux-3.6.7.patch/drivers/char/broadcom/Makefile 2012-11-18 20:53:35.147715863 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ + -diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.7/drivers/char/broadcom/vc_cma/Makefile +diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/Makefile linux-3.6.7.patch/drivers/char/broadcom/vc_cma/Makefile --- linux-3.6.7/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/char/broadcom/vc_cma/Makefile 2012-11-27 14:39:18.012107196 +0100 ++++ linux-3.6.7.patch/drivers/char/broadcom/vc_cma/Makefile 2012-11-18 20:53:35.148715882 +0100 @@ -0,0 +1,15 @@ +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs +EXTRA_CFLAGS += -Werror @@ -8473,9 +7138,9 @@ diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.6.7/dri + +vc-cma-objs := vc_cma.o + -diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.7/drivers/char/broadcom/vc_cma/vc_cma.c +diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.6.7.patch/drivers/char/broadcom/vc_cma/vc_cma.c --- linux-3.6.7/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/char/broadcom/vc_cma/vc_cma.c 2012-11-27 14:39:18.017107300 +0100 ++++ linux-3.6.7.patch/drivers/char/broadcom/vc_cma/vc_cma.c 2012-11-18 20:53:35.149715901 +0100 @@ -0,0 +1,886 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -9363,9 +8028,9 @@ diff -Naur linux-3.6.7/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.6.7/dri +module_exit(vc_cma_exit); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Broadcom Corporation"); -diff -Naur linux-3.6.7/drivers/char/Kconfig linux-rpi-3.6.7/drivers/char/Kconfig +diff -Naur linux-3.6.7/drivers/char/Kconfig linux-3.6.7.patch/drivers/char/Kconfig --- linux-3.6.7/drivers/char/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/char/Kconfig 2012-11-27 14:39:18.404115238 +0100 ++++ linux-3.6.7.patch/drivers/char/Kconfig 2012-11-18 20:53:35.150715920 +0100 @@ -585,6 +585,8 @@ source "drivers/s390/char/Kconfig" @@ -9375,9 +8040,9 @@ diff -Naur linux-3.6.7/drivers/char/Kconfig linux-rpi-3.6.7/drivers/char/Kconfig config MSM_SMD_PKT bool "Enable device interface for some SMD packet ports" default n -diff -Naur linux-3.6.7/drivers/char/Makefile linux-rpi-3.6.7/drivers/char/Makefile +diff -Naur linux-3.6.7/drivers/char/Makefile linux-3.6.7.patch/drivers/char/Makefile --- linux-3.6.7/drivers/char/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/char/Makefile 2012-11-27 14:39:18.235111763 +0100 ++++ linux-3.6.7.patch/drivers/char/Makefile 2012-11-18 20:53:35.150715920 +0100 @@ -63,3 +63,6 @@ js-rtc-y = rtc.o @@ -9385,9 +8050,9 @@ diff -Naur linux-3.6.7/drivers/char/Makefile linux-rpi-3.6.7/drivers/char/Makefi + +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ + -diff -Naur linux-3.6.7/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.7/drivers/cpufreq/bcm2835-cpufreq.c +diff -Naur linux-3.6.7/drivers/cpufreq/bcm2835-cpufreq.c linux-3.6.7.patch/drivers/cpufreq/bcm2835-cpufreq.c --- linux-3.6.7/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/cpufreq/bcm2835-cpufreq.c 2012-11-27 14:38:10.905753487 +0100 ++++ linux-3.6.7.patch/drivers/cpufreq/bcm2835-cpufreq.c 2012-11-18 20:53:35.151715939 +0100 @@ -0,0 +1,239 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -9628,9 +8293,9 @@ diff -Naur linux-3.6.7/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.6.7/drivers +module_init(bcm2835_cpufreq_module_init); +module_exit(bcm2835_cpufreq_module_exit); + -diff -Naur linux-3.6.7/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.7/drivers/cpufreq/Kconfig.arm +diff -Naur linux-3.6.7/drivers/cpufreq/Kconfig.arm linux-3.6.7.patch/drivers/cpufreq/Kconfig.arm --- linux-3.6.7/drivers/cpufreq/Kconfig.arm 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/cpufreq/Kconfig.arm 2012-11-27 14:38:10.863752628 +0100 ++++ linux-3.6.7.patch/drivers/cpufreq/Kconfig.arm 2012-11-18 20:53:35.152715958 +0100 @@ -76,3 +76,12 @@ help This adds the CPUFreq driver for Samsung EXYNOS5250 @@ -9644,9 +8309,9 @@ diff -Naur linux-3.6.7/drivers/cpufreq/Kconfig.arm linux-rpi-3.6.7/drivers/cpufr + + If in doubt, say N. + -diff -Naur linux-3.6.7/drivers/cpufreq/Makefile linux-rpi-3.6.7/drivers/cpufreq/Makefile +diff -Naur linux-3.6.7/drivers/cpufreq/Makefile linux-3.6.7.patch/drivers/cpufreq/Makefile --- linux-3.6.7/drivers/cpufreq/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/cpufreq/Makefile 2012-11-27 14:38:10.953754467 +0100 ++++ linux-3.6.7.patch/drivers/cpufreq/Makefile 2012-11-18 20:53:35.152715958 +0100 @@ -48,6 +48,7 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o @@ -9655,9 +8320,9 @@ diff -Naur linux-3.6.7/drivers/cpufreq/Makefile linux-rpi-3.6.7/drivers/cpufreq/ ################################################################################## # PowerPC platform drivers -diff -Naur linux-3.6.7/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.7/drivers/hwmon/bcm2835-hwmon.c +diff -Naur linux-3.6.7/drivers/hwmon/bcm2835-hwmon.c linux-3.6.7.patch/drivers/hwmon/bcm2835-hwmon.c --- linux-3.6.7/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/hwmon/bcm2835-hwmon.c 2012-11-27 14:38:48.088503890 +0100 ++++ linux-3.6.7.patch/drivers/hwmon/bcm2835-hwmon.c 2012-11-18 20:53:35.153715977 +0100 @@ -0,0 +1,219 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -9878,9 +8543,9 @@ diff -Naur linux-3.6.7/drivers/hwmon/bcm2835-hwmon.c linux-rpi-3.6.7/drivers/hwm +MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip"); + +module_platform_driver(bcm2835_hwmon_driver); -diff -Naur linux-3.6.7/drivers/hwmon/Kconfig linux-rpi-3.6.7/drivers/hwmon/Kconfig +diff -Naur linux-3.6.7/drivers/hwmon/Kconfig linux-3.6.7.patch/drivers/hwmon/Kconfig --- linux-3.6.7/drivers/hwmon/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/hwmon/Kconfig 2012-11-27 14:38:48.333508919 +0100 ++++ linux-3.6.7.patch/drivers/hwmon/Kconfig 2012-11-18 20:53:35.154715996 +0100 @@ -1411,6 +1411,16 @@ help Support for the A/D converter on MC13783 and MC13892 PMIC. @@ -9898,9 +8563,9 @@ diff -Naur linux-3.6.7/drivers/hwmon/Kconfig linux-rpi-3.6.7/drivers/hwmon/Kconf if ACPI comment "ACPI drivers" -diff -Naur linux-3.6.7/drivers/hwmon/Makefile linux-rpi-3.6.7/drivers/hwmon/Makefile +diff -Naur linux-3.6.7/drivers/hwmon/Makefile linux-3.6.7.patch/drivers/hwmon/Makefile --- linux-3.6.7/drivers/hwmon/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/hwmon/Makefile 2012-11-27 14:38:48.308508405 +0100 ++++ linux-3.6.7.patch/drivers/hwmon/Makefile 2012-11-18 20:53:35.154715996 +0100 @@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o @@ -9909,9 +8574,9 @@ diff -Naur linux-3.6.7/drivers/hwmon/Makefile linux-rpi-3.6.7/drivers/hwmon/Make obj-$(CONFIG_PMBUS) += pmbus/ -diff -Naur linux-3.6.7/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.7/drivers/i2c/busses/i2c-bcm2708.c +diff -Naur linux-3.6.7/drivers/i2c/busses/i2c-bcm2708.c linux-3.6.7.patch/drivers/i2c/busses/i2c-bcm2708.c --- linux-3.6.7/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/i2c/busses/i2c-bcm2708.c 2012-11-27 14:39:26.837285612 +0100 ++++ linux-3.6.7.patch/drivers/i2c/busses/i2c-bcm2708.c 2012-11-18 20:53:35.155716015 +0100 @@ -0,0 +1,400 @@ +/* + * Driver for Broadcom BCM2708 BSC Controllers @@ -10313,9 +8978,9 @@ diff -Naur linux-3.6.7/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.6.7/drivers/ +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Naur linux-3.6.7/drivers/i2c/busses/Kconfig linux-rpi-3.6.7/drivers/i2c/busses/Kconfig +diff -Naur linux-3.6.7/drivers/i2c/busses/Kconfig linux-3.6.7.patch/drivers/i2c/busses/Kconfig --- linux-3.6.7/drivers/i2c/busses/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/i2c/busses/Kconfig 2012-11-27 14:39:26.944287810 +0100 ++++ linux-3.6.7.patch/drivers/i2c/busses/Kconfig 2012-11-18 20:53:35.156716034 +0100 @@ -314,6 +314,25 @@ This driver can also be built as a module. If so, the module will be called i2c-au1550. @@ -10342,9 +9007,9 @@ diff -Naur linux-3.6.7/drivers/i2c/busses/Kconfig linux-rpi-3.6.7/drivers/i2c/bu config I2C_BLACKFIN_TWI tristate "Blackfin TWI I2C support" depends on BLACKFIN -diff -Naur linux-3.6.7/drivers/i2c/busses/Makefile linux-rpi-3.6.7/drivers/i2c/busses/Makefile +diff -Naur linux-3.6.7/drivers/i2c/busses/Makefile linux-3.6.7.patch/drivers/i2c/busses/Makefile --- linux-3.6.7/drivers/i2c/busses/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/i2c/busses/Makefile 2012-11-27 14:39:26.894286783 +0100 ++++ linux-3.6.7.patch/drivers/i2c/busses/Makefile 2012-11-18 20:53:35.156716034 +0100 @@ -30,6 +30,7 @@ # Embedded system I2C/SMBus host controller drivers obj-$(CONFIG_I2C_AT91) += i2c-at91.o @@ -10353,9 +9018,9 @@ diff -Naur linux-3.6.7/drivers/i2c/busses/Makefile linux-rpi-3.6.7/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.7/drivers/misc/Kconfig linux-rpi-3.6.7/drivers/misc/Kconfig +diff -Naur linux-3.6.7/drivers/misc/Kconfig linux-3.6.7.patch/drivers/misc/Kconfig --- linux-3.6.7/drivers/misc/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/Kconfig 2012-11-27 14:38:22.591989425 +0100 ++++ linux-3.6.7.patch/drivers/misc/Kconfig 2012-11-18 20:53:35.157716053 +0100 @@ -517,4 +517,6 @@ source "drivers/misc/carma/Kconfig" source "drivers/misc/altera-stapl/Kconfig" @@ -10363,17 +9028,17 @@ diff -Naur linux-3.6.7/drivers/misc/Kconfig linux-rpi-3.6.7/drivers/misc/Kconfig +source "drivers/misc/vc04_services/Kconfig" endmenu + -diff -Naur linux-3.6.7/drivers/misc/Makefile linux-rpi-3.6.7/drivers/misc/Makefile +diff -Naur linux-3.6.7/drivers/misc/Makefile linux-3.6.7.patch/drivers/misc/Makefile --- linux-3.6.7/drivers/misc/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/Makefile 2012-11-27 14:38:22.400985597 +0100 ++++ linux-3.6.7.patch/drivers/misc/Makefile 2012-11-18 20:53:35.157716053 +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.7/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/connections/connection.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-11-27 14:38:22.246982457 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2012-11-18 20:53:35.159716091 +0100 @@ -0,0 +1,313 @@ +/* + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10688,9 +9353,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/connections/con +#endif /* CONNECTION_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-11-27 14:38:22.266982868 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2012-11-18 20:53:35.159716091 +0100 @@ -0,0 +1,189 @@ +/* + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -10881,9 +9546,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/message_drivers +#endif // _VCHI_MESSAGE_H_ + +/****************************** End of file ***********************************/ -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-11-27 14:38:22.266982868 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2012-11-18 20:53:35.160716110 +0100 @@ -0,0 +1,209 @@ +/* + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11094,9 +9759,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linu +#endif /* VCHI_CFG_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-11-27 14:38:22.246982457 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2012-11-18 20:53:35.160716110 +0100 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11154,9 +9819,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_cfg_intern +//#define VCHI_RX_NANOLOCKS + +#endif /*VCHI_CFG_INTERNAL_H_*/ -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_common.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-11-27 14:38:22.254982622 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2012-11-18 20:53:35.161716129 +0100 @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11306,9 +9971,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_common.h l + + +#endif // VCHI_COMMON_H_ -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-11-27 14:38:22.265982848 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi.h 2012-11-18 20:53:35.162716148 +0100 @@ -0,0 +1,355 @@ +/* + * Copyright (c) 2010-2012 Broadcom. All rights reserved. @@ -11665,9 +10330,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rp +#endif /* VCHI_H_ */ + +/****************************** End of file **********************************/ -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_mh.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-11-27 14:38:22.245982437 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2012-11-18 20:53:35.162716148 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -11696,9 +10361,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux +#define VCHI_MEM_HANDLE_INVALID 0 + +#endif -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-11-27 14:38:22.243982396 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2012-11-18 20:53:35.163716167 +0100 @@ -0,0 +1,523 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -12223,9 +10888,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835 + + kfree(pagelist); +} -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-11-27 14:38:22.242982375 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2012-11-18 20:53:35.164716186 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -12254,10 +10919,10 @@ diff -Naur linux-3.6.7/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.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-11-27 14:38:22.227982069 +0100 -@@ -0,0 +1,2787 @@ ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2012-11-18 20:53:35.167716243 +0100 +@@ -0,0 +1,2788 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. + * @@ -13827,6 +12492,7 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. +vchiq_arm_init_state(VCHIQ_STATE_T *state, VCHIQ_ARM_STATE_T *arm_state) +{ + VCHIQ_STATUS_T status = VCHIQ_SUCCESS; ++ char threadname[10]; + + if (arm_state) { + rwlock_init(&arm_state->susp_res_lock); @@ -13853,6 +12519,19 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. + * completion while things are waiting on the resume blocker */ + complete_all(&arm_state->blocked_blocker); + ++ snprintf(threadname, sizeof(threadname), "VCHIQka-%d", ++ state->id); ++ arm_state->ka_thread = kthread_create( ++ &vchiq_keepalive_thread_func, ++ (void *)state, ++ threadname); ++ if (arm_state->ka_thread == NULL) { ++ vchiq_log_error(vchiq_susp_log_level, ++ "vchiq: FATAL: couldn't create thread %s", ++ threadname); ++ status = VCHIQ_ERROR; ++ } ++ + arm_state->suspend_timer_timeout = SUSPEND_TIMER_TIMEOUT_MS; + arm_state->suspend_timer_running = 0; + init_timer(&arm_state->suspend_timer); @@ -14868,22 +13547,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. + if (state->conn_state == VCHIQ_CONNSTATE_CONNECTED) { + write_lock_bh(&arm_state->susp_res_lock); + if (!arm_state->first_connect) { -+ char threadname[10]; + arm_state->first_connect = 1; + write_unlock_bh(&arm_state->susp_res_lock); -+ snprintf(threadname, sizeof(threadname), "VCHIQka-%d", -+ state->id); -+ arm_state->ka_thread = kthread_create( -+ &vchiq_keepalive_thread_func, -+ (void *)state, -+ threadname); -+ if (arm_state->ka_thread == NULL) { -+ vchiq_log_error(vchiq_susp_log_level, -+ "vchiq: FATAL: couldn't create thread %s", -+ threadname); -+ } else { -+ wake_up_process(arm_state->ka_thread); -+ } ++ wake_up_process(arm_state->ka_thread); + } else + write_unlock_bh(&arm_state->susp_res_lock); + } @@ -15045,9 +13711,9 @@ diff -Naur linux-3.6.7/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.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-11-27 14:38:22.242982375 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2012-11-18 20:53:35.168716262 +0100 @@ -0,0 +1,197 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -15246,9 +13912,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm. + + +#endif /* VCHIQ_ARM_H */ -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2012-11-27 14:38:22.242982375 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2012-11-18 20:53:35.168716262 +0100 @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -15272,9 +13938,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_buil +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.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-11-27 14:38:22.245982437 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2012-11-18 20:53:35.169716281 +0100 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -15321,9 +13987,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg. +#endif + +#endif /* VCHIQ_CFG_H */ -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-11-27 14:38:22.240982335 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2012-11-18 20:53:35.169716281 +0100 @@ -0,0 +1,100 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -15425,9 +14091,9 @@ diff -Naur linux-3.6.7/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.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-11-27 14:38:22.243982396 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2012-11-18 20:53:35.170716300 +0100 @@ -0,0 +1,32 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -15461,9 +14127,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_conn + +#endif /* VCHIQ_CONNECTED_H */ + -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-11-27 14:38:22.243982396 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2012-11-18 20:53:35.174716376 +0100 @@ -0,0 +1,3676 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -19141,9 +17807,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + numBytes = 0; + } +} -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-11-27 14:38:22.243982396 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2012-11-18 20:53:35.176716414 +0100 @@ -0,0 +1,682 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -19827,9 +18493,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core + size_t numBytes); + +#endif -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2012-11-27 14:38:22.230982129 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2012-11-18 20:53:35.176716414 +0100 @@ -0,0 +1,87 @@ +#!/usr/bin/perl -w + @@ -19918,9 +18584,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genv + return vchiq_build_time; +} +EOF -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-11-27 14:38:22.244982417 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2012-11-18 20:53:35.176716414 +0100 @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2010-2011 Broadcom. All rights reserved. @@ -19948,9 +18614,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h li + +#endif + -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-11-27 14:38:22.240982335 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2012-11-18 20:53:35.177716433 +0100 @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -20119,9 +18785,9 @@ diff -Naur linux-3.6.7/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.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-11-27 14:38:22.243982396 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2012-11-18 20:53:35.178716452 +0100 @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -20237,9 +18903,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioct +#define VCHIQ_IOC_MAX 15 + +#endif -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-11-27 14:38:22.227982069 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2012-11-18 20:53:35.178716452 +0100 @@ -0,0 +1,424 @@ +/***************************************************************************** +* Copyright 2001 - 2011 Broadcom Corporation. All rights reserved. @@ -20665,9 +19331,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern + + return status; +} -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-11-27 14:38:22.242982375 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2012-11-18 20:53:35.179716471 +0100 @@ -0,0 +1,52 @@ +/***************************************************************************** +* Copyright 2001 - 2010 Broadcom Corporation. All rights reserved. @@ -20721,9 +19387,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memd + const VCHIQ_PLATFORM_DATA_T * platform_data); + +#endif -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-11-27 14:38:22.241982355 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2012-11-18 20:53:35.179716471 +0100 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -20768,9 +19434,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_page +} FRAGMENTS_T; + +#endif /* VCHIQ_PAGELIST_H */ -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2012-11-27 14:38:22.227982069 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2012-11-18 20:53:35.180716490 +0100 @@ -0,0 +1,225 @@ +/* + * Copyright (c) 2012 Broadcom Corporation. All rights reserved. @@ -20997,9 +19663,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc + return proc_info.clients; +} + -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-11-27 14:38:22.241982355 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2012-11-18 20:53:35.181716508 +0100 @@ -0,0 +1,787 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -21788,9 +20454,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim + return ret; +} +EXPORT_SYMBOL(vchi_service_release); -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-11-27 14:38:22.227982069 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2012-11-18 20:53:35.182716527 +0100 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -21897,9 +20563,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + + return header; +} -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-11-27 14:38:22.245982437 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2012-11-18 20:53:35.182716527 +0100 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2010-2011 Broadcom Corporation. All rights reserved. @@ -21968,9 +20634,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util + +#endif + -diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c +diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c --- linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2012-11-27 14:38:22.228982089 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2012-11-18 20:53:35.183716546 +0100 @@ -0,0 +1,27 @@ +#include "vchiq_build_info.h" +#include @@ -21999,9 +20665,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_vers +{ + return vchiq_build_time; +} -diff -Naur linux-3.6.7/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.7/drivers/misc/vc04_services/Kconfig +diff -Naur linux-3.6.7/drivers/misc/vc04_services/Kconfig linux-3.6.7.patch/drivers/misc/vc04_services/Kconfig --- linux-3.6.7/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/Kconfig 2012-11-27 14:38:22.267982887 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/Kconfig 2012-11-18 20:53:35.183716546 +0100 @@ -0,0 +1,10 @@ +config BCM2708_VCHIQ + tristate "Videocore VCHIQ" @@ -22013,9 +20679,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/Kconfig linux-rpi-3.6.7/driver + Defaults to Y when the Broadcom Videocore services + are included in the build, N otherwise. + -diff -Naur linux-3.6.7/drivers/misc/vc04_services/Makefile linux-rpi-3.6.7/drivers/misc/vc04_services/Makefile +diff -Naur linux-3.6.7/drivers/misc/vc04_services/Makefile linux-3.6.7.patch/drivers/misc/vc04_services/Makefile --- linux-3.6.7/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/misc/vc04_services/Makefile 2012-11-27 14:38:22.267982887 +0100 ++++ linux-3.6.7.patch/drivers/misc/vc04_services/Makefile 2012-11-18 20:53:35.184716565 +0100 @@ -0,0 +1,18 @@ +ifeq ($(CONFIG_MACH_BCM2708),y) + @@ -22035,9 +20701,9 @@ diff -Naur linux-3.6.7/drivers/misc/vc04_services/Makefile linux-rpi-3.6.7/drive + +endif + -diff -Naur linux-3.6.7/drivers/mmc/card/block.c linux-rpi-3.6.7/drivers/mmc/card/block.c +diff -Naur linux-3.6.7/drivers/mmc/card/block.c linux-3.6.7.patch/drivers/mmc/card/block.c --- linux-3.6.7/drivers/mmc/card/block.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/mmc/card/block.c 2012-11-27 14:38:23.423006230 +0100 ++++ linux-3.6.7.patch/drivers/mmc/card/block.c 2012-11-18 20:53:35.185716584 +0100 @@ -1135,7 +1135,7 @@ brq->data.blocks = 1; } @@ -22047,170 +20713,9 @@ diff -Naur linux-3.6.7/drivers/mmc/card/block.c linux-rpi-3.6.7/drivers/mmc/card /* SPI multiblock writes terminate using a special * token, not a STOP_TRANSMISSION request. */ -diff -Naur linux-3.6.7/drivers/mmc/core/sd.c linux-rpi-3.6.7/drivers/mmc/core/sd.c ---- linux-3.6.7/drivers/mmc/core/sd.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/mmc/core/sd.c 2012-11-27 14:38:23.408005923 +0100 -@@ -13,6 +13,8 @@ - #include - #include - #include -+#include -+#include - - #include - #include -@@ -58,6 +60,15 @@ - __res & __mask; \ - }) - -+// timeout for tries -+static const unsigned long retry_timeout_ms= 10*1000; -+ -+// try at least 10 times, even if timeout is reached -+static const int retry_min_tries= 10; -+ -+// delay between tries -+static const unsigned long retry_delay_ms= 10; -+ - /* - * Given the decoded CSD structure, decode the raw CID to our CID structure. - */ -@@ -210,12 +221,62 @@ - } - - /* -- * Fetch and process SD Status register. -+ * Fetch and process SD Configuration Register. -+ */ -+static int mmc_read_scr(struct mmc_card *card) -+{ -+ unsigned long timeout_at; -+ int err, tries; -+ -+ timeout_at= jiffies + msecs_to_jiffies( retry_timeout_ms ); -+ tries= 0; -+ -+ while( tries < retry_min_tries || time_before( jiffies, timeout_at ) ) -+ { -+ unsigned long delay_at; -+ tries++; -+ -+ err = mmc_app_send_scr(card, card->raw_scr); -+ if( !err ) -+ break; // sucess!!! -+ -+ touch_nmi_watchdog(); // we are still alive! -+ -+ // delay -+ delay_at= jiffies + msecs_to_jiffies( retry_delay_ms ); -+ while( time_before( jiffies, delay_at ) ) -+ { -+ mdelay( 1 ); -+ touch_nmi_watchdog(); // we are still alive! -+ } -+ } -+ -+ if( err) -+ { -+ pr_err("%s: failed to read SD Configuration register (SCR) after %d tries during %lu ms, error %d\n", mmc_hostname(card->host), tries, retry_timeout_ms, err ); -+ return err; -+ } -+ -+ if( tries > 1 ) -+ { -+ pr_info("%s: could read SD Configuration register (SCR) at the %dth attempt\n", mmc_hostname(card->host), tries ); -+ } -+ -+ err = mmc_decode_scr(card); -+ if (err) -+ return err; -+ -+ return err; -+} -+ -+/* -+ * Fetch and process SD Status Register. - */ - static int mmc_read_ssr(struct mmc_card *card) - { -+ unsigned long timeout_at; - unsigned int au, es, et, eo; -- int err, i; -+ int err, i, tries; - u32 *ssr; - - if (!(card->csd.cmdclass & CCC_APP_SPEC)) { -@@ -227,15 +288,41 @@ - ssr = kmalloc(64, GFP_KERNEL); - if (!ssr) - return -ENOMEM; -- -- err = mmc_app_sd_status(card, ssr); -- if (err) { -- pr_warning("%s: problem reading SD Status " -- "register.\n", mmc_hostname(card->host)); -- err = 0; -+ -+ timeout_at= jiffies + msecs_to_jiffies( retry_timeout_ms ); -+ tries= 0; -+ -+ while( tries < retry_min_tries || time_before( jiffies, timeout_at ) ) -+ { -+ unsigned long delay_at; -+ tries++; -+ -+ err= mmc_app_sd_status(card, ssr); -+ if( !err ) -+ break; // sucess!!! -+ -+ touch_nmi_watchdog(); // we are still alive! -+ -+ // delay -+ delay_at= jiffies + msecs_to_jiffies( retry_delay_ms ); -+ while( time_before( jiffies, delay_at ) ) -+ { -+ mdelay( 1 ); -+ touch_nmi_watchdog(); // we are still alive! -+ } -+ } -+ -+ if( err) -+ { -+ pr_err("%s: failed to read SD Status register (SSR) after %d tries during %lu ms, error %d\n", mmc_hostname(card->host), tries, retry_timeout_ms, err ); - goto out; - } - -+ if( tries > 1 ) -+ { -+ pr_info("%s: could read SD Status register (SSR) at the %dth attempt\n", mmc_hostname(card->host), tries ); -+ } -+ - for (i = 0; i < 16; i++) - ssr[i] = be32_to_cpu(ssr[i]); - -@@ -799,15 +886,11 @@ - - if (!reinit) { - /* -- * Fetch SCR from card. -+ * Fetch and decode SD Configuration register. - */ -- err = mmc_app_send_scr(card, card->raw_scr); -- if (err) -- return err; -- -- err = mmc_decode_scr(card); -- if (err) -- return err; -+ err = mmc_read_scr(card); -+ if( err ) -+ return err; - - /* - * Fetch and process SD Status register. -diff -Naur linux-3.6.7/drivers/mmc/host/Kconfig linux-rpi-3.6.7/drivers/mmc/host/Kconfig +diff -Naur linux-3.6.7/drivers/mmc/host/Kconfig linux-3.6.7.patch/drivers/mmc/host/Kconfig --- linux-3.6.7/drivers/mmc/host/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/mmc/host/Kconfig 2012-11-27 14:38:23.152000824 +0100 ++++ linux-3.6.7.patch/drivers/mmc/host/Kconfig 2012-11-18 20:53:35.186716603 +0100 @@ -229,6 +229,27 @@ YMMV. @@ -22239,9 +20744,9 @@ diff -Naur linux-3.6.7/drivers/mmc/host/Kconfig linux-rpi-3.6.7/drivers/mmc/host config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP -diff -Naur linux-3.6.7/drivers/mmc/host/Makefile linux-rpi-3.6.7/drivers/mmc/host/Makefile +diff -Naur linux-3.6.7/drivers/mmc/host/Makefile linux-3.6.7.patch/drivers/mmc/host/Makefile --- linux-3.6.7/drivers/mmc/host/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/mmc/host/Makefile 2012-11-27 14:38:23.139000556 +0100 ++++ linux-3.6.7.patch/drivers/mmc/host/Makefile 2012-11-18 20:53:35.186716603 +0100 @@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-pxav2.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o @@ -22250,10 +20755,10 @@ diff -Naur linux-3.6.7/drivers/mmc/host/Makefile linux-rpi-3.6.7/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.7/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.7/drivers/mmc/host/sdhci-bcm2708.c +diff -Naur linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c linux-3.6.7.patch/drivers/mmc/host/sdhci-bcm2708.c --- linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/mmc/host/sdhci-bcm2708.c 2012-11-27 14:38:23.142000618 +0100 -@@ -0,0 +1,1413 @@ ++++ linux-3.6.7.patch/drivers/mmc/host/sdhci-bcm2708.c 2012-11-18 20:53:35.188716641 +0100 +@@ -0,0 +1,1406 @@ +/* + * sdhci-bcm2708.c Support for SDHCI device on BCM2708 + * Copyright (c) 2010 Broadcom @@ -22393,7 +20898,6 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.7/drivers/ +static int emmc_clock_freq = BCM2708_EMMC_CLOCK_FREQ; +static bool sync_after_dma = 1; +static bool missing_status = 1; -+static bool spurious_crc_acmd51 = 0; +bool enable_llm = 1; + +#if 0 @@ -23360,7 +21864,7 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.7/drivers/ + return 1; +} + -+static unsigned int sdhci_bcm2708_quirk_spurious_crc_acmd51(struct sdhci_host *host) ++static unsigned int sdhci_bcm2708_quirk_spurious_crc(struct sdhci_host *host) +{ + return 1; +} @@ -23406,6 +21910,7 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.7/drivers/ + .pdma_reset = sdhci_bcm2708_platdma_reset, +#endif + .extra_ints = sdhci_bcm2708_quirk_extra_ints, ++ .spurious_crc_acmd51 = sdhci_bcm2708_quirk_spurious_crc, + .voltage_broken = sdhci_bcm2708_quirk_voltage_broken, + .uhs_broken = sdhci_bcm2708_uhs_broken, +}; @@ -23450,11 +21955,6 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.7/drivers/ + sdhci_bcm2708_ops.missing_status = sdhci_bcm2708_missing_status; + } + -+ if( spurious_crc_acmd51 ) { -+ sdhci_bcm2708_ops.spurious_crc_acmd51 = sdhci_bcm2708_quirk_spurious_crc_acmd51; -+ } -+ -+ + printk("sdhci: %s low-latency mode\n",enable_llm?"Enable":"Disable"); + + host->hw_name = "BCM2708_Arasan"; @@ -23650,7 +22150,6 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.7/drivers/ +module_param(emmc_clock_freq, int, 0444); +module_param(sync_after_dma, bool, 0444); +module_param(missing_status, bool, 0444); -+module_param(spurious_crc_acmd51, bool, 0444); +module_param(enable_llm, bool, 0444); +module_param(cycle_delay, int, 0444); + @@ -23663,13 +22162,12 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.6.7/drivers/ +MODULE_PARM_DESC(emmc_clock_freq, "Specify the speed of emmc clock"); +MODULE_PARM_DESC(sync_after_dma, "Block in driver until dma complete"); +MODULE_PARM_DESC(missing_status, "Use the missing status quirk"); -+MODULE_PARM_DESC(spurious_crc_acmd51, "Use the spurious crc quirk for reading SCR (ACMD51)"); +MODULE_PARM_DESC(enable_llm, "Enable low-latency mode"); + + -diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.c linux-rpi-3.6.7/drivers/mmc/host/sdhci.c +diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.c linux-3.6.7.patch/drivers/mmc/host/sdhci.c --- linux-3.6.7/drivers/mmc/host/sdhci.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/mmc/host/sdhci.c 2012-11-27 14:38:23.106999902 +0100 ++++ linux-3.6.7.patch/drivers/mmc/host/sdhci.c 2012-11-18 20:54:37.925908084 +0100 @@ -28,6 +28,7 @@ #include #include @@ -24540,9 +23038,9 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.c linux-rpi-3.6.7/drivers/mmc/host } sdhci_disable_card_detection(host); -diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.h linux-rpi-3.6.7/drivers/mmc/host/sdhci.h +diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.h linux-3.6.7.patch/drivers/mmc/host/sdhci.h --- linux-3.6.7/drivers/mmc/host/sdhci.h 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/mmc/host/sdhci.h 2012-11-27 14:38:23.108999945 +0100 ++++ linux-3.6.7.patch/drivers/mmc/host/sdhci.h 2012-11-18 20:53:35.194716755 +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); @@ -24603,9 +23101,9 @@ diff -Naur linux-3.6.7/drivers/mmc/host/sdhci.h linux-rpi-3.6.7/drivers/mmc/host + + #endif /* __SDHCI_HW_H */ -diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.c linux-rpi-3.6.7/drivers/net/usb/smsc95xx.c +diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.c linux-3.6.7.patch/drivers/net/usb/smsc95xx.c --- linux-3.6.7/drivers/net/usb/smsc95xx.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/net/usb/smsc95xx.c 2012-11-27 14:38:29.037119844 +0100 ++++ linux-3.6.7.patch/drivers/net/usb/smsc95xx.c 2012-11-18 20:53:35.207717002 +0100 @@ -46,11 +46,23 @@ #define SMSC95XX_INTERNAL_PHY_ID (1) #define SMSC95XX_TX_OVERHEAD (8) @@ -25620,9 +24118,9 @@ diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.c linux-rpi-3.6.7/drivers/net/us .disconnect = usbnet_disconnect, .disable_hub_initiated_lpm = 1, }; -diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.h linux-rpi-3.6.7/drivers/net/usb/smsc95xx.h +diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.h linux-3.6.7.patch/drivers/net/usb/smsc95xx.h --- linux-3.6.7/drivers/net/usb/smsc95xx.h 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/net/usb/smsc95xx.h 2012-11-27 14:38:29.062120351 +0100 ++++ linux-3.6.7.patch/drivers/net/usb/smsc95xx.h 2012-11-18 20:53:35.208717021 +0100 @@ -63,6 +63,7 @@ #define INT_STS_TDFO_ (0x00001000) #define INT_STS_RXDF_ (0x00000800) @@ -25661,195 +24159,9 @@ diff -Naur linux-3.6.7/drivers/net/usb/smsc95xx.h linux-rpi-3.6.7/drivers/net/us #define COE_CR (0x130) #define Tx_COE_EN_ (0x00010000) -diff -Naur linux-3.6.7/drivers/net/usb/usbnet.c linux-rpi-3.6.7/drivers/net/usb/usbnet.c ---- linux-3.6.7/drivers/net/usb/usbnet.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/net/usb/usbnet.c 2012-11-27 14:38:29.026119618 +0100 -@@ -359,10 +359,12 @@ - void usbnet_defer_kevent (struct usbnet *dev, int work) - { - set_bit (work, &dev->flags); -- if (!schedule_work (&dev->kevent)) -- netdev_err(dev->net, "kevent %d may have been dropped\n", work); -- else -+ if (!schedule_work (&dev->kevent)) { -+ if (net_ratelimit()) -+ netdev_err(dev->net, "kevent %d may have been dropped\n", work); -+ } else { - netdev_dbg(dev->net, "kevent %d scheduled\n", work); -+ } - } - EXPORT_SYMBOL_GPL(usbnet_defer_kevent); - -diff -Naur linux-3.6.7/drivers/net/wireless/Kconfig linux-rpi-3.6.7/drivers/net/wireless/Kconfig -diff -Naur linux-3.6.7/drivers/net/wireless/Makefile linux-rpi-3.6.7/drivers/net/wireless/Makefile -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/clean linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/clean -\ Kein Zeilenumbruch am Dateiende. -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/efuse/rtw_efuse.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_br_ext.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_cmd.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_debug.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_debug.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_eeprom.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_ieee80211.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_io.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_io.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_query.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_rtl.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_ioctl_set.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_iol.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_iol.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_mlme.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_mlme_ext.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_mp.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_mp.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_mp_ioctl.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_p2p.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_pwrctrl.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_recv.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_recv.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_rf.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_rf.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_security.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_security.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_sta_mgt.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_wlan_util.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/core/rtw_xmit.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/hal_init.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/hal_init.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/ifcfg-wlan0 -\ Kein Zeilenumbruch am Dateiende. -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/autoconf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/autoconf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/basic_types.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/basic_types.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/big_endian.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/generic.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/little_endian.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/swabb.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/byteorder/swab.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/circ_buf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/circ_buf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/cmd_osdep.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_conf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_conf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_types_ce.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_types.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_types.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_types_linux.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/drv_types_xp.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/ethernet.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/ethernet.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/farray.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/farray.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/h2clbk.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/h2clbk.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CEHWImg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyCfg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CPhyReg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192CUHWImg_wowlan.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DEHWImg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DETestHWImg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DETestHWImg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyCfg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DPhyReg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DUHWImg_wowlan.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DUTestHWImg.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/Hal8192DUTestHWImg.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/hal_init.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/hal_init.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/ieee80211_ext.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/ieee80211.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/ieee80211.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/if_ether.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/if_ether.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/ioctl_cfg80211.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/ip.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/ip.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/mlme_osdep.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/mp_custom_oid.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/nic_spec.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/nic_spec.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/osdep_ce_service.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/osdep_intf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/osdep_intf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/osdep_service.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/osdep_service.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/pci_hal.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/pci_hal.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/pci_ops.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/pci_ops.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/pci_osintf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/pci_osintf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/recv_osdep.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/recv_osdep.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_cmd.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_dm.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_event.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_hal.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_led.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_recv.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_rf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_spec.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_sreset.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192c_xmit.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_cmd.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_dm.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_hal.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_led.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_recv.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_rf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_spec.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtl8192d_xmit.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_android.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_android.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_br_ext.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_byteorder.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_cmd.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_debug.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_debug.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_eeprom.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_efuse.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_event.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_event.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ht.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ht.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ioctl.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_query.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_rtl.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_ioctl_set.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_io.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_io.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_iol.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_iol.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_led.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_led.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mlme_ext.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mlme.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mp.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mp.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mp_ioctl.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_mp_phy_regdef.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_p2p.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_pwrctrl.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_qos.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_qos.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_recv.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_recv.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_rf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_rf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_security.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_security.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_version.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_version.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/rtw_xmit.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_hal.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_hal.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_ops_ce.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_ops_ce.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_ops.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_ops.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_ops_linux.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_ops_linux.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_ops_xp.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_ops_xp.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_osintf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/sdio_osintf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/sta_info.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/sta_info.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/usb_hal.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/usb_hal.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/usb_ops.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/usb_ops.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/usb_osintf.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/usb_osintf.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/usb_vendor_req.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/wifi.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/wifi.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/wlan_bssdef.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/include/xmit_osdep.h -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/Kconfig linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/Kconfig -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/Makefile linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/Makefile -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_cfg80211.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/ioctl_linux.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/mlme_linux.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/os_intfs.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/pci_intf.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/recv_linux.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/rtw_android.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/sdio_intf.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/sdio_intf.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/usb_intf.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/linux/xmit_linux.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/os_dep/osdep_service.c -diff -Naur linux-3.6.7/drivers/net/wireless/rtl8192cu/wlan0dhcp linux-rpi-3.6.7/drivers/net/wireless/rtl8192cu/wlan0dhcp -diff -Naur linux-3.6.7/drivers/spi/Kconfig linux-rpi-3.6.7/drivers/spi/Kconfig +diff -Naur linux-3.6.7/drivers/spi/Kconfig linux-3.6.7.patch/drivers/spi/Kconfig --- linux-3.6.7/drivers/spi/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/spi/Kconfig 2012-11-27 14:38:22.665990936 +0100 ++++ linux-3.6.7.patch/drivers/spi/Kconfig 2012-11-18 20:53:35.210717059 +0100 @@ -74,6 +74,14 @@ This selects a driver for the Atmel SPI Controller, present on many AT32 (AVR32) and AT91 (ARM) chips. @@ -25865,9 +24177,9 @@ diff -Naur linux-3.6.7/drivers/spi/Kconfig linux-rpi-3.6.7/drivers/spi/Kconfig config SPI_BFIN5XX tristate "SPI controller driver for ADI Blackfin5xx" depends on BLACKFIN -diff -Naur linux-3.6.7/drivers/spi/Makefile linux-rpi-3.6.7/drivers/spi/Makefile +diff -Naur linux-3.6.7/drivers/spi/Makefile linux-3.6.7.patch/drivers/spi/Makefile --- linux-3.6.7/drivers/spi/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/spi/Makefile 2012-11-27 14:38:22.662990875 +0100 ++++ linux-3.6.7.patch/drivers/spi/Makefile 2012-11-18 20:53:35.210717059 +0100 @@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_AU1550) += spi-au1550.o obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o @@ -25876,9 +24188,9 @@ diff -Naur linux-3.6.7/drivers/spi/Makefile linux-rpi-3.6.7/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.7/drivers/spi/spi-bcm2708.c linux-rpi-3.6.7/drivers/spi/spi-bcm2708.c +diff -Naur linux-3.6.7/drivers/spi/spi-bcm2708.c linux-3.6.7.patch/drivers/spi/spi-bcm2708.c --- linux-3.6.7/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/spi/spi-bcm2708.c 2012-11-27 14:38:22.638990383 +0100 ++++ linux-3.6.7.patch/drivers/spi/spi-bcm2708.c 2012-11-18 20:53:35.211717078 +0100 @@ -0,0 +1,594 @@ +/* + * Driver for Broadcom BCM2708 SPI Controllers @@ -26474,12 +24786,9 @@ diff -Naur linux-3.6.7/drivers/spi/spi-bcm2708.c linux-rpi-3.6.7/drivers/spi/spi +MODULE_AUTHOR("Chris Boot "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); -diff -Naur linux-3.6.7/drivers/staging/media/lirc/Kconfig linux-rpi-3.6.7/drivers/staging/media/lirc/Kconfig -diff -Naur linux-3.6.7/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.6.7/drivers/staging/media/lirc/lirc_rpi.c -diff -Naur linux-3.6.7/drivers/staging/media/lirc/Makefile linux-rpi-3.6.7/drivers/staging/media/lirc/Makefile -diff -Naur linux-3.6.7/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.7/drivers/thermal/bcm2835-thermal.c +diff -Naur linux-3.6.7/drivers/thermal/bcm2835-thermal.c linux-3.6.7.patch/drivers/thermal/bcm2835-thermal.c --- linux-3.6.7/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/thermal/bcm2835-thermal.c 2012-11-27 14:38:26.909076904 +0100 ++++ linux-3.6.7.patch/drivers/thermal/bcm2835-thermal.c 2012-11-18 20:53:35.212717097 +0100 @@ -0,0 +1,208 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -26689,9 +24998,9 @@ diff -Naur linux-3.6.7/drivers/thermal/bcm2835-thermal.c linux-rpi-3.6.7/drivers +MODULE_DESCRIPTION("Thermal driver for bcm2835 chip"); + +module_platform_driver(bcm2835_thermal_driver); -diff -Naur linux-3.6.7/drivers/thermal/Kconfig linux-rpi-3.6.7/drivers/thermal/Kconfig +diff -Naur linux-3.6.7/drivers/thermal/Kconfig linux-3.6.7.patch/drivers/thermal/Kconfig --- linux-3.6.7/drivers/thermal/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/thermal/Kconfig 2012-11-27 14:38:26.910076924 +0100 ++++ linux-3.6.7.patch/drivers/thermal/Kconfig 2012-11-18 20:53:35.212717097 +0100 @@ -27,3 +27,14 @@ help Enable this to plug the SPEAr thermal sensor driver into the Linux @@ -26707,9 +25016,9 @@ diff -Naur linux-3.6.7/drivers/thermal/Kconfig linux-rpi-3.6.7/drivers/thermal/K + +endif # THERMAL_BCM2835 + -diff -Naur linux-3.6.7/drivers/thermal/Makefile linux-rpi-3.6.7/drivers/thermal/Makefile +diff -Naur linux-3.6.7/drivers/thermal/Makefile linux-3.6.7.patch/drivers/thermal/Makefile --- linux-3.6.7/drivers/thermal/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/thermal/Makefile 2012-11-27 14:38:26.909076904 +0100 ++++ linux-3.6.7.patch/drivers/thermal/Makefile 2012-11-18 20:53:35.213717116 +0100 @@ -3,4 +3,5 @@ # @@ -26718,9 +25027,9 @@ diff -Naur linux-3.6.7/drivers/thermal/Makefile linux-rpi-3.6.7/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.7/drivers/usb/core/generic.c linux-rpi-3.6.7/drivers/usb/core/generic.c +diff -Naur linux-3.6.7/drivers/usb/core/generic.c linux-3.6.7.patch/drivers/usb/core/generic.c --- linux-3.6.7/drivers/usb/core/generic.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/core/generic.c 2012-11-27 14:38:23.787013612 +0100 ++++ linux-3.6.7.patch/drivers/usb/core/generic.c 2012-11-18 20:53:35.213717116 +0100 @@ -149,6 +149,7 @@ dev_warn(&udev->dev, "no configuration chosen from %d choice%s\n", @@ -26729,9 +25038,9 @@ diff -Naur linux-3.6.7/drivers/usb/core/generic.c linux-rpi-3.6.7/drivers/usb/co } return i; } -diff -Naur linux-3.6.7/drivers/usb/core/hub.c linux-rpi-3.6.7/drivers/usb/core/hub.c +diff -Naur linux-3.6.7/drivers/usb/core/hub.c linux-3.6.7.patch/drivers/usb/core/hub.c --- linux-3.6.7/drivers/usb/core/hub.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/core/hub.c 2012-11-27 14:38:23.800013878 +0100 ++++ linux-3.6.7.patch/drivers/usb/core/hub.c 2012-11-18 20:53:35.216717173 +0100 @@ -25,7 +25,6 @@ #include #include @@ -26852,9 +25161,9 @@ diff -Naur linux-3.6.7/drivers/usb/core/hub.c linux-rpi-3.6.7/drivers/usb/core/h } if (hub->hdev->parent || !hcd->driver->port_handed_over || -diff -Naur linux-3.6.7/drivers/usb/core/message.c linux-rpi-3.6.7/drivers/usb/core/message.c +diff -Naur linux-3.6.7/drivers/usb/core/message.c linux-3.6.7.patch/drivers/usb/core/message.c --- linux-3.6.7/drivers/usb/core/message.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/core/message.c 2012-11-27 14:38:23.802013919 +0100 ++++ linux-3.6.7.patch/drivers/usb/core/message.c 2012-11-18 20:53:35.218717211 +0100 @@ -1877,6 +1877,85 @@ if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) @@ -26941,9 +25250,9 @@ diff -Naur linux-3.6.7/drivers/usb/core/message.c linux-rpi-3.6.7/drivers/usb/co /* Now that the interfaces are installed, re-enable LPM. */ usb_unlocked_enable_lpm(dev); -diff -Naur linux-3.6.7/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.7/drivers/usb/core/otg_whitelist.h +diff -Naur linux-3.6.7/drivers/usb/core/otg_whitelist.h linux-3.6.7.patch/drivers/usb/core/otg_whitelist.h --- linux-3.6.7/drivers/usb/core/otg_whitelist.h 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/core/otg_whitelist.h 2012-11-27 14:38:23.790013672 +0100 ++++ linux-3.6.7.patch/drivers/usb/core/otg_whitelist.h 2012-11-18 20:53:35.219717230 +0100 @@ -19,33 +19,82 @@ static struct usb_device_id whitelist_table [] = { @@ -27159,9 +25468,9 @@ diff -Naur linux-3.6.7/drivers/usb/core/otg_whitelist.h linux-rpi-3.6.7/drivers/ #endif } -diff -Naur linux-3.6.7/drivers/usb/gadget/file_storage.c linux-rpi-3.6.7/drivers/usb/gadget/file_storage.c +diff -Naur linux-3.6.7/drivers/usb/gadget/file_storage.c linux-3.6.7.patch/drivers/usb/gadget/file_storage.c --- linux-3.6.7/drivers/usb/gadget/file_storage.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/gadget/file_storage.c 2012-11-27 14:38:25.358045437 +0100 ++++ linux-3.6.7.patch/drivers/usb/gadget/file_storage.c 2012-11-18 20:53:35.221717268 +0100 @@ -573,8 +573,37 @@ .iConfiguration = FSG_STRING_CONFIG, .bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER, @@ -27289,9 +25598,9 @@ diff -Naur linux-3.6.7/drivers/usb/gadget/file_storage.c linux-rpi-3.6.7/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.7/drivers/usb/gadget/Kconfig linux-rpi-3.6.7/drivers/usb/gadget/Kconfig +diff -Naur linux-3.6.7/drivers/usb/gadget/Kconfig linux-3.6.7.patch/drivers/usb/gadget/Kconfig --- linux-3.6.7/drivers/usb/gadget/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/gadget/Kconfig 2012-11-27 14:38:25.336044997 +0100 ++++ linux-3.6.7.patch/drivers/usb/gadget/Kconfig 2012-11-18 20:53:35.222717287 +0100 @@ -505,6 +505,12 @@ bool depends on USB_GADGET_DUALSPEED @@ -27305,9 +25614,9 @@ diff -Naur linux-3.6.7/drivers/usb/gadget/Kconfig linux-rpi-3.6.7/drivers/usb/ga # # USB Gadget Drivers # -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/changes.txt +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/changes.txt linux-3.6.7.patch/drivers/usb/host/dwc_common_port/changes.txt --- linux-3.6.7/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/changes.txt 2012-11-27 14:38:23.520008209 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/changes.txt 2012-11-18 20:53:35.223717306 +0100 @@ -0,0 +1,174 @@ + +dwc_read_reg32() and friends now take an additional parameter, a pointer to an @@ -27483,9 +25792,9 @@ diff -Naur linux-3.6.7/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.7/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/doc/doxygen.cfg +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-3.6.7.patch/drivers/usb/host/dwc_common_port/doc/doxygen.cfg --- linux-3.6.7/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2012-11-27 14:38:23.519008189 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2012-11-18 20:53:35.224717325 +0100 @@ -0,0 +1,270 @@ +# Doxyfile 1.4.5 + @@ -27757,9 +26066,9 @@ diff -Naur linux-3.6.7/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.7/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.c --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-11-27 14:38:23.520008209 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.c 2012-11-18 20:53:35.226717363 +0100 @@ -0,0 +1,532 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ @@ -28293,9 +26602,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.6.7 +} + +#endif /* DWC_CCLIB */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.h --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-11-27 14:38:23.523008273 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_cc.h 2012-11-18 20:53:35.227717382 +0100 @@ -0,0 +1,225 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ @@ -28522,9 +26831,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.6.7 + +#endif /* _DWC_CC_H_ */ + -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2012-11-27 14:38:23.518008169 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2012-11-18 20:53:35.228717401 +0100 @@ -0,0 +1,1308 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -29834,9 +28143,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux- +{ + return wq->pending; +} -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_linux.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-11-27 14:38:23.516008129 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2012-11-18 20:53:35.230717439 +0100 @@ -0,0 +1,1421 @@ +#include +#include @@ -31259,9 +29568,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux +MODULE_LICENSE ("GPL"); + +#endif /* DWC_LIBMODULE */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2012-11-27 14:38:23.517008149 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2012-11-18 20:53:35.232717477 +0100 @@ -0,0 +1,1275 @@ +#include "dwc_os.h" +#include "dwc_list.h" @@ -32538,9 +30847,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux- +{ + return wq->pending; +} -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-11-27 14:38:23.517008149 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.c 2012-11-18 20:53:35.232717477 +0100 @@ -0,0 +1,308 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ @@ -32850,9 +31159,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3 +} + +#endif /* DWC_CRYPTOLIB */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-11-27 14:38:23.519008189 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_crypto.h 2012-11-18 20:53:35.233717496 +0100 @@ -0,0 +1,111 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ @@ -32965,9 +31274,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3 +#endif + +#endif /* _DWC_CRYPTO_H_ */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.c --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-11-27 14:38:23.523008273 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.c 2012-11-18 20:53:35.234717515 +0100 @@ -0,0 +1,291 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ @@ -33260,9 +31569,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.6.7 +#endif /* !CONFIG_MACH_IPMATE */ + +#endif /* DWC_CRYPTOLIB */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.h --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-11-27 14:38:23.518008169 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_dh.h 2012-11-18 20:53:35.234717515 +0100 @@ -0,0 +1,106 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ @@ -33370,9 +31679,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.6.7 +#endif + +#endif /* _DWC_DH_H_ */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_list.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_list.h --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_list.h 2012-11-27 14:38:23.522008252 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_list.h 2012-11-18 20:53:35.236717553 +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 $ */ @@ -33968,9 +32277,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.6 +#endif + +#endif /* _DWC_LIST_H_ */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_mem.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_mem.c --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-11-27 14:38:23.519008189 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_mem.c 2012-11-18 20:53:35.236717553 +0100 @@ -0,0 +1,245 @@ +/* Memory Debugging */ +#ifdef DWC_DEBUG_MEMORY @@ -34217,9 +32526,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.6. +} + +#endif /* DWC_DEBUG_MEMORY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-11-27 14:38:23.523008273 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.c 2012-11-18 20:53:35.237717572 +0100 @@ -0,0 +1,636 @@ +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. + * @@ -34857,9 +33166,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3 +#endif /* CONFIG_MACH_IPMATE */ + +#endif /*DWC_CRYPTOLIB */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-11-27 14:38:23.518008169 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_modpow.h 2012-11-18 20:53:35.238717591 +0100 @@ -0,0 +1,34 @@ +/* + * dwc_modpow.h @@ -34895,9 +33204,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3 +#endif + +#endif /* _LINUX_BIGNUM_H */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-11-27 14:38:23.520008209 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.c 2012-11-18 20:53:35.238717591 +0100 @@ -0,0 +1,319 @@ +#ifdef DWC_NOTIFYLIB + @@ -35218,9 +33527,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi +} + +#endif /* DWC_NOTIFYLIB */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-11-27 14:38:23.521008230 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_notifier.h 2012-11-18 20:53:35.239717610 +0100 @@ -0,0 +1,122 @@ + +#ifndef __DWC_NOTIFIER_H__ @@ -35344,9 +33653,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi +#endif + +#endif /* __DWC_NOTIFIER_H__ */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_os.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_os.h --- linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/dwc_os.h 2012-11-27 14:38:23.521008230 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/dwc_os.h 2012-11-18 20:53:35.241717648 +0100 @@ -0,0 +1,1260 @@ +/* ========================================================================= + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ @@ -36608,9 +34917,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.6.7 +#endif + +#endif /* _DWC_OS_H_ */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/Makefile +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile --- linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/Makefile 2012-11-27 14:38:23.523008273 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile 2012-11-18 20:53:35.242717667 +0100 @@ -0,0 +1,58 @@ +# +# Makefile for DWC_common library @@ -36670,9 +34979,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.6.7 + +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.7/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/Makefile.fbsd +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.fbsd --- linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/Makefile.fbsd 2012-11-27 14:38:23.522008252 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.fbsd 2012-11-18 20:53:35.242717667 +0100 @@ -0,0 +1,17 @@ +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -DDWC_FREEBSD @@ -36691,9 +35000,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi- + dwc_common_fbsd.c dwc_mem.c + +.include -diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/Makefile.linux +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.linux --- linux-3.6.7/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/Makefile.linux 2012-11-27 14:38:23.520008209 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/Makefile.linux 2012-11-18 20:53:35.244717705 +0100 @@ -0,0 +1,49 @@ +# +# Makefile for DWC_common library @@ -36744,9 +35053,9 @@ diff -Naur linux-3.6.7/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.7/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/usb.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/usb.h linux-3.6.7.patch/drivers/usb/host/dwc_common_port/usb.h --- linux-3.6.7/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_common_port/usb.h 2012-11-27 14:38:23.522008252 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_common_port/usb.h 2012-11-18 20:53:35.246717742 +0100 @@ -0,0 +1,946 @@ +/* + * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37694,9 +36003,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.6.7/dr +#endif + +#endif /* _USB_H_ */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.7/drivers/usb/host/dwc_otg/doc/doxygen.cfg +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.6.7.patch/drivers/usb/host/dwc_otg/doc/doxygen.cfg --- linux-3.6.7/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2012-11-27 14:38:23.592009673 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2012-11-18 20:53:35.247717761 +0100 @@ -0,0 +1,224 @@ +# Doxyfile 1.3.9.1 + @@ -37922,9 +36231,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.6.7/ +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dummy_audio.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dummy_audio.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dummy_audio.c 2012-11-27 14:38:23.609010022 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dummy_audio.c 2012-11-18 20:53:35.249717799 +0100 @@ -0,0 +1,1575 @@ +/* + * zero.c -- Gadget Zero, for USB development @@ -39501,9 +37810,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.6.7/dr + remove_proc_entry("isoc_test", NULL); +} +module_exit (cleanup); -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_cfi_common.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-11-27 14:38:23.592009673 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2012-11-18 20:53:35.250717818 +0100 @@ -0,0 +1,142 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -39647,9 +37956,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.6.7 +typedef struct cfi_string cfi_string_t; + +#endif -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2012-11-27 14:38:23.605009939 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2012-11-18 20:53:35.251717837 +0100 @@ -0,0 +1,854 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ @@ -40505,9 +38814,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.6.7/dr +#endif + return 1; +} -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2012-11-27 14:38:23.597009774 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2012-11-18 20:53:35.251717837 +0100 @@ -0,0 +1,80 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ @@ -40589,9 +38898,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.6.7/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.7/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-11-27 14:38:23.607009979 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2012-11-18 20:53:35.253717875 +0100 @@ -0,0 +1,1210 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ @@ -41803,9 +40112,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.6.7/d + device_remove_file(&dev->dev, &dev_attr_sleep_status); +#endif +} -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-11-27 14:38:23.604009918 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2012-11-18 20:53:35.254717894 +0100 @@ -0,0 +1,89 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ @@ -41896,9 +40205,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.6.7/d +#endif + ); +#endif -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-11-27 14:38:23.604009918 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2012-11-18 20:53:35.256717932 +0100 @@ -0,0 +1,1876 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -43776,9 +42085,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.6.7/dr +} + +#endif //DWC_UTE_CFI -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-11-27 14:38:23.548008785 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2012-11-18 20:53:35.257717951 +0100 @@ -0,0 +1,320 @@ +/* ========================================================================== + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, @@ -44100,9 +42409,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.6.7/dr +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); + +#endif /* (__DWC_OTG_CFI_H__) */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-11-27 14:38:23.607009979 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2012-11-18 20:53:35.266718122 +0100 @@ -0,0 +1,7151 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ @@ -51255,9 +49564,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.6.7/dr + dwc_otg_pcd_start_srp_timer(core_if); + return; +} -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-11-27 14:38:23.593009693 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2012-11-18 20:53:35.269718177 +0100 @@ -0,0 +1,1464 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ @@ -52723,9 +51032,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.6.7/dr +////////////////////////////////////////////////////////////////////// + +#endif -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-11-27 14:38:23.584009506 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2012-11-18 20:53:35.271718217 +0100 @@ -0,0 +1,1571 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ @@ -54298,9 +52607,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.6 + + return retval; +} -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_core_if.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-11-27 14:38:23.610010043 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2012-11-18 20:53:35.272718237 +0100 @@ -0,0 +1,705 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ @@ -55007,9 +53316,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.6. +/** @} */ + +#endif /* __DWC_CORE_IF_H__ */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_dbg.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-11-27 14:38:23.598009795 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2012-11-18 20:53:35.273718256 +0100 @@ -0,0 +1,117 @@ +/* ========================================================================== + * @@ -55128,9 +53437,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.6.7/dr + +#endif /*DEBUG*/ +#endif -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-11-27 14:38:23.594009713 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2012-11-18 20:53:35.276718311 +0100 @@ -0,0 +1,1732 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ @@ -56864,9 +55173,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.6.7 + + +*/ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-11-27 14:38:23.585009526 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2012-11-18 20:53:35.276718311 +0100 @@ -0,0 +1,86 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ @@ -56954,9 +55263,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.6.7 +#endif + +#endif -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-11-27 14:38:23.610010043 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2012-11-18 20:53:35.281718407 +0100 @@ -0,0 +1,3498 @@ + +/* ========================================================================== @@ -60456,9 +58765,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.6.7/dr +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-11-27 14:38:23.597009774 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2012-11-18 20:53:35.283718445 +0100 @@ -0,0 +1,1132 @@ +/*========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ @@ -61592,9 +59901,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.6 +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-11-27 14:38:23.608010000 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2012-11-18 20:53:35.284718464 +0100 @@ -0,0 +1,829 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ @@ -62425,9 +60734,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.6.7/dr +#endif +#endif +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-11-27 14:38:23.609010022 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2012-11-18 20:53:35.285718483 +0100 @@ -0,0 +1,417 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ @@ -62846,9 +61155,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.6.7 + +#endif /* __DWC_HCD_IF_H__ */ +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-11-27 14:38:23.604009918 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2012-11-18 20:53:35.288718540 +0100 @@ -0,0 +1,2248 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ @@ -65098,9 +63407,9 @@ diff -Naur linux-3.6.7/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.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-11-27 14:38:23.592009673 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2012-11-18 20:53:35.290718578 +0100 @@ -0,0 +1,938 @@ + +/* ========================================================================== @@ -66040,9 +64349,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3. +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-11-27 14:38:23.596009753 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2012-11-18 20:53:35.291718597 +0100 @@ -0,0 +1,957 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ @@ -67001,9 +65310,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3. +} + +#endif /* DWC_DEVICE_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2012-11-27 14:38:23.593009693 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2012-11-18 20:53:35.292718616 +0100 @@ -0,0 +1,113 @@ +#include "dwc_otg_regs.h" +#include "dwc_otg_dbg.h" @@ -67118,9 +65427,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.6 + + return; +} -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2012-11-27 14:38:23.586009548 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2012-11-18 20:53:35.292718616 +0100 @@ -0,0 +1,36 @@ +#ifndef __DWC_OTG_MPHI_FIX_H__ +#define __DWC_OTG_MPHI_FIX_H__ @@ -67158,9 +65467,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.6 +#endif + +#endif -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2012-11-27 14:38:23.595009733 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2012-11-18 20:53:35.293718635 +0100 @@ -0,0 +1,188 @@ +#ifndef _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_ @@ -67350,9 +65659,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.6.7 + + +#endif /* _DWC_OS_DEP_H_ */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-11-27 14:38:23.591009652 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2012-11-18 20:53:35.296718692 +0100 @@ -0,0 +1,2708 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ @@ -70062,9 +68371,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.6.7/dr +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-11-27 14:38:23.580009428 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2012-11-18 20:53:35.297718711 +0100 @@ -0,0 +1,266 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ @@ -70332,9 +68641,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.6.7/dr +extern void do_test_mode(void *data); +#endif +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-11-27 14:38:23.595009733 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2012-11-18 20:53:35.298718730 +0100 @@ -0,0 +1,360 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ @@ -70696,9 +69005,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.6.7 +#endif /* __DWC_PCD_IF_H__ */ + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-11-27 14:38:23.597009774 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2012-11-18 20:53:35.304718844 +0100 @@ -0,0 +1,5147 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ @@ -75847,9 +74156,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.6 +} + +#endif /* DWC_HOST_ONLY */ -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-11-27 14:38:23.595009733 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2012-11-18 20:53:35.306718882 +0100 @@ -0,0 +1,1374 @@ + /* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ @@ -77225,9 +75534,9 @@ diff -Naur linux-3.6.7/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.7/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_regs.h +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h --- linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-11-27 14:38:23.608010000 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2012-11-18 20:53:35.309718939 +0100 @@ -0,0 +1,2550 @@ +/* ========================================================================== + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ @@ -79779,9 +78088,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.6.7/d +} gpwrdn_data_t; + +#endif -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.7/drivers/usb/host/dwc_otg/Makefile +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/Makefile linux-3.6.7.patch/drivers/usb/host/dwc_otg/Makefile --- linux-3.6.7/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/Makefile 2012-11-27 14:38:23.605009939 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/Makefile 2012-11-18 20:53:35.310718958 +0100 @@ -0,0 +1,81 @@ +# +# Makefile for DWC_otg Highspeed USB controller driver @@ -79864,9 +78173,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.6.7/drivers + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + +endif -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3.6.7/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm --- linux-3.6.7/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2012-11-27 14:38:23.588009589 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2012-11-18 20:53:35.311718977 +0100 @@ -0,0 +1,337 @@ +package dwc_otg_test; + @@ -80205,9 +78514,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3 +); + +1; -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.7/drivers/usb/host/dwc_otg/test/Makefile +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/Makefile linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/Makefile --- linux-3.6.7/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/test/Makefile 2012-11-27 14:38:23.588009589 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/Makefile 2012-11-18 20:53:35.311718977 +0100 @@ -0,0 +1,16 @@ + +PERL=/usr/bin/perl @@ -80225,9 +78534,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.6.7/dr + else echo "=======> $$test, FAILED" ; \ + fi \ + done -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-3.6.7/drivers/usb/host/dwc_otg/test/test_mod_param.pl +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_mod_param.pl --- linux-3.6.7/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2012-11-27 14:38:23.588009589 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2012-11-18 20:53:35.312718995 +0100 @@ -0,0 +1,133 @@ +#!/usr/bin/perl -w +# @@ -80362,9 +78671,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi + +test_main(); +0; -diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.6.7/drivers/usb/host/dwc_otg/test/test_sysfs.pl +diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_sysfs.pl --- linux-3.6.7/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2012-11-27 14:38:23.587009569 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2012-11-18 20:53:35.312718995 +0100 @@ -0,0 +1,193 @@ +#!/usr/bin/perl -w +# @@ -80559,9 +78868,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.6 + +test_main(); +0; -diff -Naur linux-3.6.7/drivers/usb/host/Kconfig linux-rpi-3.6.7/drivers/usb/host/Kconfig +diff -Naur linux-3.6.7/drivers/usb/host/Kconfig linux-3.6.7.patch/drivers/usb/host/Kconfig --- linux-3.6.7/drivers/usb/host/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/Kconfig 2012-11-27 14:38:23.630010452 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/Kconfig 2012-11-18 20:53:35.313719014 +0100 @@ -610,6 +610,19 @@ To compile this driver a module, choose M here: the module will be called "hwa-hc". @@ -80582,9 +78891,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/Kconfig linux-rpi-3.6.7/drivers/usb/host config USB_IMX21_HCD tristate "i.MX21 HCD support" depends on USB && ARM && ARCH_MXC -diff -Naur linux-3.6.7/drivers/usb/host/Makefile linux-rpi-3.6.7/drivers/usb/host/Makefile +diff -Naur linux-3.6.7/drivers/usb/host/Makefile linux-3.6.7.patch/drivers/usb/host/Makefile --- linux-3.6.7/drivers/usb/host/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/host/Makefile 2012-11-27 14:38:23.542008662 +0100 ++++ linux-3.6.7.patch/drivers/usb/host/Makefile 2012-11-18 20:53:35.314719033 +0100 @@ -37,6 +37,8 @@ obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o @@ -80594,9 +78903,9 @@ diff -Naur linux-3.6.7/drivers/usb/host/Makefile linux-rpi-3.6.7/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.7/drivers/usb/Makefile linux-rpi-3.6.7/drivers/usb/Makefile +diff -Naur linux-3.6.7/drivers/usb/Makefile linux-3.6.7.patch/drivers/usb/Makefile --- linux-3.6.7/drivers/usb/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/usb/Makefile 2012-11-27 14:38:25.586050001 +0100 ++++ linux-3.6.7.patch/drivers/usb/Makefile 2012-11-18 20:53:35.314719033 +0100 @@ -25,6 +25,7 @@ obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/ @@ -80605,9 +78914,9 @@ diff -Naur linux-3.6.7/drivers/usb/Makefile linux-rpi-3.6.7/drivers/usb/Makefile obj-$(CONFIG_USB_IMX21_HCD) += host/ obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/ -diff -Naur linux-3.6.7/drivers/video/bcm2708_fb.c linux-rpi-3.6.7/drivers/video/bcm2708_fb.c +diff -Naur linux-3.6.7/drivers/video/bcm2708_fb.c linux-3.6.7.patch/drivers/video/bcm2708_fb.c --- linux-3.6.7/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/video/bcm2708_fb.c 2012-11-27 14:38:19.352923889 +0100 ++++ linux-3.6.7.patch/drivers/video/bcm2708_fb.c 2012-11-18 20:53:35.315719052 +0100 @@ -0,0 +1,491 @@ +/* + * linux/drivers/video/bcm2708_fb.c @@ -81100,9 +79409,9 @@ diff -Naur linux-3.6.7/drivers/video/bcm2708_fb.c linux-rpi-3.6.7/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.7/drivers/video/Kconfig linux-rpi-3.6.7/drivers/video/Kconfig +diff -Naur linux-3.6.7/drivers/video/Kconfig linux-3.6.7.patch/drivers/video/Kconfig --- linux-3.6.7/drivers/video/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/video/Kconfig 2012-11-27 14:38:20.665950480 +0100 ++++ linux-3.6.7.patch/drivers/video/Kconfig 2012-11-18 20:53:35.316719071 +0100 @@ -312,6 +312,20 @@ help Support the Permedia2 FIFO disconnect feature. @@ -81124,9 +79433,9 @@ diff -Naur linux-3.6.7/drivers/video/Kconfig linux-rpi-3.6.7/drivers/video/Kconf config FB_ARMCLCD tristate "ARM PrimeCell PL110 support" depends on FB && ARM && ARM_AMBA -diff -Naur linux-3.6.7/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6.7/drivers/video/logo/logo_linux_clut224.ppm +diff -Naur linux-3.6.7/drivers/video/logo/logo_linux_clut224.ppm linux-3.6.7.patch/drivers/video/logo/logo_linux_clut224.ppm --- linux-3.6.7/drivers/video/logo/logo_linux_clut224.ppm 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/video/logo/logo_linux_clut224.ppm 2012-11-27 14:38:18.948915727 +0100 ++++ linux-3.6.7.patch/drivers/video/logo/logo_linux_clut224.ppm 2012-11-18 20:53:35.321719166 +0100 @@ -1,1604 +1,883 @@ P3 -# Standard 224-color Linux logo @@ -83613,9 +81922,9 @@ diff -Naur linux-3.6.7/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.6.7 +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.7/drivers/video/Makefile linux-rpi-3.6.7/drivers/video/Makefile +diff -Naur linux-3.6.7/drivers/video/Makefile linux-3.6.7.patch/drivers/video/Makefile --- linux-3.6.7/drivers/video/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/video/Makefile 2012-11-27 14:38:20.066938372 +0100 ++++ linux-3.6.7.patch/drivers/video/Makefile 2012-11-18 20:53:35.321719166 +0100 @@ -99,6 +99,7 @@ obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o @@ -83624,9 +81933,9 @@ diff -Naur linux-3.6.7/drivers/video/Makefile linux-rpi-3.6.7/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.7/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.7/drivers/watchdog/bcm2708_wdog.c +diff -Naur linux-3.6.7/drivers/watchdog/bcm2708_wdog.c linux-3.6.7.patch/drivers/watchdog/bcm2708_wdog.c --- linux-3.6.7/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/watchdog/bcm2708_wdog.c 2012-11-27 14:39:00.792759710 +0100 ++++ linux-3.6.7.patch/drivers/watchdog/bcm2708_wdog.c 2012-11-18 20:53:35.322719185 +0100 @@ -0,0 +1,385 @@ +/* + * Broadcom BCM2708 watchdog driver. @@ -84013,9 +82322,9 @@ diff -Naur linux-3.6.7/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.6.7/drivers/w +MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_LICENSE("GPL"); + -diff -Naur linux-3.6.7/drivers/watchdog/Kconfig linux-rpi-3.6.7/drivers/watchdog/Kconfig +diff -Naur linux-3.6.7/drivers/watchdog/Kconfig linux-3.6.7.patch/drivers/watchdog/Kconfig --- linux-3.6.7/drivers/watchdog/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/watchdog/Kconfig 2012-11-27 14:39:01.180767608 +0100 ++++ linux-3.6.7.patch/drivers/watchdog/Kconfig 2012-11-18 20:53:35.323719204 +0100 @@ -352,6 +352,12 @@ To compile this driver as a module, choose M here: the module will be called imx2_wdt. @@ -84029,9 +82338,9 @@ diff -Naur linux-3.6.7/drivers/watchdog/Kconfig linux-rpi-3.6.7/drivers/watchdog # AVR32 Architecture config AT32AP700X_WDT -diff -Naur linux-3.6.7/drivers/watchdog/Makefile linux-rpi-3.6.7/drivers/watchdog/Makefile +diff -Naur linux-3.6.7/drivers/watchdog/Makefile linux-3.6.7.patch/drivers/watchdog/Makefile --- linux-3.6.7/drivers/watchdog/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/drivers/watchdog/Makefile 2012-11-27 14:39:01.150766991 +0100 ++++ linux-3.6.7.patch/drivers/watchdog/Makefile 2012-11-18 20:53:35.324719223 +0100 @@ -52,6 +52,7 @@ obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o @@ -84040,10 +82349,9 @@ diff -Naur linux-3.6.7/drivers/watchdog/Makefile linux-rpi-3.6.7/drivers/watchdo # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o -diff -Naur linux-3.6.7/.gitignore linux-rpi-3.6.7/.gitignore -diff -Naur linux-3.6.7/include/linux/broadcom/vc_cma.h linux-rpi-3.6.7/include/linux/broadcom/vc_cma.h +diff -Naur linux-3.6.7/include/linux/broadcom/vc_cma.h linux-3.6.7.patch/include/linux/broadcom/vc_cma.h --- linux-3.6.7/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/include/linux/broadcom/vc_cma.h 2012-11-27 14:41:42.335024935 +0100 ++++ linux-3.6.7.patch/include/linux/broadcom/vc_cma.h 2012-11-18 20:53:35.325719242 +0100 @@ -0,0 +1,30 @@ +/***************************************************************************** +* Copyright 2012 Broadcom Corporation. All rights reserved. @@ -84075,9 +82383,9 @@ diff -Naur linux-3.6.7/include/linux/broadcom/vc_cma.h linux-rpi-3.6.7/include/l + +#endif /* VC_CMA_H */ + -diff -Naur linux-3.6.7/include/linux/mmc/host.h linux-rpi-3.6.7/include/linux/mmc/host.h +diff -Naur linux-3.6.7/include/linux/mmc/host.h linux-3.6.7.patch/include/linux/mmc/host.h --- linux-3.6.7/include/linux/mmc/host.h 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/include/linux/mmc/host.h 2012-11-27 14:41:38.791953571 +0100 ++++ linux-3.6.7.patch/include/linux/mmc/host.h 2012-11-18 20:53:35.325719242 +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 */ @@ -84086,9 +82394,9 @@ diff -Naur linux-3.6.7/include/linux/mmc/host.h linux-rpi-3.6.7/include/linux/mm mmc_pm_flag_t pm_caps; /* supported pm features */ unsigned int power_notify_type; -diff -Naur linux-3.6.7/include/linux/mmc/sdhci.h linux-rpi-3.6.7/include/linux/mmc/sdhci.h +diff -Naur linux-3.6.7/include/linux/mmc/sdhci.h linux-3.6.7.patch/include/linux/mmc/sdhci.h --- linux-3.6.7/include/linux/mmc/sdhci.h 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/include/linux/mmc/sdhci.h 2012-11-27 14:41:38.807953897 +0100 ++++ linux-3.6.7.patch/include/linux/mmc/sdhci.h 2012-11-18 20:53:35.326719261 +0100 @@ -93,6 +93,7 @@ #define SDHCI_QUIRK2_HOST_OFF_CARD_ON (1<<0) @@ -84113,9 +82421,9 @@ diff -Naur linux-3.6.7/include/linux/mmc/sdhci.h linux-rpi-3.6.7/include/linux/m struct mmc_data *data; /* Current data request */ unsigned int data_early:1; /* Data finished before cmd */ -diff -Naur linux-3.6.7/kernel/module.c linux-rpi-3.6.7/kernel/module.c +diff -Naur linux-3.6.7/kernel/module.c linux-3.6.7.patch/kernel/module.c --- linux-3.6.7/kernel/module.c 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/kernel/module.c 2012-11-27 14:41:57.232325334 +0100 ++++ linux-3.6.7.patch/kernel/module.c 2012-11-18 20:53:35.327719280 +0100 @@ -2675,20 +2675,23 @@ memset(ptr, 0, mod->core_size); mod->module_core = ptr; @@ -84153,9 +82461,9 @@ diff -Naur linux-3.6.7/kernel/module.c linux-rpi-3.6.7/kernel/module.c /* Transfer each section which specifies SHF_ALLOC */ pr_debug("final section addresses:\n"); -diff -Naur linux-3.6.7/sound/arm/bcm2835.c linux-rpi-3.6.7/sound/arm/bcm2835.c +diff -Naur linux-3.6.7/sound/arm/bcm2835.c linux-3.6.7.patch/sound/arm/bcm2835.c --- linux-3.6.7/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/sound/arm/bcm2835.c 2012-11-27 14:42:12.361632280 +0100 ++++ linux-3.6.7.patch/sound/arm/bcm2835.c 2012-11-18 20:53:35.328719299 +0100 @@ -0,0 +1,413 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -84570,9 +82878,9 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835.c linux-rpi-3.6.7/sound/arm/bcm2835.c +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:bcm2835_alsa"); -diff -Naur linux-3.6.7/sound/arm/bcm2835-ctl.c linux-rpi-3.6.7/sound/arm/bcm2835-ctl.c +diff -Naur linux-3.6.7/sound/arm/bcm2835-ctl.c linux-3.6.7.patch/sound/arm/bcm2835-ctl.c --- linux-3.6.7/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/sound/arm/bcm2835-ctl.c 2012-11-27 14:42:12.358632219 +0100 ++++ linux-3.6.7.patch/sound/arm/bcm2835-ctl.c 2012-11-18 20:53:35.329719318 +0100 @@ -0,0 +1,200 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -84774,9 +83082,9 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835-ctl.c linux-rpi-3.6.7/sound/arm/bcm2835 + } + return 0; +} -diff -Naur linux-3.6.7/sound/arm/bcm2835.h linux-rpi-3.6.7/sound/arm/bcm2835.h +diff -Naur linux-3.6.7/sound/arm/bcm2835.h linux-3.6.7.patch/sound/arm/bcm2835.h --- linux-3.6.7/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/sound/arm/bcm2835.h 2012-11-27 14:42:12.360632260 +0100 ++++ linux-3.6.7.patch/sound/arm/bcm2835.h 2012-11-18 20:53:35.329719318 +0100 @@ -0,0 +1,155 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -84933,9 +83241,9 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835.h linux-rpi-3.6.7/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.7/sound/arm/bcm2835-pcm.c linux-rpi-3.6.7/sound/arm/bcm2835-pcm.c +diff -Naur linux-3.6.7/sound/arm/bcm2835-pcm.c linux-3.6.7.patch/sound/arm/bcm2835-pcm.c --- linux-3.6.7/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/sound/arm/bcm2835-pcm.c 2012-11-27 14:42:12.357632198 +0100 ++++ linux-3.6.7.patch/sound/arm/bcm2835-pcm.c 2012-11-18 20:53:35.330719337 +0100 @@ -0,0 +1,408 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -85345,9 +83653,9 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835-pcm.c linux-rpi-3.6.7/sound/arm/bcm2835 + + return 0; +} -diff -Naur linux-3.6.7/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.7/sound/arm/bcm2835-vchiq.c +diff -Naur linux-3.6.7/sound/arm/bcm2835-vchiq.c linux-3.6.7.patch/sound/arm/bcm2835-vchiq.c --- linux-3.6.7/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/sound/arm/bcm2835-vchiq.c 2012-11-27 14:42:12.358632219 +0100 ++++ linux-3.6.7.patch/sound/arm/bcm2835-vchiq.c 2012-11-18 20:53:35.331719356 +0100 @@ -0,0 +1,826 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86175,9 +84483,9 @@ diff -Naur linux-3.6.7/sound/arm/bcm2835-vchiq.c linux-rpi-3.6.7/sound/arm/bcm28 + atomic_sub(count, &alsa_stream->retrieved); + return count; +} -diff -Naur linux-3.6.7/sound/arm/Kconfig linux-rpi-3.6.7/sound/arm/Kconfig +diff -Naur linux-3.6.7/sound/arm/Kconfig linux-3.6.7.patch/sound/arm/Kconfig --- linux-3.6.7/sound/arm/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/sound/arm/Kconfig 2012-11-27 14:42:12.360632260 +0100 ++++ linux-3.6.7.patch/sound/arm/Kconfig 2012-11-18 20:53:35.332719375 +0100 @@ -39,5 +39,12 @@ Say Y or M if you want to support any AC97 codec attached to the PXA2xx AC97 interface. @@ -86191,9 +84499,9 @@ diff -Naur linux-3.6.7/sound/arm/Kconfig linux-rpi-3.6.7/sound/arm/Kconfig + endif # SND_ARM -diff -Naur linux-3.6.7/sound/arm/Makefile linux-rpi-3.6.7/sound/arm/Makefile +diff -Naur linux-3.6.7/sound/arm/Makefile linux-3.6.7.patch/sound/arm/Makefile --- linux-3.6.7/sound/arm/Makefile 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/sound/arm/Makefile 2012-11-27 14:42:12.359632240 +0100 ++++ linux-3.6.7.patch/sound/arm/Makefile 2012-11-18 20:53:35.332719375 +0100 @@ -14,3 +14,9 @@ obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o @@ -86204,9 +84512,9 @@ diff -Naur linux-3.6.7/sound/arm/Makefile linux-rpi-3.6.7/sound/arm/Makefile + +EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 + -diff -Naur linux-3.6.7/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.7/sound/arm/vc_vchi_audioserv_defs.h +diff -Naur linux-3.6.7/sound/arm/vc_vchi_audioserv_defs.h linux-3.6.7.patch/sound/arm/vc_vchi_audioserv_defs.h --- linux-3.6.7/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-rpi-3.6.7/sound/arm/vc_vchi_audioserv_defs.h 2012-11-27 14:42:12.353632116 +0100 ++++ linux-3.6.7.patch/sound/arm/vc_vchi_audioserv_defs.h 2012-11-18 20:53:35.333719393 +0100 @@ -0,0 +1,114 @@ +/***************************************************************************** +* Copyright 2011 Broadcom Corporation. All rights reserved. @@ -86322,17 +84630,3 @@ diff -Naur linux-3.6.7/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.6.7/sound/ +} VC_AUDIO_MSG_T; + +#endif // _VC_AUDIO_DEFS_H_ -diff -Naur linux-3.6.7/sound/pci/Kconfig linux-rpi-3.6.7/sound/pci/Kconfig ---- linux-3.6.7/sound/pci/Kconfig 2012-11-17 22:21:23.000000000 +0100 -+++ linux-rpi-3.6.7/sound/pci/Kconfig 2012-11-27 14:42:16.363713092 +0100 -@@ -2,8 +2,8 @@ - - config SND_TEA575X - tristate -- depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO -- default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO -+ depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK -+ default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK - - menuconfig SND_PCI - bool "PCI sound devices" diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 2351d2cf34..49d3ab42e7 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -312,7 +312,6 @@ CONFIG_MACH_BCM2708=y CONFIG_BCM2708_GPIO=y CONFIG_BCM2708_VCMEM=y # CONFIG_BCM2708_NOL2CACHE is not set -CONFIG_BCM2708_DMAER=y # # Processor Type From 5bcc06cbd40ed7daac2713b61756c753b7df7c99 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Nov 2012 06:26:34 +0100 Subject: [PATCH 3/4] Revert "bcm2835-bootloader: update to bcm2835-bootloader-afc05b9" This reverts commit 6b72af0a54b2069000869c0ad0e0c9dce2289213. --- 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 ba51631f88..e15deedb76 100644 --- a/packages/tools/bcm2835-bootloader/meta +++ b/packages/tools/bcm2835-bootloader/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-bootloader" -PKG_VERSION="afc05b9" +PKG_VERSION="99a37d1" PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="nonfree" From a751a33b5c3ee6267b5b79d32ff384030e18c0c7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Nov 2012 06:26:42 +0100 Subject: [PATCH 4/4] Revert "bcm2835-driver: update to bcm2835-driver-afc05b9" This reverts commit f0bc76bca59024a3d5b05b10c98c1ce829477f14. --- 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 ebae2aff97..abda1e7194 100644 --- a/packages/graphics/bcm2835-driver/meta +++ b/packages/graphics/bcm2835-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bcm2835-driver" -PKG_VERSION="afc05b9" +PKG_VERSION="99a37d1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree"