summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/linux/patches/3.12.13/raspberry.patch1974
1 files changed, 1198 insertions, 776 deletions
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
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/gpio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/gpio.h
+--- linux-3.12.13/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-11 17:51:02.000000000 +0100
@@ -0,0 +1,17 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/gpio.h
@@ -6234,9 +6272,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/gpio.h linux-3.1
+#define irq_to_gpio(x) ((x) - GPIO_IRQ_START)
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/hardware.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/hardware.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/hardware.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/hardware.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,28 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/hardware.h
@@ -6266,9 +6304,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/hardware.h linux
+#include <mach/platform.h>
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/io.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/io.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/io.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/io.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,27 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/io.h
@@ -6297,9 +6335,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/io.h linux-3.12.
+#define __io(a) __typesafe_io(a)
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/irqs.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/irqs.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/irqs.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/irqs.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,199 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/irqs.h
@@ -6500,9 +6538,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/irqs.h linux-3.1
+
+
+#endif /* _BCM2708_IRQS_H_ */
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/memory.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/memory.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/memory.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/memory.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/memory.h
@@ -6561,9 +6599,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/memory.h linux-3
+#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET))
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/platform.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/platform.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/platform.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/platform.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,228 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/platform.h
@@ -6793,9 +6831,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/platform.h linux
+#endif
+
+/* END */
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/power.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/power.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/power.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/power.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,26 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.h
@@ -6823,9 +6861,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/power.h linux-3.
+extern int bcm_power_close(BCM_POWER_HANDLE_T handle);
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/system.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/system.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/system.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/system.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,38 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/system.h
@@ -6865,9 +6903,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/system.h linux-3
+}
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/timex.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/timex.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/timex.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/timex.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,23 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h
@@ -6892,9 +6930,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/timex.h linux-3.
+ */
+
+#define CLOCK_TICK_RATE (1000000)
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/uncompress.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/uncompress.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/uncompress.h
+--- linux-3.12.13/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-11 17:51:02.000000000 +0100
@@ -0,0 +1,84 @@
+/*
+ * arch/arm/mach-bcn2708/include/mach/uncompress.h
@@ -6980,9 +7018,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/uncompress.h lin
+ * nothing to do
+ */
+#define arch_decomp_wdog()
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/vcio.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/vcio.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/vcio.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vcio.h
+--- linux-3.12.13/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-11 17:51:02.000000000 +0100
@@ -0,0 +1,141 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vcio.h
@@ -7125,9 +7163,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vcio.h linux-3.1
+#define DEVICE_FILE_NAME "char_dev"
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_mem.h
+--- linux-3.12.13/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-11 17:51:02.000000000 +0100
@@ -0,0 +1,35 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -7164,9 +7202,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-3
+#endif
+
+#endif /* VC_MEM_H */
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/vc_support.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/vc_support.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vc_support.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,69 @@
+#ifndef _VC_SUPPORT_H_
+#define _VC_SUPPORT_H_
@@ -7237,9 +7275,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vc_support.h lin
+ unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5);
+
+#endif
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-3.12.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-raspberry-pi/arch/arm/mach-bcm2708/include/mach/vmalloc.h
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,20 @@
+/*
+ * arch/arm/mach-bcm2708/include/mach/vmalloc.h
@@ -7261,9 +7299,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#define VMALLOC_END (0xe8000000)
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/Kconfig linux-3.12.11/arch/arm/mach-bcm2708/Kconfig
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/Kconfig 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/Kconfig linux-raspberry-pi/arch/arm/mach-bcm2708/Kconfig
+--- linux-3.12.13/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/Kconfig 2014-03-11 17:51:02.000000000 +0100
@@ -0,0 +1,49 @@
+menu "Broadcom BCM2708 Implementations"
+ depends on ARCH_BCM2708
@@ -7314,9 +7352,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/Kconfig linux-3.12.11/arch/ar
+ Enable DMA helper for accelerating X composition
+
+endmenu
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/Makefile linux-3.12.11/arch/arm/mach-bcm2708/Makefile
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/Makefile 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/Makefile linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile
+--- linux-3.12.13/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile 2014-03-11 17:51:02.000000000 +0100
@@ -0,0 +1,10 @@
+#
+# Makefile for the linux kernel.
@@ -7328,16 +7366,16 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/Makefile linux-3.12.11/arch/a
+
+obj-$(CONFIG_BCM2708_DMAER) += dmaer_master.o
+dmaer_master-objs := dmaer.o vc_support.o
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/Makefile.boot linux-3.12.11/arch/arm/mach-bcm2708/Makefile.boot
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/Makefile.boot 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/Makefile.boot linux-raspberry-pi/arch/arm/mach-bcm2708/Makefile.boot
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,3 @@
+ zreladdr-y := 0x00008000
+params_phys-y := 0x00000100
+initrd_phys-y := 0x00800000
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/power.c linux-3.12.11/arch/arm/mach-bcm2708/power.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/power.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/power.c linux-raspberry-pi/arch/arm/mach-bcm2708/power.c
+--- linux-3.12.13/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-11 17:31:43.000000000 +0100
@@ -0,0 +1,194 @@
+/*
+ * linux/arch/arm/mach-bcm2708/power.c
@@ -7533,9 +7571,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/power.c linux-3.12.11/arch/ar
+MODULE_AUTHOR("Phil Elwell");
+MODULE_DESCRIPTION("Interface to BCM2708 power management");
+MODULE_LICENSE("GPL");
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/vcio.c linux-3.12.11/arch/arm/mach-bcm2708/vcio.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/vcio.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/vcio.c linux-raspberry-pi/arch/arm/mach-bcm2708/vcio.c
+--- linux-3.12.13/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-11 17:51:02.000000000 +0100
@@ -0,0 +1,474 @@
+/*
+ * linux/arch/arm/mach-bcm2708/vcio.c
@@ -8011,9 +8049,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/vcio.c linux-3.12.11/arch/arm
+MODULE_DESCRIPTION("ARM I/O to VideoCore processor");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm-mbox");
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.12.11/arch/arm/mach-bcm2708/vc_mem.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/vc_mem.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/vc_mem.c linux-raspberry-pi/arch/arm/mach-bcm2708/vc_mem.c
+--- linux-3.12.13/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-11 17:51:02.000000000 +0100
@@ -0,0 +1,462 @@
+/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@@ -8477,9 +8515,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/vc_mem.c linux-3.12.11/arch/a
+module_param(mem_size, uint, 0644);
+module_param(mem_base, uint, 0644);
+
-diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/vc_support.c linux-3.12.11/arch/arm/mach-bcm2708/vc_support.c
---- linux-3.12.11.orig/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.11/arch/arm/mach-bcm2708/vc_support.c 2014-02-18 11:52:14.000000000 +0100
+diff -Nur linux-3.12.13/arch/arm/mach-bcm2708/vc_support.c linux-raspberry-pi/arch/arm/mach-bcm2708/vc_support.c
+--- linux-3.12.13/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-11 17:51:02.000000000 +0100
@@ -0,0 +1,318 @@
+/*
+ * vc_support.c
@@ -8799,9 +8837,9 @@ diff -Nur linux-3.12.11.orig/arch/arm/mach-bcm2708/vc_support.c linux-3.12.11/ar
+ return 1;
+ }
+}
-diff -Nur linux-3.12.11.orig/arch/arm/Ma