summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.runtime11
-rw-r--r--target/linux/config/Config.in.audio33
-rw-r--r--target/linux/config/Config.in.debug1
-rw-r--r--target/linux/config/Config.in.netfilter.ip411
-rw-r--r--target/linux/config/Config.in.watchdog2
-rw-r--r--target/linux/patches/3.12.13/raspberry.patch1974
-rw-r--r--target/linux/patches/3.13.6/bsd-compatibility.patch (renamed from target/linux/patches/3.13.5/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.13.6/defaults.patch (renamed from target/linux/patches/3.13.5/defaults.patch)0
-rw-r--r--target/linux/patches/3.13.6/disable-netfilter.patch (renamed from target/linux/patches/3.13.5/disable-netfilter.patch)0
-rw-r--r--target/linux/patches/3.13.6/export-symbol-for-exmap.patch (renamed from target/linux/patches/3.13.5/export-symbol-for-exmap.patch)0
-rw-r--r--target/linux/patches/3.13.6/gemalto.patch (renamed from target/linux/patches/3.13.5/gemalto.patch)0
-rw-r--r--target/linux/patches/3.13.6/lemote-rfkill.patch (renamed from target/linux/patches/3.13.5/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.13.6/microblaze-axi.patch (renamed from target/linux/patches/3.13.5/microblaze-axi.patch)0
-rw-r--r--target/linux/patches/3.13.6/microblaze-early-printk.patch12
-rw-r--r--target/linux/patches/3.13.6/microblaze-ethernet.patch (renamed from target/linux/patches/3.13.5/microblaze-ethernet.patch)0
-rw-r--r--target/linux/patches/3.13.6/microblaze-setup.patch (renamed from target/linux/patches/3.13.5/microblaze-setup.patch)0
-rw-r--r--target/linux/patches/3.13.6/mtd-rootfs.patch (renamed from target/linux/patches/3.13.5/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.13.6/non-static.patch (renamed from target/linux/patches/3.13.5/non-static.patch)0
-rw-r--r--target/linux/patches/3.13.6/ppc64-missing-zlib.patch (renamed from target/linux/patches/3.13.5/ppc64-missing-zlib.patch)0
-rw-r--r--target/linux/patches/3.13.6/ppc64-missing_arch_random.patch (renamed from target/linux/patches/3.13.5/ppc64-missing_arch_random.patch)0
-rw-r--r--target/linux/patches/3.13.6/raspberry.patch (renamed from target/linux/patches/3.13.5/raspberry.patch)2282
-rw-r--r--target/linux/patches/3.13.6/startup.patch (renamed from target/linux/patches/3.13.5/startup.patch)0
-rw-r--r--target/linux/patches/3.13.6/uuid.patch (renamed from target/linux/patches/3.13.5/uuid.patch)0
-rw-r--r--target/linux/patches/3.13.6/vga-cons-default-off.patch (renamed from target/linux/patches/3.13.5/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.13.6/wlan-cf.patch (renamed from target/linux/patches/3.13.5/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.13.6/xargs.patch (renamed from target/linux/patches/3.13.5/xargs.patch)0
-rw-r--r--target/linux/patches/3.13.6/zlib-inflate.patch (renamed from target/linux/patches/3.13.5/zlib-inflate.patch)0
-rw-r--r--target/packages/pkg-available/test1
-rw-r--r--target/sparc/Makefile6
29 files changed, 2657 insertions, 1676 deletions
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 3634564ed..7848a25ce 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -77,7 +77,7 @@ prompt "Initial login shell for the root user"
default ADK_ROOTSH_MKSH
config ADK_ROOTSH_MKSH
- select ADK_PACKAGE_MKSH
+ select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
bool "mksh (MirBSD Korn Shell)"
help
Use mksh (a Korn Shell variant) as standard login shell
@@ -97,13 +97,6 @@ config ADK_ROOTSH_BASH
help
Use GNU bash as standard login shell for the superuser.
-config ADK_ROOTSH_MKSH
- select ADK_PACKAGE_MKSH
- bool "mksh (MirBSD Korn Shell)"
- help
- Use mksh (a Korn Shell variant) as standard login shell
- for the superuser.
-
config ADK_ROOTSH_TCSH
select ADK_PACKAGE_TCSH
bool "tcsh (Tenex C Shell)"
@@ -124,7 +117,7 @@ prompt "System /bin/sh (POSIX script shell)"
default ADK_BINSH_MKSH
config ADK_BINSH_MKSH
- select ADK_PACKAGE_MKSH
+ select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
bool "mksh (MirBSD Korn Shell)"
help
Use mksh (a Korn Shell variant) as system shell, which is
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 76c353f0c..c466bed45 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -7,9 +7,6 @@ config ADK_KERNEL_SND_ARM
config ADK_KERNEL_SND_USB
boolean
-config ADK_KERNEL_SND_SOC
- boolean
-
config ADK_KERNEL_SND_PXA2XX_AC97
boolean
@@ -105,6 +102,10 @@ config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
help
ALSA AMD CS5535 driver
+config ADK_KPACKAGE_KMOD_SND_SOC
+ tristate
+ default n
+
config ADK_KERNEL_SND_PXA2XX_SOC
tristate
default n
@@ -113,10 +114,10 @@ config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ
prompt "kmod-snd-pxa2xx-soc-spitz..... ALSA SOC Sharp Zaurus"
tristate
select ADK_KERNEL_SND_ARM
- select ADK_KERNEL_SND_SOC
select ADK_KERNEL_SND_PXA2XX_AC97
- select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
select ADK_KPACKAGE_KMOD_SND
+ select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
+ select ADK_KPACKAGE_KMOD_SND_SOC
select ADK_KERNEL_SND_PXA2XX_SOC
depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -131,4 +132,26 @@ config ADK_KPACKAGE_KMOD_SND_BCM2835
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
+config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+ prompt "kmod-snd-bcm2708-soc-i2s........ ALSA SOC I2S Raspberry PI"
+ select ADK_KPACKAGE_KMOD_SND
+ select ADK_KERNEL_SND_ARM
+ select ADK_KPACKAGE_KMOD_SND_SOC
+ boolean
+ default n
+
+config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC
+ prompt "kmod-snd-bcm2708-hifiberry-dac.... ALSA for Raspberry PI with hifiberry DAC"
+ tristate
+ select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+ depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default n
+
+config ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DIGI
+ prompt "kmod-snd-bcm2708-hifiberry-digi... ALSA for Raspberry PI with hifiberry DIGI"
+ tristate
+ select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_I2S
+ depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
+ default n
+
endmenu
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index 46942160f..80387c627 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -34,6 +34,7 @@ config ADK_KERNEL_PRINTK
boolean
select ADK_KERNEL_EARLY_PRINTK
default y
+ depends on !ADK_PKG_TEST
help
Disable printk to save space and quieten bootup.
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index cf33c02a2..b43a566b9 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -37,9 +37,10 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
config ADK_KPACKAGE_KMOD_FULL_NAT
tristate "Meta package for Full NAT"
select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30
select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_11
- select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_5
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13
+ select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6
config ADK_KPACKAGE_KMOD_NF_NAT
tristate 'Full NAT'
@@ -53,8 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT
config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
tristate 'Full NAT'
depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
- depends on ADK_KERNEL_VERSION_3_11_10 || ADK_KERNEL_VERSION_3_12_11 \
- || ADK_KERNEL_VERSION_3_13_5
+ depends on ADK_KERNEL_VERSION_3_10_30 \
+ || ADK_KERNEL_VERSION_3_11_10 \
+ || ADK_KERNEL_VERSION_3_12_13 \
+ || ADK_KERNEL_VERSION_3_13_6
help
The Full NAT option allows masquerading, port forwarding and other
forms of full Network Address Port Translation. It is controlled by
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 08e884a01..4a727e7d6 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -73,7 +73,7 @@ config ADK_KERNEL_RC32434_WDT
Routerboard 532's SoC, the IDT RC32434.
config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG
- prompt "kmod-softdog...................... Software watchdog"
+ prompt "kmod-soft-watchdog...................... Software watchdog"
tristate
default n
select ADK_KERNEL_WATCHDOG
diff --git a/target/linux/patches/3.12.13/raspberry.patch b/target/linux/patches/3.12.13/raspberry.patch
index 3a0290e84..c306f4faf 100644
--- a/target/linux/patches/3.12.13/raspberry.patch
+++ b/target/linux/patches/3.12.13/raspberry.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-3.12.11.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.12.11/arch/arm/configs/bcmrpi_cutdown_defconfig
---- linux-3.12.11.orig/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/configs/bcmrpi_cutdown_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig
+--- linux-3.12.13/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/configs/bcmrpi_cutdown_defconfig 2014-03-11 17:51:00.000000000 +0100
@@ -0,0 +1,503 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -505,10 +505,10 @@ diff -Nur linux-3.12.11.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_BCM2708=m
-diff -Nur linux-3.12.11.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.11/arch/arm/configs/bcmrpi_defconfig
---- linux-3.12.11.orig/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/configs/bcmrpi_defconfig 2014-02-18 11:52:14.000000000 +0100
-@@ -0,0 +1,1092 @@
+diff -Nur linux-3.12.13/arch/arm/configs/bcmrpi_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.12.13/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/configs/bcmrpi_defconfig 2014-03-11 17:51:00.000000000 +0100
+@@ -0,0 +1,1094 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
@@ -1247,8 +1247,10 @@ diff -Nur linux-3.12.11.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.11/arc
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
++CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_BCM2708_SOC_I2S=m
+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
++CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
+CONFIG_SND_BCM2708_SOC_RPI_DAC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_PCM5102A=m
@@ -1601,9 +1603,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.11/arc
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.11.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3.12.11/arch/arm/configs/bcmrpi_emergency_defconfig
---- linux-3.12.11.orig/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/configs/bcmrpi_emergency_defconfig 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/configs/bcmrpi_emergency_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig
+--- linux-3.12.13/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/configs/bcmrpi_emergency_defconfig 2014-03-11 17:31:42.000000000 +0100
@@ -0,0 +1,532 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
@@ -2137,9 +2139,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/configs/bcmrpi_emergency_defconfig linux-3
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.11.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.12.11/arch/arm/configs/bcmrpi_quick_defconfig
---- linux-3.12.11.orig/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/configs/bcmrpi_quick_defconfig 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/configs/bcmrpi_quick_defconfig linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig
+--- linux-3.12.13/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/configs/bcmrpi_quick_defconfig 2014-03-11 17:31:42.000000000 +0100
@@ -0,0 +1,197 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_LOCALVERSION="-quick"
@@ -2338,9 +2340,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/configs/bcmrpi_quick_defconfig linux-3.12.
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y
-diff -Nur linux-3.12.11.orig/arch/arm/include/asm/fiq.h linux-3.12.11/arch/arm/include/asm/fiq.h
---- linux-3.12.11.orig/arch/arm/include/asm/fiq.h 2014-02-13 22:51:06.000000000 +0100
-+++ linux-3.12.11/arch/arm/include/asm/fiq.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/include/asm/fiq.h linux-raspberry-pi/arch/arm/include/asm/fiq.h
+--- linux-3.12.13/arch/arm/include/asm/fiq.h 2014-02-22 22:32:50.000000000 +0100
++++ linux-raspberry-pi/arch/arm/include/asm/fiq.h 2014-03-11 17:31:42.000000000 +0100
@@ -42,6 +42,7 @@
/* helpers defined in fiqasm.S: */
extern void __set_fiq_regs(unsigned long const *regs);
@@ -2349,9 +2351,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/include/asm/fiq.h linux-3.12.11/arch/arm/i
static inline void set_fiq_regs(struct pt_regs const *regs)
{
-diff -Nur linux-3.12.11.orig/arch/arm/Kconfig linux-3.12.11/arch/arm/Kconfig
---- linux-3.12.11.orig/arch/arm/Kconfig 2014-02-13 22:51:06.000000000 +0100
-+++ linux-3.12.11/arch/arm/Kconfig 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/Kconfig linux-raspberry-pi/arch/arm/Kconfig
+--- linux-3.12.13/arch/arm/Kconfig 2014-02-22 22:32:50.000000000 +0100
++++ linux-raspberry-pi/arch/arm/Kconfig 2014-03-11 17:51:00.000000000 +0100
@@ -368,6 +368,24 @@
This enables support for systems based on Atmel
AT91RM9200 and AT91SAM9* processors.
@@ -2385,9 +2387,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/Kconfig linux-3.12.11/arch/arm/Kconfig
source "arch/arm/mach-zynq/Kconfig"
-diff -Nur linux-3.12.11.orig/arch/arm/Kconfig.debug linux-3.12.11/arch/arm/Kconfig.debug
---- linux-3.12.11.orig/arch/arm/Kconfig.debug 2014-02-13 22:51:06.000000000 +0100
-+++ linux-3.12.11/arch/arm/Kconfig.debug 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/Kconfig.debug linux-raspberry-pi/arch/arm/Kconfig.debug
+--- linux-3.12.13/arch/arm/Kconfig.debug 2014-02-22 22:32:50.000000000 +0100
++++ linux-raspberry-pi/arch/arm/Kconfig.debug 2014-03-11 17:51:00.000000000 +0100
@@ -847,6 +847,14 @@
options; the platform specific options are deprecated
and will be soon removed.
@@ -2403,9 +2405,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/Kconfig.debug linux-3.12.11/arch/arm/Kconf
endchoice
config DEBUG_EXYNOS_UART
-diff -Nur linux-3.12.11.orig/arch/arm/kernel/fiqasm.S linux-3.12.11/arch/arm/kernel/fiqasm.S
---- linux-3.12.11.orig/arch/arm/kernel/fiqasm.S 2014-02-13 22:51:06.000000000 +0100
-+++ linux-3.12.11/arch/arm/kernel/fiqasm.S 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/kernel/fiqasm.S linux-raspberry-pi/arch/arm/kernel/fiqasm.S
+--- linux-3.12.13/arch/arm/kernel/fiqasm.S 2014-02-22 22:32:50.000000000 +0100
++++ linux-raspberry-pi/arch/arm/kernel/fiqasm.S 2014-03-11 17:31:43.000000000 +0100
@@ -25,6 +25,9 @@
ENTRY(__set_fiq_regs)
mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
@@ -2424,9 +2426,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/kernel/fiqasm.S linux-3.12.11/arch/arm/ker
+ENTRY(__FIQ_Branch)
+ mov pc, r8
+ENDPROC(__FIQ_Branch)
-diff -Nur linux-3.12.11.orig/arch/arm/kernel/fiq.c linux-3.12.11/arch/arm/kernel/fiq.c
---- linux-3.12.11.orig/arch/arm/kernel/fiq.c 2014-02-13 22:51:06.000000000 +0100
-+++ linux-3.12.11/arch/arm/kernel/fiq.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/kernel/fiq.c linux-raspberry-pi/arch/arm/kernel/fiq.c
+--- linux-3.12.13/arch/arm/kernel/fiq.c 2014-02-22 22:32:50.000000000 +0100
++++ linux-raspberry-pi/arch/arm/kernel/fiq.c 2014-03-11 17:31:43.000000000 +0100
@@ -142,6 +142,7 @@
EXPORT_SYMBOL(set_fiq_handler);
EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */
@@ -2435,9 +2437,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/kernel/fiq.c linux-3.12.11/arch/arm/kernel
EXPORT_SYMBOL(claim_fiq);
EXPORT_SYMBOL(release_fiq);
EXPORT_SYMBOL(enable_fiq);
-diff -Nur linux-3.12.11.orig/arch/arm/kernel/process.c linux-3.12.11/arch/arm/kernel/process.c
---- linux-3.12.11.orig/arch/arm/kernel/process.c 2014-02-13 22:51:06.000000000 +0100
-+++ linux-3.12.11/arch/arm/kernel/process.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/kernel/process.c linux-raspberry-pi/arch/arm/kernel/process.c
+--- linux-3.12.13/arch/arm/kernel/process.c 2014-02-22 22:32:50.000000000 +0100
++++ linux-raspberry-pi/arch/arm/kernel/process.c 2014-03-11 17:51:02.000000000 +0100
@@ -176,6 +176,16 @@
default_idle();
}
@@ -2455,9 +2457,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/kernel/process.c linux-3.12.11/arch/arm/ke
/*
* Called by kexec, immediately prior to machine_kexec().
*
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.12.11/arch/arm/mach-bcm2708/armctrl.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/armctrl.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/armctrl.c linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c
+--- linux-3.12.13/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.c 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,219 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.c
@@ -2678,9 +2680,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/armctrl.c linux-3.12.11/arch/
+ init_FIQ(FIQ_START);
+ return 0;
+}
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.12.11/arch/arm/mach-bcm2708/armctrl.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/armctrl.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/armctrl.h linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h
+--- linux-3.12.13/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/armctrl.h 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,27 @@
+/*
+ * linux/arch/arm/mach-bcm2708/armctrl.h
@@ -2709,10 +2711,10 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/armctrl.h linux-3.12.11/arch/
+ u32 armctrl_sources, u32 resume_sources);
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.12.11/arch/arm/mach-bcm2708/bcm2708.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/bcm2708.c 2014-02-18 11:52:14.000000000 +0100
-@@ -0,0 +1,985 @@
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/bcm2708.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c
+--- linux-3.12.13/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.c 2014-03-11 17:51:02.000000000 +0100
+@@ -0,0 +1,1011 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.c
+ *
@@ -2798,6 +2800,8 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.12.11/arch/
+/* command line parameters */
+static unsigned boardrev, serial;
+static unsigned uart_clock;
++static unsigned disk_led_gpio = 16;
++static unsigned disk_led_active_low = 1;
+static unsigned reboot_part = 0;
+
+static void __init bcm2708_init_led(void);
@@ -3368,6 +3372,21 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.12.11/arch/
+};
+#endif
+
++#if defined(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) || defined(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI_MODULE)
++static struct platform_device snd_hifiberry_digi_device = {
++ .name = "snd-hifiberry-digi",
++ .id = 0,
++ .num_resources = 0,
++};
++
++static struct i2c_board_info __initdata snd_wm8804_i2c_devices[] = {
++ {
++ I2C_BOARD_INFO("wm8804", 0x3b)
++ },
++};
++
++#endif
++
+#if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE)
+static struct platform_device snd_rpi_dac_device = {
+ .name = "snd-rpi-dac",
@@ -3517,6 +3536,11 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.12.11/arch/
+ bcm_register_device(&snd_pcm5102a_codec_device);
+#endif
+
++#if defined(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) || defined(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI_MODULE)
++ bcm_register_device(&snd_hifiberry_digi_device);
++ i2c_register_board_info(1, snd_wm8804_i2c_devices, ARRAY_SIZE(snd_wm8804_i2c_devices));
++#endif
++
+#if defined(CONFIG_SND_BCM2708_SOC_RPI_DAC) || defined(CONFIG_SND_BCM2708_SOC_RPI_DAC_MODULE)
+ bcm_register_device(&snd_rpi_dac_device);
+ bcm_register_device(&snd_pcm1794a_codec_device);
@@ -3658,7 +3682,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.12.11/arch/
+
+static void __init bcm2708_init_led(void)
+{
-+ platform_device_register(&bcm2708_led_device);
++ bcm2708_leds[0].gpio = disk_led_gpio;
++ bcm2708_leds[0].active_low = disk_led_active_low;
++ platform_device_register(&bcm2708_led_device);
+}
+#else
+static inline void bcm2708_init_led(void)
@@ -3697,10 +3723,12 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.c linux-3.12.11/arch/
+module_param(boardrev, uint, 0644);
+module_param(serial, uint, 0644);
+module_param(uart_clock, uint, 0644);
++module_param(disk_led_gpio, uint, 0644);
++module_param(disk_led_active_low, uint, 0644);
+module_param(reboot_part, uint, 0644);
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.12.11/arch/arm/mach-bcm2708/bcm2708_gpio.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c
+--- linux-3.12.13/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708_gpio.c 2014-03-11 17:51:02.000000000 +0100
@@ -0,0 +1,339 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@@ -4041,9 +4069,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-3.12.11/
+
+MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.12.11/arch/arm/mach-bcm2708/bcm2708.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/bcm2708.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/bcm2708.h linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h
+--- linux-3.12.13/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/bcm2708.h 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,51 @@
+/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.h
@@ -4096,9 +4124,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/bcm2708.h linux-3.12.11/arch/
+}
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/clock.c linux-3.12.11/arch/arm/mach-bcm2708/clock.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/clock.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/clock.c linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c
+--- linux-3.12.13/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.c 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.c
@@ -4161,9 +4189,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/clock.c linux-3.12.11/arch/ar
+ return -EIO;
+}
+EXPORT_SYMBOL(clk_set_rate);
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/clock.h linux-3.12.11/arch/arm/mach-bcm2708/clock.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/clock.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/clock.h linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h
+--- linux-3.12.13/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/clock.h 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,24 @@
+/*
+ * linux/arch/arm/mach-bcm2708/clock.h
@@ -4189,10 +4217,10 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/clock.h linux-3.12.11/arch/ar
+struct clk {
+ unsigned long rate;
+};
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/dma.c linux-3.12.11/arch/arm/mach-bcm2708/dma.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/dma.c 2014-02-18 11:52:14.000000000 +0100
-@@ -0,0 +1,399 @@
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/dma.c linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c
+--- linux-3.12.13/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/dma.c 2014-03-11 17:31:43.000000000 +0100
+@@ -0,0 +1,407 @@
+/*
+ * linux/arch/arm/mach-bcm2708/dma.c
+ *
@@ -4278,6 +4306,14 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/dma.c linux-3.12.11/arch/arm/
+
+EXPORT_SYMBOL_GPL(bcm_dma_start);
+
++extern bool bcm_dma_is_busy(void __iomem *dma_chan_base)
++{
++ dsb();
++
++ return readl(dma_chan_base + BCM2708_DMA_CS) & BCM2708_DMA_ACTIVE;
++}
++EXPORT_SYMBOL_GPL(bcm_dma_is_busy);
++
+/* Complete an ongoing DMA (assuming its results are to be ignored)
+ Does nothing if there is no DMA in progress.
+ This routine waits for the current AXI transfer to complete before
@@ -4592,9 +4628,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/dma.c linux-3.12.11/arch/arm/
+MODULE_LICENSE("GPL");
+
+MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.12.11/arch/arm/mach-bcm2708/dmaer.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/dmaer.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/dmaer.c linux-raspberry-pi/arch/arm/mach-bcm2708/dmaer.c
+--- linux-3.12.13/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-11 17:51:02.000000000 +0100
@@ -0,0 +1,886 @@
+#include <linux/init.h>
+#include <linux/sched.h>
@@ -5482,9 +5518,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/dmaer.c linux-3.12.11/arch/ar
+MODULE_AUTHOR("Simon Hall");
+module_init(dmaer_init);
+module_exit(dmaer_exit);
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/arm_control.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h
+--- linux-3.12.13/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_control.h 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,419 @@
+/*
+ * linux/arch/arm/mach-bcm2708/arm_control.h
@@ -5905,9 +5941,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/arm_control.h li
+#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c)
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/arm_power.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h
+--- linux-3.12.13/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/arm_power.h 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,60 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@@ -5969,9 +6005,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/arm_power.h linu
+};
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/clkdev.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h
+--- linux-3.12.13/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/clkdev.h 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,7 @@
+#ifndef __ASM_MACH_CLKDEV_H
+#define __ASM_MACH_CLKDEV_H
@@ -5980,9 +6016,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-3
+#define __clk_put(clk) do { } while (0)
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-3.12.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S
+--- linux-3.12.13/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2014-03-11 17:51:02.000000000 +0100
@@ -0,0 +1,22 @@
+/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
+ *
@@ -6006,10 +6042,10 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/debug-macro.S li
+ .endm
+
+#include <debug/pl01x.S>
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/dma.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/dma.h 2014-02-18 11:52:14.000000000 +0100
-@@ -0,0 +1,88 @@
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/dma.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h
+--- linux-3.12.13/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/dma.h 2014-03-11 17:31:43.000000000 +0100
+@@ -0,0 +1,90 @@
+/*
+ * linux/arch/arm/mach-bcm2708/include/mach/dma.h
+ *
@@ -6076,11 +6112,13 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.12
+ unsigned long next;
+ unsigned long pad[2];
+};
++struct scatterlist;
+
+extern int bcm_sg_suitable_for_dma(struct scatterlist *sg_ptr, int sg_len);
+extern void bcm_dma_start(void __iomem *dma_chan_base,
+ dma_addr_t control_block);
+extern void bcm_dma_wait_idle(void __iomem *dma_chan_base);
++extern bool bcm_dma_is_busy(void __iomem *dma_chan_base);
+extern int /*rc*/ bcm_dma_abort(void __iomem *dma_chan_base);
+
+/* When listing features we can ask for when allocating DMA channels give
@@ -6098,9 +6136,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/dma.h linux-3.12
+
+
+#endif /* _MACH_BCM2708_DMA_H */
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-3.12.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S
+--- linux-3.12.13/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,69 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@@ -6171,9 +6209,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/entry-macro.S li
+1020: @ EQ will be set if no irqs pending
+
+ .endm
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/frc.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/frc.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/frc.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h
+--- linux-3.12.13/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/frc.h 2014-03-11 17:31:43.000000000 +0100
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6213,9 +6251,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/frc.h linux-3.12
+extern unsigned long long frc_clock_ticks63(void);
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/gpio.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/gpio.h 2014-02-18 11:52:14.000000000 +0100