summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.in6
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--package/bcm2835-bootloader/Makefile10
-rw-r--r--package/bcm2835-vc/Makefile10
-rw-r--r--package/ffmpeg/Makefile4
-rw-r--r--package/omxplayer/Makefile10
-rw-r--r--package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c11
-rw-r--r--target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch (renamed from target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch)0
-rw-r--r--target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch (renamed from target/arm/raspberry-pi/patches/3.10.34/raspberry-pi.patch)3256
-rw-r--r--target/linux/patches/3.10.36/bsd-compatibility.patch (renamed from target/linux/patches/3.10.34/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.10.36/startup.patch (renamed from target/linux/patches/3.10.34/startup.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.34/cleankernel.patch11
-rw-r--r--toolchain/kernel-headers/patches/3.10.36/headers-install.patch91
-rw-r--r--toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch (renamed from toolchain/kernel-headers/patches/3.10.34/mkpiggy.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.36/relocs.patch (renamed from toolchain/kernel-headers/patches/3.10.34/relocs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.36/sgidefs.patch (renamed from toolchain/kernel-headers/patches/3.10.34/sgidefs.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.10.36/sortext.patch (renamed from toolchain/kernel-headers/patches/3.10.34/sortext.patch)0
17 files changed, 2044 insertions, 1371 deletions
diff --git a/Config.in b/Config.in
index 01e64ae07..09c66e435 100644
--- a/Config.in
+++ b/Config.in
@@ -118,8 +118,8 @@ config ADK_KERNEL_VERSION_3_11_10
prompt "3.11.10"
boolean
-config ADK_KERNEL_VERSION_3_10_34
- prompt "3.10.34"
+config ADK_KERNEL_VERSION_3_10_36
+ prompt "3.10.36"
boolean
config ADK_KERNEL_VERSION_3_4_84
@@ -133,7 +133,7 @@ config ADK_KERNEL_VERSION
default "3.13.7" if ADK_KERNEL_VERSION_3_13_7
default "3.12.14" if ADK_KERNEL_VERSION_3_12_14
default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
- default "3.10.34" if ADK_KERNEL_VERSION_3_10_34
+ default "3.10.36" if ADK_KERNEL_VERSION_3_10_36
default "3.4.84" if ADK_KERNEL_VERSION_3_4_84
help
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 7cfb5998b..452415a94 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -22,11 +22,11 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176
endif
-ifeq ($(ADK_KERNEL_VERSION_3_10_34),y)
-KERNEL_VERSION:= 3.10.34
+ifeq ($(ADK_KERNEL_VERSION_3_10_36),y)
+KERNEL_VERSION:= 3.10.36
KERNEL_MOD_VERSION:= $(KERNEL_VERSION)
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= 30991b495a3d75196d5608072d2e62e6
+KERNEL_MD5SUM:= 721f76050755ec8ec88876ee350a2726
endif
ifeq ($(ADK_KERNEL_VERSION_3_4_84),y)
KERNEL_VERSION:= 3.4.84
diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile
index b88cd7f08..a23764076 100644
--- a/package/bcm2835-bootloader/Makefile
+++ b/package/bcm2835-bootloader/Makefile
@@ -4,15 +4,17 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bcm2835-bootloader
-# actually 9953ce0847c04b587b694c79c5b5a4ac63f5c369 from 25.03.2014
-# https://github.com/raspberrypi/firmware
-PKG_VERSION:= 0.7
+# actually 04ba1c03780ae708c9289bce14f56933e55e9c20 from 13.04.2014
+PKG_VERSION:= 0.8
PKG_RELEASE:= 1
-PKG_MD5SUM:= 7ad7e5d3ad311d88d1e82fc729042d87
+PKG_MD5SUM:= 08beaa7d66e7dd6b0ab58483d0f4ce40
PKG_DESCR:= bootloader for raspberry pi (bcm2835)
PKG_SECTION:= boot
+PKG_URL:= https://github.com/raspberrypi/firmware
PKG_SITES:= http://openadk.org/distfiles/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
PKG_SYSTEM_DEPENDS:= raspberry-pi
include ${TOPDIR}/mk/package.mk
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile
index 12655228c..707d4e067 100644
--- a/package/bcm2835-vc/Makefile
+++ b/package/bcm2835-vc/Makefile
@@ -4,17 +4,19 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bcm2835-vc
-# actually a8fbe2cd6a3d4455344295809f2e663373ad25cb from 25.03.2014
-# https://github.com/raspberrypi/userland
-PKG_VERSION:= 0.4
+# actually a59842a068cbd19e262701f30014499e9070fbf6 from 13.04.2014
+PKG_VERSION:= 0.5
PKG_RELEASE:= 1
-PKG_MD5SUM:= 091ae422e05a59ffc2b8908256047b7d
+PKG_MD5SUM:= ed8c41f58e5657209cca73cb46b846d3
PKG_DESCR:= vc tools and libraries for raspberry pi
PKG_SECTION:= base
PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= cmake-host
+PKG_URL:= https://github.com/raspberrypi/userland
PKG_SITES:= http://openadk.org/distfiles/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
PKG_SYSTEM_DEPENDS:= raspberry-pi
include ${TOPDIR}/mk/package.mk
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 6a3f60fdd..ec02cc545 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= ffmpeg
-PKG_VERSION:= 2.2
+PKG_VERSION:= 2.2.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 744febca199548c9393b1f1ed05ccdd8
+PKG_MD5SUM:= b8a1ee4964c2638f46fcc803ed453818
PKG_DESCR:= record, convert and stream audio & video
PKG_SECTION:= libs
PKG_FDEPENDS:= libpthread
diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile
index c36174f43..7e724dcd3 100644
--- a/package/omxplayer/Makefile
+++ b/package/omxplayer/Makefile
@@ -4,10 +4,10 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= omxplayer
-# actually 1ca2f7adaa7f6a92410d9664e76c395537659dba from 07.04.2014
-PKG_VERSION:= 0.4
-PKG_RELEASE:= 2
-PKG_MD5SUM:= d4efff32305bd16315e6fa4f80ea2a98
+# actually 46616c55c2fad3dac47d17e8a6b41a16a4d6f15e from 13.04.2014
+PKG_VERSION:= 0.5
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 1c882539dfcbc4e8efeae85ff8069cbe
PKG_DESCR:= video player for raspberry pi
PKG_SECTION:= multimedia
PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre
@@ -16,6 +16,8 @@ PKG_BUILDDEP:= ffmpeg boost bcm2835-vc freetype pcre dbus
PKG_URL:= https://github.com/popcornmix/omxplayer
PKG_SITES:= http://openadk.org/distfiles/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
PKG_SYSTEM_DEPENDS:= raspberry-pi
PKG_LIBC_DEPENDS:= glibc musl
diff --git a/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c
new file mode 100644
index 000000000..1a93e1411
--- /dev/null
+++ b/package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c
@@ -0,0 +1,11 @@
+--- xbmc-12.3-Frodo.orig/lib/xbmc-dll-symbols/DllAvFormat.c 2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/lib/xbmc-dll-symbols/DllAvFormat.c 2014-04-14 17:07:49.000000000 +0200
+@@ -110,7 +110,7 @@ void av_read_frame_flush(AVFormatContext
+ #define RELATIVE_TS_BASE (INT64_MAX - (1LL<<48))
+ if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE;
+ else st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
+- st->reference_dts = AV_NOPTS_VALUE;
++ //st->reference_dts = AV_NOPTS_VALUE;
+
+ st->probe_packets = MAX_PROBE_PACKETS;
+ #endif
diff --git a/target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch b/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch
index beaa71b4e..beaa71b4e 100644
--- a/target/arm/cubox-i/patches/3.10.34/solidrun-cubox-i.patch
+++ b/target/arm/cubox-i/patches/3.10.36/solidrun-cubox-i.patch
diff --git a/target/arm/raspberry-pi/patches/3.10.34/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch
index 2c313a843..bb50393a9 100644
--- a/target/arm/raspberry-pi/patches/3.10.34/raspberry-pi.patch
+++ b/target/arm/raspberry-pi/patches/3.10.36/raspberry-pi.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig
---- linux-3.10.33/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-03-13 12:46:12.312043485 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_cutdown_defconfig
+--- linux-3.10.36.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,504 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -506,10 +506,10 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberr
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_BCM2708=m
+
-diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig
---- linux-3.10.33/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig 2014-03-13 12:46:12.312043485 +0100
-@@ -0,0 +1,1093 @@
+diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.10.36.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/configs/bcmrpi_defconfig 2014-04-13 17:32:40.000000000 +0200
+@@ -0,0 +1,1098 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
@@ -781,6 +781,9 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arc
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_L2TP=m
++CONFIG_L2TP_V3=y
++CONFIG_L2TP_IP=m
++CONFIG_L2TP_ETH=m
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
@@ -928,6 +931,7 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arc
+CONFIG_MACVLAN=m
+CONFIG_NETCONSOLE=m
+CONFIG_TUN=m
++CONFIG_VETH=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
@@ -1255,6 +1259,7 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arc
+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
+CONFIG_SND_BCM2708_SOC_RPI_DAC=m
++CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
+CONFIG_SOUND_PRIME=m
+CONFIG_HIDRAW=y
+CONFIG_HID_A4TECH=m
@@ -1603,545 +1608,9 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arc
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_emergency_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig
---- linux-3.10.33/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig 2014-03-13 12:46:12.312043485 +0100
-@@ -0,0 +1,532 @@
-+CONFIG_EXPERIMENTAL=y
-+# 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_AUDIT=y
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE="../target_fs"
-+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_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_CFQ_GROUP_IOSCHED=y
-+CONFIG_ARCH_BCM2708=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_AEABI=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=ext3 rootwait"
-+CONFIG_KEXEC=y
-+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_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+# CONFIG_INET_DIAG is not set
-+# CONFIG_IPV6 is not set
-+CONFIG_NET_PKTGEN=m
-+CONFIG_IRDA=m
-+CONFIG_IRLAN=m
-+CONFIG_IRCOMM=m
-+CONFIG_IRDA_ULTRA=y
-+CONFIG_IRDA_CACHE_LAST_LSAP=y
-+CONFIG_IRDA_FAST_RR=y
-+CONFIG_IRTTY_SIR=m
-+CONFIG_KINGSUN_DONGLE=m
-+CONFIG_KSDAZZLE_DONGLE=m
-+CONFIG_KS959_DONGLE=m
-+CONFIG_USB_IRDA=m
-+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
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=m
-+CONFIG_BT_HCIBTUSB=m
-+CONFIG_BT_HCIBCM203X=m
-+CONFIG_BT_HCIBPA10X=m
-+CONFIG_BT_HCIBFUSB=m
-+CONFIG_BT_HCIVHCI=m
-+CONFIG_BT_MRVL=m
-+CONFIG_BT_MRVL_SDIO=m
-+CONFIG_BT_ATH3K=m
-+CONFIG_CFG80211=m
-+CONFIG_MAC80211=m
-+CONFIG_MAC80211_RC_PID=y
-+CONFIG_MAC80211_MESH=y
-+CONFIG_WIMAX=m
-+CONFIG_NET_9P=m
-+CONFIG_NFC=m
-+CONFIG_NFC_PN533=m
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+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_MISC_DEVICES=y
-+CONFIG_SCSI=y
-+# CONFIG_SCSI_PROC_FS is not set
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_BLK_DEV_SR=m
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_LOWLEVEL is not set
-+CONFIG_MD=y
-+CONFIG_NETDEVICES=y
-+CONFIG_TUN=m
-+CONFIG_PHYLIB=m
-+CONFIG_MDIO_BITBANG=m
-+CONFIG_NET_ETHERNET=y
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+CONFIG_LIBERTAS_THINFIRM=m
-+CONFIG_LIBERTAS_THINFIRM_USB=m
-+CONFIG_AT76C50X_USB=m
-+CONFIG_USB_ZD1201=m
-+CONFIG_USB_NET_RNDIS_WLAN=m
-+CONFIG_RTL8187=m
-+CONFIG_MAC80211_HWSIM=m
-+CONFIG_ATH_COMMON=m
-+CONFIG_ATH9K=m
-+CONFIG_ATH9K_HTC=m
-+CONFIG_CARL9170=m
-+CONFIG_B43=m
-+CONFIG_B43LEGACY=m
-+CONFIG_HOSTAP=m
-+CONFIG_IWM=m
-+CONFIG_LIBERTAS=m
-+CONFIG_LIBERTAS_USB=m
-+CONFIG_LIBERTAS_SDIO=m
-+CONFIG_P54_COMMON=m
-+CONFIG_P54_USB=m
-+CONFIG_RT2X00=m
-+CONFIG_RT2500USB=m
-+CONFIG_RT73USB=m
-+CONFIG_RT2800USB=m
-+CONFIG_RT2800USB_RT53XX=y
-+CONFIG_RTL8192CU=m
-+CONFIG_WL1251=m
-+CONFIG_WL12XX_MENU=m
-+CONFIG_ZD1211RW=m
-+CONFIG_MWIFIEX=m
-+CONFIG_MWIFIEX_SDIO=m
-+CONFIG_WIMAX_I2400M_USB=m
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_CDC_EEM=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_SMSC75XX=m
-+CONFIG_USB_NET_SMSC95XX=y
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_KC2190=y
-+# CONFIG_USB_NET_ZAURUS is not set
-+CONFIG_USB_NET_CX82310_ETH=m
-+CONFIG_USB_NET_KALMIA=m
-+CONFIG_USB_NET_INT51X1=m
-+CONFIG_USB_IPHETH=m
-+CONFIG_USB_SIERRA_NET=m
-+CONFIG_USB_VL600=m
-+CONFIG_PPP=m
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_SLIP=m
-+CONFIG_SLIP_COMPRESSED=y
-+CONFIG_NETCONSOLE=m
-+CONFIG_INPUT_POLLDEV=m
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=m
-+# CONFIG_INPUT_KEYBOARD is not set
-+# CONFIG_INPUT_MOUSE is not set
-+CONFIG_INPUT_MISC=y
-+CONFIG_INPUT_AD714X=m
-+CONFIG_INPUT_ATI_REMOTE=m
-+CONFIG_INPUT_ATI_REMOTE2=m
-+CONFIG_INPUT_KEYSPAN_REMOTE=m
-+CONFIG_INPUT_POWERMATE=m
-+CONFIG_INPUT_YEALINK=m
-+CONFIG_INPUT_CM109=m
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-+CONFIG_INPUT_ADXL34X=m
-+CONFIG_INPUT_CMA3000=m
-+CONFIG_SERIO=m
-+CONFIG_SERIO_RAW=m
-+CONFIG_GAMEPORT=m
-+CONFIG_GAMEPORT_NS558=m
-+CONFIG_GAMEPORT_L4=m
-+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_HW_RANDOM is not set
-+CONFIG_RAW_DRIVER=y
-+CONFIG_GPIO_SYSFS=y
-+# CONFIG_HWMON is not set
-+CONFIG_WATCHDOG=y
-+CONFIG_BCM2708_WDT=m
-+# CONFIG_MFD_SUPPORT is not set
-+CONFIG_FB=y
-+CONFIG_FB_BCM2708=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_SND=m
-+CONFIG_SND_SEQUENCER=m
-+CONFIG_SND_SEQ_DUMMY=m
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_SEQUENCER_OSS=y
-+CONFIG_SND_HRTIMER=m
-+CONFIG_SND_DUMMY=m
-+CONFIG_SND_ALOOP=m
-+CONFIG_SND_VIRMIDI=m
-+CONFIG_SND_MTPAV=m
-+CONFIG_SND_SERIAL_U16550=m
-+CONFIG_SND_MPU401=m
-+CONFIG_SND_BCM2835=m
-+CONFIG_SND_USB_AUDIO=m
-+CONFIG_SND_USB_UA101=m
-+CONFIG_SND_USB_CAIAQ=m
-+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
-+CONFIG_HID_BELKIN=m
-+CONFIG_HID_CHERRY=m
-+CONFIG_HID_CHICONY=m
-+CONFIG_HID_CYPRESS=m
-+CONFIG_HID_DRAGONRISE=m
-+CONFIG_HID_EMS_FF=m
-+CONFIG_HID_ELECOM=m
-+CONFIG_HID_EZKEY=m
-+CONFIG_HID_HOLTEK=m
-+CONFIG_HID_KEYTOUCH=m
-+CONFIG_HID_KYE=m
-+CONFIG_HID_UCLOGIC=m
-+CONFIG_HID_WALTOP=m
-+CONFIG_HID_GYRATION=m
-+CONFIG_HID_TWINHAN=m
-+CONFIG_HID_KENSINGTON=m
-+CONFIG_HID_LCPOWER=m
-+CONFIG_HID_LOGITECH=m
-+CONFIG_HID_MAGICMOUSE=m
-+CONFIG_HID_MICROSOFT=m
-+CONFIG_HID_MONTEREY=m
-+CONFIG_HID_MULTITOUCH=m
-+CONFIG_HID_NTRIG=m
-+CONFIG_HID_ORTEK=m
-+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
-+CONFIG_HID_SPEEDLINK=m
-+CONFIG_HID_SUNPLUS=m
-+CONFIG_HID_GREENASIA=m
-+CONFIG_HID_SMARTJOYPLUS=m
-+CONFIG_HID_TOPSEED=m
-+CONFIG_HID_THRUSTMASTER=m
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_WIIMOTE=m
-+CONFIG_HID_ZEROPLUS=m
-+CONFIG_HID_ZYDACRON=m
-+CONFIG_USB=y
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+CONFIG_USB_MON=m
-+CONFIG_USB_DWCOTG=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_STORAGE_REALTEK=m
-+CONFIG_USB_STORAGE_DATAFAB=m
-+CONFIG_USB_STORAGE_FREECOM=m
-+CONFIG_USB_STORAGE_ISD200=m
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_STORAGE_ALAUDA=m
-+CONFIG_USB_STORAGE_ONETOUCH=m
-+CONFIG_USB_STORAGE_KARMA=m
-+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-+CONFIG_USB_STORAGE_ENE_UB6250=m
-+CONFIG_USB_UAS=y
-+CONFIG_USB_LIBUSUAL=y
-+CONFIG_USB_MDC800=m
-+CONFIG_USB_MICROTEK=m
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+CONFIG_USB_SERIAL_CH341=m
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP210X=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+CONFIG_USB_SERIAL_IUU=m
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_MOTOROLA=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+CONFIG_USB_SERIAL_OTI6858=m
-+CONFIG_USB_SERIAL_QCAUX=m
-+CONFIG_USB_SERIAL_QUALCOMM=m
-+CONFIG_USB_SERIAL_SPCP8X5=m
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SIEMENS_MPI=m
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_SYMBOL=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+CONFIG_USB_SERIAL_OPTICON=m
-+CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
-+CONFIG_USB_SERIAL_ZIO=m
-+CONFIG_USB_SERIAL_SSU100=m
-+CONFIG_USB_SERIAL_DEBUG=m
-+CONFIG_USB_EMI62=m
-+CONFIG_USB_EMI26=m
-+CONFIG_USB_ADUTUX=m
-+CONFIG_USB_SEVSEG=m
-+CONFIG_USB_RIO500=m
-+CONFIG_USB_LEGOTOWER=m
-+CONFIG_USB_LCD=m
-+CONFIG_USB_LED=m
-+CONFIG_USB_CYPRESS_CY7C63=m
-+CONFIG_USB_CYTHERM=m
-+CONFIG_USB_IDMOUSE=m
-+CONFIG_USB_FTDI_ELAN=m
-+CONFIG_USB_APPLEDISPLAY=m
-+CONFIG_USB_LD=m
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+CONFIG_USB_TEST=m
-+CONFIG_USB_ISIGHTFW=m
-+CONFIG_USB_YUREX=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_LEDS_GPIO=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_JFS_STATISTICS=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_FANOTIFY=y
-+CONFIG_AUTOFS4_FS=y
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
-+CONFIG_FSCACHE=y
-+CONFIG_FSCACHE_STATS=y
-+CONFIG_FSCACHE_HISTOGRAM=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=y
-+CONFIG_NFS_V3_ACL=y
-+CONFIG_NFS_V4=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFS_FSCACHE=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_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
-+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_NLS_UTF8=m
-+CONFIG_PRINTK_TIME=y
-+CONFIG_DETECT_HUNG_TASK=y
-+CONFIG_TIMER_STATS=y
-+CONFIG_DEBUG_STACK_USAGE=y
-+CONFIG_DEBUG_INFO=y
-+CONFIG_DEBUG_MEMORY_INIT=y
-+CONFIG_BOOT_PRINTK_DELAY=y
-+CONFIG_LATENCYTOP=y
-+CONFIG_SYSCTL_SYSCALL_CHECK=y
-+CONFIG_IRQSOFF_TRACER=y
-+CONFIG_SCHED_TRACER=y
-+CONFIG_STACK_TRACER=y
-+CONFIG_BLK_DEV_IO_TRACE=y
-+CONFIG_FUNCTION_PROFILER=y
-+CONFIG_KGDB=y
-+CONFIG_KGDB_KDB=y
-+CONFIG_KDB_KEYBOARD=y
-+CONFIG_STRICT_DEVMEM=y
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_SEQIV=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_SHA1=y
-+CONFIG_CRYPTO_SHA256=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_WP512=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_DEFLATE=m
-+# CONFIG_CRYPTO_ANSI_CPRNG is not set
-+# CONFIG_CRYPTO_HW is not set
-+CONFIG_CRC_ITU_T=y
-+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_quick_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig
---- linux-3.10.33/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig 2014-03-13 12:46:12.312043485 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.10.36/arch/arm/configs/bcmrpi_quick_defconfig
+--- linux-3.10.36.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/configs/bcmrpi_quick_defconfig 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,197 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_LOCALVERSION="-quick"
@@ -2340,9 +1809,9 @@ diff -Nur linux-3.10.33/arch/arm/configs/bcmrpi_quick_defconfig linux-raspberry-
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.10.33/arch/arm/include/asm/fiq.h linux-raspberry-pi/arch/arm/include/asm/fiq.h
---- linux-3.10.33/arch/arm/include/asm/fiq.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/include/asm/fiq.h 2014-03-13 12:46:12.344043549 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/include/asm/fiq.h linux-3.10.36/arch/arm/include/asm/fiq.h
+--- linux-3.10.36.orig/arch/arm/include/asm/fiq.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/include/asm/fiq.h 2014-04-13 17:32:40.000000000 +0200
@@ -42,6 +42,7 @@
/* helpers defined in fiqasm.S: */
extern void __set_fiq_regs(unsigned long const *regs);
@@ -2351,9 +1820,9 @@ diff -Nur linux-3.10.33/arch/arm/include/asm/fiq.h linux-raspberry-pi/arch/arm/i
static inline void set_fiq_regs(struct pt_regs const *regs)
{
-diff -Nur linux-3.10.33/arch/arm/Kconfig linux-raspberry-pi/arch/arm/Kconfig
---- linux-3.10.33/arch/arm/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/Kconfig 2014-03-13 12:46:12.260043381 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/Kconfig linux-3.10.36/arch/arm/Kconfig
+--- linux-3.10.36.orig/arch/arm/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/Kconfig 2014-04-13 17:32:40.000000000 +0200
@@ -361,6 +361,24 @@
This enables support for systems based on Atmel
AT91RM9200 and AT91SAM9* processors.
@@ -2387,9 +1856,9 @@ diff -Nur linux-3.10.33/arch/arm/Kconfig linux-raspberry-pi/arch/arm/Kconfig
source "arch/arm/mach-zynq/Kconfig"
-diff -Nur linux-3.10.33/arch/arm/Kconfig.debug linux-raspberry-pi/arch/arm/Kconfig.debug
---- linux-3.10.33/arch/arm/Kconfig.debug 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/Kconfig.debug 2014-03-13 12:46:12.260043381 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/Kconfig.debug linux-3.10.36/arch/arm/Kconfig.debug
+--- linux-3.10.36.orig/arch/arm/Kconfig.debug 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/Kconfig.debug 2014-04-13 17:32:40.000000000 +0200
@@ -519,6 +519,14 @@
For more details about semihosting, please see
chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
@@ -2405,9 +1874,9 @@ diff -Nur linux-3.10.33/arch/arm/Kconfig.debug linux-raspberry-pi/arch/arm/Kconf
endchoice
config DEBUG_EXYNOS_UART
-diff -Nur linux-3.10.33/arch/arm/kernel/armksyms.c linux-raspberry-pi/arch/arm/kernel/armksyms.c
---- linux-3.10.33/arch/arm/kernel/armksyms.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/armksyms.c 2014-03-13 12:46:12.372043605 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/kernel/armksyms.c linux-3.10.36/arch/arm/kernel/armksyms.c
+--- linux-3.10.36.orig/arch/arm/kernel/armksyms.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/kernel/armksyms.c 2014-04-13 17:32:40.000000000 +0200
@@ -156,3 +156,7 @@
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
EXPORT_SYMBOL(__pv_phys_offset);
@@ -2416,9 +1885,9 @@ diff -Nur linux-3.10.33/arch/arm/kernel/armksyms.c linux-raspberry-pi/arch/arm/k
+extern void v6wbi_flush_kern_tlb_range(void);
+EXPORT_SYMBOL(v6wbi_flush_kern_tlb_range);
+
-diff -Nur linux-3.10.33/arch/arm/kernel/fiqasm.S linux-raspberry-pi/arch/arm/kernel/fiqasm.S
---- linux-3.10.33/arch/arm/kernel/fiqasm.S 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/fiqasm.S 2014-03-13 12:46:12.376043613 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiqasm.S linux-3.10.36/arch/arm/kernel/fiqasm.S
+--- linux-3.10.36.orig/arch/arm/kernel/fiqasm.S 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/kernel/fiqasm.S 2014-04-13 17:32:40.000000000 +0200
@@ -25,6 +25,9 @@
ENTRY(__set_fiq_regs)
mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
@@ -2437,9 +1906,9 @@ diff -Nur linux-3.10.33/arch/arm/kernel/fiqasm.S linux-raspberry-pi/arch/arm/ker
+ENTRY(__FIQ_Branch)
+ mov pc, r8
+ENDPROC(__FIQ_Branch)
-diff -Nur linux-3.10.33/arch/arm/kernel/fiq.c linux-raspberry-pi/arch/arm/kernel/fiq.c
---- linux-3.10.33/arch/arm/kernel/fiq.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/fiq.c 2014-03-13 12:46:12.376043613 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/kernel/fiq.c linux-3.10.36/arch/arm/kernel/fiq.c
+--- linux-3.10.36.orig/arch/arm/kernel/fiq.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/kernel/fiq.c 2014-04-13 17:32:40.000000000 +0200
@@ -84,17 +84,14 @@
void set_fiq_handler(void *start, unsigned int length)
@@ -2469,9 +1938,9 @@ diff -Nur linux-3.10.33/arch/arm/kernel/fiq.c linux-raspberry-pi/arch/arm/kernel
EXPORT_SYMBOL(claim_fiq);
EXPORT_SYMBOL(release_fiq);
EXPORT_SYMBOL(enable_fiq);
-diff -Nur linux-3.10.33/arch/arm/kernel/process.c linux-raspberry-pi/arch/arm/kernel/process.c
---- linux-3.10.33/arch/arm/kernel/process.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/kernel/process.c 2014-03-13 12:46:12.380043621 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/kernel/process.c linux-3.10.36/arch/arm/kernel/process.c
+--- linux-3.10.36.orig/arch/arm/kernel/process.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/kernel/process.c 2014-04-13 17:32:40.000000000 +0200
@@ -174,7 +174,7 @@
default_idle();
}
@@ -2481,9 +1950,9 @@ diff -Nur linux-3.10.33/arch/arm/kernel/process.c linux-raspberry-pi/arch/arm/ke
int __init reboot_setup(char *str)
{
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/armctrl.c linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c
---- linux-3.10.33/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.10.36/arch/arm/mach-bcm2708/armctrl.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/armctrl.c 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,219 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.c
@@ -2704,9 +2173,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/armctrl.c linux-raspberry-pi/arch/
+ init_FIQ(FIQ_START);
+ return 0;
+}
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/armctrl.h linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h
---- linux-3.10.33/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.10.36/arch/arm/mach-bcm2708/armctrl.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/armctrl.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,27 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.h
@@ -2735,10 +2204,10 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/armctrl.h linux-raspberry-pi/arch/
+ u32 armctrl_sources, u32 resume_sources);
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c
---- linux-3.10.33/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c 2014-03-13 12:46:12.432043725 +0100
-@@ -0,0 +1,1014 @@
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.c 2014-04-13 17:32:40.000000000 +0200
+@@ -0,0 +1,1036 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.c
+ *
@@ -3426,6 +2895,22 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/
+};
+#endif
+
++
++#if defined(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) || defined(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC_MODULE)
++static struct platform_device snd_rpi_iqaudio_dac_device = {
++ .name = "snd-rpi-iqaudio-dac",
++ .id = 0,
++ .num_resources = 0,
++};
++
++// Use the actual device name rather than generic driver name
++static struct i2c_board_info __initdata snd_pcm512x_i2c_devices[] = {
++ {
++ I2C_BOARD_INFO("pcm5122", 0x4c)
++ },
++};
++#endif
++
+int __init bcm_register_device(struct platform_device *pdev)
+{
+ int ret;
@@ -3572,6 +3057,12 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/
+ bcm_register_device(&snd_pcm1794a_codec_device);
+#endif
+
++#if defined(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) || defined(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC_MODULE)
++ bcm_register_device(&snd_rpi_iqaudio_dac_device);
++ i2c_register_board_info(1, snd_pcm512x_i2c_devices, ARRAY_SIZE(snd_pcm512x_i2c_devices));
++#endif
++
++
+ for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
+ struct amba_device *d = amba_devs[i];
+ amba_device_register(d, &iomem_resource);
@@ -3753,9 +3244,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/
+module_param(disk_led_active_low, uint, 0644);
+module_param(reboot_part, uint, 0644);
+module_param(w1_gpio_pin, uint, 0644);
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c
---- linux-3.10.33/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.10.36/arch/arm/mach-bcm2708/bcm2708_gpio.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,361 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -4118,9 +3609,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-raspberry-pi/
+
+MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/bcm2708.h linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h
---- linux-3.10.33/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/bcm2708.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,51 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.h
@@ -4173,9 +3664,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/bcm2708.h linux-raspberry-pi/arch/
+}
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/clock.c linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c
---- linux-3.10.33/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.c linux-3.10.36/arch/arm/mach-bcm2708/clock.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/clock.c 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,61 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.c
@@ -4238,9 +3729,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/clock.c linux-raspberry-pi/arch/ar
+ return -EIO;
+}
+EXPORT_SYMBOL(clk_set_rate);
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/clock.h linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h
---- linux-3.10.33/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.h linux-3.10.36/arch/arm/mach-bcm2708/clock.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/clock.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,24 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.h
@@ -4266,9 +3757,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/clock.h linux-raspberry-pi/arch/ar
+struct clk {
+ unsigned long rate;
+};
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/dma.c linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c
---- linux-3.10.33/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dma.c linux-3.10.36/arch/arm/mach-bcm2708/dma.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/dma.c 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,407 @@
+/*
+ * linux/arch/arm/mach-bcm2708/dma.c
@@ -4677,9 +4168,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/dma.c linux-raspberry-pi/arch/arm/
+MODULE_LICENSE("GPL");
+
+MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/dmaer.c linux-raspberry-pi/arch/arm/mach-bcm2708/dmaer.c
---- linux-3.10.33/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/dmaer.c 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.10.36/arch/arm/mach-bcm2708/dmaer.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/dmaer.c 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,887 @@
+#include <linux/init.h>
+#include <linux/sched.h>
@@ -5568,9 +5059,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/dmaer.c linux-raspberry-pi/arch/ar
+module_init(dmaer_init);
+module_exit(dmaer_exit);
+
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_control.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,419 @@
+/*
+ * linux/arch/arm/mach-bcm2708/arm_control.h
@@ -5991,9 +5482,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-r
+#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c)
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_power.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,60 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@@ -6055,9 +5546,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-ras
+};
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/clkdev.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,7 @@
+#ifndef __ASM_MACH_CLKDEV_H
+#define __ASM_MACH_CLKDEV_H
@@ -6066,9 +5557,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-raspbe
+#define __clk_put(clk) do { } while (0)
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.10.36/arch/arm/mach-bcm2708/include/mach/debug-macro.S
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,22 @@
+/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
+ *
@@ -6092,9 +5583,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-r
+ .endm
+
+#include <asm/hardware/debug-pl01x.S>
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/dma.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/dma.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/dma.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,90 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/dma.h
@@ -6186,9 +5677,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/dma.h linux-raspberry
+
+
+#endif /* _MACH_BCM2708_DMA_H */
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.10.36/arch/arm/mach-bcm2708/include/mach/entry-macro.S
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,69 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@@ -6259,9 +5750,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-r
+1020: @ EQ will be set if no irqs pending
+
+ .endm
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/frc.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/frc.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/frc.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6301,9 +5792,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/frc.h linux-raspberry
+extern unsigned long long frc_clock_ticks63(void);
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/gpio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/gpio.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/gpio.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,18 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/gpio.h
@@ -6323,9 +5814,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/gpio.h linux-raspberr
+
+#endif
+
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/hardware.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/hardware.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/hardware.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,28 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/hardware.h
@@ -6355,9 +5846,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rasp
+#include <mach/platform.h>
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/io.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/io.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/io.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/io.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/io.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,27 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/io.h
@@ -6386,9 +5877,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/io.h linux-raspberry-
+#define __io(a) __typesafe_io(a)
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/irqs.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/irqs.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/irqs.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,199 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/irqs.h
@@ -6589,9 +6080,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/irqs.h linux-raspberr
+
+
+#endif /* _BCM2708_IRQS_H_ */
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/memory.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/memory.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/memory.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/memory.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/memory.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,57 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/memory.h
@@ -6650,9 +6141,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/memory.h linux-raspbe
+#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET))
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/platform.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/platform.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/platform.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/platform.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/platform.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,228 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/platform.h
@@ -6882,9 +6373,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/platform.h linux-rasp
+#endif
+
+/* END */
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/power.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/power.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/power.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/power.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,26 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.h
@@ -6912,9 +6403,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/power.h linux-raspber
+extern int bcm_power_close(BCM_POWER_HANDLE_T handle);
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/system.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/system.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/system.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/system.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/system.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/system.h
@@ -6954,9 +6445,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/system.h linux-raspbe
+}
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/timex.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/timex.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/timex.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/timex.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/timex.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,23 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6981,9 +6472,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/timex.h linux-raspber
+ */
+
+#define CLOCK_TICK_RATE (1000000)
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/uncompress.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/uncompress.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,85 @@
+/*
+ * arch/arm/mach-bcn2708/include/mach/uncompress.h
@@ -7070,9 +6561,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-ra
+ */
+#define arch_decomp_wdog()
+
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vcio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vcio.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vcio.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,141 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vcio.h
@@ -7215,9 +6706,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vcio.h linux-raspberr
+#define DEVICE_FILE_NAME "char_dev"
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_mem.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_mem.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,36 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -7255,9 +6746,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-raspbe
+
+#endif /* VC_MEM_H */
+
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_support.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_support.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_support.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vc_support.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,69 @@
+#ifndef _VC_SUPPORT_H_
+#define _VC_SUPPORT_H_
@@ -7328,9 +6819,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-ra
+ unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5);
+
+#endif
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vmalloc.h
---- linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vmalloc.h
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,20 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vmalloc.h
@@ -7352,9 +6843,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-raspb
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#define VMALLOC_END (0xe8000000)
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/Kconfig linux-raspberry-pi/arch/arm/mach-bcm2708/Kconfig
---- linux-3.10.33/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/Kconfig 2014-03-13 12:46:12.424043709 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Kconfig linux-3.10.36/arch/arm/mach-bcm2708/Kconfig
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/Kconfig 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,49 @@
+menu "Broadcom BCM2708 Implementations"
+ depends on ARCH_BCM2708
@@ -7405,9 +6896,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/Kconfig linux-raspberry-pi/arch/ar
+ Enable DMA helper for accelerating X composition
+
+endmenu
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/Makefile linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile
---- linux-3.10.33/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile 2014-03-13 12:46:12.424043709 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile linux-3.10.36/arch/arm/mach-bcm2708/Makefile
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/Makefile 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,11 @@
+#
+# Makefile for the linux kernel.
@@ -7420,16 +6911,16 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/Makefile linux-raspberry-pi/arch/a
+obj-$(CONFIG_BCM2708_DMAER) += dmaer_master.o
+dmaer_master-objs := dmaer.o vc_support.o
+
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/Makefile.boot linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile.boot
---- linux-3.10.33/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile.boot 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.10.36/arch/arm/mach-bcm2708/Makefile.boot
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/Makefile.boot 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,3 @@
+ zreladdr-y := 0x00008000
+params_phys-y := 0x00000100
+initrd_phys-y := 0x00800000
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/power.c linux-raspberry-pi/arch/arm/mach-bcm2708/power.c
---- linux-3.10.33/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/power.c 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/power.c linux-3.10.36/arch/arm/mach-bcm2708/power.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/power.c 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,194 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.c
@@ -7625,9 +7116,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/power.c linux-raspberry-pi/arch/ar
+MODULE_AUTHOR("Phil Elwell");
+MODULE_DESCRIPTION("Interface to BCM2708 power management");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/vcio.c linux-raspberry-pi/arch/arm/mach-bcm2708/vcio.c
---- linux-3.10.33/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/vcio.c 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vcio.c linux-3.10.36/arch/arm/mach-bcm2708/vcio.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/vcio.c 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,474 @@
+/*
+ * linux/arch/arm/mach-bcm2708/vcio.c
@@ -8103,9 +7594,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/vcio.c linux-raspberry-pi/arch/arm
+MODULE_DESCRIPTION("ARM I/O to VideoCore processor");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm-mbox");
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/vc_mem.c linux-raspberry-pi/arch/arm/mach-bcm2708/vc_mem.c
---- linux-3.10.33/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/vc_mem.c 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.10.36/arch/arm/mach-bcm2708/vc_mem.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/vc_mem.c 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,432 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -8539,9 +8030,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/vc_mem.c linux-raspberry-pi/arch/a
+module_param(mem_size, uint, 0644);
+module_param(mem_base, uint, 0644);
+
-diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/vc_support.c linux-raspberry-pi/arch/arm/mach-bcm2708/vc_support.c
---- linux-3.10.33/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mach-bcm2708/vc_support.c 2014-03-13 12:46:12.432043725 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_support.c linux-3.10.36/arch/arm/mach-bcm2708/vc_support.c
+--- linux-3.10.36.orig/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/arch/arm/mach-bcm2708/vc_support.c 2014-04-13 17:32:40.000000000 +0200
@@ -0,0 +1,319 @@
+/*
+ * vc_support.c
@@ -8862,9 +8353,9 @@ diff -Nur linux-3.10.33/arch/arm/mach-bcm2708/vc_support.c linux-raspberry-pi/ar
+ }
+}
+
-diff -Nur linux-3.10.33/arch/arm/Makefile linux-raspberry-pi/arch/arm/Makefile
---- linux-3.10.33/arch/arm/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/Makefile 2014-03-13 12:46:12.260043381 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/Makefile linux-3.10.36/arch/arm/Makefile
+--- linux-3.10.36.orig/arch/arm/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/Makefile 2014-04-13 17:32:40.000000000 +0200
@@ -139,6 +139,7 @@
# by CONFIG_* macro name.
machine-$(CONFIG_ARCH_AT91) += at91
@@ -8873,9 +8364,9 @@ diff -Nur linux-3.10.33/arch/arm/Makefile linux-raspberry-pi/arch/arm/Makefile
machine-$(CONFIG_ARCH_BCM2835) += bcm2835
machine-$(CONFIG_ARCH_CLPS711X) += clps711x
machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx
-diff -Nur linux-3.10.33/arch/arm/mm/Kconfig linux-raspberry-pi/arch/arm/mm/Kconfig
---- linux-3.10.33/arch/arm/mm/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mm/Kconfig 2014-03-13 12:46:12.764044389 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mm/Kconfig linux-3.10.36/arch/arm/mm/Kconfig
+--- linux-3.10.36.orig/arch/arm/mm/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/mm/Kconfig 2014-04-13 17:32:41.000000000 +0200
@@ -358,7 +358,7 @@
# ARMv6
@@ -8885,9 +8376,9 @@ diff -Nur linux-3.10.33/arch/arm/mm/Kconfig linux-raspberry-pi/arch/arm/mm/Kconf
select CPU_32v6
select CPU_ABRT_EV6
select CPU_CACHE_V6
-diff -Nur linux-3.10.33/arch/arm/mm/proc-v6.S linux-raspberry-pi/arch/arm/mm/proc-v6.S
---- linux-3.10.33/arch/arm/mm/proc-v6.S 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/mm/proc-v6.S 2014-03-13 12:46:12.772044405 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/mm/proc-v6.S linux-3.10.36/arch/arm/mm/proc-v6.S
+--- linux-3.10.36.orig/arch/arm/mm/proc-v6.S 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/mm/proc-v6.S 2014-04-13 17:32:41.000000000 +0200
@@ -73,10 +73,19 @@
*
* IRQs are already disabled.
@@ -8911,9 +8402,9 @@ diff -Nur linux-3.10.33/arch/arm/mm/proc-v6.S linux-raspberry-pi/arch/arm/mm/pro
mov pc, lr
ENTRY(cpu_v6_dcache_clean_area)
-diff -Nur linux-3.10.33/arch/arm/tools/mach-types linux-raspberry-pi/arch/arm/tools/mach-types
---- linux-3.10.33/arch/arm/tools/mach-types 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/arch/arm/tools/mach-types 2014-03-13 12:46:12.828044517 +0100
+diff -Nur linux-3.10.36.orig/arch/arm/tools/mach-types linux-3.10.36/arch/arm/tools/mach-types
+--- linux-3.10.36.orig/arch/arm/tools/mach-types 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/arch/arm/tools/mach-types 2014-04-13 17:32:41.000000000 +0200
@@ -522,6 +522,7 @@
prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103
paz00 MACH_PAZ00 PAZ00 3128
@@ -8922,9 +8413,9 @@ diff -Nur linux-3.10.33/arch/arm/tools/mach-types linux-raspberry-pi/arch/arm/to
ag5evm MACH_AG5EVM AG5EVM 3189
ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206
wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207
-diff -Nur linux-3.10.33/Documentation/video4linux/bcm2835-v4l2.txt linux-raspberry-pi/Documentation/video4linux/bcm2835-v4l2.txt
---- linux-3.10.33/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/Documentation/video4linux/bcm2835-v4l2.txt 2014-03-13 12:46:12.092043045 +0100
+diff -Nur linux-3.10.36.orig/Documentation/video4linux/bcm2835-v4l2.txt linux-3.10.36/Documentation/video4linux/bcm2835-v4l2.txt
+--- linux-3.10.36.orig/Documentation/video4linux/bcm2835-v4l2.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/Documentation/video4linux/bcm2835-v4l2.txt 2014-04-13 17:32:39.000000000 +0200
@@ -0,0 +1,60 @@
+
+BCM2835 (aka Raspberry Pi) V4L2 driver
@@ -8986,9 +8477,9 @@ diff -Nur linux-3.10.33/Documentation/video4linux/bcm2835-v4l2.txt linux-raspber
+List of available formats:
+
+$ v4l2-ctl --list-formats
-diff -Nur linux-3.10.33/drivers/char/broadcom/Kconfig linux-raspberry-pi/drivers/char/broadcom/Kconfig
---- linux-3.10.33/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/char/broadcom/Kconfig 2014-03-13 12:46:15.356049576 +0100
+diff -Nur linux-3.10.36.orig/drivers/char/broadcom/Kconfig linux-3.10.36/drivers/char/broadcom/Kconfig
+--- linux-3.10.36.orig/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/char/broadcom/Kconfig 2014-04-13 17:32:54.000000000 +0200
@@ -0,0 +1,16 @@
+#
+# Broadcom char driver config
@@ -9006,15 +8497,15 @@ diff -Nur linux-3.10.33/drivers/char/broadcom/Kconfig linux-raspberry-pi/drivers
+ help
+ Helper for videocore CMA access.
+
-diff -Nur linux-3.10.33/drivers/char/broadcom/Makefile linux-raspberry-pi/drivers/char/broadcom/Makefile
---- linux-3.10.33/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/char/broadcom/Makefile 2014-03-13 12:46:15.356049576 +0100
+diff -Nur linux-3.10.36.orig/drivers/char/broadcom/Makefile linux-3.10.36/drivers/char/broadcom/Makefile
+--- linux-3.10.36.orig/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/char/broadcom/Makefile 2014-04-13 17:32:54.000000000 +0200
@@ -0,0 +1,2 @@
+obj-$(CONFIG_BCM_VC_CMA) += vc_cma/
+
-diff -Nur linux-3.10.33/drivers/char/broadcom/vc_cma/Makefile linux-raspberry-pi/drivers/char/broadcom/vc_cma/Makefile
---- linux-3.10.33/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/char/broadcom/vc_cma/Makefile 2014-03-13 12:46:15.356049576 +0100
+diff -Nur linux-3.10.36.orig/drivers/char/broadcom/vc_cma/Makefile linux-3.10.36/drivers/char/broadcom/vc_cma/Makefile
+--- linux-3.10.36.orig/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/char/broadcom/vc_cma/Makefile 2014-04-13 17:32:54.000000000 +0200
@@ -0,0 +1,14 @@
+ccflags-y += -Wall -Wstrict-prototypes -Wno-trigraphs
+ccflags-y += -Werror
@@ -9030,9 +8521,9 @@ diff -Nur linux-3.10.33/drivers/char/broadcom/vc_cma/Makefile linux-raspberry-pi
+
+vc-cma-objs := vc_cma.o
+
-diff -Nur linux-3.10.33/drivers/char/broadcom/vc_cma/vc_cma.c linux-raspberry-pi/drivers/char/broadcom/vc_cma/vc_cma.c
---- linux-3.10.33/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/char/broadcom/vc_cma/vc_cma.c 2014-03-13 12:46:15.356049576 +0100
+diff -Nur linux-3.10.36.orig/drivers/char/broadcom/vc_cma/vc_cma.c linux-3.10.36/drivers/char/broadcom/vc_cma/vc_cma.c
+--- linux-3.10.36.orig/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/char/broadcom/vc_cma/vc_cma.c 2014-04-13 17:32:54.000000000 +0200
@@ -0,0 +1,1143 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -10177,9 +9668,9 @@ diff -Nur linux-3.10.33/drivers/char/broadcom/vc_cma/vc_cma.c linux-raspberry-pi
+module_exit(vc_cma_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom Corporation");
-diff -Nur linux-3.10.33/drivers/char/hw_random/bcm2708-rng.c linux-raspberry-pi/drivers/char/hw_random/bcm2708-rng.c
---- linux-3.10.33/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/char/hw_random/bcm2708-rng.c 2014-03-13 12:46:15.356049576 +0100
+diff -Nur linux-3.10.36.orig/drivers/char/hw_random/bcm2708-rng.c linux-3.10.36/drivers/char/hw_random/bcm2708-rng.c
+--- linux-3.10.36.orig/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/char/hw_random/bcm2708-rng.c 2014-04-13 17:32:54.000000000 +0200
@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -10298,9 +9789,9 @@ diff -Nur linux-3.10.33/drivers/char/hw_random/bcm2708-rng.c linux-raspberry-pi/
+
+MODULE_DESCRIPTION("BCM2708 H/W Random Number Generator (RNG) driver");
+MODULE_LICENSE("GPL and additional rights");
-diff -Nur linux-3.10.33/drivers/char/hw_random/Kconfig linux-raspberry-pi/drivers/char/hw_random/Kconfig
---- linux-3.10.33/drivers/char/hw_random/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/char/hw_random/Kconfig 2014-03-13 12:46:15.356049576 +0100
+diff -Nur linux-3.10.36.orig/drivers/char/hw_random/Kconfig linux-3.10.36/drivers/char/hw_random/Kconfig
+--- linux-3.10.36.orig/drivers/char/hw_random/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/char/hw_random/Kconfig 2014-04-13 17:32:54.000000000 +0200
@@ -314,3 +314,15 @@
module will be called tpm-rng.
@@ -10317,17 +9808,17 @@ diff -Nur linux-3.10.33/drivers/char/hw_random/Kconfig linux-raspberry-pi/driver
+
+ If unsure, say N.
+
-diff -Nur linux-3.10.33/drivers/char/hw_random/Makefile linux-raspberry-pi/drivers/char/hw_random/Makefile
---- linux-3.10.33/drivers/char/hw_random/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/char/hw_random/Makefile 2014-03-13 12:46:15.356049576 +0100
+diff -Nur linux-3.10.36.orig/drivers/char/hw_random/Makefile linux-3.10.36/drivers/char/hw_random/Makefile
+--- linux-3.10.36.orig/drivers/char/hw_random/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/char/hw_random/Makefile 2014-04-13 17:32:54.000000000 +0200
@@ -27,3 +27,4 @@
obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o
obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o
obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o
+obj-$(CONFIG_HW_RANDOM_BCM2708) += bcm2708-rng.o
-diff -Nur linux-3.10.33/drivers/char/Kconfig linux-raspberry-pi/drivers/char/Kconfig
---- linux-3.10.33/drivers/char/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/char/Kconfig 2014-03-13 12:46:15.348049560 +0100
+diff -Nur linux-3.10.36.orig/drivers/char/Kconfig linux-3.10.36/drivers/char/Kconfig
+--- linux-3.10.36.orig/drivers/char/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/char/Kconfig 2014-04-13 17:32:54.000000000 +0200
@@ -586,6 +586,8 @@
source "drivers/s390/char/Kconfig"
@@ -10337,9 +9828,9 @@ diff -Nur linux-3.10.33/drivers/char/Kconfig linux-raspberry-pi/drivers/char/Kco
config MSM_SMD_PKT
bool "Enable device interface for some SMD packet ports"
default n
-diff -Nur linux-3.10.33/drivers/char/Makefile linux-raspberry-pi/drivers/char/Makefile
---- linux-3.10.33/drivers/char/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/char/Makefile 2014-03-13 12:46:15.348049560 +0100
+diff -Nur linux-3.10.36.orig/drivers/char/Makefile linux-3.10.36/drivers/char/Makefile
+--- linux-3.10.36.orig/drivers/char/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/char/Makefile 2014-04-13 17:32:54.000000000 +0200
@@ -62,3 +62,6 @@
js-rtc-y = rtc.o
@@ -10347,9 +9838,9 @@ diff -Nur linux-3.10.33/drivers/char/Makefile linux-raspberry-pi/drivers/char/Ma
+
+obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/
+
-diff -Nur linux-3.10.33/drivers/cpufreq/bcm2835-cpufreq.c linux-raspberry-pi/drivers/cpufreq/bcm2835-cpufreq.c
---- linux-3.10.33/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/cpufreq/bcm2835-cpufreq.c 2014-03-13 12:46:15.508049881 +0100
+diff -Nur linux-3.10.36.orig/drivers/cpufreq/bcm2835-cpufreq.c linux-3.10.36/drivers/cpufreq/bcm2835-cpufreq.c
+--- linux-3.10.36.orig/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/cpufreq/bcm2835-cpufreq.c 2014-04-13 17:32:55.000000000 +0200
@@ -0,0 +1,239 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -10590,9 +10081,9 @@ diff -Nur linux-3.10.33/drivers/cpufreq/bcm2835-cpufreq.c linux-raspberry-pi/dri
+module_init(bcm2835_cpufreq_module_init);
+module_exit(bcm2835_cpufreq_module_exit);
+
-diff -Nur linux-3.10.33/drivers/cpufreq/Kconfig.arm linux-raspberry-pi/drivers/cpufreq/Kconfig.arm
---- linux-3.10.33/drivers/cpufreq/Kconfig.arm 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/cpufreq/Kconfig.arm 2014-03-13 12:46:15.504049873 +0100
+diff -Nur linux-3.10.36.orig/drivers/cpufreq/Kconfig.arm linux-3.10.36/drivers/cpufreq/Kconfig.arm
+--- linux-3.10.36.orig/drivers/cpufreq/Kconfig.arm 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/cpufreq/Kconfig.arm 2014-04-13 17:32:55.000000000 +0200
@@ -150,3 +150,11 @@
default y
help
@@ -10605,9 +10096,9 @@ diff -Nur linux-3.10.33/drivers/cpufreq/Kconfig.arm linux-raspberry-pi/drivers/c
+ This adds the CPUFreq driver for BCM2835
+
+ If in doubt, say N.
-diff -Nur linux-3.10.33/drivers/cpufreq/Makefile linux-raspberry-pi/drivers/cpufreq/Makefile
---- linux-3.10.33/drivers/cpufreq/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/cpufreq/Makefile 2014-03-13 12:46:15.504049873 +0100
+diff -Nur linux-3.10.36.orig/drivers/cpufreq/Makefile linux-3.10.36/drivers/cpufreq/Makefile
+--- linux-3.10.36.orig/drivers/cpufreq/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/cpufreq/Makefile 2014-04-13 17:32:55.000000000 +0200
@@ -72,6 +72,7 @@
obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o
obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o
@@ -10616,9 +10107,9 @@ diff -Nur linux-3.10.33/drivers/cpufreq/Makefile linux-raspberry-pi/drivers/cpuf
##################################################################################
# PowerPC platform drivers
-diff -Nur linux-3.10.33/drivers/dma/bcm2708-dmaengine.c linux-raspberry-pi/drivers/dma/bcm2708-dmaengine.c
---- linux-3.10.33/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/dma/bcm2708-dmaengine.c 2014-03-13 12:46:15.532049928 +0100
+diff -Nur linux-3.10.36.orig/drivers/dma/bcm2708-dmaengine.c linux-3.10.36/drivers/dma/bcm2708-dmaengine.c
+--- linux-3.10.36.orig/drivers/dma/bcm2708-dmaengine.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/dma/bcm2708-dmaengine.c 2014-04-13 17:32:55.000000000 +0200
@@ -0,0 +1,588 @@
+/*
+ * BCM2708 DMA engine support
@@ -11208,9 +10699,9 @@ diff -Nur linux-3.10.33/drivers/dma/bcm2708-dmaengine.c linux-raspberry-pi/drive
+MODULE_DESCRIPTION("BCM2708 DMA engine driver");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.33/drivers/dma/Kconfig linux-raspberry-pi/drivers/dma/Kconfig
---- linux-3.10.33/drivers/dma/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/dma/Kconfig 2014-03-13 12:46:15.532049928 +0100
+diff -Nur linux-3.10.36.orig/drivers/dma/Kconfig linux-3.10.36/drivers/dma/Kconfig
+--- linux-3.10.36.orig/drivers/dma/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/dma/Kconfig 2014-04-13 17:32:55.000000000 +0200
@@ -305,6 +305,12 @@
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS
@@ -11224,18 +10715,18 @@ diff -Nur linux-3.10.33/drivers/dma/Kconfig linux-raspberry-pi/drivers/dma/Kconf
config MMP_PDMA
bool "MMP PDMA support"
depends on (ARCH_MMP || ARCH_PXA)
-diff -Nur linux-3.10.33/drivers/dma/Makefile linux-raspberry-pi/drivers/dma/Makefile
---- linux-3.10.33/drivers/dma/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/dma/Makefile 2014-03-13 12:46:15.532049928 +0100
+diff -Nur linux-3.10.36.orig/drivers/dma/Makefile linux-3.10.36/drivers/dma/Makefile
+--- linux-3.10.36.orig/drivers/dma/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/dma/Makefile 2014-04-13 17:32:55.000000000 +0200
@@ -37,4 +37,5 @@
obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o
obj-$(CONFIG_MMP_TDMA) += mmp_tdma.o
obj-$(CONFIG_DMA_OMAP) += omap-dma.o
+obj-$(CONFIG_DMA_BCM2708) += bcm2708-dmaengine.o
obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o
-diff -Nur linux-3.10.33/drivers/hwmon/bcm2835-hwmon.c linux-raspberry-pi/drivers/hwmon/bcm2835-hwmon.c
---- linux-3.10.33/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/hwmon/bcm2835-hwmon.c 2014-03-13 12:46:16.004050873 +0100
+diff -Nur linux-3.10.36.orig/drivers/hwmon/bcm2835-hwmon.c linux-3.10.36/drivers/hwmon/bcm2835-hwmon.c
+--- linux-3.10.36.orig/drivers/hwmon/bcm2835-hwmon.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/hwmon/bcm2835-hwmon.c 2014-04-13 17:32:56.000000000 +0200
@@ -0,0 +1,219 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -11456,9 +10947,9 @@ diff -Nur linux-3.10.33/drivers/hwmon/bcm2835-hwmon.c linux-raspberry-pi/drivers
+MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip");
+
+module_platform_driver(bcm2835_hwmon_driver);
-diff -Nur linux-3.10.33/drivers/hwmon/Kconfig linux-raspberry-pi/drivers/hwmon/Kconfig
---- linux-3.10.33/drivers/hwmon/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/hwmon/Kconfig 2014-03-13 12:46:16.000050865 +0100
+diff -Nur linux-3.10.36.orig/drivers/hwmon/Kconfig linux-3.10.36/drivers/hwmon/Kconfig
+--- linux-3.10.36.orig/drivers/hwmon/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/hwmon/Kconfig 2014-04-13 17:32:56.000000000 +0200
@@ -1528,6 +1528,16 @@
help
Support for the A/D converter on MC13783 and MC13892 PMIC.
@@ -11476,9 +10967,9 @@ diff -Nur linux-3.10.33/drivers/hwmon/Kconfig linux-raspberry-pi/drivers/hwmon/K
if ACPI
comment "ACPI drivers"
-diff -Nur linux-3.10.33/drivers/hwmon/Makefile linux-raspberry-pi/drivers/hwmon/Makefile
---- linux-3.10.33/drivers/hwmon/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/hwmon/Makefile 2014-03-13 12:46:16.000050865 +0100
+diff -Nur linux-3.10.36.orig/drivers/hwmon/Makefile linux-3.10.36/drivers/hwmon/Makefile
+--- linux-3.10.36.orig/drivers/hwmon/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/hwmon/Makefile 2014-04-13 17:32:56.000000000 +0200
@@ -140,6 +140,7 @@
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
@@ -11487,9 +10978,9 @@ diff -Nur linux-3.10.33/drivers/hwmon/Makefile linux-raspberry-pi/drivers/hwmon/
obj-$(CONFIG_PMBUS) += pmbus/
-diff -Nur linux-3.10.33/drivers/i2c/busses/i2c-bcm2708.c linux-raspberry-pi/drivers/i2c/busses/i2c-bcm2708.c
---- linux-3.10.33/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/i2c/busses/i2c-bcm2708.c 2014-03-13 12:46:16.092051049 +0100
+diff -Nur linux-3.10.36.orig/drivers/i2c/busses/i2c-bcm2708.c linux-3.10.36/drivers/i2c/busses/i2c-bcm2708.c
+--- linux-3.10.36.orig/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/i2c/busses/i2c-bcm2708.c 2014-04-13 17:32:56.000000000 +0200
@@ -0,0 +1,419 @@
+/*
+ * Driver for Broadcom BCM2708 BSC Controllers
@@ -11910,9 +11401,9 @@ diff -Nur linux-3.10.33/drivers/i2c/busses/i2c-bcm2708.c linux-raspberry-pi/driv
+MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
-diff -Nur linux-3.10.33/drivers/i2c/busses/Kconfig linux-raspberry-pi/drivers/i2c/busses/Kconfig
---- linux-3.10.33/drivers/i2c/busses/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/i2c/busses/Kconfig 2014-03-13 12:46:16.092051049 +0100
+diff -Nur linux-3.10.36.orig/drivers/i2c/busses/Kconfig linux-3.10.36/drivers/i2c/busses/Kconfig
+--- linux-3.10.36.orig/drivers/i2c/busses/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/i2c/busses/Kconfig 2014-04-13 17:32:56.000000000 +0200
@@ -345,6 +345,25 @@
This support is also available as a module. If so, the module
will be called i2c-bcm2835.
@@ -11939,9 +11430,9 @@ diff -Nur linux-3.10.33/drivers/i2c/busses/Kconfig linux-raspberry-pi/drivers/i2
config I2C_BLACKFIN_TWI
tristate "Blackfin TWI I2C support"
depends on BLACKFIN
-diff -Nur linux-3.10.33/drivers/i2c/busses/Makefile linux-raspberry-pi/drivers/i2c/busses/Makefile
---- linux-3.10.33/drivers/i2c/busses/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/i2c/busses/Makefile 2014-03-13 12:46:16.092051049 +0100
+diff -Nur linux-3.10.36.orig/drivers/i2c/busses/Makefile linux-3.10.36/drivers/i2c/busses/Makefile
+--- linux-3.10.36.orig/drivers/i2c/busses/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/i2c/busses/Makefile 2014-04-13 17:32:56.000000000 +0200
@@ -32,6 +32,7 @@
obj-$(CONFIG_I2C_AT91) += i2c-at91.o
obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o
@@ -11950,9 +11441,9 @@ diff -Nur linux-3.10.33/drivers/i2c/busses/Makefile linux-raspberry-pi/drivers/i
obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o
obj-$(CONFIG_I2C_CBUS_GPIO) += i2c-cbus-gpio.o
obj-$(CONFIG_I2C_CPM) += i2c-cpm.o
-diff -Nur linux-3.10.33/drivers/media/dvb-core/dvb-usb-ids.h linux-raspberry-pi/drivers/media/dvb-core/dvb-usb-ids.h
---- linux-3.10.33/drivers/media/dvb-core/dvb-usb-ids.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/dvb-core/dvb-usb-ids.h 2014-03-13 12:46:17.644054155 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/dvb-core/dvb-usb-ids.h linux-3.10.36/drivers/media/dvb-core/dvb-usb-ids.h
+--- linux-3.10.36.orig/drivers/media/dvb-core/dvb-usb-ids.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/media/dvb-core/dvb-usb-ids.h 2014-04-13 17:32:57.000000000 +0200
@@ -365,6 +365,7 @@
#define USB_PID_TERRATEC_DVBS2CI_V2 0x10ac
#define USB_PID_TECHNISAT_USB2_HDCI_V1 0x0001
@@ -11961,10 +11452,10 @@ diff -Nur linux-3.10.33/drivers/media/dvb-core/dvb-usb-ids.h linux-raspberry-pi/
#define USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2 0x0004
#define USB_PID_TECHNISAT_USB2_DVB_S2 0x0500
#endif
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.c linux-raspberry-pi/drivers/media/platform/bcm2835/bcm2835-camera.c
---- linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/bcm2835-camera.c 2014-03-13 12:46:18.260055389 +0100
-@@ -0,0 +1,1695 @@
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.c linux-3.10.36/drivers/media/platform/bcm2835/bcm2835-camera.c
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/bcm2835-camera.c 2014-04-13 17:32:57.000000000 +0200
+@@ -0,0 +1,1722 @@
+/*
+ * Broadcom BM2835 V4L2 driver
+ *
@@ -12009,6 +11500,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.c linux-ra
+#define MAX_HEIGHT 1944
+#define MIN_BUFFER_SIZE (80*1024)
+
++/* Max number of pixels supported whilst still being considered
++ * a video mode by the GPU.
++ */
+#define MAX_VIDEO_MODE_WIDTH 1280
+#define MAX_VIDEO_MODE_HEIGHT 720
+
@@ -12114,6 +11608,30 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.c linux-ra
+ .depth = 12,
+ .mmal_component = MMAL_COMPONENT_CAMERA,
+ },
++ {
++ .name = "RGB24 (BE)",
++ .fourcc = V4L2_PIX_FMT_BGR24,
++ .flags = 0,
++ .mmal = MMAL_ENCODING_RGB24,
++ .depth = 24,
++ .mmal_component = MMAL_COMPONENT_CAMERA,
++ },
++ {
++ .name = "4:2:0, packed YVU",
++ .fourcc = V4L2_PIX_FMT_YVU420,
++ .flags = 0,
++ .mmal = MMAL_ENCODING_YV12,
++ .depth = 12,
++ .mmal_component = MMAL_COMPONENT_CAMERA,
++ },
++ {
++ .name = "4:2:0, packed, NV21",
++ .fourcc = V4L2_PIX_FMT_NV21,
++ .flags = 0,
++ .mmal = MMAL_ENCODING_NV21,
++ .depth = 12,
++ .mmal_component = MMAL_COMPONENT_CAMERA,
++ },
+};
+
+static struct mmal_fmt *get_format(struct v4l2_format *f)
@@ -12860,8 +12378,8 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.c linux-ra
+ switch (mfmt->mmal_component) {
+ case MMAL_COMPONENT_CAMERA:
+ /* Make a further decision on port based on resolution */
-+ if (f->fmt.pix.width <= MAX_VIDEO_MODE_WIDTH
-+ && f->fmt.pix.height <= MAX_VIDEO_MODE_HEIGHT)
++ if ((f->fmt.pix.width*f->fmt.pix.height) <=
++ (MAX_VIDEO_MODE_WIDTH * MAX_VIDEO_MODE_HEIGHT))
+ camera_port = port =
+ &dev->component[MMAL_COMPONENT_CAMERA]->
+ output[MMAL_CAMERA_PORT_VIDEO];
@@ -13297,7 +12815,7 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.c linux-ra
+ .one_shot_stills = 1,
+ .max_preview_video_w = 1920,
+ .max_preview_video_h = 1088,
-+ .num_preview_video_frames = 3,
++ .num_preview_video_frames = 6,
+ .stills_capture_circular_buffer_height = 0,
+ .fast_preview_resume = 0,
+ .use_stc_timestamp = MMAL_PARAM_TIMESTAMP_MODE_RAW_STC
@@ -13660,10 +13178,10 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.c linux-ra
+
+module_init(bm2835_mmal_init);
+module_exit(bm2835_mmal_exit);
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.h linux-raspberry-pi/drivers/media/platform/bcm2835/bcm2835-camera.h
---- linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/bcm2835-camera.h 2014-03-13 12:46:18.260055389 +0100
-@@ -0,0 +1,123 @@
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.h linux-3.10.36/drivers/media/platform/bcm2835/bcm2835-camera.h
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/bcm2835-camera.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/bcm2835-camera.h 2014-04-13 17:32:57.000000000 +0200
+@@ -0,0 +1,125 @@
+/*
+ * Broadcom BM2835 V4L2 driver
+ *
@@ -13681,7 +13199,7 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.h linux-ra
+ * core driver device
+ */
+
-+#define V4L2_CTRL_COUNT 25 /* number of v4l controls */
++#define V4L2_CTRL_COUNT 27 /* number of v4l controls */
+
+enum {
+ MMAL_COMPONENT_CAMERA = 0,
@@ -13715,6 +13233,8 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.h linux-ra
+ struct mmal_colourfx colourfx;
+ int hflip;
+ int vflip;
++ int red_gain;
++ int blue_gain;
+ enum mmal_parameter_exposuremode exposure_mode_user;
+ enum v4l2_exposure_auto_type exposure_mode_v4l2_user;
+ /* active exposure mode may differ if selected via a scene mode */
@@ -13787,10 +13307,10 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/bcm2835-camera.h linux-ra
+ (pix_fmt)->pixelformat, (pix_fmt)->bytesperline, \
+ (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \
+}
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/controls.c linux-raspberry-pi/drivers/media/platform/bcm2835/controls.c
---- linux-3.10.33/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/controls.c 2014-03-13 12:46:18.260055389 +0100
-@@ -0,0 +1,1278 @@
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/controls.c linux-3.10.36/drivers/media/platform/bcm2835/controls.c
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/controls.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/controls.c 2014-04-13 17:32:57.000000000 +0200
+@@ -0,0 +1,1315 @@
+/*
+ * Broadcom BM2835 V4L2 driver
+ *
@@ -14284,6 +13804,29 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/controls.c linux-raspberr
+ &u32_value, sizeof(u32_value));
+}
+
++static int ctrl_set_awb_gains(struct bm2835_mmal_dev *dev,
++ struct v4l2_ctrl *ctrl,
++ const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
++{
++ struct vchiq_mmal_port *control;
++ struct mmal_parameter_awbgains gains;
++
++ control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
++
++ if (ctrl->id == V4L2_CID_RED_BALANCE)
++ dev->red_gain = ctrl->val;
++ else if (ctrl->id == V4L2_CID_BLUE_BALANCE)
++ dev->blue_gain = ctrl->val;
++
++ gains.r_gain.num = dev->red_gain;
++ gains.b_gain.num = dev->blue_gain;
++ gains.r_gain.den = gains.b_gain.den = 1000;
++
++ return vchiq_mmal_port_parameter_set(dev->instance, control,
++ mmal_ctrl->mmal_id,
++ &gains, sizeof(gains));
++}
++
+static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev,
+ struct v4l2_ctrl *ctrl,
+ const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
@@ -14784,12 +14327,26 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/controls.c linux-raspberr
+ {
+ V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE,
+ MMAL_CONTROL_TYPE_STD_MENU,
-+ ~0x3fe, 9, V4L2_WHITE_BALANCE_AUTO, 0, NULL,
++ ~0x3ff, 9, V4L2_WHITE_BALANCE_AUTO, 0, NULL,
+ MMAL_PARAMETER_AWB_MODE,
+ &ctrl_set_awb_mode,
+ false
+ },
+ {
++ V4L2_CID_RED_BALANCE, MMAL_CONTROL_TYPE_STD,
++ 1, 7999, 1000, 1, NULL,
++ MMAL_PARAMETER_CUSTOM_AWB_GAINS,
++ &ctrl_set_awb_gains,
++ false
++ },
++ {
++ V4L2_CID_BLUE_BALANCE, MMAL_CONTROL_TYPE_STD,
++ 1, 7999, 1000, 1, NULL,
++ MMAL_PARAMETER_CUSTOM_AWB_GAINS,
++ &ctrl_set_awb_gains,
++ false
++ },
++ {
+ V4L2_CID_COLORFX, MMAL_CONTROL_TYPE_STD_MENU,
+ 0, 15, V4L2_COLORFX_NONE, 0, NULL,
+ MMAL_PARAMETER_IMAGE_EFFECT,
@@ -15069,9 +14626,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/controls.c linux-raspberr
+
+ return 0;
+}
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/Kconfig linux-raspberry-pi/drivers/media/platform/bcm2835/Kconfig
---- linux-3.10.33/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/Kconfig 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/Kconfig linux-3.10.36/drivers/media/platform/bcm2835/Kconfig
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/Kconfig 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,25 @@
+# Broadcom VideoCore IV v4l2 camera support
+
@@ -15098,18 +14655,18 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/Kconfig linux-raspberry-p
+
+
+endif # VIDEO_BM2835
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/Makefile linux-raspberry-pi/drivers/media/platform/bcm2835/Makefile
---- linux-3.10.33/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/Makefile 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/Makefile linux-3.10.36/drivers/media/platform/bcm2835/Makefile
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/Makefile 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,5 @@
+bcm2835-v4l2-objs := bcm2835-camera.o controls.o mmal-vchiq.o
+
+obj-$(CONFIG_VIDEO_BCM2835_MMAL) += bcm2835-v4l2.o
+
+ccflags-$(CONFIG_VIDEO_BCM2835) += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-common.h linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-common.h
---- linux-3.10.33/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-common.h 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-common.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-common.h
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-common.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,53 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -15164,9 +14721,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-common.h linux-raspb
+ u32 v;
+};
+
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-encodings.h linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-encodings.h
---- linux-3.10.33/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-encodings.h 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-encodings.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-encodings.h
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-encodings.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-encodings.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,94 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -15262,9 +14819,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-encodings.h linux-ra
+#define MMAL_ENCODING_VARIANT_H264_AVC1 MMAL_FOURCC('A', 'V', 'C', '1')
+/** Implicitly delineated NAL units without emulation prevention */
+#define MMAL_ENCODING_VARIANT_H264_RAW MMAL_FOURCC('R', 'A', 'W', ' ')
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg-common.h linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-msg-common.h
---- linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-msg-common.h 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-common.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-common.h
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-common.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,50 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -15316,9 +14873,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg-common.h linux-r
+};
+
+#endif /* MMAL_MSG_COMMON_H */
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg-format.h linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-msg-format.h
---- linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-msg-format.h 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-format.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-format.h
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-format.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-format.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,81 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -15401,9 +14958,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg-format.h linux-r
+};
+
+#endif /* MMAL_MSG_FORMAT_H */
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg.h linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-msg.h
---- linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-msg.h 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg.h
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,404 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -15809,9 +15366,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg.h linux-raspberr
+ u8 payload[MMAL_MSG_MAX_PAYLOAD];
+ } u;
+};
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg-port.h linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-msg-port.h
---- linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-msg-port.h 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-port.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-port.h
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-msg-port.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-msg-port.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,107 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -15920,10 +15477,10 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-msg-port.h linux-ras
+ */
+
+};
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-parameters.h linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-parameters.h
---- linux-3.10.33/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-parameters.h 2014-03-13 12:46:18.260055389 +0100
-@@ -0,0 +1,649 @@
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-parameters.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-parameters.h
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-parameters.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-parameters.h 2014-04-13 17:32:57.000000000 +0200
+@@ -0,0 +1,655 @@
+/*
+ * Broadcom BM2835 V4L2 driver
+ *
@@ -16087,7 +15644,8 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-parameters.h linux-r
+ MMAL_PARAMETER_SW_SHARPEN_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
+ MMAL_PARAMETER_FLASH_REQUIRED, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
+ MMAL_PARAMETER_SW_SATURATION_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
-+ MMAL_PARAMETER_SHUTTER_SPEED /**< Takes a @ref MMAL_PARAMETER_UINT32_T */
++ MMAL_PARAMETER_SHUTTER_SPEED, /**< Takes a @ref MMAL_PARAMETER_UINT32_T */
++ MMAL_PARAMETER_CUSTOM_AWB_GAINS, /**< Takes a @ref MMAL_PARAMETER_AWB_GAINS_T */
+};
+
+struct mmal_parameter_rational {
@@ -16218,6 +15776,11 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-parameters.h linux-r
+ MMAL_PARAM_FLICKERAVOID_MAX = 0x7FFFFFFF
+};
+
++struct mmal_parameter_awbgains {
++ struct mmal_parameter_rational r_gain; /**< Red gain */
++ struct mmal_parameter_rational b_gain; /**< Blue gain */
++};
++
+/** Manner of video rate control */
+enum mmal_parameter_rate_control_mode {
+ MMAL_VIDEO_RATECONTROL_DEFAULT,
@@ -16573,9 +16136,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-parameters.h linux-r
+ u32 num_effect_params;
+ u32 effect_parameter[MMAL_MAX_IMAGEFX_PARAMETERS];
+};
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-vchiq.c linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-vchiq.c
---- linux-3.10.33/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-vchiq.c 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.c linux-3.10.36/drivers/media/platform/bcm2835/mmal-vchiq.c
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-vchiq.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,1916 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -18493,9 +18056,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-vchiq.c linux-raspbe
+ kfree(instance);
+ return -ENODEV;
+}
-diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-vchiq.h linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-vchiq.h
---- linux-3.10.33/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/bcm2835/mmal-vchiq.h 2014-03-13 12:46:18.260055389 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.h linux-3.10.36/drivers/media/platform/bcm2835/mmal-vchiq.h
+--- linux-3.10.36.orig/drivers/media/platform/bcm2835/mmal-vchiq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/media/platform/bcm2835/mmal-vchiq.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,178 @@
+/*
+ * Broadcom BM2835 V4L2 driver
@@ -18675,9 +18238,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/bcm2835/mmal-vchiq.h linux-raspbe
+ struct mmal_buffer *buf);
+
+#endif /* MMAL_VCHIQ_H */
-diff -Nur linux-3.10.33/drivers/media/platform/Kconfig linux-raspberry-pi/drivers/media/platform/Kconfig
---- linux-3.10.33/drivers/media/platform/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/Kconfig 2014-03-13 12:46:18.256055381 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/Kconfig linux-3.10.36/drivers/media/platform/Kconfig
+--- linux-3.10.36.orig/drivers/media/platform/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/media/platform/Kconfig 2014-04-13 17:32:57.000000000 +0200
@@ -124,6 +124,7 @@
source "drivers/media/platform/soc_camera/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
@@ -18686,9 +18249,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/Kconfig linux-raspberry-pi/driver
endif # V4L_PLATFORM_DRIVERS
-diff -Nur linux-3.10.33/drivers/media/platform/Makefile linux-raspberry-pi/drivers/media/platform/Makefile
---- linux-3.10.33/drivers/media/platform/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/platform/Makefile 2014-03-13 12:46:18.256055381 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/platform/Makefile linux-3.10.36/drivers/media/platform/Makefile
+--- linux-3.10.36.orig/drivers/media/platform/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/media/platform/Makefile 2014-04-13 17:32:57.000000000 +0200
@@ -50,4 +50,6 @@
obj-$(CONFIG_ARCH_OMAP) += omap/
@@ -18696,9 +18259,9 @@ diff -Nur linux-3.10.33/drivers/media/platform/Makefile linux-raspberry-pi/drive
+obj-$(CONFIG_VIDEO_BCM2835) += bcm2835/
+
ccflags-y += -I$(srctree)/drivers/media/i2c
-diff -Nur linux-3.10.33/drivers/media/usb/dvb-usb-v2/az6007.c linux-raspberry-pi/drivers/media/usb/dvb-usb-v2/az6007.c
---- linux-3.10.33/drivers/media/usb/dvb-usb-v2/az6007.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/usb/dvb-usb-v2/az6007.c 2014-03-13 12:46:18.908056686 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/az6007.c linux-3.10.36/drivers/media/usb/dvb-usb-v2/az6007.c
+--- linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/az6007.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/media/usb/dvb-usb-v2/az6007.c 2014-04-13 17:32:57.000000000 +0200
@@ -68,6 +68,19 @@
.microcode_name = "dvb-usb-terratec-h7-drxk.fw",
};
@@ -18786,9 +18349,9 @@ diff -Nur linux-3.10.33/drivers/media/usb/dvb-usb-v2/az6007.c linux-raspberry-pi
{0},
};
-diff -Nur linux-3.10.33/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-raspberry-pi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
---- linux-3.10.33/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-03-13 12:46:18.964056798 +0100
+diff -Nur linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-3.10.36/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+--- linux-3.10.36.orig/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/media/usb/dvb-usb-v2/rtl28xxu.c 2014-04-13 17:32:57.000000000 +0200
@@ -1408,6 +1408,10 @@
&rtl2832u_props, "Compro VideoMate U620F", NULL) },
{ DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394,
@@ -18800,9 +18363,9 @@ diff -Nur linux-3.10.33/drivers/media/usb/dvb-usb-v2/rtl28xxu.c linux-raspberry-
{ }
};
MODULE_DEVICE_TABLE(usb, rtl28xxu_id_table);
-diff -Nur linux-3.10.33/drivers/misc/Kconfig linux-raspberry-pi/drivers/misc/Kconfig
---- linux-3.10.33/drivers/misc/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/Kconfig 2014-03-13 12:46:20.576060026 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/Kconfig linux-3.10.36/drivers/misc/Kconfig
+--- linux-3.10.36.orig/drivers/misc/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/misc/Kconfig 2014-04-13 17:32:57.000000000 +0200
@@ -536,4 +536,6 @@
source "drivers/misc/altera-stapl/Kconfig"
source "drivers/misc/mei/Kconfig"
@@ -18810,17 +18373,17 @@ diff -Nur linux-3.10.33/drivers/misc/Kconfig linux-raspberry-pi/drivers/misc/Kco
+source "drivers/misc/vc04_services/Kconfig"
endmenu
+
-diff -Nur linux-3.10.33/drivers/misc/Makefile linux-raspberry-pi/drivers/misc/Makefile
---- linux-3.10.33/drivers/misc/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/Makefile 2014-03-13 12:46:20.576060026 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/Makefile linux-3.10.36/drivers/misc/Makefile
+--- linux-3.10.36.orig/drivers/misc/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/misc/Makefile 2014-04-13 17:32:57.000000000 +0200
@@ -53,3 +53,4 @@
obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/
obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o
obj-$(CONFIG_SRAM) += sram.o
+obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/connections/connection.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/connections/connection.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,328 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19150,9 +18713,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/connections/co
+#endif /* CONNECTION_H_ */
+
+/****************************** End of file **********************************/
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,204 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19358,9 +18921,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/message_driver
+#endif // _VCHI_MESSAGE_H_
+
+/****************************** End of file ***********************************/
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,224 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19586,9 +19149,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h lin
+#endif /* VCHI_CFG_H_ */
+
+/****************************** End of file **********************************/
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19661,9 +19224,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_cfg_inter
+//#define VCHI_RX_NANOLOCKS
+
+#endif /*VCHI_CFG_INTERNAL_H_*/
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi_common.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_common.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,163 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -19828,9 +19391,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_common.h
+
+
+#endif // VCHI_COMMON_H_
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,373 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -20205,9 +19768,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi.h linux-r
+#endif /* VCHI_H_ */
+
+/****************************** End of file **********************************/
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -20251,9 +19814,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linu
+#define VCHI_MEM_HANDLE_INVALID 0
+
+#endif
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,561 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -20816,9 +20379,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283
+
+ kfree(pagelist);
+}
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -20862,9 +20425,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_283
+#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1
+
+#endif /* VCHIQ_2835_H */
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,2813 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -23679,9 +23242,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm
+module_exit(vchiq_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom Corporation");
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,212 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -23895,9 +23458,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm
+
+
+#endif /* VCHIQ_ARM_H */
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -23936,9 +23499,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_bui
+const char *vchiq_get_build_version(void);
+const char *vchiq_get_build_time(void);
+const char *vchiq_get_build_date(void);
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -24000,9 +23563,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg
+#endif
+
+#endif /* VCHIQ_CFG_H */
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -24123,9 +23686,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con
+ mutex_unlock(&g_connected_mutex);
+}
+EXPORT_SYMBOL(vchiq_add_connected_callback);
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -24178,9 +23741,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_con
+
+#endif /* VCHIQ_CONNECTED_H */
+
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,3824 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -28006,9 +27569,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor
+ numBytes = 0;
+ }
+}
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,706 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -28716,9 +28279,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cor
+ size_t numBytes);
+
+#endif
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,89 @@
+#!/usr/bin/perl -w
+
@@ -28809,9 +28372,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_gen
+EOF
+
+
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -28854,9 +28417,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h l
+
+#endif
+
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,188 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29046,9 +28609,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.
+ short *peer_version);
+
+#endif /* VCHIQ_IF_H */
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,129 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29179,9 +28742,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioc
+#define VCHIQ_IOC_MAX 15
+
+#endif
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,456 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29639,9 +29202,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ker
+
+ return status;
+}
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29714,9 +29277,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_mem
+ const VCHIQ_PLATFORM_DATA_T * platform_data);
+
+#endif
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -29776,9 +29339,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pag
+} FRAGMENTS_T;
+
+#endif /* VCHIQ_PAGELIST_H */
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,254 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -30034,9 +29597,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pro
+
+#endif
+
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,828 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -30866,9 +30429,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shi
+ return ret;
+}
+EXPORT_SYMBOL(vchi_service_release);
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,151 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -31021,9 +30584,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti
+
+ return header;
+}
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -31107,9 +30670,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_uti
+
+#endif
+
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
---- linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2014-03-13 12:46:20.600060074 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
+--- linux-3.10.36.orig/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@@ -31170,9 +30733,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ver
+{
+ return vchiq_build_time;
+}
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/Kconfig linux-raspberry-pi/drivers/misc/vc04_services/Kconfig
---- linux-3.10.33/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/Kconfig 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/Kconfig linux-3.10.36/drivers/misc/vc04_services/Kconfig
+--- linux-3.10.36.orig/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/Kconfig 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,10 @@
+config BCM2708_VCHIQ
+ tristate "Videocore VCHIQ"
@@ -31184,9 +30747,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/Kconfig linux-raspberry-pi/dr
+ Defaults to Y when the Broadcom Videocore services
+ are included in the build, N otherwise.
+
-diff -Nur linux-3.10.33/drivers/misc/vc04_services/Makefile linux-raspberry-pi/drivers/misc/vc04_services/Makefile
---- linux-3.10.33/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/misc/vc04_services/Makefile 2014-03-13 12:46:20.596060066 +0100
+diff -Nur linux-3.10.36.orig/drivers/misc/vc04_services/Makefile linux-3.10.36/drivers/misc/vc04_services/Makefile
+--- linux-3.10.36.orig/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/misc/vc04_services/Makefile 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,18 @@
+ifeq ($(CONFIG_MACH_BCM2708),y)
+
@@ -31206,9 +30769,9 @@ diff -Nur linux-3.10.33/drivers/misc/vc04_services/Makefile linux-raspberry-pi/d
+
+endif
+
-diff -Nur linux-3.10.33/drivers/mmc/card/block.c linux-raspberry-pi/drivers/mmc/card/block.c
---- linux-3.10.33/drivers/mmc/card/block.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/mmc/card/block.c 2014-03-13 12:46:20.796060466 +0100
+diff -Nur linux-3.10.36.orig/drivers/mmc/card/block.c linux-3.10.36/drivers/mmc/card/block.c
+--- linux-3.10.36.orig/drivers/mmc/card/block.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/mmc/card/block.c 2014-04-13 17:32:57.000000000 +0200
@@ -1333,7 +1333,7 @@
brq->data.blocks = 1;
}
@@ -31218,9 +30781,21 @@ diff -Nur linux-3.10.33/drivers/mmc/card/block.c linux-raspberry-pi/drivers/mmc/
/* SPI multiblock writes terminate using a special
* token, not a STOP_TRANSMISSION request.
*/
-diff -Nur linux-3.10.33/drivers/mmc/core/sd.c linux-raspberry-pi/drivers/mmc/core/sd.c
---- linux-3.10.33/drivers/mmc/core/sd.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/mmc/core/sd.c 2014-03-13 12:46:20.800060474 +0100
+diff -Nur linux-3.10.36.orig/drivers/mmc/core/mmc.c linux-3.10.36/drivers/mmc/core/mmc.c
+--- linux-3.10.36.orig/drivers/mmc/core/mmc.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/mmc/core/mmc.c 2014-04-13 17:32:57.000000000 +0200
+@@ -293,7 +293,7 @@
+ }
+
+ card->ext_csd.rev = ext_csd[EXT_CSD_REV];
+- if (card->ext_csd.rev > 6) {
++ if (card->ext_csd.rev > 7) {
+ pr_err("%s: unrecognised EXT_CSD revision %d\n",
+ mmc_hostname(card->host), card->ext_csd.rev);
+ err = -EINVAL;
+diff -Nur linux-3.10.36.orig/drivers/mmc/core/sd.c linux-3.10.36/drivers/mmc/core/sd.c
+--- linux-3.10.36.orig/drivers/mmc/core/sd.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/mmc/core/sd.c 2014-04-13 17:32:57.000000000 +0200
@@ -13,6 +13,8 @@
#include <linux/err.h>
#include <linux/slab.h>
@@ -31379,9 +30954,9 @@ diff -Nur linux-3.10.33/drivers/mmc/core/sd.c linux-raspberry-pi/drivers/mmc/cor
/*
* Fetch and process SD Status register.
-diff -Nur linux-3.10.33/drivers/mmc/host/Kconfig linux-raspberry-pi/drivers/mmc/host/Kconfig
---- linux-3.10.33/drivers/mmc/host/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/mmc/host/Kconfig 2014-03-13 12:46:20.804060482 +0100
+diff -Nur linux-3.10.36.orig/drivers/mmc/host/Kconfig linux-3.10.36/drivers/mmc/host/Kconfig
+--- linux-3.10.36.orig/drivers/mmc/host/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/mmc/host/Kconfig 2014-04-13 17:32:57.000000000 +0200
@@ -249,6 +249,27 @@
YMMV.
@@ -31410,9 +30985,9 @@ diff -Nur linux-3.10.33/drivers/mmc/host/Kconfig linux-raspberry-pi/drivers/mmc/
config MMC_SDHCI_BCM2835
tristate "SDHCI platform support for the BCM2835 SD/MMC Controller"
depends on ARCH_BCM2835
-diff -Nur linux-3.10.33/drivers/mmc/host/Makefile linux-raspberry-pi/drivers/mmc/host/Makefile
---- linux-3.10.33/drivers/mmc/host/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/mmc/host/Makefile 2014-03-13 12:46:20.804060482 +0100
+diff -Nur linux-3.10.36.orig/drivers/mmc/host/Makefile linux-3.10.36/drivers/mmc/host/Makefile
+--- linux-3.10.36.orig/drivers/mmc/host/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/mmc/host/Makefile 2014-04-13 17:32:57.000000000 +0200
@@ -15,6 +15,7 @@
obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o
obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o
@@ -31421,9 +30996,9 @@ diff -Nur linux-3.10.33/drivers/mmc/host/Makefile linux-raspberry-pi/drivers/mmc
obj-$(CONFIG_MMC_WBSD) += wbsd.o
obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
obj-$(CONFIG_MMC_OMAP) += omap.o
-diff -Nur linux-3.10.33/drivers/mmc/host/sdhci-bcm2708.c linux-raspberry-pi/drivers/mmc/host/sdhci-bcm2708.c
---- linux-3.10.33/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/mmc/host/sdhci-bcm2708.c 2014-03-13 12:46:21.004060883 +0100
+diff -Nur linux-3.10.36.orig/drivers/mmc/host/sdhci-bcm2708.c linux-3.10.36/drivers/mmc/host/sdhci-bcm2708.c
+--- linux-3.10.36.orig/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/mmc/host/sdhci-bcm2708.c 2014-04-13 17:32:57.000000000 +0200
@@ -0,0 +1,1410 @@
+/*
+ * sdhci-bcm2708.c Support for SDHCI device on BCM2708
@@ -31690,7 +31265,7 @@ diff -Nur linux-3.10.33/drivers/mmc/host/sdhci-bcm2708.c linux-raspberry-pi/driv
+ {
+ /* we must have waited at least this many ns: */
+ unsigned int ns_wait = HPTIME_CLK_NS *
-+ (last_write_hpt - now - 1);
++ (now - last_write_hpt - 1);
+ if (ns_wait < ns_2clk)
+ ndelay(ns_2clk - ns_wait);
+ }
@@ -32835,9 +32410,9 @@ diff -Nur linux-3.10.33/drivers/mmc/host/sdhci-bcm2708.c linux-raspberry-pi/driv
+MODULE_PARM_DESC(extra_messages, "Enable more sdcard warning messages");
+
+
-diff -Nur linux-3.10.33/drivers/mmc/host/sdhci.c linux-raspberry-pi/drivers/mmc/host/sdhci.c
---- linux-3.10.33/drivers/mmc/host/sdhci.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/mmc/host/sdhci.c 2014-03-13 12:46:21.008060891 +0100
+diff -Nur linux-3.10.36.orig/drivers/mmc/host/sdhci.c linux-3.10.36/drivers/mmc/host/sdhci.c
+--- linux-3.10.36.orig/drivers/mmc/host/sdhci.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/mmc/host/sdhci.c 2014-04-13 17:32:57.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/mmc/mmc.h>
#include <linux/mmc/host.h>
@@ -33397,9 +32972,9 @@ diff -Nur linux-3.10.33/drivers/mmc/host/sdhci.c linux-raspberry-pi/drivers/mmc/
(host->flags & SDHCI_USE_ADMA) ? "ADMA" :
(host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO");
-diff -Nur linux-3.10.33/drivers/mmc/host/sdhci.h linux-raspberry-pi/drivers/mmc/host/sdhci.h
---- linux-3.10.33/drivers/mmc/host/sdhci.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/mmc/host/sdhci.h 2014-03-13 12:46:21.008060891 +0100
+diff -Nur linux-3.10.36.orig/drivers/mmc/host/sdhci.h linux-3.10.36/drivers/mmc/host/sdhci.h
+--- linux-3.10.36.orig/drivers/mmc/host/sdhci.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/mmc/host/sdhci.h 2014-04-13 17:32:57.000000000 +0200
@@ -289,6 +289,18 @@
void (*platform_reset_enter)(struct sdhci_host *host, u8 mask);
void (*platform_reset_exit)(struct sdhci_host *host, u8 mask);
@@ -33458,9 +33033,9 @@ diff -Nur linux-3.10.33/drivers/mmc/host/sdhci.h linux-raspberry-pi/drivers/mmc/
+
+
#endif /* __SDHCI_HW_H */
-diff -Nur linux-3.10.33/drivers/net/usb/smsc95xx.c linux-raspberry-pi/drivers/net/usb/smsc95xx.c
---- linux-3.10.33/drivers/net/usb/smsc95xx.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/net/usb/smsc95xx.c 2014-03-13 12:46:25.472069833 +0100
+diff -Nur linux-3.10.36.orig/drivers/net/usb/smsc95xx.c linux-3.10.36/drivers/net/usb/smsc95xx.c
+--- linux-3.10.36.orig/drivers/net/usb/smsc95xx.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/net/usb/smsc95xx.c 2014-04-13 17:33:03.000000000 +0200
@@ -61,6 +61,7 @@
#define SUSPEND_SUSPEND3 (0x08)
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
@@ -33540,9 +33115,9 @@ diff -Nur linux-3.10.33/drivers/net/usb/smsc95xx.c linux-raspberry-pi/drivers/ne
/* try reading mac address from EEPROM */
if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
dev->net->dev_addr) == 0) {
-diff -Nur linux-3.10.33/drivers/net/wireless/ath/ath9k/hif_usb.c linux-raspberry-pi/drivers/net/wireless/ath/ath9k/hif_usb.c
---- linux-3.10.33/drivers/net/wireless/ath/ath9k/hif_usb.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/net/wireless/ath/ath9k/hif_usb.c 2014-03-13 12:46:25.532069953 +0100
+diff -Nur linux-3.10.36.orig/drivers/net/wireless/ath/ath9k/hif_usb.c linux-3.10.36/drivers/net/wireless/ath/ath9k/hif_usb.c
+--- linux-3.10.36.orig/drivers/net/wireless/ath/ath9k/hif_usb.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/net/wireless/ath/ath9k/hif_usb.c 2014-04-13 17:33:03.000000000 +0200
@@ -37,9 +37,11 @@
{ USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
{ USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
@@ -33555,25 +33130,9 @@ diff -Nur linux-3.10.33/drivers/net/wireless/ath/ath9k/hif_usb.c linux-raspberry
{ USB_DEVICE(0x0cf3, 0x7015),
.driver_info = AR9287_USB }, /* Atheros */
-diff -Nur linux-3.10.33/drivers/net/wireless/Makefile linux-raspberry-pi/drivers/net/wireless/Makefile
---- linux-3.10.33/drivers/net/wireless/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/net/wireless/Makefile 2014-03-13 12:47:52.768245516 +0100
-@@ -23,7 +23,6 @@
- obj-$(CONFIG_B43LEGACY) += b43legacy/
- obj-$(CONFIG_ZD1211RW) += zd1211rw/
- obj-$(CONFIG_RTL8180) += rtl818x/
--obj-$(CONFIG_RTL8187) += rtl818x/
- obj-$(CONFIG_RTLWIFI) += rtlwifi/
-
- # 16-bit wireless PCMCIA client drivers
-@@ -57,3 +56,4 @@
-
- obj-$(CONFIG_BRCMFMAC) += brcm80211/
- obj-$(CONFIG_BRCMSMAC) += brcm80211/
-+obj-$(CONFIG_RTL8192CU) += rtl8192cu/
-diff -Nur linux-3.10.33/drivers/net/wireless/rt2x00/rt2800.h linux-raspberry-pi/drivers/net/wireless/rt2x00/rt2800.h
---- linux-3.10.33/drivers/net/wireless/rt2x00/rt2800.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/net/wireless/rt2x00/rt2800.h 2014-03-13 12:46:27.364073623 +0100
+diff -Nur linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800.h linux-3.10.36/drivers/net/wireless/rt2x00/rt2800.h
+--- linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/net/wireless/rt2x00/rt2800.h 2014-04-13 17:33:04.000000000 +0200
@@ -70,6 +70,7 @@
#define RF3322 0x000c
#define RF3053 0x000d
@@ -33582,9 +33141,9 @@ diff -Nur linux-3.10.33/drivers/net/wireless/rt2x00/rt2800.h linux-raspberry-pi/
#define RF3290 0x3290
#define RF5360 0x5360
#define RF5370 0x5370
-diff -Nur linux-3.10.33/drivers/net/wireless/rt2x00/rt2800lib.c linux-raspberry-pi/drivers/net/wireless/rt2x00/rt2800lib.c
---- linux-3.10.33/drivers/net/wireless/rt2x00/rt2800lib.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/net/wireless/rt2x00/rt2800lib.c 2014-03-13 12:46:27.364073623 +0100
+diff -Nur linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.10.36/drivers/net/wireless/rt2x00/rt2800lib.c
+--- linux-3.10.36.orig/drivers/net/wireless/rt2x00/rt2800lib.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/net/wireless/rt2x00/rt2800lib.c 2014-04-13 17:33:04.000000000 +0200
@@ -2599,6 +2599,7 @@
break;
case RF5360:
@@ -33633,9 +33192,9 @@ diff -Nur linux-3.10.33/drivers/net/wireless/rt2x00/rt2800lib.c linux-raspberry-
case RF5372:
case RF5390:
case RF5392:
-diff -Nur linux-3.10.33/drivers/spi/Kconfig linux-raspberry-pi/drivers/spi/Kconfig
---- linux-3.10.33/drivers/spi/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/spi/Kconfig 2014-03-13 12:46:31.776082466 +0100
+diff -Nur linux-3.10.36.orig/drivers/spi/Kconfig linux-3.10.36/drivers/spi/Kconfig
+--- linux-3.10.36.orig/drivers/spi/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/spi/Kconfig 2014-04-13 17:33:08.000000000 +0200
@@ -86,6 +86,14 @@
is for the regular SPI controller. Slave mode operation is not also
not supported.
@@ -33651,9 +33210,9 @@ diff -Nur linux-3.10.33/drivers/spi/Kconfig linux-raspberry-pi/drivers/spi/Kconf
config SPI_BFIN5XX
tristate "SPI controller driver for ADI Blackfin5xx"
depends on BLACKFIN
-diff -Nur linux-3.10.33/drivers/spi/Makefile linux-raspberry-pi/drivers/spi/Makefile
---- linux-3.10.33/drivers/spi/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/spi/Makefile 2014-03-13 12:46:31.776082466 +0100
+diff -Nur linux-3.10.36.orig/drivers/spi/Makefile linux-3.10.36/drivers/spi/Makefile
+--- linux-3.10.36.orig/drivers/spi/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/spi/Makefile 2014-04-13 17:33:08.000000000 +0200
@@ -17,6 +17,7 @@
obj-$(CONFIG_SPI_BCM2835) += spi-bcm2835.o
obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o
@@ -33662,9 +33221,9 @@ diff -Nur linux-3.10.33/drivers/spi/Makefile linux-raspberry-pi/drivers/spi/Make
obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o
obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o
obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o
-diff -Nur linux-3.10.33/drivers/spi/spi-bcm2708.c linux-raspberry-pi/drivers/spi/spi-bcm2708.c
---- linux-3.10.33/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/spi/spi-bcm2708.c 2014-03-13 12:46:31.776082466 +0100
+diff -Nur linux-3.10.36.orig/drivers/spi/spi-bcm2708.c linux-3.10.36/drivers/spi/spi-bcm2708.c
+--- linux-3.10.36.orig/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/spi/spi-bcm2708.c 2014-04-13 17:33:08.000000000 +0200
@@ -0,0 +1,626 @@
+/*
+ * Driver for Broadcom BCM2708 SPI Controllers
@@ -34292,9 +33851,9 @@ diff -Nur linux-3.10.33/drivers/spi/spi-bcm2708.c linux-raspberry-pi/drivers/spi
+MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME);
-diff -Nur linux-3.10.33/drivers/staging/media/lirc/Kconfig linux-raspberry-pi/drivers/staging/media/lirc/Kconfig
---- linux-3.10.33/drivers/staging/media/lirc/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/staging/media/lirc/Kconfig 2014-03-13 12:46:33.700086324 +0100
+diff -Nur linux-3.10.36.orig/drivers/staging/media/lirc/Kconfig linux-3.10.36/drivers/staging/media/lirc/Kconfig
+--- linux-3.10.36.orig/drivers/staging/media/lirc/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/staging/media/lirc/Kconfig 2014-04-13 17:33:09.000000000 +0200
@@ -38,6 +38,12 @@
help
Driver for Homebrew Parallel Port Receivers
@@ -34308,9 +33867,9 @@ diff -Nur linux-3.10.33/drivers/staging/media/lirc/Kconfig linux-raspberry-pi/dr
config LIRC_SASEM
tristate "Sasem USB IR Remote"
depends on LIRC && USB
-diff -Nur linux-3.10.33/drivers/staging/media/lirc/lirc_rpi.c linux-raspberry-pi/drivers/staging/media/lirc/lirc_rpi.c
---- linux-3.10.33/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/staging/media/lirc/lirc_rpi.c 2014-03-13 12:46:33.700086324 +0100
+diff -Nur linux-3.10.36.orig/drivers/staging/media/lirc/lirc_rpi.c linux-3.10.36/drivers/staging/media/lirc/lirc_rpi.c
+--- linux-3.10.36.orig/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/staging/media/lirc/lirc_rpi.c 2014-04-13 17:33:09.000000000 +0200
@@ -0,0 +1,693 @@
+/*
+ * lirc_rpi.c
@@ -34394,8 +33953,8 @@ diff -Nur linux-3.10.33/drivers/staging/media/lirc/lirc_rpi.c linux-raspberry-pi
+static void send_space(long length);
+static void lirc_rpi_exit(void);
+
-+int valid_gpio_pins[] = { 0, 1, 4, 8, 7, 9, 10, 11, 14, 15, 17, 18, 21, 22, 23,
-+ 24, 25 };
++int valid_gpio_pins[] = { 0, 1, 2, 3, 4, 7, 8, 9, 10, 11, 14, 15, 17, 18, 21,
++ 22, 23, 24, 25 ,27, 28, 29, 30, 31 };
+
+static struct platform_device *lirc_rpi_dev;
+static struct timeval lasttv = { 0, 0 };
@@ -35005,9 +34564,9 @@ diff -Nur linux-3.10.33/drivers/staging/media/lirc/lirc_rpi.c linux-raspberry-pi
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Enable debugging messages");
-diff -Nur linux-3.10.33/drivers/staging/media/lirc/Makefile linux-raspberry-pi/drivers/staging/media/lirc/Makefile
---- linux-3.10.33/drivers/staging/media/lirc/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/staging/media/lirc/Makefile 2014-03-13 12:46:33.700086324 +0100
+diff -Nur linux-3.10.36.orig/drivers/staging/media/lirc/Makefile linux-3.10.36/drivers/staging/media/lirc/Makefile
+--- linux-3.10.36.orig/drivers/staging/media/lirc/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/staging/media/lirc/Makefile 2014-04-13 17:33:09.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o
obj-$(CONFIG_LIRC_IMON) += lirc_imon.o
@@ -35016,9 +34575,9 @@ diff -Nur linux-3.10.33/drivers/staging/media/lirc/Makefile linux-raspberry-pi/d
obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
obj-$(CONFIG_LIRC_SIR) += lirc_sir.o
-diff -Nur linux-3.10.33/drivers/thermal/bcm2835-thermal.c linux-raspberry-pi/drivers/thermal/bcm2835-thermal.c
---- linux-3.10.33/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/thermal/bcm2835-thermal.c 2014-03-13 12:46:37.912094770 +0100
+diff -Nur linux-3.10.36.orig/drivers/thermal/bcm2835-thermal.c linux-3.10.36/drivers/thermal/bcm2835-thermal.c
+--- linux-3.10.36.orig/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/thermal/bcm2835-thermal.c 2014-04-13 17:33:10.000000000 +0200
@@ -0,0 +1,184 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -35204,9 +34763,9 @@ diff -Nur linux-3.10.33/drivers/thermal/bcm2835-thermal.c linux-raspberry-pi/dri
+MODULE_DESCRIPTION("Thermal driver for bcm2835 chip");
+
+module_platform_driver(bcm2835_thermal_driver);
-diff -Nur linux-3.10.33/drivers/thermal/Kconfig linux-raspberry-pi/drivers/thermal/Kconfig
---- linux-3.10.33/drivers/thermal/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/thermal/Kconfig 2014-03-13 12:46:37.912094770 +0100
+diff -Nur linux-3.10.36.orig/drivers/thermal/Kconfig linux-3.10.36/drivers/thermal/Kconfig
+--- linux-3.10.36.orig/drivers/thermal/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/thermal/Kconfig 2014-04-13 17:33:10.000000000 +0200
@@ -169,4 +169,11 @@
enforce idle time which results in more package C-state residency. The
user interface is exposed via generic thermal framework.
@@ -35219,18 +34778,18 @@ diff -Nur linux-3.10.33/drivers/thermal/Kconfig linux-raspberry-pi/drivers/therm
+
endif
+
-diff -Nur linux-3.10.33/drivers/thermal/Makefile linux-raspberry-pi/drivers/thermal/Makefile
---- linux-3.10.33/drivers/thermal/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/thermal/Makefile 2014-03-13 12:46:37.912094770 +0100
+diff -Nur linux-3.10.36.orig/drivers/thermal/Makefile linux-3.10.36/drivers/thermal/Makefile
+--- linux-3.10.36.orig/drivers/thermal/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/thermal/Makefile 2014-04-13 17:33:10.000000000 +0200
@@ -23,4 +23,5 @@
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
+obj-$(CONFIG_THERMAL_BCM2835) += bcm2835-thermal.o
-diff -Nur linux-3.10.33/drivers/tty/serial/amba-pl011.c linux-raspberry-pi/drivers/tty/serial/amba-pl011.c
---- linux-3.10.33/drivers/tty/serial/amba-pl011.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/tty/serial/amba-pl011.c 2014-03-13 12:46:38.336095622 +0100
+diff -Nur linux-3.10.36.orig/drivers/tty/serial/amba-pl011.c linux-3.10.36/drivers/tty/serial/amba-pl011.c
+--- linux-3.10.36.orig/drivers/tty/serial/amba-pl011.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/tty/serial/amba-pl011.c 2014-04-13 17:33:10.000000000 +0200
@@ -84,7 +84,7 @@
static unsigned int get_fifosize_arm(unsigned int periphid)
@@ -35240,9 +34799,9 @@ diff -Nur linux-3.10.33/drivers/tty/serial/amba-pl011.c linux-raspberry-pi/drive
return rev < 3 ? 16 : 32;
}
-diff -Nur linux-3.10.33/drivers/usb/core/generic.c linux-raspberry-pi/drivers/usb/core/generic.c
---- linux-3.10.33/drivers/usb/core/generic.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/core/generic.c 2014-03-13 12:46:38.912096777 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/core/generic.c linux-3.10.36/drivers/usb/core/generic.c
+--- linux-3.10.36.orig/drivers/usb/core/generic.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/usb/core/generic.c 2014-04-13 17:33:11.000000000 +0200
@@ -152,6 +152,7 @@
dev_warn(&udev->dev,
"no configuration chosen from %d choice%s\n",
@@ -35251,9 +34810,9 @@ diff -Nur linux-3.10.33/drivers/usb/core/generic.c linux-raspberry-pi/drivers/us
}
return i;
}
-diff -Nur linux-3.10.33/drivers/usb/core/message.c linux-raspberry-pi/drivers/usb/core/message.c
---- linux-3.10.33/drivers/usb/core/message.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/core/message.c 2014-03-13 12:46:38.916096785 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/core/message.c linux-3.10.36/drivers/usb/core/message.c
+--- linux-3.10.36.orig/drivers/usb/core/message.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/usb/core/message.c 2014-04-13 17:33:11.000000000 +0200
@@ -1875,6 +1875,85 @@
if (cp->string == NULL &&
!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
@@ -35340,9 +34899,9 @@ diff -Nur linux-3.10.33/drivers/usb/core/message.c linux-raspberry-pi/drivers/us
/* Now that the interfaces are installed, re-enable LPM. */
usb_unlocked_enable_lpm(dev);
-diff -Nur linux-3.10.33/drivers/usb/core/otg_whitelist.h linux-raspberry-pi/drivers/usb/core/otg_whitelist.h
---- linux-3.10.33/drivers/usb/core/otg_whitelist.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/core/otg_whitelist.h 2014-03-13 12:46:38.916096785 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/core/otg_whitelist.h linux-3.10.36/drivers/usb/core/otg_whitelist.h
+--- linux-3.10.36.orig/drivers/usb/core/otg_whitelist.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/usb/core/otg_whitelist.h 2014-04-13 17:33:11.000000000 +0200
@@ -19,33 +19,82 @@
static struct usb_device_id whitelist_table [] = {
@@ -35558,9 +35117,9 @@ diff -Nur linux-3.10.33/drivers/usb/core/otg_whitelist.h linux-raspberry-pi/driv
#endif
}
-diff -Nur linux-3.10.33/drivers/usb/gadget/file_storage.c linux-raspberry-pi/drivers/usb/gadget/file_storage.c
---- linux-3.10.33/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/gadget/file_storage.c 2014-03-13 12:46:38.928096810 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/gadget/file_storage.c linux-3.10.36/drivers/usb/gadget/file_storage.c
+--- linux-3.10.36.orig/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/gadget/file_storage.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,3676 @@
+/*
+ * file_storage.c -- File-backed USB Storage Gadget, for USB development
@@ -39238,9 +38797,9 @@ diff -Nur linux-3.10.33/drivers/usb/gadget/file_storage.c linux-raspberry-pi/dri
+ kref_put(&fsg->ref, fsg_release);
+}
+module_exit(fsg_cleanup);
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/changes.txt linux-raspberry-pi/drivers/usb/host/dwc_common_port/changes.txt
---- linux-3.10.33/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/changes.txt 2014-03-13 12:46:38.980096914 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/changes.txt linux-3.10.36/drivers/usb/host/dwc_common_port/changes.txt
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/changes.txt 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,174 @@
+
+dwc_read_reg32() and friends now take an additional parameter, a pointer to an
@@ -39416,9 +38975,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/changes.txt linux-raspb
+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 -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-raspberry-pi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
---- linux-3.10.33/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2014-03-13 12:46:39.096097148 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-3.10.36/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,270 @@
+# Doxyfile 1.4.5
+
@@ -39690,9 +39249,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-r
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_cc.c linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_cc.c
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_cc.c 2014-03-13 12:46:39.096097148 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_cc.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_cc.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,532 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $
@@ -40226,9 +39785,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_cc.c linux-raspberr
+}
+
+#endif /* DWC_CCLIB */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_cc.h linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_cc.h
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_cc.h 2014-03-13 12:46:39.096097148 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_cc.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_cc.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,225 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $
@@ -40455,9 +40014,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_cc.h linux-raspberr
+
+#endif /* _DWC_CC_H_ */
+
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2014-03-13 12:46:39.096097148 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1308 @@
+#include "dwc_os.h"
+#include "dwc_list.h"
@@ -41767,9 +41326,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux
+{
+ return wq->pending;
+}
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_common_linux.c
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_linux.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1431 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
@@ -43202,9 +42761,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_common_linux.c linu
+MODULE_LICENSE ("GPL");
+
+#endif /* DWC_LIBMODULE */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1275 @@
+#include "dwc_os.h"
+#include "dwc_list.h"
@@ -44481,9 +44040,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux
+{
+ return wq->pending;
+}
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_crypto.c
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_crypto.c 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_crypto.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_crypto.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,308 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $
@@ -44793,9 +44352,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rasp
+}
+
+#endif /* DWC_CRYPTOLIB */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_crypto.h
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_crypto.h 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_crypto.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_crypto.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,111 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $
@@ -44908,9 +44467,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rasp
+#endif
+
+#endif /* _DWC_CRYPTO_H_ */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_dh.c linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_dh.c
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_dh.c 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_dh.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_dh.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,291 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $
@@ -45203,9 +44762,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_dh.c linux-raspberr
+#endif /* !CONFIG_MACH_IPMATE */
+
+#endif /* DWC_CRYPTOLIB */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_dh.h linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_dh.h
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_dh.h 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_dh.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_dh.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,106 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $
@@ -45313,9 +44872,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_dh.h linux-raspberr
+#endif
+
+#endif /* _DWC_DH_H_ */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_list.h linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_list.h
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_list.h 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_list.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_list.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_list.h 2014-04-13 17:33:11.000000000 +0200
@@ -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 $ */
@@ -45911,9 +45470,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_list.h linux-raspbe
+#endif
+
+#endif /* _DWC_LIST_H_ */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_mem.c linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_mem.c
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_mem.c 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_mem.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_mem.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_mem.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,245 @@
+/* Memory Debugging */
+#ifdef DWC_DEBUG_MEMORY
@@ -46160,9 +45719,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_mem.c linux-raspber
+}
+
+#endif /* DWC_DEBUG_MEMORY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_modpow.c
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_modpow.c 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_modpow.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_modpow.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,636 @@
+/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows.
+ *
@@ -46800,9 +46359,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rasp
+#endif /* CONFIG_MACH_IPMATE */
+
+#endif /*DWC_CRYPTOLIB */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_modpow.h
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_modpow.h 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_modpow.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_modpow.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,34 @@
+/*
+ * dwc_modpow.h
@@ -46838,9 +46397,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rasp
+#endif
+
+#endif /* _LINUX_BIGNUM_H */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_notifier.c
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_notifier.c 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_notifier.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_notifier.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,319 @@
+#ifdef DWC_NOTIFYLIB
+
@@ -47161,9 +46720,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-ra
+}
+
+#endif /* DWC_NOTIFYLIB */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_notifier.h
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_notifier.h 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_notifier.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_notifier.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,122 @@
+
+#ifndef __DWC_NOTIFIER_H__
@@ -47287,9 +46846,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-ra
+#endif
+
+#endif /* __DWC_NOTIFIER_H__ */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_os.h linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_os.h
---- linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/dwc_os.h 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_os.h linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_os.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/dwc_os.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1262 @@
+/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $
@@ -48553,9 +48112,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/dwc_os.h linux-raspberr
+#endif
+
+#endif /* _DWC_OS_H_ */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/Makefile linux-raspberry-pi/drivers/usb/host/dwc_common_port/Makefile
---- linux-3.10.33/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/Makefile 2014-03-13 12:46:38.980096914 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,58 @@
+#
+# Makefile for DWC_common library
@@ -48615,9 +48174,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/Makefile linux-raspberr
+
+clean:
+ rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-raspberry-pi/drivers/usb/host/dwc_common_port/Makefile.fbsd
---- linux-3.10.33/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/Makefile.fbsd 2014-03-13 12:46:38.980096914 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile.fbsd
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile.fbsd 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,17 @@
+CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include
+CFLAGS += -DDWC_FREEBSD
@@ -48636,9 +48195,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-ras
+ dwc_common_fbsd.c dwc_mem.c
+
+.include <bsd.kmod.mk>
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/Makefile.linux linux-raspberry-pi/drivers/usb/host/dwc_common_port/Makefile.linux
---- linux-3.10.33/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/Makefile.linux 2014-03-13 12:46:38.980096914 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.linux linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile.linux
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/Makefile.linux 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,49 @@
+#
+# Makefile for DWC_common library
@@ -48689,9 +48248,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/Makefile.linux linux-ra
+
+clean:
+ rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/usb.h linux-raspberry-pi/drivers/usb/host/dwc_common_port/usb.h
---- linux-3.10.33/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_common_port/usb.h 2014-03-13 12:46:39.480097919 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_common_port/usb.h linux-3.10.36/drivers/usb/host/dwc_common_port/usb.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_common_port/usb.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,946 @@
+/*
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -49639,9 +49198,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_common_port/usb.h linux-raspberry-p
+#endif
+
+#endif /* _USB_H_ */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-raspberry-pi/drivers/usb/host/dwc_otg/doc/doxygen.cfg
---- linux-3.10.33/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-3.10.36/drivers/usb/host/dwc_otg/doc/doxygen.cfg
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,224 @@
+# Doxyfile 1.3.9.1
+
@@ -49867,9 +49426,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-raspberry
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dummy_audio.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dummy_audio.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dummy_audio.c 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dummy_audio.c linux-3.10.36/drivers/usb/host/dwc_otg/dummy_audio.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dummy_audio.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1575 @@
+/*
+ * zero.c -- Gadget Zero, for USB development
@@ -51446,9 +51005,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dummy_audio.c linux-raspberry-p
+ remove_proc_entry("isoc_test", NULL);
+}
+module_exit (cleanup);
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_cfi_common.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_cfi_common.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,142 @@
+/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -51592,9 +51151,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-raspberr
+typedef struct cfi_string cfi_string_t;
+
+#endif
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_adp.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_adp.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,854 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $
@@ -52450,9 +52009,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-raspberry-p
+#endif
+ return 1;
+}
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_adp.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_adp.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,80 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $
@@ -52534,9 +52093,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-raspberry-p
+extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if);
+
+#endif //__DWC_OTG_ADP_H__
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_attr.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_attr.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1210 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $
@@ -53748,9 +53307,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-raspberry-
+ device_remove_file(&dev->dev, &dev_attr_sleep_status);
+#endif
+}
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_attr.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_attr.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,89 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $
@@ -53841,9 +53400,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-raspberry-
+#endif
+ );
+#endif
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1876 @@
+/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -55721,9 +55280,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-raspberry-p
+}
+
+#endif //DWC_UTE_CFI
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,320 @@
+/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@@ -56045,9 +55604,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-raspberry-p
+int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl);
+
+#endif /* (__DWC_OTG_CFI_H__) */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cil.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,7151 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $
@@ -63200,9 +62759,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-raspberry-p
+ dwc_otg_pcd_start_srp_timer(core_if);
+ return;
+}
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cil.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1464 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $
@@ -64668,9 +64227,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-raspberry-p
+//////////////////////////////////////////////////////////////////////
+
+#endif
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1588 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $
@@ -66260,9 +65819,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-raspbe
+
+ return retval;
+}
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_core_if.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,705 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $
@@ -66969,9 +66528,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-raspber
+/** @} */
+
+#endif /* __DWC_CORE_IF_H__ */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,117 @@
+/* ==========================================================================
+ *
@@ -67090,9 +66649,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-raspberry-p
+
+#endif /*DEBUG*/
+#endif
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_driver.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_driver.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1742 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $
@@ -68836,9 +68395,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-raspberr
+ </td></tr>
+
+*/
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_driver.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_driver.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,86 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $
@@ -68926,9 +68485,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-raspberr
+#endif
+
+#endif
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,3685 @@
+
+/* ==========================================================================
@@ -72615,9 +72174,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-raspberry-p
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1132 @@
+/*==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $
@@ -73751,9 +73310,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-raspbe
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,851 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $
@@ -74606,9 +74165,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-raspberry-p
+#endif
+#endif
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,417 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $
@@ -75027,9 +74586,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-raspberr
+
+#endif /* __DWC_HCD_IF_H__ */
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2014-03-13 12:46:39.516097989 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,2741 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $
@@ -77772,9 +77331,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-raspbe
+ return retval;
+}
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,972 @@
+
+/* ==========================================================================
@@ -78748,9 +78307,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-raspb
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,959 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $
@@ -79711,9 +79270,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-raspb
+}
+
+#endif /* DWC_DEVICE_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,113 @@
+#include "dwc_otg_regs.h"
+#include "dwc_otg_dbg.h"
@@ -79828,9 +79387,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-raspbe
+
+ return;
+}
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,48 @@
+#ifndef __DWC_OTG_MPHI_FIX_H__
+#define __DWC_OTG_MPHI_FIX_H__
@@ -79880,9 +79439,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-raspbe
+extern bool fiq_fix_enable, nak_holdoff_enable, fiq_split_enable;
+
+#endif
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,188 @@
+#ifndef _DWC_OS_DEP_H_
+#define _DWC_OS_DEP_H_
@@ -80072,9 +79631,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-raspberr
+
+
+#endif /* _DWC_OS_DEP_H_ */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,2708 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $
@@ -82784,9 +82343,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-raspberry-p
+}
+
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,266 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $
@@ -83054,9 +82613,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-raspberry-p
+extern void do_test_mode(void *data);
+#endif
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,360 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $
@@ -83418,9 +82977,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-raspberr
+#endif /* __DWC_PCD_IF_H__ */
+
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,5147 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $
@@ -88569,9 +88128,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-raspbe
+}
+
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2014-03-13 12:46:39.520097997 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,1358 @@
+ /* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $
@@ -89931,9 +89490,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-raspb
+EXPORT_SYMBOL(usb_gadget_unregister_driver);
+
+#endif /* DWC_HOST_ONLY */
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_regs.h
---- linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2014-03-13 12:46:39.524098005 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_regs.h
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,2550 @@
+/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $
@@ -92485,9 +92044,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-raspberry-
+} gpwrdn_data_t;
+
+#endif
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/Makefile linux-raspberry-pi/drivers/usb/host/dwc_otg/Makefile
---- linux-3.10.33/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/Makefile 2014-03-13 12:46:39.512097981 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/Makefile linux-3.10.36/drivers/usb/host/dwc_otg/Makefile
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/Makefile 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,81 @@
+#
+# Makefile for DWC_otg Highspeed USB controller driver
@@ -92570,9 +92129,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/Makefile linux-raspberry-pi/dri
+ rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers
+
+endif
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-raspberry-pi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
---- linux-3.10.33/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2014-03-13 12:46:39.560098077 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-3.10.36/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,337 @@
+package dwc_otg_test;
+
@@ -92911,9 +92470,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rasp
+);
+
+1;
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/test/Makefile linux-raspberry-pi/drivers/usb/host/dwc_otg/test/Makefile
---- linux-3.10.33/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/test/Makefile 2014-03-13 12:46:39.560098077 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/Makefile linux-3.10.36/drivers/usb/host/dwc_otg/test/Makefile
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/test/Makefile 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,16 @@
+
+PERL=/usr/bin/perl
@@ -92931,9 +92490,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/test/Makefile linux-raspberry-p
+ else echo "=======> $$test, FAILED" ; \
+ fi \
+ done
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-raspberry-pi/drivers/usb/host/dwc_otg/test/test_mod_param.pl
---- linux-3.10.33/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2014-03-13 12:46:39.560098077 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-3.10.36/drivers/usb/host/dwc_otg/test/test_mod_param.pl
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,133 @@
+#!/usr/bin/perl -w
+#
@@ -93068,9 +92627,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-ra
+
+test_main();
+0;
-diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-raspberry-pi/drivers/usb/host/dwc_otg/test/test_sysfs.pl
---- linux-3.10.33/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2014-03-13 12:46:39.560098077 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-3.10.36/drivers/usb/host/dwc_otg/test/test_sysfs.pl
+--- linux-3.10.36.orig/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2014-04-13 17:33:11.000000000 +0200
@@ -0,0 +1,193 @@
+#!/usr/bin/perl -w
+#
@@ -93265,9 +92824,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-raspbe
+
+test_main();
+0;
-diff -Nur linux-3.10.33/drivers/usb/host/Kconfig linux-raspberry-pi/drivers/usb/host/Kconfig
---- linux-3.10.33/drivers/usb/host/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/Kconfig 2014-03-13 12:46:38.980096914 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/Kconfig linux-3.10.36/drivers/usb/host/Kconfig
+--- linux-3.10.36.orig/drivers/usb/host/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/usb/host/Kconfig 2014-04-13 17:33:11.000000000 +0200
@@ -663,6 +663,19 @@
To compile this driver a module, choose M here: the module
will be called "hwa-hc".
@@ -93288,9 +92847,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/Kconfig linux-raspberry-pi/drivers/usb/
config USB_IMX21_HCD
tristate "i.MX21 HCD support"
depends on ARM && ARCH_MXC
-diff -Nur linux-3.10.33/drivers/usb/host/Makefile linux-raspberry-pi/drivers/usb/host/Makefile
---- linux-3.10.33/drivers/usb/host/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/host/Makefile 2014-03-13 12:46:38.980096914 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/host/Makefile linux-3.10.36/drivers/usb/host/Makefile
+--- linux-3.10.36.orig/drivers/usb/host/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/usb/host/Makefile 2014-04-13 17:33:11.000000000 +0200
@@ -47,6 +47,8 @@
obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
@@ -93300,9 +92859,9 @@ diff -Nur linux-3.10.33/drivers/usb/host/Makefile linux-raspberry-pi/drivers/usb
obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
-diff -Nur linux-3.10.33/drivers/usb/Makefile linux-raspberry-pi/drivers/usb/Makefile
---- linux-3.10.33/drivers/usb/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/usb/Makefile 2014-03-13 12:46:38.904096761 +0100
+diff -Nur linux-3.10.36.orig/drivers/usb/Makefile linux-3.10.36/drivers/usb/Makefile
+--- linux-3.10.36.orig/drivers/usb/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/usb/Makefile 2014-04-13 17:33:10.000000000 +0200
@@ -23,6 +23,7 @@
obj-$(CONFIG_USB_R8A66597_HCD) += host/
obj-$(CONFIG_USB_HWA_HCD) += host/
@@ -93311,9 +92870,9 @@ diff -Nur linux-3.10.33/drivers/usb/Makefile linux-raspberry-pi/drivers/usb/Make
obj-$(CONFIG_USB_IMX21_HCD) += host/
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += host/
-diff -Nur linux-3.10.33/drivers/video/bcm2708_fb.c linux-raspberry-pi/drivers/video/bcm2708_fb.c
---- linux-3.10.33/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/video/bcm2708_fb.c 2014-03-13 12:46:40.304099570 +0100
+diff -Nur linux-3.10.36.orig/drivers/video/bcm2708_fb.c linux-3.10.36/drivers/video/bcm2708_fb.c
+--- linux-3.10.36.orig/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/video/bcm2708_fb.c 2014-04-13 17:33:14.000000000 +0200
@@ -0,0 +1,763 @@
+/*
+ * linux/drivers/video/bcm2708_fb.c
@@ -94078,9 +93637,9 @@ diff -Nur linux-3.10.33/drivers/video/bcm2708_fb.c linux-raspberry-pi/drivers/vi
+MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer");
+MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer");
+MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes");
-diff -Nur linux-3.10.33/drivers/video/cfbimgblt.c linux-raspberry-pi/drivers/video/cfbimgblt.c
---- linux-3.10.33/drivers/video/cfbimgblt.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/video/cfbimgblt.c 2014-03-13 12:46:40.308099578 +0100
+diff -Nur linux-3.10.36.orig/drivers/video/cfbimgblt.c linux-3.10.36/drivers/video/cfbimgblt.c
+--- linux-3.10.36.orig/drivers/video/cfbimgblt.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/video/cfbimgblt.c 2014-04-13 17:33:14.000000000 +0200
@@ -28,6 +28,11 @@
*
* Also need to add code to deal with cards endians that are different than
@@ -94254,9 +93813,9 @@ diff -Nur linux-3.10.33/drivers/video/cfbimgblt.c linux-raspberry-pi/drivers/vid
slow_imageblit(image, p, dst1, fgcolor, bgcolor,
start_index, pitch_index);
} else
-diff -Nur linux-3.10.33/drivers/video/fbmem.c linux-raspberry-pi/drivers/video/fbmem.c
---- linux-3.10.33/drivers/video/fbmem.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/video/fbmem.c 2014-03-13 12:46:40.316099594 +0100
+diff -Nur linux-3.10.36.orig/drivers/video/fbmem.c linux-3.10.36/drivers/video/fbmem.c
+--- linux-3.10.36.orig/drivers/video/fbmem.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/video/fbmem.c 2014-04-13 17:33:14.000000000 +0200
@@ -1074,6 +1074,25 @@
return ret;
}
@@ -94315,9 +93874,9 @@ diff -Nur linux-3.10.33/drivers/video/fbmem.c linux-raspberry-pi/drivers/video/f
arg = (unsigned long) compat_ptr(arg);
case FBIOBLANK:
ret = do_fb_ioctl(info, cmd, arg);
-diff -Nur linux-3.10.33/drivers/video/Kconfig linux-raspberry-pi/drivers/video/Kconfig
---- linux-3.10.33/drivers/video/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/video/Kconfig 2014-03-13 12:46:40.288099538 +0100
+diff -Nur linux-3.10.36.orig/drivers/video/Kconfig linux-3.10.36/drivers/video/Kconfig
+--- linux-3.10.36.orig/drivers/video/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/video/Kconfig 2014-04-13 17:33:13.000000000 +0200
@@ -310,6 +310,20 @@
help
Support the Permedia2 FIFO disconnect feature.
@@ -94339,9 +93898,9 @@ diff -Nur linux-3.10.33/drivers/video/Kconfig linux-raspberry-pi/drivers/video/K
config FB_ARMCLCD
tristate "ARM PrimeCell PL110 support"
depends on FB && ARM && ARM_AMBA
-diff -Nur linux-3.10.33/drivers/video/logo/logo_linux_clut224.ppm linux-raspberry-pi/drivers/video/logo/logo_linux_clut224.ppm
---- linux-3.10.33/drivers/video/logo/logo_linux_clut224.ppm 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/video/logo/logo_linux_clut224.ppm 2014-03-13 12:46:40.328099618 +0100
+diff -Nur linux-3.10.36.orig/drivers/video/logo/logo_linux_clut224.ppm linux-3.10.36/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-3.10.36.orig/drivers/video/logo/logo_linux_clut224.ppm 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/video/logo/logo_linux_clut224.ppm 2014-04-13 17:33:14.000000000 +0200
@@ -1,1604 +1,883 @@
P3
-# Standard 224-color Linux logo
@@ -96828,9 +96387,9 @@ diff -Nur linux-3.10.33/drivers/video/logo/logo_linux_clut224.ppm linux-raspberr
+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 -Nur linux-3.10.33/drivers/video/Makefile linux-raspberry-pi/drivers/video/Makefile
---- linux-3.10.33/drivers/video/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/video/Makefile 2014-03-13 12:46:40.288099538 +0100
+diff -Nur linux-3.10.36.orig/drivers/video/Makefile linux-3.10.36/drivers/video/Makefile
+--- linux-3.10.36.orig/drivers/video/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/video/Makefile 2014-04-13 17:33:13.000000000 +0200
@@ -100,6 +100,7 @@
obj-$(CONFIG_FB_VOODOO1) += sstfb.o
obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o
@@ -96839,9 +96398,9 @@ diff -Nur linux-3.10.33/drivers/video/Makefile linux-raspberry-pi/drivers/video/
obj-$(CONFIG_FB_68328) += 68328fb.o
obj-$(CONFIG_FB_GBE) += gbefb.o
obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o
-diff -Nur linux-3.10.33/drivers/w1/masters/w1-gpio.c linux-raspberry-pi/drivers/w1/masters/w1-gpio.c
---- linux-3.10.33/drivers/w1/masters/w1-gpio.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/w1/masters/w1-gpio.c 2014-03-13 12:46:40.752100469 +0100
+diff -Nur linux-3.10.36.orig/drivers/w1/masters/w1-gpio.c linux-3.10.36/drivers/w1/masters/w1-gpio.c
+--- linux-3.10.36.orig/drivers/w1/masters/w1-gpio.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/w1/masters/w1-gpio.c 2014-04-13 17:33:16.000000000 +0200
@@ -23,6 +23,9 @@
#include "../w1.h"
#include "../w1_int.h"
@@ -96883,9 +96442,9 @@ diff -Nur linux-3.10.33/drivers/w1/masters/w1-gpio.c linux-raspberry-pi/drivers/
err = w1_add_master_device(master);
if (err) {
dev_err(&pdev->dev, "w1_add_master device failed\n");
-diff -Nur linux-3.10.33/drivers/w1/w1.h linux-raspberry-pi/drivers/w1/w1.h
---- linux-3.10.33/drivers/w1/w1.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/w1/w1.h 2014-03-13 12:46:40.756100477 +0100
+diff -Nur linux-3.10.36.orig/drivers/w1/w1.h linux-3.10.36/drivers/w1/w1.h
+--- linux-3.10.36.orig/drivers/w1/w1.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/w1/w1.h 2014-04-13 17:33:16.000000000 +0200
@@ -148,6 +148,12 @@
*/
u8 (*set_pullup)(void *, int);
@@ -96899,9 +96458,9 @@ diff -Nur linux-3.10.33/drivers/w1/w1.h linux-raspberry-pi/drivers/w1/w1.h
/** Really nice hardware can handles the different types of ROM search
* w1_master* is passed to the slave found callback.
*/
-diff -Nur linux-3.10.33/drivers/w1/w1_int.c linux-raspberry-pi/drivers/w1/w1_int.c
---- linux-3.10.33/drivers/w1/w1_int.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/w1/w1_int.c 2014-03-13 12:46:40.756100477 +0100
+diff -Nur linux-3.10.36.orig/drivers/w1/w1_int.c linux-3.10.36/drivers/w1/w1_int.c
+--- linux-3.10.36.orig/drivers/w1/w1_int.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/w1/w1_int.c 2014-04-13 17:33:16.000000000 +0200
@@ -117,19 +117,21 @@
printk(KERN_ERR "w1_add_master_device: invalid function set\n");
return(-EINVAL);
@@ -96931,9 +96490,9 @@ diff -Nur linux-3.10.33/drivers/w1/w1_int.c linux-raspberry-pi/drivers/w1/w1_int
/* Lock until the device is added (or not) to w1_masters. */
mutex_lock(&w1_mlock);
/* Search for the first available id (starting at 1). */
-diff -Nur linux-3.10.33/drivers/w1/w1_io.c linux-raspberry-pi/drivers/w1/w1_io.c
---- linux-3.10.33/drivers/w1/w1_io.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/w1/w1_io.c 2014-03-13 12:46:40.756100477 +0100
+diff -Nur linux-3.10.36.orig/drivers/w1/w1_io.c linux-3.10.36/drivers/w1/w1_io.c
+--- linux-3.10.36.orig/drivers/w1/w1_io.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/w1/w1_io.c 2014-04-13 17:33:16.000000000 +0200
@@ -127,10 +127,22 @@
static void w1_post_write(struct w1_master *dev)
{
@@ -96960,9 +96519,9 @@ diff -Nur linux-3.10.33/drivers/w1/w1_io.c linux-raspberry-pi/drivers/w1/w1_io.c
dev->pullup_duration = 0;
}
}
-diff -Nur linux-3.10.33/drivers/watchdog/bcm2708_wdog.c linux-raspberry-pi/drivers/watchdog/bcm2708_wdog.c
---- linux-3.10.33/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/drivers/watchdog/bcm2708_wdog.c 2014-03-13 12:46:40.756100477 +0100
+diff -Nur linux-3.10.36.orig/drivers/watchdog/bcm2708_wdog.c linux-3.10.36/drivers/watchdog/bcm2708_wdog.c
+--- linux-3.10.36.orig/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/drivers/watchdog/bcm2708_wdog.c 2014-04-13 17:33:16.000000000 +0200
@@ -0,0 +1,385 @@
+/*
+ * Broadcom BCM2708 watchdog driver.
@@ -97349,9 +96908,9 @@ diff -Nur linux-3.10.33/drivers/watchdog/bcm2708_wdog.c linux-raspberry-pi/drive
+MODULE_ALIAS_MISCDEV(TEMP_MINOR);
+MODULE_LICENSE("GPL");
+
-diff -Nur linux-3.10.33/drivers/watchdog/Kconfig linux-raspberry-pi/drivers/watchdog/Kconfig
---- linux-3.10.33/drivers/watchdog/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/watchdog/Kconfig 2014-03-13 12:46:40.756100477 +0100
+diff -Nur linux-3.10.36.orig/drivers/watchdog/Kconfig linux-3.10.36/drivers/watchdog/Kconfig
+--- linux-3.10.36.orig/drivers/watchdog/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/watchdog/Kconfig 2014-04-13 17:33:16.000000000 +0200
@@ -391,6 +391,12 @@
To compile this driver as a module, choose M here: the
module will be called retu_wdt.
@@ -97365,9 +96924,9 @@ diff -Nur linux-3.10.33/drivers/watchdog/Kconfig linux-raspberry-pi/drivers/watc
# AVR32 Architecture
config AT32AP700X_WDT
-diff -Nur linux-3.10.33/drivers/watchdog/Makefile linux-raspberry-pi/drivers/watchdog/Makefile
---- linux-3.10.33/drivers/watchdog/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/drivers/watchdog/Makefile 2014-03-13 12:46:40.756100477 +0100
+diff -Nur linux-3.10.36.orig/drivers/watchdog/Makefile linux-3.10.36/drivers/watchdog/Makefile
+--- linux-3.10.36.orig/drivers/watchdog/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/drivers/watchdog/Makefile 2014-04-13 17:33:16.000000000 +0200
@@ -54,6 +54,7 @@
obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o
@@ -97376,9 +96935,9 @@ diff -Nur linux-3.10.33/drivers/watchdog/Makefile linux-raspberry-pi/drivers/wat
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
-diff -Nur linux-3.10.33/include/linux/broadcom/vc_cma.h linux-raspberry-pi/include/linux/broadcom/vc_cma.h
---- linux-3.10.33/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/include/linux/broadcom/vc_cma.h 2014-03-13 12:46:41.852102677 +0100
+diff -Nur linux-3.10.36.orig/include/linux/broadcom/vc_cma.h linux-3.10.36/include/linux/broadcom/vc_cma.h
+--- linux-3.10.36.orig/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/include/linux/broadcom/vc_cma.h 2014-04-13 17:33:18.000000000 +0200
@@ -0,0 +1,30 @@
+/*****************************************************************************
+* Copyright 2012 Broadcom Corporation. All rights reserved.
@@ -97410,9 +96969,9 @@ diff -Nur linux-3.10.33/include/linux/broadcom/vc_cma.h linux-raspberry-pi/inclu
+
+#endif /* VC_CMA_H */
+
-diff -Nur linux-3.10.33/include/linux/mmc/host.h linux-raspberry-pi/include/linux/mmc/host.h
---- linux-3.10.33/include/linux/mmc/host.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/include/linux/mmc/host.h 2014-03-13 12:46:42.008102990 +0100
+diff -Nur linux-3.10.36.orig/include/linux/mmc/host.h linux-3.10.36/include/linux/mmc/host.h
+--- linux-3.10.36.orig/include/linux/mmc/host.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/include/linux/mmc/host.h 2014-04-13 17:33:19.000000000 +0200
@@ -281,6 +281,7 @@
#define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \
MMC_CAP2_PACKED_WR)
@@ -97421,9 +96980,9 @@ diff -Nur linux-3.10.33/include/linux/mmc/host.h linux-raspberry-pi/include/linu
mmc_pm_flag_t pm_caps; /* supported pm features */
-diff -Nur linux-3.10.33/include/linux/mmc/sdhci.h linux-raspberry-pi/include/linux/mmc/sdhci.h
---- linux-3.10.33/include/linux/mmc/sdhci.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/include/linux/mmc/sdhci.h 2014-03-13 12:46:42.008102990 +0100
+diff -Nur linux-3.10.36.orig/include/linux/mmc/sdhci.h linux-3.10.36/include/linux/mmc/sdhci.h
+--- linux-3.10.36.orig/include/linux/mmc/sdhci.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/include/linux/mmc/sdhci.h 2014-04-13 17:33:19.000000000 +0200
@@ -97,6 +97,7 @@
#define SDHCI_QUIRK2_PRESET_VALUE_BROKEN (1<<3)
@@ -97448,9 +97007,9 @@ diff -Nur linux-3.10.33/include/linux/mmc/sdhci.h linux-raspberry-pi/include/lin
struct mmc_data *data; /* Current data request */
unsigned int data_early:1; /* Data finished before cmd */
-diff -Nur linux-3.10.33/include/sound/soc-dai.h linux-raspberry-pi/include/sound/soc-dai.h
---- linux-3.10.33/include/sound/soc-dai.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/include/sound/soc-dai.h 2014-03-13 12:46:42.236103447 +0100
+diff -Nur linux-3.10.36.orig/include/sound/soc-dai.h linux-3.10.36/include/sound/soc-dai.h
+--- linux-3.10.36.orig/include/sound/soc-dai.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/include/sound/soc-dai.h 2014-04-13 17:33:21.000000000 +0200
@@ -105,6 +105,8 @@
int snd_soc_dai_set_pll(struct snd_soc_dai *dai,
int pll_id, int source, unsigned int freq_in, unsigned int freq_out);
@@ -97468,9 +97027,9 @@ diff -Nur linux-3.10.33/include/sound/soc-dai.h linux-raspberry-pi/include/sound
/*
* DAI format configuration
-diff -Nur linux-3.10.33/include/uapi/linux/fb.h linux-raspberry-pi/include/uapi/linux/fb.h
---- linux-3.10.33/include/uapi/linux/fb.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/include/uapi/linux/fb.h 2014-03-13 12:46:42.300103576 +0100
+diff -Nur linux-3.10.36.orig/include/uapi/linux/fb.h linux-3.10.36/include/uapi/linux/fb.h
+--- linux-3.10.36.orig/include/uapi/linux/fb.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/include/uapi/linux/fb.h 2014-04-13 17:33:21.000000000 +0200
@@ -34,6 +34,11 @@
#define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618
@@ -97483,9 +97042,9 @@ diff -Nur linux-3.10.33/include/uapi/linux/fb.h linux-raspberry-pi/include/uapi/
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved planes */
-diff -Nur linux-3.10.33/kernel/cgroup.c linux-raspberry-pi/kernel/cgroup.c
---- linux-3.10.33/kernel/cgroup.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/kernel/cgroup.c 2014-03-13 12:46:42.456103889 +0100
+diff -Nur linux-3.10.36.orig/kernel/cgroup.c linux-3.10.36/kernel/cgroup.c
+--- linux-3.10.36.orig/kernel/cgroup.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/kernel/cgroup.c 2014-04-13 17:33:22.000000000 +0200
@@ -5127,6 +5127,37 @@
}
__setup("cgroup_disable=", cgroup_disable);
@@ -97524,10 +97083,10 @@ diff -Nur linux-3.10.33/kernel/cgroup.c linux-raspberry-pi/kernel/cgroup.c
/*
* Functons for CSS ID.
*/
-diff -Nur linux-3.10.33/mm/memcontrol.c linux-raspberry-pi/mm/memcontrol.c
---- linux-3.10.33/mm/memcontrol.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/mm/memcontrol.c 2014-03-13 12:46:42.696104370 +0100
-@@ -6956,6 +6956,7 @@
+diff -Nur linux-3.10.36.orig/mm/memcontrol.c linux-3.10.36/mm/memcontrol.c
+--- linux-3.10.36.orig/mm/memcontrol.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/mm/memcontrol.c 2014-04-13 17:33:23.000000000 +0200
+@@ -6970,6 +6970,7 @@
.base_cftypes = mem_cgroup_files,
.early_init = 0,
.use_id = 1,
@@ -97535,9 +97094,9 @@ diff -Nur linux-3.10.33/mm/memcontrol.c linux-raspberry-pi/mm/memcontrol.c
};
#ifdef CONFIG_MEMCG_SWAP
-diff -Nur linux-3.10.33/sound/arm/bcm2835.c linux-raspberry-pi/sound/arm/bcm2835.c
---- linux-3.10.33/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/arm/bcm2835.c 2014-03-13 12:46:44.060107108 +0100
+diff -Nur linux-3.10.36.orig/sound/arm/bcm2835.c linux-3.10.36/sound/arm/bcm2835.c
+--- linux-3.10.36.orig/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/arm/bcm2835.c 2014-04-13 17:33:26.000000000 +0200
@@ -0,0 +1,413 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -97952,9 +97511,9 @@ diff -Nur linux-3.10.33/sound/arm/bcm2835.c linux-raspberry-pi/sound/arm/bcm2835
+MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm2835_alsa");
-diff -Nur linux-3.10.33/sound/arm/bcm2835-ctl.c linux-raspberry-pi/sound/arm/bcm2835-ctl.c
---- linux-3.10.33/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/arm/bcm2835-ctl.c 2014-03-13 12:46:44.052107092 +0100
+diff -Nur linux-3.10.36.orig/sound/arm/bcm2835-ctl.c linux-3.10.36/sound/arm/bcm2835-ctl.c
+--- linux-3.10.36.orig/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/arm/bcm2835-ctl.c 2014-04-13 17:33:26.000000000 +0200
@@ -0,0 +1,200 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -98156,9 +97715,9 @@ diff -Nur linux-3.10.33/sound/arm/bcm2835-ctl.c linux-raspberry-pi/sound/arm/bcm
+ }
+ return 0;
+}
-diff -Nur linux-3.10.33/sound/arm/bcm2835.h linux-raspberry-pi/sound/arm/bcm2835.h
---- linux-3.10.33/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/arm/bcm2835.h 2014-03-13 12:46:44.060107108 +0100
+diff -Nur linux-3.10.36.orig/sound/arm/bcm2835.h linux-3.10.36/sound/arm/bcm2835.h
+--- linux-3.10.36.orig/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/arm/bcm2835.h 2014-04-13 17:33:26.000000000 +0200
@@ -0,0 +1,157 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -98317,9 +97876,9 @@ diff -Nur linux-3.10.33/sound/arm/bcm2835.h linux-raspberry-pi/sound/arm/bcm2835
+void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream);
+
+#endif /* __SOUND_ARM_BCM2835_H */
-diff -Nur linux-3.10.33/sound/arm/bcm2835-pcm.c linux-raspberry-pi/sound/arm/bcm2835-pcm.c
---- linux-3.10.33/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/arm/bcm2835-pcm.c 2014-03-13 12:46:44.052107092 +0100
+diff -Nur linux-3.10.36.orig/sound/arm/bcm2835-pcm.c linux-3.10.36/sound/arm/bcm2835-pcm.c
+--- linux-3.10.36.orig/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/arm/bcm2835-pcm.c 2014-04-13 17:33:26.000000000 +0200
@@ -0,0 +1,426 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -98747,9 +98306,9 @@ diff -Nur linux-3.10.33/sound/arm/bcm2835-pcm.c linux-raspberry-pi/sound/arm/bcm
+
+ return 0;
+}
-diff -Nur linux-3.10.33/sound/arm/bcm2835-vchiq.c linux-raspberry-pi/sound/arm/bcm2835-vchiq.c
---- linux-3.10.33/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/arm/bcm2835-vchiq.c 2014-03-13 12:46:44.060107108 +0100
+diff -Nur linux-3.10.36.orig/sound/arm/bcm2835-vchiq.c linux-3.10.36/sound/arm/bcm2835-vchiq.c
+--- linux-3.10.36.orig/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/arm/bcm2835-vchiq.c 2014-04-13 17:33:26.000000000 +0200
@@ -0,0 +1,879 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -99630,9 +99189,9 @@ diff -Nur linux-3.10.33/sound/arm/bcm2835-vchiq.c linux-raspberry-pi/sound/arm/b
+
+module_param(force_bulk, bool, 0444);
+MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio");
-diff -Nur linux-3.10.33/sound/arm/Kconfig linux-raspberry-pi/sound/arm/Kconfig
---- linux-3.10.33/sound/arm/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/sound/arm/Kconfig 2014-03-13 12:46:44.052107092 +0100
+diff -Nur linux-3.10.36.orig/sound/arm/Kconfig linux-3.10.36/sound/arm/Kconfig
+--- linux-3.10.36.orig/sound/arm/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/sound/arm/Kconfig 2014-04-13 17:33:26.000000000 +0200
@@ -39,5 +39,12 @@
Say Y or M if you want to support any AC97 codec attached to
the PXA2xx AC97 interface.
@@ -99646,9 +99205,9 @@ diff -Nur linux-3.10.33/sound/arm/Kconfig linux-raspberry-pi/sound/arm/Kconfig
+
endif # SND_ARM
-diff -Nur linux-3.10.33/sound/arm/Makefile linux-raspberry-pi/sound/arm/Makefile
---- linux-3.10.33/sound/arm/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/sound/arm/Makefile 2014-03-13 12:46:44.052107092 +0100
+diff -Nur linux-3.10.36.orig/sound/arm/Makefile linux-3.10.36/sound/arm/Makefile
+--- linux-3.10.36.orig/sound/arm/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/sound/arm/Makefile 2014-04-13 17:33:26.000000000 +0200
@@ -14,3 +14,9 @@
obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
@@ -99659,9 +99218,9 @@ diff -Nur linux-3.10.33/sound/arm/Makefile linux-raspberry-pi/sound/arm/Makefile
+
+ccflags-y += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000
+
-diff -Nur linux-3.10.33/sound/arm/vc_vchi_audioserv_defs.h linux-raspberry-pi/sound/arm/vc_vchi_audioserv_defs.h
---- linux-3.10.33/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/arm/vc_vchi_audioserv_defs.h 2014-03-13 12:46:44.060107108 +0100
+diff -Nur linux-3.10.36.orig/sound/arm/vc_vchi_audioserv_defs.h linux-3.10.36/sound/arm/vc_vchi_audioserv_defs.h
+--- linux-3.10.36.orig/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/arm/vc_vchi_audioserv_defs.h 2014-04-13 17:33:26.000000000 +0200
@@ -0,0 +1,116 @@
+/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved.
@@ -99779,9 +99338,9 @@ diff -Nur linux-3.10.33/sound/arm/vc_vchi_audioserv_defs.h linux-raspberry-pi/so
+} VC_AUDIO_MSG_T;
+
+#endif // _VC_AUDIO_DEFS_H_
-diff -Nur linux-3.10.33/sound/soc/bcm/bcm2708-i2s.c linux-raspberry-pi/sound/soc/bcm/bcm2708-i2s.c
---- linux-3.10.33/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/bcm/bcm2708-i2s.c 2014-03-13 12:46:44.480107952 +0100
+diff -Nur linux-3.10.36.orig/sound/soc/bcm/bcm2708-i2s.c linux-3.10.36/sound/soc/bcm/bcm2708-i2s.c
+--- linux-3.10.36.orig/sound/soc/bcm/bcm2708-i2s.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/bcm/bcm2708-i2s.c 2014-04-13 17:33:28.000000000 +0200
@@ -0,0 +1,945 @@
+/*
+ * ALSA SoC I2S Audio Layer for Broadcom BCM2708 SoC
@@ -100728,9 +100287,9 @@ diff -Nur linux-3.10.33/sound/soc/bcm/bcm2708-i2s.c linux-raspberry-pi/sound/soc
+MODULE_DESCRIPTION("BCM2708 I2S interface");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.33/sound/soc/bcm/hifiberry_dac.c linux-raspberry-pi/sound/soc/bcm/hifiberry_dac.c
---- linux-3.10.33/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/bcm/hifiberry_dac.c 2014-03-13 12:46:44.480107952 +0100
+diff -Nur linux-3.10.36.orig/sound/soc/bcm/hifiberry_dac.c linux-3.10.36/sound/soc/bcm/hifiberry_dac.c
+--- linux-3.10.36.orig/sound/soc/bcm/hifiberry_dac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/bcm/hifiberry_dac.c 2014-04-13 17:33:28.000000000 +0200
@@ -0,0 +1,100 @@
+/*
+ * ASoC Driver for HifiBerry DAC
@@ -100832,9 +100391,9 @@ diff -Nur linux-3.10.33/sound/soc/bcm/hifiberry_dac.c linux-raspberry-pi/sound/s
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_DESCRIPTION("ASoC Driver for HifiBerry DAC");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.33/sound/soc/bcm/hifiberry_digi.c linux-raspberry-pi/sound/soc/bcm/hifiberry_digi.c
---- linux-3.10.33/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/bcm/hifiberry_digi.c 2014-03-13 12:46:44.480107952 +0100
+diff -Nur linux-3.10.36.orig/sound/soc/bcm/hifiberry_digi.c linux-3.10.36/sound/soc/bcm/hifiberry_digi.c
+--- linux-3.10.36.orig/sound/soc/bcm/hifiberry_digi.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/bcm/hifiberry_digi.c 2014-04-13 17:33:28.000000000 +0200
@@ -0,0 +1,153 @@
+/*
+ * ASoC Driver for HifiBerry Digi
@@ -100989,10 +100548,125 @@ diff -Nur linux-3.10.33/sound/soc/bcm/hifiberry_digi.c linux-raspberry-pi/sound/
+MODULE_AUTHOR("Daniel Matuschek <info@crazy-audio.com>");
+MODULE_DESCRIPTION("ASoC Driver for HifiBerry Digi");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.33/sound/soc/bcm/Kconfig linux-raspberry-pi/sound/soc/bcm/Kconfig
---- linux-3.10.33/sound/soc/bcm/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/bcm/Kconfig 2014-03-13 12:46:44.480107952 +0100
-@@ -0,0 +1,31 @@
+diff -Nur linux-3.10.36.orig/sound/soc/bcm/iqaudio-dac.c linux-3.10.36/sound/soc/bcm/iqaudio-dac.c
+--- linux-3.10.36.orig/sound/soc/bcm/iqaudio-dac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/bcm/iqaudio-dac.c 2014-04-13 17:33:28.000000000 +0200
+@@ -0,0 +1,111 @@
++/*
++ * ASoC Driver for IQaudIO DAC
++ *
++ * Author: Florian Meier <florian.meier@koalo.de>
++ * Copyright 2013
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * version 2 as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++
++#include <sound/core.h>
++#include <sound/pcm.h>
++#include <sound/pcm_params.h>
++#include <sound/soc.h>
++#include <sound/jack.h>
++
++static int snd_rpi_iqaudio_dac_init(struct snd_soc_pcm_runtime *rtd)
++{
++// NOT USED struct snd_soc_codec *codec = rtd->codec;
++
++ return 0;
++}
++
++static int snd_rpi_iqaudio_dac_hw_params(struct snd_pcm_substream *substream,
++ struct snd_pcm_hw_params *params)
++{
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++// NOT USED struct snd_soc_dai *codec_dai = rtd->codec_dai;
++// NOT USED struct snd_soc_codec *codec = rtd->codec;
++ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
++
++ unsigned int sample_bits =
++ snd_pcm_format_physical_width(params_format(params));
++
++ return snd_soc_dai_set_bclk_ratio(cpu_dai, sample_bits * 2);
++}
++
++/* machine stream operations */
++static struct snd_soc_ops snd_rpi_iqaudio_dac_ops = {
++ .hw_params = snd_rpi_iqaudio_dac_hw_params,
++};
++
++static struct snd_soc_dai_link snd_rpi_iqaudio_dac_dai[] = {
++{
++ .name = "IQaudIO DAC",
++ .stream_name = "IQaudIO DAC HiFi",
++ .cpu_dai_name = "bcm2708-i2s.0",
++ .codec_dai_name = "pcm512x-hifi",
++ .platform_name = "bcm2708-i2s.0",
++ .codec_name = "pcm512x.1-004c",
++ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
++ SND_SOC_DAIFMT_CBS_CFS,
++ .ops = &snd_rpi_iqaudio_dac_ops,
++ .init = snd_rpi_iqaudio_dac_init,
++},
++};
++
++/* audio machine driver */
++static struct snd_soc_card snd_rpi_iqaudio_dac = {
++ .name = "snd_rpi_iqaudio_dac",
++ .dai_link = snd_rpi_iqaudio_dac_dai,
++ .num_links = ARRAY_SIZE(snd_rpi_iqaudio_dac_dai),
++};
++
++static int snd_rpi_iqaudio_dac_probe(struct platform_device *pdev)
++{
++ int ret = 0;
++
++ snd_rpi_iqaudio_dac.dev = &pdev->dev;
++ ret = snd_soc_register_card(&snd_rpi_iqaudio_dac);
++ if (ret)
++ dev_err(&pdev->dev,
++ "snd_soc_register_card() failed: %d\n", ret);
++
++ return ret;
++}
++
++static int snd_rpi_iqaudio_dac_remove(struct platform_device *pdev)
++{
++ return snd_soc_unregister_card(&snd_rpi_iqaudio_dac);
++}
++
++static const struct of_device_id iqaudio_of_match[] = {
++ { .compatible = "iqaudio,iqaudio-dac", },
++ {},
++};
++
++static struct platform_driver snd_rpi_iqaudio_dac_driver = {
++ .driver = {
++ .name = "snd-rpi-iqaudio-dac",
++ .owner = THIS_MODULE,
++ .of_match_table = iqaudio_of_match,
++ },
++ .probe = snd_rpi_iqaudio_dac_probe,
++ .remove = snd_rpi_iqaudio_dac_remove,
++};
++
++module_platform_driver(snd_rpi_iqaudio_dac_driver);
++
++MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
++MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC");
++MODULE_LICENSE("GPL v2");
+diff -Nur linux-3.10.36.orig/sound/soc/bcm/Kconfig linux-3.10.36/sound/soc/bcm/Kconfig
+--- linux-3.10.36.orig/sound/soc/bcm/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/bcm/Kconfig 2014-04-13 17:33:28.000000000 +0200
+@@ -0,0 +1,38 @@
+config SND_BCM2708_SOC_I2S
+ tristate "SoC Audio support for the Broadcom BCM2708 I2S module"
+ depends on MACH_BCM2708
@@ -101024,10 +100698,17 @@ diff -Nur linux-3.10.33/sound/soc/bcm/Kconfig linux-raspberry-pi/sound/soc/bcm/K
+ select SND_SOC_PCM1794A
+ help
+ Say Y or M if you want to add support for RPi-DAC.
-diff -Nur linux-3.10.33/sound/soc/bcm/Makefile linux-raspberry-pi/sound/soc/bcm/Makefile
---- linux-3.10.33/sound/soc/bcm/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/bcm/Makefile 2014-03-13 12:46:44.480107952 +0100
-@@ -0,0 +1,13 @@
++
++config SND_BCM2708_SOC_IQAUDIO_DAC
++ tristate "Support for IQaudIO-DAC"
++ depends on SND_BCM2708_SOC_I2S
++ select SND_SOC_PCM512x
++ help
++ Say Y or M if you want to add support for IQaudIO-DAC.
+diff -Nur linux-3.10.36.orig/sound/soc/bcm/Makefile linux-3.10.36/sound/soc/bcm/Makefile
+--- linux-3.10.36.orig/sound/soc/bcm/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/bcm/Makefile 2014-04-13 17:33:28.000000000 +0200
+@@ -0,0 +1,16 @@
+# BCM2708 Platform Support
+snd-soc-bcm2708-i2s-objs := bcm2708-i2s.o
+
@@ -101037,13 +100718,16 @@ diff -Nur linux-3.10.33/sound/soc/bcm/Makefile linux-raspberry-pi/sound/soc/bcm/
+snd-soc-hifiberry-dac-objs := hifiberry_dac.o
+snd-soc-hifiberry-digi-objs := hifiberry_digi.o
+snd-soc-rpi-dac-objs := rpi-dac.o
++snd-soc-iqaudio-dac-objs := iqaudio-dac.o
+
+obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
+obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o
+obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
-diff -Nur linux-3.10.33/sound/soc/bcm/rpi-dac.c linux-raspberry-pi/sound/soc/bcm/rpi-dac.c
---- linux-3.10.33/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/bcm/rpi-dac.c 2014-03-13 12:46:44.480107952 +0100
++obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
++
+diff -Nur linux-3.10.36.orig/sound/soc/bcm/rpi-dac.c linux-3.10.36/sound/soc/bcm/rpi-dac.c
+--- linux-3.10.36.orig/sound/soc/bcm/rpi-dac.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/bcm/rpi-dac.c 2014-04-13 17:33:28.000000000 +0200
@@ -0,0 +1,97 @@
+/*
+ * ASoC Driver for RPi-DAC.
@@ -101142,19 +100826,20 @@ diff -Nur linux-3.10.33/sound/soc/bcm/rpi-dac.c linux-raspberry-pi/sound/soc/bcm
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_DESCRIPTION("ASoC Driver for RPi-DAC");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.33/sound/soc/codecs/Kconfig linux-raspberry-pi/sound/soc/codecs/Kconfig
---- linux-3.10.33/sound/soc/codecs/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/codecs/Kconfig 2014-03-13 12:46:44.524108040 +0100
-@@ -55,6 +55,8 @@
+diff -Nur linux-3.10.36.orig/sound/soc/codecs/Kconfig linux-3.10.36/sound/soc/codecs/Kconfig
+--- linux-3.10.36.orig/sound/soc/codecs/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/sound/soc/codecs/Kconfig 2014-04-13 17:33:28.000000000 +0200
+@@ -55,6 +55,9 @@
select SND_SOC_ML26124 if I2C
select SND_SOC_OMAP_HDMI_CODEC if OMAP4_DSS_HDMI
select SND_SOC_PCM3008
+ select SND_SOC_PCM1794A
+ select SND_SOC_PCM5102A
++ select SND_SOC_PCM512x if SND_SOC_I2C_AND_SPI
select SND_SOC_RT5631 if I2C
select SND_SOC_SGTL5000 if I2C
select SND_SOC_SI476X if MFD_SI476X_CORE
-@@ -293,6 +295,12 @@
+@@ -293,6 +296,15 @@
config SND_SOC_PCM3008
tristate
@@ -101164,33 +100849,38 @@ diff -Nur linux-3.10.33/sound/soc/codecs/Kconfig linux-raspberry-pi/sound/soc/co
+config SND_SOC_PCM5102A
+ tristate
+
++config SND_SOC_PCM512x
++ tristate
++
config SND_SOC_RT5631
tristate
-diff -Nur linux-3.10.33/sound/soc/codecs/Makefile linux-raspberry-pi/sound/soc/codecs/Makefile
---- linux-3.10.33/sound/soc/codecs/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/codecs/Makefile 2014-03-13 12:46:44.524108040 +0100
-@@ -43,6 +43,8 @@
+diff -Nur linux-3.10.36.orig/sound/soc/codecs/Makefile linux-3.10.36/sound/soc/codecs/Makefile
+--- linux-3.10.36.orig/sound/soc/codecs/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/sound/soc/codecs/Makefile 2014-04-13 17:33:28.000000000 +0200
+@@ -43,6 +43,9 @@
snd-soc-ml26124-objs := ml26124.o
snd-soc-omap-hdmi-codec-objs := omap-hdmi.o
snd-soc-pcm3008-objs := pcm3008.o
+snd-soc-pcm1794a-objs := pcm1794a.o
+snd-soc-pcm5102a-objs := pcm5102a.o
++snd-soc-pcm512x-objs := pcm512x.o
snd-soc-rt5631-objs := rt5631.o
snd-soc-sgtl5000-objs := sgtl5000.o
snd-soc-alc5623-objs := alc5623.o
-@@ -170,6 +172,8 @@
+@@ -170,6 +173,9 @@
obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o
obj-$(CONFIG_SND_SOC_OMAP_HDMI_CODEC) += snd-soc-omap-hdmi-codec.o
obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o
+obj-$(CONFIG_SND_SOC_PCM1794A) += snd-soc-pcm1794a.o
+obj-$(CONFIG_SND_SOC_PCM5102A) += snd-soc-pcm5102a.o
++obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o
obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o
obj-$(CONFIG_SND_SOC_SGTL5000) += snd-soc-sgtl5000.o
obj-$(CONFIG_SND_SOC_SIGMADSP) += snd-soc-sigmadsp.o
-diff -Nur linux-3.10.33/sound/soc/codecs/pcm1794a.c linux-raspberry-pi/sound/soc/codecs/pcm1794a.c
---- linux-3.10.33/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/codecs/pcm1794a.c 2014-03-13 12:46:44.540108072 +0100
+diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm1794a.c linux-3.10.36/sound/soc/codecs/pcm1794a.c
+--- linux-3.10.36.orig/sound/soc/codecs/pcm1794a.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/codecs/pcm1794a.c 2014-04-13 17:33:29.000000000 +0200
@@ -0,0 +1,62 @@
+/*
+ * Driver for the PCM1794A codec
@@ -101254,9 +100944,9 @@ diff -Nur linux-3.10.33/sound/soc/codecs/pcm1794a.c linux-raspberry-pi/sound/soc
+MODULE_DESCRIPTION("ASoC PCM1794A codec driver");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.33/sound/soc/codecs/pcm5102a.c linux-raspberry-pi/sound/soc/codecs/pcm5102a.c
---- linux-3.10.33/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/codecs/pcm5102a.c 2014-03-13 12:46:44.540108072 +0100
+diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm5102a.c linux-3.10.36/sound/soc/codecs/pcm5102a.c
+--- linux-3.10.36.orig/sound/soc/codecs/pcm5102a.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/codecs/pcm5102a.c 2014-04-13 17:33:29.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * Driver for the PCM5102A codec
@@ -101321,9 +101011,837 @@ diff -Nur linux-3.10.33/sound/soc/codecs/pcm5102a.c linux-raspberry-pi/sound/soc
+MODULE_DESCRIPTION("ASoC PCM5102A codec driver");
+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
+MODULE_LICENSE("GPL v2");
-diff -Nur linux-3.10.33/sound/soc/codecs/wm8804.c linux-raspberry-pi/sound/soc/codecs/wm8804.c
---- linux-3.10.33/sound/soc/codecs/wm8804.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/codecs/wm8804.c 2014-03-13 12:46:44.660108313 +0100
+diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm512x.c linux-3.10.36/sound/soc/codecs/pcm512x.c
+--- linux-3.10.36.orig/sound/soc/codecs/pcm512x.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/codecs/pcm512x.c 2014-04-13 17:33:29.000000000 +0200
+@@ -0,0 +1,678 @@
++/*
++ * Driver for the PCM512x CODECs
++ *
++ * Author: Mark Brown <broonie@linaro.org>
++ * Copyright 2014 Linaro Ltd
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * version 2 as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ */
++
++
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/clk.h>
++#include <linux/i2c.h>
++#include <linux/pm_runtime.h>
++#include <linux/regmap.h>
++#include <linux/regulator/consumer.h>
++#include <linux/spi/spi.h>
++#include <sound/soc.h>
++#include <sound/soc-dapm.h>
++#include <sound/tlv.h>
++
++#include "pcm512x.h"
++
++#define PCM512x_NUM_SUPPLIES 3
++static const char *pcm512x_supply_names[PCM512x_NUM_SUPPLIES] = {
++ "AVDD",
++ "DVDD",
++ "CPVDD",
++};
++
++struct pcm512x_priv {
++ struct regmap *regmap;
++ struct clk *sclk;
++ struct regulator_bulk_data supplies[PCM512x_NUM_SUPPLIES];
++ struct notifier_block supply_nb[PCM512x_NUM_SUPPLIES];
++};
++
++/*
++ * We can't use the same notifier block for more than one supply and
++ * there's no way I can see to get from a callback to the caller
++ * except container_of().
++ */
++#define PCM512x_REGULATOR_EVENT(n) \
++static int pcm512x_regulator_event_##n(struct notifier_block *nb, \
++ unsigned long event, void *data) \
++{ \
++ struct pcm512x_priv *pcm512x = container_of(nb, struct pcm512x_priv, \
++ supply_nb[n]); \
++ if (event & REGULATOR_EVENT_DISABLE) { \
++ regcache_mark_dirty(pcm512x->regmap); \
++ regcache_cache_only(pcm512x->regmap, true); \
++ } \
++ return 0; \
++}
++
++PCM512x_REGULATOR_EVENT(0)
++PCM512x_REGULATOR_EVENT(1)
++PCM512x_REGULATOR_EVENT(2)
++
++static const struct reg_default pcm512x_reg_defaults[] = {
++ { PCM512x_RESET, 0x00 },
++ { PCM512x_POWER, 0x00 },
++ { PCM512x_MUTE, 0x00 },
++ { PCM512x_DSP, 0x00 },
++ { PCM512x_PLL_REF, 0x00 },
++ { PCM512x_DAC_ROUTING, 0x11 },
++ { PCM512x_DSP_PROGRAM, 0x01 },
++ { PCM512x_CLKDET, 0x00 },
++ { PCM512x_AUTO_MUTE, 0x00 },
++ { PCM512x_ERROR_DETECT, 0x00 },
++ { PCM512x_DIGITAL_VOLUME_1, 0x00 },
++ { PCM512x_DIGITAL_VOLUME_2, 0x30 },
++ { PCM512x_DIGITAL_VOLUME_3, 0x30 },
++ { PCM512x_DIGITAL_MUTE_1, 0x22 },
++ { PCM512x_DIGITAL_MUTE_2, 0x00 },
++ { PCM512x_DIGITAL_MUTE_3, 0x07 },
++};
++
++static bool pcm512x_readable(struct device *dev, unsigned int reg)
++{
++ switch (reg) {
++ case PCM512x_RESET:
++ case PCM512x_POWER:
++ case PCM512x_MUTE:
++ case PCM512x_PLL_EN:
++ case PCM512x_SPI_MISO_FUNCTION:
++ case PCM512x_DSP:
++ case PCM512x_GPIO_EN:
++ case PCM512x_BCLK_LRCLK_CFG:
++ case PCM512x_DSP_GPIO_INPUT:
++ case PCM512x_MASTER_MODE:
++ case PCM512x_PLL_REF:
++ case PCM512x_PLL_COEFF_0:
++ case PCM512x_PLL_COEFF_1:
++ case PCM512x_PLL_COEFF_2:
++ case PCM512x_PLL_COEFF_3:
++ case PCM512x_PLL_COEFF_4:
++ case PCM512x_DSP_CLKDIV:
++ case PCM512x_DAC_CLKDIV:
++ case PCM512x_NCP_CLKDIV:
++ case PCM512x_OSR_CLKDIV:
++ case PCM512x_MASTER_CLKDIV_1:
++ case PCM512x_MASTER_CLKDIV_2:
++ case PCM512x_FS_SPEED_MODE:
++ case PCM512x_IDAC_1:
++ case PCM512x_IDAC_2:
++ case PCM512x_ERROR_DETECT:
++ case PCM512x_I2S_1:
++ case PCM512x_I2S_2:
++ case PCM512x_DAC_ROUTING:
++ case PCM512x_DSP_PROGRAM:
++ case PCM512x_CLKDET:
++ case PCM512x_AUTO_MUTE:
++ case PCM512x_DIGITAL_VOLUME_1:
++ case PCM512x_DIGITAL_VOLUME_2:
++ case PCM512x_DIGITAL_VOLUME_3:
++ case PCM512x_DIGITAL_MUTE_1:
++ case PCM512x_DIGITAL_MUTE_2:
++ case PCM512x_DIGITAL_MUTE_3:
++ case PCM512x_GPIO_OUTPUT_1:
++ case PCM512x_GPIO_OUTPUT_2:
++ case PCM512x_GPIO_OUTPUT_3:
++ case PCM512x_GPIO_OUTPUT_4:
++ case PCM512x_GPIO_OUTPUT_5:
++ case PCM512x_GPIO_OUTPUT_6:
++ case PCM512x_GPIO_CONTROL_1:
++ case PCM512x_GPIO_CONTROL_2:
++ case PCM512x_OVERFLOW:
++ case PCM512x_RATE_DET_1:
++ case PCM512x_RATE_DET_2:
++ case PCM512x_RATE_DET_3:
++ case PCM512x_RATE_DET_4:
++ case PCM512x_ANALOG_MUTE_DET:
++ case PCM512x_GPIN:
++ case PCM512x_DIGITAL_MUTE_DET:
++ return true;
++ default:
++ return false;
++ }
++}
++
++static bool pcm512x_volatile(struct device *dev, unsigned int reg)
++{
++ switch (reg) {
++ case PCM512x_PLL_EN:
++ case PCM512x_OVERFLOW:
++ case PCM512x_RATE_DET_1:
++ case PCM512x_RATE_DET_2:
++ case PCM512x_RATE_DET_3:
++ case PCM512x_RATE_DET_4:
++ case PCM512x_ANALOG_MUTE_DET:
++ case PCM512x_GPIN:
++ case PCM512x_DIGITAL_MUTE_DET:
++ return true;
++ default:
++ return false;
++ }
++}
++
++static const DECLARE_TLV_DB_SCALE(digital_tlv, -10350, 50, 1);
++
++static const char *pcm512x_dsp_program_texts[] = {
++ "FIR interpolation with de-emphasis",
++ "Low latency IIR with de-emphasis",
++ "High attenuation with de-emphasis",
++ "Ringing-less low latency FIR",
++};
++
++static const unsigned int pcm512x_dsp_program_values[] = {
++ 1,
++ 2,
++ 3,
++ 5,
++ 7,
++};
++
++static const SOC_VALUE_ENUM_SINGLE_DECL(pcm512x_dsp_program,
++ PCM512x_DSP_PROGRAM, 0, 0x1f,
++ pcm512x_dsp_program_texts,
++ pcm512x_dsp_program_values);
++
++static const char *pcm512x_clk_missing_text[] = {
++ "1s", "2s", "3s", "4s", "5s", "6s", "7s", "8s"
++};
++
++static const struct soc_enum pcm512x_clk_missing =
++ SOC_ENUM_SINGLE(PCM512x_CLKDET, 0, 7, pcm512x_clk_missing_text);
++
++static const char *pcm512x_autom_text[] = {
++ "21ms", "106ms", "213ms", "533ms", "1.07s", "2.13s", "5.33s", "10.66s"
++};
++
++static const struct soc_enum pcm512x_autom_l =
++ SOC_ENUM_SINGLE(PCM512x_AUTO_MUTE, PCM512x_ATML_SHIFT, 7,
++ pcm512x_autom_text);
++
++static const struct soc_enum pcm512x_autom_r =
++ SOC_ENUM_SINGLE(PCM512x_AUTO_MUTE, PCM512x_ATMR_SHIFT, 7,
++ pcm512x_autom_text);
++
++static const char *pcm512x_ramp_rate_text[] = {
++ "1 sample/update", "2 samples/update", "4 samples/update",
++ "Immediate"
++};
++
++static const struct soc_enum pcm512x_vndf =
++ SOC_ENUM_SINGLE(PCM512x_DIGITAL_MUTE_1, PCM512x_VNDF_SHIFT, 4,
++ pcm512x_ramp_rate_text);
++
++static const struct soc_enum pcm512x_vnuf =
++ SOC_ENUM_SINGLE(PCM512x_DIGITAL_MUTE_1, PCM512x_VNUF_SHIFT, 4,
++ pcm512x_ramp_rate_text);
++
++static const struct soc_enum pcm512x_vedf =
++ SOC_ENUM_SINGLE(PCM512x_DIGITAL_MUTE_2, PCM512x_VEDF_SHIFT, 4,
++ pcm512x_ramp_rate_text);
++
++static const char *pcm512x_ramp_step_text[] = {
++ "4dB/step", "2dB/step", "1dB/step", "0.5dB/step"
++};
++
++static const struct soc_enum pcm512x_vnds =
++ SOC_ENUM_SINGLE(PCM512x_DIGITAL_MUTE_1, PCM512x_VNDS_SHIFT, 4,
++ pcm512x_ramp_step_text);
++
++static const struct soc_enum pcm512x_vnus =
++ SOC_ENUM_SINGLE(PCM512x_DIGITAL_MUTE_1, PCM512x_VNUS_SHIFT, 4,
++ pcm512x_ramp_step_text);
++
++static const struct soc_enum pcm512x_veds =
++ SOC_ENUM_SINGLE(PCM512x_DIGITAL_MUTE_2, PCM512x_VEDS_SHIFT, 4,
++ pcm512x_ramp_step_text);
++
++/* Don't let the DAC go into clipping by limiting the alsa volume control range */
++static const struct snd_kcontrol_new pcm512x_controls[] = {
++SOC_DOUBLE_R_RANGE_TLV("Playback Digital Volume", PCM512x_DIGITAL_VOLUME_2,
++ PCM512x_DIGITAL_VOLUME_3, 0, 40, 255, 1, digital_tlv),
++SOC_DOUBLE("Playback Digital Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,
++ PCM512x_RQMR_SHIFT, 1, 1),
++
++SOC_SINGLE("Deemphasis Switch", PCM512x_DSP, PCM512x_DEMP_SHIFT, 1, 1),
++SOC_VALUE_ENUM("DSP Program", pcm512x_dsp_program),
++
++SOC_ENUM("Clock Missing Period", pcm512x_clk_missing),
++SOC_ENUM("Auto Mute Time Left", pcm512x_autom_l),
++SOC_ENUM("Auto Mute Time Right", pcm512x_autom_r),
++SOC_SINGLE("Auto Mute Mono Switch", PCM512x_DIGITAL_MUTE_3,
++ PCM512x_ACTL_SHIFT, 1, 0),
++SOC_DOUBLE("Auto Mute Switch", PCM512x_DIGITAL_MUTE_3, PCM512x_AMLE_SHIFT,
++ PCM512x_AMLR_SHIFT, 1, 0),
++
++SOC_ENUM("Volume Ramp Down Rate", pcm512x_vndf),
++SOC_ENUM("Volume Ramp Down Step", pcm512x_vnds),
++SOC_ENUM("Volume Ramp Up Rate", pcm512x_vnuf),
++SOC_ENUM("Volume Ramp Up Step", pcm512x_vnus),
++SOC_ENUM("Volume Ramp Down Emergency Rate", pcm512x_vedf),
++SOC_ENUM("Volume Ramp Down Emergency Step", pcm512x_veds),
++};
++
++static const struct snd_soc_dapm_widget pcm512x_dapm_widgets[] = {
++SND_SOC_DAPM_DAC("DACL", NULL, SND_SOC_NOPM, 0, 0),
++SND_SOC_DAPM_DAC("DACR", NULL, SND_SOC_NOPM, 0, 0),
++
++SND_SOC_DAPM_OUTPUT("OUTL"),
++SND_SOC_DAPM_OUTPUT("OUTR"),
++};
++
++static const struct snd_soc_dapm_route pcm512x_dapm_routes[] = {
++ { "DACL", NULL, "Playback" },
++ { "DACR", NULL, "Playback" },
++
++ { "OUTL", NULL, "DACL" },
++ { "OUTR", NULL, "DACR" },
++};
++
++static int pcm512x_set_bias_level(struct snd_soc_codec *codec,
++ enum snd_soc_bias_level level)
++{
++ struct pcm512x_priv *pcm512x = dev_get_drvdata(codec->dev);
++ int ret;
++
++ switch (level) {
++ case SND_SOC_BIAS_ON:
++ case SND_SOC_BIAS_PREPARE:
++ break;
++
++ case SND_SOC_BIAS_STANDBY:
++ ret = regmap_update_bits(pcm512x->regmap, PCM512x_POWER,
++ PCM512x_RQST, 0);
++ if (ret != 0) {
++ dev_err(codec->dev, "Failed to remove standby: %d\n",
++ ret);
++ return ret;
++ }
++ break;
++
++ case SND_SOC_BIAS_OFF:
++ ret = regmap_update_bits(pcm512x->regmap, PCM512x_POWER,
++ PCM512x_RQST, PCM512x_RQST);
++ if (ret != 0) {
++ dev_err(codec->dev, "Failed to request standby: %d\n",
++ ret);
++ return ret;
++ }
++ break;
++ }
++
++ codec->dapm.bias_level = level;
++
++ return 0;
++}
++
++static struct snd_soc_dai_driver pcm512x_dai = {
++ .name = "pcm512x-hifi",
++ .playback = {
++ .stream_name = "Playback",
++ .channels_min = 2,
++ .channels_max = 2,
++ .rates = SNDRV_PCM_RATE_8000_192000,
++ .formats = SNDRV_PCM_FMTBIT_S16_LE |
++ SNDRV_PCM_FMTBIT_S24_LE |
++ SNDRV_PCM_FMTBIT_S32_LE
++ },
++};
++
++static struct snd_soc_codec_driver pcm512x_codec_driver = {
++ .set_bias_level = pcm512x_set_bias_level,
++ .idle_bias_off = true,
++
++ .controls = pcm512x_controls,
++ .num_controls = ARRAY_SIZE(pcm512x_controls),
++ .dapm_widgets = pcm512x_dapm_widgets,
++ .num_dapm_widgets = ARRAY_SIZE(pcm512x_dapm_widgets),
++ .dapm_routes = pcm512x_dapm_routes,
++ .num_dapm_routes = ARRAY_SIZE(pcm512x_dapm_routes),
++};
++
++static const struct regmap_config pcm512x_regmap = {
++ .reg_bits = 8,
++ .val_bits = 8,
++
++ .readable_reg = pcm512x_readable,
++ .volatile_reg = pcm512x_volatile,
++
++ .max_register = PCM512x_MAX_REGISTER,
++ .reg_defaults = pcm512x_reg_defaults,
++ .num_reg_defaults = ARRAY_SIZE(pcm512x_reg_defaults),
++ .cache_type = REGCACHE_RBTREE,
++};
++
++static const struct of_device_id pcm512x_of_match[] = {
++ { .compatible = "ti,pcm5121", },
++ { .compatible = "ti,pcm5122", },
++ { }
++};
++MODULE_DEVICE_TABLE(of, pcm512x_of_match);
++
++static int pcm512x_probe(struct device *dev, struct regmap *regmap)
++{
++ struct pcm512x_priv *pcm512x;
++ int i, ret;
++
++ pcm512x = devm_kzalloc(dev, sizeof(struct pcm512x_priv), GFP_KERNEL);
++ if (!pcm512x)
++ return -ENOMEM;
++
++ dev_set_drvdata(dev, pcm512x);
++ pcm512x->regmap = regmap;
++
++ for (i = 0; i < ARRAY_SIZE(pcm512x->supplies); i++)
++ pcm512x->supplies[i].supply = pcm512x_supply_names[i];
++
++ ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(pcm512x->supplies),
++ pcm512x->supplies);
++ if (ret != 0) {
++ dev_err(dev, "Failed to get supplies: %d\n", ret);
++ return ret;
++ }
++
++ pcm512x->supply_nb[0].notifier_call = pcm512x_regulator_event_0;
++ pcm512x->supply_nb[1].notifier_call = pcm512x_regulator_event_1;
++ pcm512x->supply_nb[2].notifier_call = pcm512x_regulator_event_2;
++
++ for (i = 0; i < ARRAY_SIZE(pcm512x->supplies); i++) {
++ ret = regulator_register_notifier(pcm512x->supplies[i].consumer,
++ &pcm512x->supply_nb[i]);
++ if (ret != 0) {
++ dev_err(dev,
++ "Failed to register regulator notifier: %d\n",
++ ret);
++ }
++ }
++
++ ret = regulator_bulk_enable(ARRAY_SIZE(pcm512x->supplies),
++ pcm512x->supplies);
++ if (ret != 0) {
++ dev_err(dev, "Failed to enable supplies: %d\n", ret);
++ return ret;
++ }
++
++ /* Reset the device, verifying I/O in the process for I2C */
++ ret = regmap_write(regmap, PCM512x_RESET,
++ PCM512x_RSTM | PCM512x_RSTR);
++ if (ret != 0) {
++ dev_err(dev, "Failed to reset device: %d\n", ret);
++ goto err;
++ }
++
++ ret = regmap_write(regmap, PCM512x_RESET, 0);
++ if (ret != 0) {
++ dev_err(dev, "Failed to reset device: %d\n", ret);
++ goto err;
++ }
++
++ pcm512x->sclk = devm_clk_get(dev, NULL);
++ if (IS_ERR(pcm512x->sclk)) {
++ if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER)
++ return -EPROBE_DEFER;
++
++ dev_info(dev, "No SCLK, using BCLK: %ld\n",
++ PTR_ERR(pcm512x->sclk));
++
++ /* Disable reporting of missing SCLK as an error */
++ regmap_update_bits(regmap, PCM512x_ERROR_DETECT,
++ PCM512x_IDCH, PCM512x_IDCH);
++
++ /* Switch PLL input to BCLK */
++ regmap_update_bits(regmap, PCM512x_PLL_REF,
++ PCM512x_SREF, PCM512x_SREF);
++ } else {
++ ret = clk_prepare_enable(pcm512x->sclk);
++ if (ret != 0) {
++ dev_err(dev, "Failed to enable SCLK: %d\n", ret);
++ return ret;
++ }
++ }
++
++ /* Default to standby mode */
++ ret = regmap_update_bits(pcm512x->regmap, PCM512x_POWER,
++ PCM512x_RQST, PCM512x_RQST);
++ if (ret != 0) {
++ dev_err(dev, "Failed to request standby: %d\n",
++ ret);
++ goto err_clk;
++ }
++
++ pm_runtime_set_active(dev);
++ pm_runtime_enable(dev);
++ pm_runtime_idle(dev);
++
++ ret = snd_soc_register_codec(dev, &pcm512x_codec_driver,
++ &pcm512x_dai, 1);
++ if (ret != 0) {
++ dev_err(dev, "Failed to register CODEC: %d\n", ret);
++ goto err_pm;
++ }
++
++ dev_info(dev, "Completed initialisation - pcm512x_probe");
++
++ return 0;
++
++err_pm:
++ pm_runtime_disable(dev);
++err_clk:
++ if (!IS_ERR(pcm512x->sclk))
++ clk_disable_unprepare(pcm512x->sclk);
++err:
++ regulator_bulk_disable(ARRAY_SIZE(pcm512x->supplies),
++ pcm512x->supplies);
++ return ret;
++}
++
++static void pcm512x_remove(struct device *dev)
++{
++ struct pcm512x_priv *pcm512x = dev_get_drvdata(dev);
++
++ snd_soc_unregister_codec(dev);
++ pm_runtime_disable(dev);
++ if (!IS_ERR(pcm512x->sclk))
++ clk_disable_unprepare(pcm512x->sclk);
++ regulator_bulk_disable(ARRAY_SIZE(pcm512x->supplies),
++ pcm512x->supplies);
++}
++
++/* TODO
++static int pcm512x_suspend(struct device *dev)
++{
++ struct pcm512x_priv *pcm512x = dev_get_drvdata(dev);
++ int ret;
++
++ ret = regmap_update_bits(pcm512x->regmap, PCM512x_POWER,
++ PCM512x_RQPD, PCM512x_RQPD);
++ if (ret != 0) {
++ dev_err(dev, "Failed to request power down: %d\n", ret);
++ return ret;
++ }
++
++ ret = regulator_bulk_disable(ARRAY_SIZE(pcm512x->supplies),
++ pcm512x->supplies);
++ if (ret != 0) {
++ dev_err(dev, "Failed to disable supplies: %d\n", ret);
++ return ret;
++ }
++
++ if (!IS_ERR(pcm512x->sclk))
++ clk_disable_unprepare(pcm512x->sclk);
++
++ return 0;
++}
++
++static int pcm512x_resume(struct device *dev)
++{
++ struct pcm512x_priv *pcm512x = dev_get_drvdata(dev);
++ int ret;
++
++ if (!IS_ERR(pcm512x->sclk)) {
++ ret = clk_prepare_enable(pcm512x->sclk);
++ if (ret != 0) {
++ dev_err(dev, "Failed to enable SCLK: %d\n", ret);
++ return ret;
++ }
++ }
++
++ ret = regulator_bulk_enable(ARRAY_SIZE(pcm512x->supplies),
++ pcm512x->supplies);
++ if (ret != 0) {
++ dev_err(dev, "Failed to enable supplies: %d\n", ret);
++ return ret;
++ }
++
++ regcache_cache_only(pcm512x->regmap, false);
++ ret = regcache_sync(pcm512x->regmap);
++ if (ret != 0) {
++ dev_err(dev, "Failed to sync cache: %d\n", ret);
++ return ret;
++ }
++
++ ret = regmap_update_bits(pcm512x->regmap, PCM512x_POWER,
++ PCM512x_RQPD, 0);
++ if (ret != 0) {
++ dev_err(dev, "Failed to remove power down: %d\n", ret);
++ return ret;
++ }
++
++ return 0;
++}
++
++// END OF PCM512x_suspend and resume calls TODO
++*/
++
++static const struct dev_pm_ops pcm512x_pm_ops = {
++ SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL)
++};
++
++#if IS_ENABLED(CONFIG_I2C)
++static int pcm512x_i2c_probe(struct i2c_client *i2c,
++ const struct i2c_device_id *id)
++{
++ struct regmap *regmap;
++
++ regmap = devm_regmap_init_i2c(i2c, &pcm512x_regmap);
++ if (IS_ERR(regmap))
++ return PTR_ERR(regmap);
++
++ return pcm512x_probe(&i2c->dev, regmap);
++}
++
++static int pcm512x_i2c_remove(struct i2c_client *i2c)
++{
++ pcm512x_remove(&i2c->dev);
++ return 0;
++}
++
++static const struct i2c_device_id pcm512x_i2c_id[] = {
++ { "pcm5121", },
++ { "pcm5122", },
++ { }
++};
++MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
++
++static struct i2c_driver pcm512x_i2c_driver = {
++ .probe = pcm512x_i2c_probe,
++ .remove = pcm512x_i2c_remove,
++ .id_table = pcm512x_i2c_id,
++ .driver = {
++ .name = "pcm512x",
++ .owner = THIS_MODULE,
++ .of_match_table = pcm512x_of_match,
++ .pm = &pcm512x_pm_ops,
++ },
++};
++#endif
++
++#if defined(CONFIG_SPI_MASTER)
++static int pcm512x_spi_probe(struct spi_device *spi)
++{
++ struct regmap *regmap;
++ int ret;
++
++ regmap = devm_regmap_init_spi(spi, &pcm512x_regmap);
++ if (IS_ERR(regmap)) {
++ ret = PTR_ERR(regmap);
++ return ret;
++ }
++
++ return pcm512x_probe(&spi->dev, regmap);
++}
++
++static int pcm512x_spi_remove(struct spi_device *spi)
++{
++ pcm512x_remove(&spi->dev);
++ return 0;
++}
++
++static const struct spi_device_id pcm512x_spi_id[] = {
++ { "pcm5121", },
++ { "pcm5122", },
++ { },
++};
++MODULE_DEVICE_TABLE(spi, pcm512x_spi_id);
++
++static struct spi_driver pcm512x_spi_driver = {
++ .probe = pcm512x_spi_probe,
++ .remove = pcm512x_spi_remove,
++ .id_table = pcm512x_spi_id,
++ .driver = {
++ .name = "pcm512x",
++ .owner = THIS_MODULE,
++ .of_match_table = pcm512x_of_match,
++ .pm = &pcm512x_pm_ops,
++ },
++};
++#endif
++
++static int __init pcm512x_modinit(void)
++{
++ int ret = 0;
++
++#if IS_ENABLED(CONFIG_I2C)
++ ret = i2c_add_driver(&pcm512x_i2c_driver);
++ if (ret) {
++ printk(KERN_ERR "Failed to register pcm512x I2C driver: %d\n",
++ ret);
++ }
++#endif
++#if defined(CONFIG_SPI_MASTER)
++ ret = spi_register_driver(&pcm512x_spi_driver);
++ if (ret != 0) {
++ printk(KERN_ERR "Failed to register pcm512x SPI driver: %d\n",
++ ret);
++ }
++#endif
++ return ret;
++}
++module_init(pcm512x_modinit);
++
++static void __exit pcm512x_exit(void)
++{
++#if IS_ENABLED(CONFIG_I2C)
++ i2c_del_driver(&pcm512x_i2c_driver);
++#endif
++#if defined(CONFIG_SPI_MASTER)
++ spi_unregister_driver(&pcm512x_spi_driver);
++#endif
++}
++module_exit(pcm512x_exit);
++
++MODULE_DESCRIPTION("ASoC PCM512x codec driver");
++MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");
++MODULE_LICENSE("GPL v2");
+diff -Nur linux-3.10.36.orig/sound/soc/codecs/pcm512x.h linux-3.10.36/sound/soc/codecs/pcm512x.h
+--- linux-3.10.36.orig/sound/soc/codecs/pcm512x.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.36/sound/soc/codecs/pcm512x.h 2014-04-13 17:33:29.000000000 +0200
+@@ -0,0 +1,142 @@
++/*
++ * Driver for the PCM512x CODECs
++ *
++ * Author: Mark Brown <broonie@linaro.org>
++ * Copyright 2014 Linaro Ltd
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * version 2 as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ */
++
++#ifndef _SND_SOC_PCM512X
++#define _SND_SOC_PCM512X
++
++#define PCM512x_PAGE_0_BASE 0
++
++#define PCM512x_PAGE 0
++
++#define PCM512x_RESET (PCM512x_PAGE_0_BASE + 1)
++#define PCM512x_POWER (PCM512x_PAGE_0_BASE + 2)
++#define PCM512x_MUTE (PCM512x_PAGE_0_BASE + 3)
++#define PCM512x_PLL_EN (PCM512x_PAGE_0_BASE + 4)
++#define PCM512x_SPI_MISO_FUNCTION (PCM512x_PAGE_0_BASE + 6)
++#define PCM512x_DSP (PCM512x_PAGE_0_BASE + 7)
++#define PCM512x_GPIO_EN (PCM512x_PAGE_0_BASE + 8)
++#define PCM512x_BCLK_LRCLK_CFG (PCM512x_PAGE_0_BASE + 9)
++#define PCM512x_DSP_GPIO_INPUT (PCM512x_PAGE_0_BASE + 10)
++#define PCM512x_MASTER_MODE (PCM512x_PAGE_0_BASE + 12)
++#define PCM512x_PLL_REF (PCM512x_PAGE_0_BASE + 13)
++#define PCM512x_PLL_COEFF_0 (PCM512x_PAGE_0_BASE + 20)
++#define PCM512x_PLL_COEFF_1 (PCM512x_PAGE_0_BASE + 21)
++#define PCM512x_PLL_COEFF_2 (PCM512x_PAGE_0_BASE + 22)
++#define PCM512x_PLL_COEFF_3 (PCM512x_PAGE_0_BASE + 23)
++#define PCM512x_PLL_COEFF_4 (PCM512x_PAGE_0_BASE + 24)
++#define PCM512x_DSP_CLKDIV (PCM512x_PAGE_0_BASE + 27)
++#define PCM512x_DAC_CLKDIV (PCM512x_PAGE_0_BASE + 28)
++#define PCM512x_NCP_CLKDIV (PCM512x_PAGE_0_BASE + 29)
++#define PCM512x_OSR_CLKDIV (PCM512x_PAGE_0_BASE + 30)
++#define PCM512x_MASTER_CLKDIV_1 (PCM512x_PAGE_0_BASE + 32)
++#define PCM512x_MASTER_CLKDIV_2 (PCM512x_PAGE_0_BASE + 33)
++#define PCM512x_FS_SPEED_MODE (PCM512x_PAGE_0_BASE + 34)
++#define PCM512x_IDAC_1 (PCM512x_PAGE_0_BASE + 35)
++#define PCM512x_IDAC_2 (PCM512x_PAGE_0_BASE + 36)
++#define PCM512x_ERROR_DETECT (PCM512x_PAGE_0_BASE + 37)
++#define PCM512x_I2S_1 (PCM512x_PAGE_0_BASE + 40)
++#define PCM512x_I2S_2 (PCM512x_PAGE_0_BASE + 41)
++#define PCM512x_DAC_ROUTING (PCM512x_PAGE_0_BASE + 42)
++#define PCM512x_DSP_PROGRAM (PCM512x_PAGE_0_BASE + 43)
++#define PCM512x_CLKDET (PCM512x_PAGE_0_BASE + 44)
++#define PCM512x_AUTO_MUTE (PCM512x_PAGE_0_BASE + 59)
++#define PCM512x_DIGITAL_VOLUME_1 (PCM512x_PAGE_0_BASE + 60)
++#define PCM512x_DIGITAL_VOLUME_2 (PCM512x_PAGE_0_BASE + 61)
++#define PCM512x_DIGITAL_VOLUME_3 (PCM512x_PAGE_0_BASE + 62)
++#define PCM512x_DIGITAL_MUTE_1 (PCM512x_PAGE_0_BASE + 63)
++#define PCM512x_DIGITAL_MUTE_2 (PCM512x_PAGE_0_BASE + 64)
++#define PCM512x_DIGITAL_MUTE_3 (PCM512x_PAGE_0_BASE + 65)
++#define PCM512x_GPIO_OUTPUT_1 (PCM512x_PAGE_0_BASE + 80)
++#define PCM512x_GPIO_OUTPUT_2 (PCM512x_PAGE_0_BASE + 81)
++#define PCM512x_GPIO_OUTPUT_3 (PCM512x_PAGE_0_BASE + 82)
++#define PCM512x_GPIO_OUTPUT_4 (PCM512x_PAGE_0_BASE + 83)
++#define PCM512x_GPIO_OUTPUT_5 (PCM512x_PAGE_0_BASE + 84)
++#define PCM512x_GPIO_OUTPUT_6 (PCM512x_PAGE_0_BASE + 85)
++#define PCM512x_GPIO_CONTROL_1 (PCM512x_PAGE_0_BASE + 86)
++#define PCM512x_GPIO_CONTROL_2 (PCM512x_PAGE_0_BASE + 87)
++#define PCM512x_OVERFLOW (PCM512x_PAGE_0_BASE + 90)
++#define PCM512x_RATE_DET_1 (PCM512x_PAGE_0_BASE + 91)
++#define PCM512x_RATE_DET_2 (PCM512x_PAGE_0_BASE + 92)
++#define PCM512x_RATE_DET_3 (PCM512x_PAGE_0_BASE + 93)
++#define PCM512x_RATE_DET_4 (PCM512x_PAGE_0_BASE + 94)
++#define PCM512x_ANALOG_MUTE_DET (PCM512x_PAGE_0_BASE + 108)
++#define PCM512x_GPIN (PCM512x_PAGE_0_BASE + 119)
++#define PCM512x_DIGITAL_MUTE_DET (PCM512x_PAGE_0_BASE + 120)
++
++#define PCM512x_MAX_REGISTER (PCM512x_PAGE_0_BASE + 120)
++
++/* Page 0, Register 1 - reset */
++#define PCM512x_RSTR (1 << 0)
++#define PCM512x_RSTM (1 << 4)
++
++/* Page 0, Register 2 - power */
++#define PCM512x_RQPD (1 << 0)
++#define PCM512x_RQPD_SHIFT 0
++#define PCM512x_RQST (1 << 4)
++#define PCM512x_RQST_SHIFT 4
++
++/* Page 0, Register 3 - mute */
++#define PCM512x_RQMR_SHIFT 0
++#define PCM512x_RQML_SHIFT 4
++
++/* Page 0, Register 4 - PLL */
++#define PCM512x_PLCE (1 << 0)
++#define PCM512x_RLCE_SHIFT 0
++#define PCM512x_PLCK (1 << 4)
++#define PCM512x_PLCK_SHIFT 4
++
++/* Page 0, Register 7 - DSP */
++#define PCM512x_SDSL (1 << 0)
++#define PCM512x_SDSL_SHIFT 0
++#define PCM512x_DEMP (1 << 4)
++#define PCM512x_DEMP_SHIFT 4
++
++/* Page 0, Register 13 - PLL reference */
++#define PCM512x_SREF (1 << 4)
++
++/* Page 0, Register 37 - Error detection */
++#define PCM512x_IPLK (1 << 0)
++#define PCM512x_DCAS (1 << 1)
++#define PCM512x_IDCM (1 << 2)
++#define PCM512x_IDCH (1 << 3)
++#define PCM512x_IDSK (1 << 4)
++#define PCM512x_IDBK (1 << 5)
++#define PCM512x_IDFS (1 << 6)
++
++/* Page 0, Register 42 - DAC routing */
++#define PCM512x_AUPR_SHIFT 0
++#define PCM512x_AUPL_SHIFT 4
++
++/* Page 0, Register 59 - auto mute */
++#define PCM512x_ATMR_SHIFT 0
++#define PCM512x_ATML_SHIFT 4
++
++/* Page 0, Register 63 - ramp rates */
++#define PCM512x_VNDF_SHIFT 6
++#define PCM512x_VNDS_SHIFT 4
++#define PCM512x_VNUF_SHIFT 2
++#define PCM512x_VNUS_SHIFT 0
++
++/* Page 0, Register 64 - emergency ramp rates */
++#define PCM512x_VEDF_SHIFT 6
++#define PCM512x_VEDS_SHIFT 4
++
++/* Page 0, Register 65 - Digital mute enables */
++#define PCM512x_ACTL_SHIFT 2
++#define PCM512x_AMLE_SHIFT 1
++#define PCM512x_AMLR_SHIFT 0
++
++#endif
+diff -Nur linux-3.10.36.orig/sound/soc/codecs/wm8804.c linux-3.10.36/sound/soc/codecs/wm8804.c
+--- linux-3.10.36.orig/sound/soc/codecs/wm8804.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/sound/soc/codecs/wm8804.c 2014-04-13 17:33:29.000000000 +0200
@@ -63,6 +63,7 @@
struct regmap *regmap;
struct regulator_bulk_data supplies[WM8804_NUM_SUPPLIES];
@@ -101409,9 +101927,9 @@ diff -Nur linux-3.10.33/sound/soc/codecs/wm8804.c linux-raspberry-pi/sound/soc/c
.controls = wm8804_snd_controls,
.num_controls = ARRAY_SIZE(wm8804_snd_controls),
-diff -Nur linux-3.10.33/sound/soc/codecs/wm8804.h linux-raspberry-pi/sound/soc/codecs/wm8804.h
---- linux-3.10.33/sound/soc/codecs/wm8804.h 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/codecs/wm8804.h 2014-03-13 12:46:44.660108313 +0100
+diff -Nur linux-3.10.36.orig/sound/soc/codecs/wm8804.h linux-3.10.36/sound/soc/codecs/wm8804.h
+--- linux-3.10.36.orig/sound/soc/codecs/wm8804.h 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/sound/soc/codecs/wm8804.h 2014-04-13 17:33:29.000000000 +0200
@@ -57,5 +57,9 @@
#define WM8804_CLKOUT_SRC_OSCCLK 4
@@ -101422,9 +101940,9 @@ diff -Nur linux-3.10.33/sound/soc/codecs/wm8804.h linux-raspberry-pi/sound/soc/c
+#define WM8804_MCLKDIV_128FS 1
#endif /* _WM8804_H */
-diff -Nur linux-3.10.33/sound/soc/Kconfig linux-raspberry-pi/sound/soc/Kconfig
---- linux-3.10.33/sound/soc/Kconfig 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/Kconfig 2014-03-13 12:46:44.420107831 +0100
+diff -Nur linux-3.10.36.orig/sound/soc/Kconfig linux-3.10.36/sound/soc/Kconfig
+--- linux-3.10.36.orig/sound/soc/Kconfig 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/sound/soc/Kconfig 2014-04-13 17:33:28.000000000 +0200
@@ -36,6 +36,7 @@
# All the supported SoCs
source "sound/soc/atmel/Kconfig"
@@ -101433,9 +101951,9 @@ diff -Nur linux-3.10.33/sound/soc/Kconfig linux-raspberry-pi/sound/soc/Kconfig
source "sound/soc/blackfin/Kconfig"
source "sound/soc/cirrus/Kconfig"
source "sound/soc/davinci/Kconfig"
-diff -Nur linux-3.10.33/sound/soc/Makefile linux-raspberry-pi/sound/soc/Makefile
---- linux-3.10.33/sound/soc/Makefile 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/Makefile 2014-03-13 12:46:44.420107831 +0100
+diff -Nur linux-3.10.36.orig/sound/soc/Makefile linux-3.10.36/sound/soc/Makefile
+--- linux-3.10.36.orig/sound/soc/Makefile 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/sound/soc/Makefile 2014-04-13 17:33:28.000000000 +0200
@@ -14,6 +14,7 @@
obj-$(CONFIG_SND_SOC) += generic/
obj-$(CONFIG_SND_SOC) += atmel/
@@ -101444,10 +101962,68 @@ diff -Nur linux-3.10.33/sound/soc/Makefile linux-raspberry-pi/sound/soc/Makefile
obj-$(CONFIG_SND_SOC) += blackfin/
obj-$(CONFIG_SND_SOC) += cirrus/
obj-$(CONFIG_SND_SOC) += davinci/
-diff -Nur linux-3.10.33/sound/soc/soc-core.c linux-raspberry-pi/sound/soc/soc-core.c
---- linux-3.10.33/sound/soc/soc-core.c 2014-03-07 06:58:45.000000000 +0100
-+++ linux-raspberry-pi/sound/soc/soc-core.c 2014-03-13 12:46:44.888108771 +0100
-@@ -3463,6 +3463,22 @@
+diff -Nur linux-3.10.36.orig/sound/soc/soc-core.c linux-3.10.36/sound/soc/soc-core.c
+--- linux-3.10.36.orig/sound/soc/soc-core.c 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/sound/soc/soc-core.c 2014-04-13 17:33:29.000000000 +0200
+@@ -2925,8 +2925,8 @@
+
+ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+ uinfo->count = snd_soc_volsw_is_stereo(mc) ? 2 : 1;
+- uinfo->value.integer.min = 0;
+- uinfo->value.integer.max = platform_max - min;
++ uinfo->value.integer.min = min;
++ uinfo->value.integer.max = platform_max;
+
+ return 0;
+ }
+@@ -2957,9 +2957,10 @@
+ unsigned int val, val_mask;
+ int ret;
+
+- val = ((ucontrol->value.integer.value[0] + min) & mask);
+ if (invert)
+- val = max - val;
++ val = ((max - ucontrol->value.integer.value[0] + min) & mask);
++ else
++ val = (ucontrol->value.integer.value[0] & mask);
+ val_mask = mask << shift;
+ val = val << shift;
+
+@@ -2968,9 +2969,10 @@
+ return ret;
+
+ if (snd_soc_volsw_is_stereo(mc)) {
+- val = ((ucontrol->value.integer.value[1] + min) & mask);
+ if (invert)
+- val = max - val;
++ val = ((max - ucontrol->value.integer.value[1] + min) & mask);
++ else
++ val = (ucontrol->value.integer.value[1] & mask);
+ val_mask = mask << shift;
+ val = val << shift;
+
+@@ -3008,18 +3010,14 @@
+ (snd_soc_read(codec, reg) >> shift) & mask;
+ if (invert)
+ ucontrol->value.integer.value[0] =
+- max - ucontrol->value.integer.value[0];
+- ucontrol->value.integer.value[0] =
+- ucontrol->value.integer.value[0] - min;
++ max - ucontrol->value.integer.value[0] + min;
+
+ if (snd_soc_volsw_is_stereo(mc)) {
+ ucontrol->value.integer.value[1] =
+ (snd_soc_read(codec, rreg) >> shift) & mask;
+ if (invert)
+ ucontrol->value.integer.value[1] =
+- max - ucontrol->value.integer.value[1];
+- ucontrol->value.integer.value[1] =
+- ucontrol->value.integer.value[1] - min;
++ max - ucontrol->value.integer.value[1] + min;
+ }
+
+ return 0;
+@@ -3463,6 +3461,22 @@
EXPORT_SYMBOL_GPL(snd_soc_codec_set_pll);
/**
diff --git a/target/linux/patches/3.10.34/bsd-compatibility.patch b/target/linux/patches/3.10.36/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.10.34/bsd-compatibility.patch
+++ b/target/linux/patches/3.10.36/bsd-compatibility.patch
diff --git a/target/linux/patches/3.10.34/startup.patch b/target/linux/patches/3.10.36/startup.patch
index 3ebc5db1e..3ebc5db1e 100644
--- a/target/linux/patches/3.10.34/startup.patch
+++ b/target/linux/patches/3.10.36/startup.patch
diff --git a/toolchain/kernel-headers/patches/3.10.34/cleankernel.patch b/toolchain/kernel-headers/patches/3.10.34/cleankernel.patch
deleted file mode 100644
index 5f26a6b72..000000000
--- a/toolchain/kernel-headers/patches/3.10.34/cleankernel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-3.10.30.orig/scripts/Makefile.headersinst linux-3.10.30/scripts/Makefile.headersinst
---- linux-3.10.30.orig/scripts/Makefile.headersinst 2014-02-13 22:48:15.000000000 +0100
-+++ linux-3.10.30/scripts/Makefile.headersinst 2014-03-09 09:47:17.000000000 +0100
-@@ -99,7 +99,6 @@
-
- targets += $(install-file)
- $(install-file): scripts/headers_install.sh $(input-files) FORCE
-- $(if $(unwanted),$(call cmd,remove),)
- $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- $(call if_changed,install)
-
diff --git a/toolchain/kernel-headers/patches/3.10.36/headers-install.patch b/toolchain/kernel-headers/patches/3.10.36/headers-install.patch
new file mode 100644
index 000000000..de37bdafb
--- /dev/null
+++ b/toolchain/kernel-headers/patches/3.10.36/headers-install.patch
@@ -0,0 +1,91 @@
+diff -Nur linux-3.10.36.orig/scripts/headers_install.sh linux-3.10.36/scripts/headers_install.sh
+--- linux-3.10.36.orig/scripts/headers_install.sh 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/scripts/headers_install.sh 2014-04-14 20:32:34.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ if [ $# -lt 1 ]
+ then
+- echo "Usage: headers_install.sh OUTDIR [FILES...]
++ echo "Usage: headers_install.sh OUTDIR SRCDIR [FILES...]
+ echo
+ echo "Prepares kernel header files for use by user space, by removing"
+ echo "all compiler.h definitions and #includes, removing any"
+@@ -10,6 +10,7 @@
+ echo "asm/inline/volatile keywords."
+ echo
+ echo "OUTDIR: directory to write each userspace header FILE to."
++ echo "SRCDIR: source directory where files are picked."
+ echo "FILES: list of header files to operate on."
+
+ exit 1
+@@ -19,6 +20,8 @@
+
+ OUTDIR="$1"
+ shift
++SRCDIR="$1"
++shift
+
+ # Iterate through files listed on command line
+
+@@ -34,7 +37,7 @@
+ -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
+ -e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
+ -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
+- "$i" > "$OUTDIR/$FILE.sed" || exit 1
++ "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
+ scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
+ > "$OUTDIR/$FILE"
+ [ $? -gt 1 ] && exit 1
+diff -Nur linux-3.10.36.orig/scripts/Makefile.headersinst linux-3.10.36/scripts/Makefile.headersinst
+--- linux-3.10.36.orig/scripts/Makefile.headersinst 2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/scripts/Makefile.headersinst 2014-04-14 20:42:47.000000000 +0200
+@@ -47,18 +47,24 @@
+ all-files := $(header-y) $(genhdr-y) $(wrapper-files)
+ output-files := $(addprefix $(installdir)/, $(all-files))
+
+-input-files := $(foreach hdr, $(header-y), \
++input-files1 := $(foreach hdr, $(header-y), \
+ $(if $(wildcard $(srcdir)/$(hdr)), \
+- $(wildcard $(srcdir)/$(hdr)), \
++ $(wildcard $(srcdir)/$(hdr))) \
++ )
++input-files1-name := $(notdir $(input-files1))
++input-files2 := $(foreach hdr, $(header-y), \
++ $(if $(wildcard $(srcdir)/$(hdr)),, \
+ $(if $(wildcard $(oldsrcdir)/$(hdr)), \
+ $(wildcard $(oldsrcdir)/$(hdr)), \
+ $(error Missing UAPI file $(srcdir)/$(hdr))) \
+- )) \
+- $(foreach hdr, $(genhdr-y), \
++ ))
++input-files2-name := $(notdir $(input-files2))
++input-files3 := $(foreach hdr, $(genhdr-y), \
+ $(if $(wildcard $(gendir)/$(hdr)), \
+ $(wildcard $(gendir)/$(hdr)), \
+ $(error Missing generated UAPI file $(gendir)/$(hdr)) \
+ ))
++input-files3-name := $(notdir $(input-files3))
+
+ # Work out what needs to be removed
+ oldheaders := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
+@@ -72,7 +78,9 @@
+ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
+ file$(if $(word 2, $(all-files)),s))
+ cmd_install = \
+- $(CONFIG_SHELL) $< $(installdir) $(input-files); \
++ $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \
++ $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \
++ $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \
+ for F in $(wrapper-files); do \
+ echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \
+ done; \
+@@ -98,8 +106,7 @@
+ @:
+
+ targets += $(install-file)
+-$(install-file): scripts/headers_install.sh $(input-files) FORCE
+- $(if $(unwanted),$(call cmd,remove),)
++$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
+ $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
+ $(call if_changed,install)
+
diff --git a/toolchain/kernel-headers/patches/3.10.34/mkpiggy.patch b/toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.10.34/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.10.36/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.10.34/relocs.patch b/toolchain/kernel-headers/patches/3.10.36/relocs.patch
index 649b9e73e..649b9e73e 100644
--- a/toolchain/kernel-headers/patches/3.10.34/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.10.36/relocs.patch
diff --git a/toolchain/kernel-headers/patches/3.10.34/sgidefs.patch b/toolchain/kernel-headers/patches/3.10.36/sgidefs.patch
index f00a284d9..f00a284d9 100644
--- a/toolchain/kernel-headers/patches/3.10.34/sgidefs.patch
+++ b/toolchain/kernel-headers/patches/3.10.36/sgidefs.patch
diff --git a/toolchain/kernel-headers/patches/3.10.34/sortext.patch b/toolchain/kernel-headers/patches/3.10.36/sortext.patch
index 65bbbb64b..65bbbb64b 100644
--- a/toolchain/kernel-headers/patches/3.10.34/sortext.patch
+++ b/toolchain/kernel-headers/patches/3.10.36/sortext.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 10:41:38 +0000