update 3.12.x kernel to 3.12.33

Add latest changes to raspberry-pi support patch.
Add rpi-proto driver patch.

33 files changed, 12277 insertions, 4625 deletions

diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 7af4cf028..12d008cf6 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -10,11 +10,11 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		cb00fadd0a720cc2d1690792e72e0134
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_12_27),y)
-KERNEL_VERSION:=	3.12.27
+ifeq ($(ADK_KERNEL_VERSION_3_12_33),y)
+KERNEL_VERSION:=	3.12.33
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		02801cc33702ff165c2cd6d0fcf3df34
+KERNEL_MD5SUM:=		7048cce0d24f784595b96f9d1e14a6ba
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_10_53),y)
 KERNEL_VERSION:=	3.10.53
diff --git a/target/arm/raspberry-pi/patches/3.12.33/0001-add-support-for-rpi-proto-driver.patch b/target/arm/raspberry-pi/patches/3.12.33/0001-add-support-for-rpi-proto-driver.patch
new file mode 100644
index 000000000..e0e977741
--- /dev/null
+++ b/target/arm/raspberry-pi/patches/3.12.33/0001-add-support-for-rpi-proto-driver.patch
@@ -0,0 +1,226 @@
+From 70449ef0fb20c168dd341e9bd02dd1929554971c Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbrodkorb@conet.de>
+Date: Wed, 29 Oct 2014 16:30:53 +0100
+Subject: [PATCH 1/2] add support for rpi-proto driver
+
+Forward port of 3.10.x driver from https://github.com/koalo
+We are using a custom board and would like to use rpi 3.12.x
+kernel. Patch works fine for our embedded system.
+
+Signed-off-by: Waldemar Brodkorb <wbrodkorb@conet.de>
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ arch/arm/mach-bcm2708/bcm2708.c |   17 +++++
+ sound/soc/bcm/Kconfig           |    8 +++
+ sound/soc/bcm/Makefile          |    2 +
+ sound/soc/bcm/rpi-proto.c       |  130 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 157 insertions(+)
+ create mode 100644 sound/soc/bcm/rpi-proto.c
+
+diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
+index c1a5943..0a0bb05 100644
+--- a/arch/arm/mach-bcm2708/bcm2708.c
++++ b/arch/arm/mach-bcm2708/bcm2708.c
+@@ -754,6 +754,19 @@ static struct i2c_board_info __initdata snd_pcm512x_i2c_devices[] = {
+ };
+ #endif
+ 
++#ifdef CONFIG_SND_BCM2708_SOC_RPI_CODEC_PROTO_MODULE
++static struct platform_device snd_rpi_proto_device = {
++        .name = "snd-rpi-proto",
++        .id = 0,
++        .num_resources = 0,
++};
++static struct i2c_board_info __initdata snd_rpi_proto_i2c_devices[] = {
++        {
++                I2C_BOARD_INFO("wm8731", 0x1a)
++        },
++};
++#endif
++
+ int __init bcm_register_device(struct platform_device *pdev)
+ {
+ 	int ret;
+@@ -923,6 +936,10 @@ void __init bcm2708_init(void)
+         bcm_register_device(&snd_rpi_iqaudio_dac_device);
+         i2c_register_board_info(1, snd_pcm512x_i2c_devices, ARRAY_SIZE(snd_pcm512x_i2c_devices));
+ #endif
++#if defined(CONFIG_SND_BCM2708_SOC_RPI_CODEC_PROTO_MODULE)
++	bcm_register_device(&snd_rpi_proto_device);
++	i2c_register_board_info(1, snd_rpi_proto_i2c_devices, ARRAY_SIZE(snd_rpi_proto_i2c_devices));
++#endif
+ 
+ 
+ 	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
+diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
+index 301f758..bfe382a 100644
+--- a/sound/soc/bcm/Kconfig
++++ b/sound/soc/bcm/Kconfig
+@@ -50,3 +50,11 @@ config SND_BCM2708_SOC_IQAUDIO_DAC
+ 	select SND_SOC_PCM512x
+ 	help
+ 	  Say Y or M if you want to add support for IQaudIO-DAC.
++
++config SND_BCM2708_SOC_RPI_CODEC_PROTO
++	tristate "Support for Audio Codec Board - PROTO (WM8731)"
++	depends on SND_BCM2708_SOC_I2S
++	select SND_SOC_WM8731
++	help
++	  Say Y if you want to add support for Audio Codec Board -
++	  PROTO (WM8731)
+diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
+index 8b5e8bb..d1bf274 100644
+--- a/sound/soc/bcm/Makefile
++++ b/sound/soc/bcm/Makefile
+@@ -10,6 +10,7 @@ snd-soc-hifiberry-digi-objs := hifiberry_digi.o
+ snd-soc-hifiberry-amp-objs := hifiberry_amp.o
+ snd-soc-rpi-dac-objs := rpi-dac.o
+ snd-soc-iqaudio-dac-objs := iqaudio-dac.o
++snd-soc-rpi-proto-objs := rpi-proto.o
+ 
+ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
+ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
+@@ -17,3 +18,4 @@ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI) += snd-soc-hifiberry-digi.o
+ obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.o
+ obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
+ obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
++obj-$(CONFIG_SND_BCM2708_SOC_RPI_CODEC_PROTO) += snd-soc-rpi-proto.o
+diff --git a/sound/soc/bcm/rpi-proto.c b/sound/soc/bcm/rpi-proto.c
+new file mode 100644
+index 0000000..70b0166
+--- /dev/null
++++ b/sound/soc/bcm/rpi-proto.c
+@@ -0,0 +1,130 @@
++/*
++ * ASoC driver for PROTO AudioCODEC (with a WM8731)
++ * connected to a Raspberry Pi
++ *
++ * Author:      Florian Meier, <koalo@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.
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++
++#include <sound/core.h>
++#include <sound/pcm.h>
++#include <sound/soc.h>
++#include <sound/jack.h>
++
++#include "../codecs/wm8731.h"
++
++static const unsigned int wm8731_rates_12288000[] = {
++	8000, 32000, 48000, 96000,
++};
++
++static struct snd_pcm_hw_constraint_list wm8731_constraints_12288000 = {
++	.list = wm8731_rates_12288000,
++	.count = ARRAY_SIZE(wm8731_rates_12288000),
++};
++
++static int snd_rpi_proto_startup(struct snd_pcm_substream *substream)
++{
++	/* Setup constraints, because there is a 12.288 MHz XTAL on the board */
++	snd_pcm_hw_constraint_list(substream->runtime, 0,
++				SNDRV_PCM_HW_PARAM_RATE,
++				&wm8731_constraints_12288000);
++	return 0;
++}
++
++static int snd_rpi_proto_hw_params(struct snd_pcm_substream *substream,
++				       struct snd_pcm_hw_params *params)
++{
++	struct snd_soc_pcm_runtime *rtd = substream->private_data;
++	struct snd_soc_dai *codec_dai = rtd->codec_dai;
++	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
++	int sysclk = 12288000; /* This is fixed on this board */
++
++	/* Set proto bclk */
++	int ret = snd_soc_dai_set_bclk_ratio(cpu_dai,32*2);
++	if (ret < 0){
++		dev_err(substream->pcm->dev,
++				"Failed to set BCLK ratio %d\n", ret);
++		return ret;
++	}
++
++	/* Set proto sysclk */
++	ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
++			sysclk, SND_SOC_CLOCK_IN);
++	if (ret < 0) {
++		dev_err(substream->pcm->dev,
++				"Failed to set WM8731 SYSCLK: %d\n", ret);
++		return ret;
++	}
++
++	return 0;
++}
++
++/* machine stream operations */
++static struct snd_soc_ops snd_rpi_proto_ops = {
++	.startup = snd_rpi_proto_startup,
++	.hw_params = snd_rpi_proto_hw_params,
++};
++
++static struct snd_soc_dai_link snd_rpi_proto_dai[] = {
++{
++	.name		= "WM8731",
++	.stream_name	= "WM8731 HiFi",
++	.cpu_dai_name	= "bcm2708-i2s.0",
++	.codec_dai_name	= "wm8731-hifi",
++	.platform_name	= "bcm2708-i2s.0",
++	.codec_name	= "wm8731.1-001a",
++	.dai_fmt	= SND_SOC_DAIFMT_I2S
++				| SND_SOC_DAIFMT_NB_NF
++				| SND_SOC_DAIFMT_CBM_CFM,
++	.ops		= &snd_rpi_proto_ops,
++},
++};
++
++/* audio machine driver */
++static struct snd_soc_card snd_rpi_proto = {
++	.name		= "snd_rpi_proto",
++	.dai_link	= snd_rpi_proto_dai,
++	.num_links	= ARRAY_SIZE(snd_rpi_proto_dai),
++};
++
++static int snd_rpi_proto_probe(struct platform_device *pdev)
++{
++	int ret = 0;
++
++	snd_rpi_proto.dev = &pdev->dev;
++	ret = snd_soc_register_card(&snd_rpi_proto);
++	if (ret) {
++		dev_err(&pdev->dev,
++				"snd_soc_register_card() failed: %d\n", ret);
++	}
++
++	return ret;
++}
++
++
++static int snd_rpi_proto_remove(struct platform_device *pdev)
++{
++	return snd_soc_unregister_card(&snd_rpi_proto);
++}
++
++static struct platform_driver snd_rpi_proto_driver = {
++	.driver = {
++		.name   = "snd-rpi-proto",
++		.owner  = THIS_MODULE,
++	},
++	.probe	  = snd_rpi_proto_probe,
++	.remove	 = snd_rpi_proto_remove,
++};
++
++module_platform_driver(snd_rpi_proto_driver);
++
++MODULE_AUTHOR("Florian Meier");
++MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)");
++MODULE_LICENSE("GPL");
+-- 
+1.7.10.4
+
diff --git a/target/arm/raspberry-pi/patches/3.12.33/0002-enable-MMAP-by-default-allow-overide-via-use_mmap.patch b/target/arm/raspberry-pi/patches/3.12.33/0002-enable-MMAP-by-default-allow-overide-via-use_mmap.patch
new file mode 100644
index 000000000..a8af27d9f
--- /dev/null
+++ b/target/arm/raspberry-pi/patches/3.12.33/0002-enable-MMAP-by-default-allow-overide-via-use_mmap.patch
@@ -0,0 +1,53 @@
+From f1290350dc2cc8defb2d613a32f1a7bd4400de65 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbrodkorb@conet.de>
+Date: Fri, 28 Nov 2014 16:18:36 +0100
+Subject: [PATCH 2/2] enable MMAP by default, allow overide via use_mmap
+
+Add a bool module parameter to control availability of MMAP
+in the driver.
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ sound/soc/bcm/bcm2708-i2s.c |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/sound/soc/bcm/bcm2708-i2s.c b/sound/soc/bcm/bcm2708-i2s.c
+index 3fcb740..ddf9796 100644
+--- a/sound/soc/bcm/bcm2708-i2s.c
++++ b/sound/soc/bcm/bcm2708-i2s.c
+@@ -171,6 +171,11 @@ static const unsigned int bcm2708_clk_freq[BCM2708_CLK_SRC_HDMI+1] = {
+ /* I2S pin configuration */
+ static int bcm2708_i2s_gpio=BCM2708_I2S_GPIO_AUTO;
+ 
++static bool use_mmap = 1;
++module_param(use_mmap, bool, S_IRUGO);
++MODULE_PARM_DESC(use_mmap, "Use MMAP");
++
++
+ /* General device struct */
+ struct bcm2708_i2s_dev {
+ 	struct device				*dev;
+@@ -870,7 +875,7 @@ static const struct snd_soc_component_driver bcm2708_i2s_component = {
+ 	.name		= "bcm2708-i2s-comp",
+ };
+ 
+-static const struct snd_pcm_hardware bcm2708_pcm_hardware = {
++static struct snd_pcm_hardware bcm2708_pcm_hardware = {
+ 	.info			= SNDRV_PCM_INFO_INTERLEAVED |
+ 				  SNDRV_PCM_INFO_JOINT_DUPLEX,
+ 	.formats		= SNDRV_PCM_FMTBIT_S16_LE |
+@@ -962,6 +967,11 @@ static int bcm2708_i2s_probe(struct platform_device *pdev)
+ 		return ret;
+ 	}
+ 
++	if (use_mmap) {
++		bcm2708_pcm_hardware.info |= SNDRV_PCM_INFO_MMAP;
++		bcm2708_pcm_hardware.info |= SNDRV_PCM_INFO_MMAP_VALID;
++	}
++
+ 	ret = snd_dmaengine_pcm_register(&pdev->dev,
+ 				&bcm2708_dmaengine_pcm_config,
+ 				SND_DMAENGINE_PCM_FLAG_COMPAT);
+-- 
+1.7.10.4
+
diff --git a/target/arm/raspberry-pi/patches/3.12.27/raspberry-pi.patch b/target/arm/raspberry-pi/patches/3.12.33/raspberry-pi.patch
index 4cfea3f5d..af972bb3e 100644
--- a/target/arm/raspberry-pi/patches/3.12.27/raspberry-pi.patch
+++ b/target/arm/raspberry-pi/patches/3.12.33/raspberry-pi.patch
@@ -1,62 +1,12 @@
-diff -Nur linux-3.12.26.orig/arch/arc/boot/dts/nsimosci.dts linux-3.12.26/arch/arc/boot/dts/nsimosci.dts
---- linux-3.12.26.orig/arch/arc/boot/dts/nsimosci.dts	2014-07-30 18:02:44.000000000 +0200
-+++ linux-3.12.26/arch/arc/boot/dts/nsimosci.dts	2014-08-06 16:50:13.737956371 +0200
-@@ -11,16 +11,13 @@
- 
- / {
- 	compatible = "snps,nsimosci";
--	clock-frequency = <20000000>;	/* 20 MHZ */
-+	clock-frequency = <80000000>;	/* 80 MHZ */
- 	#address-cells = <1>;
- 	#size-cells = <1>;
- 	interrupt-parent = <&intc>;
- 
- 	chosen {
--		/* this is for console on PGU */
--		/* bootargs = "console=tty0 consoleblank=0"; */
--		/* this is for console on serial */
--		bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=ttyS0,115200n8 consoleblank=0 debug";
-+		bootargs = "console=tty0 consoleblank=0";
- 	};
- 
- 	aliases {
-@@ -47,14 +44,15 @@
- 		};
- 
- 		uart0: serial@c0000000 {
--			compatible = "ns8250";
-+			compatible = "snps,dw-apb-uart";
- 			reg = <0xc0000000 0x2000>;
- 			interrupts = <11>;
-+			#clock-frequency = <80000000>;
- 			clock-frequency = <3686400>;
- 			baud = <115200>;
- 			reg-shift = <2>;
- 			reg-io-width = <4>;
--			no-loopback-test = <1>;
-+			status = "okay";
- 		};
- 
- 		pgu0: pgu@c9000000 {
-diff -Nur linux-3.12.26.orig/arch/arc/configs/nsimosci_defconfig linux-3.12.26/arch/arc/configs/nsimosci_defconfig
---- linux-3.12.26.orig/arch/arc/configs/nsimosci_defconfig	2014-07-30 18:02:44.000000000 +0200
-+++ linux-3.12.26/arch/arc/configs/nsimosci_defconfig	2014-08-06 16:50:13.737956371 +0200
-@@ -54,7 +54,6 @@
- CONFIG_SERIAL_8250=y
- CONFIG_SERIAL_8250_CONSOLE=y
- CONFIG_SERIAL_8250_DW=y
--CONFIG_SERIAL_OF_PLATFORM=y
- CONFIG_SERIAL_ARC=y
- CONFIG_SERIAL_ARC_CONSOLE=y
- # CONFIG_HW_RANDOM is not set
-diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.12.26/arch/arm/configs/bcmrpi_cutdown_defconfig
---- linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.26/arch/arm/configs/bcmrpi_cutdown_defconfig	2014-08-06 16:50:13.737956371 +0200
-@@ -0,0 +1,503 @@
-+CONFIG_EXPERIMENTAL=y
+diff -Nur linux-3.12.33/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.12.33-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig
+--- linux-3.12.33/arch/arm/configs/bcmrpi_cutdown_defconfig	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.12.33-rpi/arch/arm/configs/bcmrpi_cutdown_defconfig	2014-12-03 19:13:32.260418001 -0600
+@@ -0,0 +1,463 @@
 +# CONFIG_LOCALVERSION_AUTO is not set
 +CONFIG_SYSVIPC=y
 +CONFIG_POSIX_MQUEUE=y
++CONFIG_NO_HZ=y
++CONFIG_HIGH_RES_TIMERS=y
 +CONFIG_IKCONFIG=y
 +CONFIG_IKCONFIG_PROC=y
 +# CONFIG_UID16 is not set
@@ -70,9 +20,9 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +CONFIG_MODVERSIONS=y
 +CONFIG_MODULE_SRCVERSION_ALL=y
 +# CONFIG_BLK_DEV_BSG is not set
++CONFIG_PARTITION_ADVANCED=y
++CONFIG_MAC_PARTITION=y
 +CONFIG_ARCH_BCM2708=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
 +CONFIG_AEABI=y
 +CONFIG_ZBOOT_ROM_TEXT=0x0
 +CONFIG_ZBOOT_ROM_BSS=0x0
@@ -112,8 +62,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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
@@ -142,7 +90,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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=m
@@ -150,44 +97,16 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +CONFIG_SCSI_MULTI_LUN=y
 +# CONFIG_SCSI_LOWLEVEL is not set
 +CONFIG_NETDEVICES=y
++CONFIG_NETCONSOLE=m
 +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_PPP=m
++CONFIG_PPP_BSDCOMP=m
++CONFIG_PPP_DEFLATE=m
++CONFIG_PPP_ASYNC=m
++CONFIG_PPP_SYNC_TTY=m
++CONFIG_SLIP=m
++CONFIG_SLIP_COMPRESSED=y
 +CONFIG_USB_CATC=m
 +CONFIG_USB_KAWETH=m
 +CONFIG_USB_PEGASUS=m
@@ -214,14 +133,31 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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_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_B43=m
++CONFIG_B43LEGACY=m
++CONFIG_HOSTAP=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_ZD1211RW=m
++CONFIG_MWIFIEX=m
++CONFIG_MWIFIEX_SDIO=m
++CONFIG_WIMAX_I2400M_USB=m
 +CONFIG_INPUT_POLLDEV=m
 +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 +CONFIG_INPUT_JOYDEV=m
@@ -230,7 +166,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +# 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
@@ -245,18 +180,21 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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_I2C=y
++CONFIG_I2C_CHARDEV=m
++CONFIG_I2C_BCM2708=m
++CONFIG_SPI=y
++CONFIG_SPI_BCM2708=m
 +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
@@ -283,8 +221,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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
@@ -315,20 +251,18 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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_HID_PID=y
++CONFIG_USB_HIDDEV=y
 +CONFIG_USB=y
 +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 +CONFIG_USB_MON=m
@@ -347,8 +281,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +CONFIG_USB_STORAGE_KARMA=m
 +CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 +CONFIG_USB_STORAGE_ENE_UB6250=m
-+CONFIG_USB_UAS=m
-+CONFIG_USB_LIBUSUAL=y
 +CONFIG_USB_MDC800=m
 +CONFIG_USB_MICROTEK=m
 +CONFIG_USB_SERIAL=m
@@ -363,7 +295,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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
@@ -379,16 +310,13 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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
@@ -397,8 +325,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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
@@ -425,12 +351,9 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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_MMC_BCM2835=y
++CONFIG_MMC_BCM2835_DMA=y
 +CONFIG_UIO=m
-+CONFIG_UIO_PDRV=m
 +CONFIG_UIO_PDRV_GENIRQ=m
 +# CONFIG_IOMMU_SUPPORT is not set
 +CONFIG_EXT4_FS=y
@@ -473,7 +396,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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
@@ -483,9 +405,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +CONFIG_CIFS_XATTR=y
 +CONFIG_CIFS_POSIX=y
 +CONFIG_9P_FS=m
-+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
@@ -536,7 +455,6 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +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
@@ -547,19 +465,10 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_cutdown_defconfig linux-3.1
 +# CONFIG_CRYPTO_HW is not set
 +CONFIG_CRC_ITU_T=y
 +CONFIG_LIBCRC32C=y
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_COMPAT=y
-+CONFIG_I2C_CHARDEV=m
-+CONFIG_I2C_HELPER_AUTO=y
-+CONFIG_I2C_BCM2708=m
-+CONFIG_SPI=y
-+CONFIG_SPI_MASTER=y
-+CONFIG_SPI_BCM2708=m
-diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arch/arm/configs/bcmrpi_defconfig
---- linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.12.26/arch/arm/configs/bcmrpi_defconfig	2014-08-06 16:50:13.753956496 +0200
-@@ -0,0 +1,1097 @@
+diff -Nur linux-3.12.33/arch/arm/configs/bcmrpi_defconfig linux-3.12.33-rpi/arch/arm/configs/bcmrpi_defconfig
+--- linux-3.12.33/arch/arm/configs/bcmrpi_defconfig	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.12.33-rpi/arch/arm/configs/bcmrpi_defconfig	2014-12-03 19:13:32.288418001 -0600
+@@ -0,0 +1,1119 @@
 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 +# CONFIG_LOCALVERSION_AUTO is not set
 +CONFIG_SYSVIPC=y
@@ -654,6 +563,7 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arc
 +CONFIG_INET_XFRM_MODE_BEET=m
 +CONFIG_INET_LRO=m
 +CONFIG_INET_DIAG=m
++CONFIG_IPV6_PRIVACY=y
 +CONFIG_INET6_AH=m
 +CONFIG_INET6_ESP=m
 +CONFIG_INET6_IPCOMP=m
@@ -829,6 +739,7 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arc
 +CONFIG_BRIDGE_EBT_ULOG=m
 +CONFIG_BRIDGE_EBT_NFLOG=m
 +CONFIG_SCTP_COOKIE_HMAC_SHA1=y
++CONFIG_ATM=m
 +CONFIG_L2TP=m
 +CONFIG_L2TP_V3=y
 +CONFIG_L2TP_IP=m
@@ -943,12 +854,15 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arc
 +CONFIG_NFC_PN533=m
 +CONFIG_DEVTMPFS=y
 +CONFIG_DEVTMPFS_MOUNT=y
++CONFIG_DMA_CMA=y
++CONFIG_CMA_SIZE_MBYTES=5
 +CONFIG_BLK_DEV_LOOP=y
 +CONFIG_BLK_DEV_CRYPTOLOOP=m
 +CONFIG_BLK_DEV_DRBD=m
 +CONFIG_BLK_DEV_NBD=m
 +CONFIG_BLK_DEV_RAM=y
 +CONFIG_CDROM_PKTCDVD=m
++CONFIG_EEPROM_AT24=m
 +CONFIG_SCSI=y
 +# CONFIG_SCSI_PROC_FS is not set
 +CONFIG_BLK_DEV_SD=y
@@ -967,8 +881,8 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arc
 +CONFIG_DM_CRYPT=m
 +CONFIG_DM_SNAPSHOT=m
 +CONFIG_DM_MIRROR=m
-+CONFIG_DM_LOG_USERSPACE=m
 +CONFIG_DM_RAID=m
++CONFIG_DM_LOG_USERSPACE=m
 +CONFIG_DM_ZERO=m
 +CONFIG_DM_DELAY=m
 +CONFIG_NETDEVICES=y
@@ -986,6 +900,7 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arc
 +CONFIG_PPP_FILTER=y
 +CONFIG_PPP_MPPE=m
 +CONFIG_PPP_MULTILINK=y
++CONFIG_PPPOATM=m
 +CONFIG_PPPOE=m
 +CONFIG_PPPOL2TP=m
 +CONFIG_PPP_ASYNC=m
@@ -1021,6 +936,7 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arc
 +CONFIG_USB_NET_CX82310_ETH=m
 +CONFIG_USB_NET_KALMIA=m
 +CONFIG_USB_NET_QMI_WWAN=m
++CONFIG_USB_HSO=m
 +CONFIG_USB_NET_INT51X1=m
 +CONFIG_USB_IPHETH=m
 +CONFIG_USB_SIERRA_NET=m
@@ -1091,6 +1007,7 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arc
 +CONFIG_GAMEPORT=m
 +CONFIG_GAMEPORT_NS558=m
 +CONFIG_GAMEPORT_L4=m
++CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 +# CONFIG_LEGACY_PTYS is not set
 +# CONFIG_DEVKMEM is not set
 +CONFIG_SERIAL_AMBA_PL011=y
@@ -1101,12 +1018,16 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arc
 +CONFIG_RAW_DRIVER=y
 +CONFIG_BRCM_CHAR_DRIVERS=y
 +CONFIG_BCM_VC_CMA=y
++CONFIG_BCM_VC_SM=y
 +CONFIG_I2C=y
 +CONFIG_I2C_CHARDEV=m
 +CONFIG_I2C_BCM2708=m
 +CONFIG_SPI=y
 +CONFIG_SPI_BCM2708=m
 +CONFIG_SPI_SPIDEV=y
++CONFIG_PPS=m
++CONFIG_PPS_CLIENT_LDISC=m
++CONFIG_PPS_CLIENT_GPIO=m
 +CONFIG_GPIO_SYSFS=y
 +CONFIG_W1=m
 +CONFIG_W1_MASTER_DS2490=m
@@ -1188,6 +1109,7 @@ diff -Nur linux-3.12.26.orig/arch/arm/configs/bcmrpi_defconfig linux-3.12.26/arc
 +CONFIG_USB_GSPCA_SQ905C=m
 +CONFIG_USB_GSPCA_SQ930X=m
 +CONFIG_USB_GSPCA_S