update kernel patches

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 344 insertions, 0 deletions

diff --git a/patches/linux-3.1.9/0055-bcm2835-ctl-fix-alsamixer-control.patch b/patches/linux-3.1.9/0055-bcm2835-ctl-fix-alsamixer-control.patch
new file mode 100644
index 0000000..1971ae6
--- /dev/null
+++ b/patches/linux-3.1.9/0055-bcm2835-ctl-fix-alsamixer-control.patch
@@ -0,0 +1,60 @@
+From d0735c7d129d35bd91ba1c2c5b5a5201ed4a6c37 Mon Sep 17 00:00:00 2001
+From: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
+Date: Wed, 6 Jun 2012 08:02:10 +0200
+Subject: [PATCH] bcm2835-ctl: fix alsamixer control.
+
+alsamixer read the volume for the screen controller so we had to
+scale the chipvol back to db for reading.
+---
+ sound/arm/bcm2835-ctl.c |   22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/sound/arm/bcm2835-ctl.c b/sound/arm/bcm2835-ctl.c
+index c0546e35..828a820 100755
+--- a/sound/arm/bcm2835-ctl.c
++++ b/sound/arm/bcm2835-ctl.c
+@@ -33,6 +33,19 @@
+ 
+ #include "bcm2835.h"
+ 
++
++/* functions to convert alsa to chip volume and back. */
++int alsa2chip(int vol)
++{
++	return -((vol << 8) / 100);
++}
++
++int chip2alsa(int vol)
++{
++	return -((vol * 100) >> 8);
++}
++
++
+ static int snd_bcm2835_ctl_info(struct snd_kcontrol *kcontrol,
+ 				struct snd_ctl_elem_info *uinfo)
+ {
+@@ -64,7 +77,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
+ 	BUG_ON(!chip && !(chip->avail_substreams & AVAIL_SUBSTREAMS_MASK));
+ 
+ 	if (kcontrol->private_value == PCM_PLAYBACK_VOLUME)
+-		ucontrol->value.integer.value[0] = chip->volume;
++		ucontrol->value.integer.value[0] = chip2alsa(chip->volume);
+ 	else if (kcontrol->private_value == PCM_PLAYBACK_MUTE)
+ 		ucontrol->value.integer.value[0] = chip->mute;
+ 	else if (kcontrol->private_value == PCM_PLAYBACK_DEVICE)
+@@ -85,13 +98,10 @@ static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
+ 			changed = 1;
+ 		}
+ 		if (changed
+-		    || (ucontrol->value.integer.value[0] != chip->volume)) {
+-			int atten;
++		    || (ucontrol->value.integer.value[0] != chip2alsa(chip->volume))) {
+ 
+-			chip->volume = ucontrol->value.integer.value[0];
++			chip->volume = alsa2chip(ucontrol->value.integer.value[0]);
+ 			changed = 1;
+-			atten = -((chip->volume << 8) / 100);
+-			chip->volume = atten;
+ 		}
+ 
+ 	} else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) {
diff --git a/patches/linux-3.1.9/0056-bcm2835-ctl-limit-maximal-volume-to-4db.patch b/patches/linux-3.1.9/0056-bcm2835-ctl-limit-maximal-volume-to-4db.patch
new file mode 100644
index 0000000..da4561e
--- /dev/null
+++ b/patches/linux-3.1.9/0056-bcm2835-ctl-limit-maximal-volume-to-4db.patch
@@ -0,0 +1,23 @@
+From 829da61c0229c0734a109339f5de308bf8205bf6 Mon Sep 17 00:00:00 2001
+From: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
+Date: Wed, 6 Jun 2012 08:06:15 +0200
+Subject: [PATCH] bcm2835-ctl: limit maximal volume to 4db.
+
+it makes no sense to set 23.04db as maximum volume since around 3db it start to cliping. So with 4db the alsamixer is much better to control. (86% is 0db)
+---
+ sound/arm/bcm2835-ctl.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sound/arm/bcm2835-ctl.c b/sound/arm/bcm2835-ctl.c
+index 828a820..f901ddd 100755
+--- a/sound/arm/bcm2835-ctl.c
++++ b/sound/arm/bcm2835-ctl.c
+@@ -53,7 +53,7 @@ static int snd_bcm2835_ctl_info(struct snd_kcontrol *kcontrol,
+ 		uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+ 		uinfo->count = 1;
+ 		uinfo->value.integer.min = -10240;
+-		uinfo->value.integer.max = 2303;
++		uinfo->value.integer.max = 400;      /* 2303 */
+ 	} else if (kcontrol->private_value == PCM_PLAYBACK_MUTE) {
+ 		uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+ 		uinfo->count = 1;
diff --git a/patches/linux-3.1.9/0057-Add-iptables-and-devtmpfs_mount-to-non-cutdown-confi.patch b/patches/linux-3.1.9/0057-Add-iptables-and-devtmpfs_mount-to-non-cutdown-confi.patch
new file mode 100644
index 0000000..1bde17e
--- /dev/null
+++ b/patches/linux-3.1.9/0057-Add-iptables-and-devtmpfs_mount-to-non-cutdown-confi.patch
@@ -0,0 +1,258 @@
+From 958eacf5c1353cd655e6aa8238c69d379e460670 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Sun, 10 Jun 2012 13:32:02 +0100
+Subject: [PATCH] Add iptables and devtmpfs_mount to non-cutdown config. This
+ will become default kernel
+
+---
+ arch/arm/configs/bcmrpi_cutdown_defconfig |    1 +
+ arch/arm/configs/bcmrpi_defconfig         |  147 ++++++++++++++++++++++++++++-
+ 2 files changed, 144 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/configs/bcmrpi_cutdown_defconfig b/arch/arm/configs/bcmrpi_cutdown_defconfig
+index 8958358..ec5bdc9 100644
+--- a/arch/arm/configs/bcmrpi_cutdown_defconfig
++++ b/arch/arm/configs/bcmrpi_cutdown_defconfig
+@@ -85,6 +85,7 @@ CONFIG_NET_9P=m
+ CONFIG_NFC=m
+ CONFIG_NFC_PN533=m
+ CONFIG_DEVTMPFS=y
++CONFIG_DEVTMPFS_MOUNT=y
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_CRYPTOLOOP=m
+ CONFIG_BLK_DEV_NBD=m
+diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
+index 1470bdd..39ef11f 100644
+--- a/arch/arm/configs/bcmrpi_defconfig
++++ b/arch/arm/configs/bcmrpi_defconfig
+@@ -34,6 +34,7 @@ CONFIG_NO_HZ=y
+ CONFIG_HIGH_RES_TIMERS=y
+ CONFIG_PREEMPT=y
+ CONFIG_AEABI=y
++CONFIG_UACCESS_WITH_MEMCPY=y
+ CONFIG_SECCOMP=y
+ CONFIG_CC_STACKPROTECTOR=y
+ CONFIG_ZBOOT_ROM_TEXT=0x0
+@@ -50,19 +51,142 @@ CONFIG_XFRM_USER=y
+ CONFIG_NET_KEY=m
+ CONFIG_INET=y
+ CONFIG_IP_MULTICAST=y
++CONFIG_IP_ADVANCED_ROUTER=y
++CONFIG_IP_MULTIPLE_TABLES=y
++CONFIG_IP_ROUTE_MULTIPATH=y
++CONFIG_IP_ROUTE_VERBOSE=y
+ CONFIG_IP_PNP=y
+ CONFIG_IP_PNP_DHCP=y
+ CONFIG_IP_PNP_RARP=y
++CONFIG_NET_IPIP=m
+ CONFIG_SYN_COOKIES=y
+ # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+ # CONFIG_INET_XFRM_MODE_TUNNEL is not set
+ # CONFIG_INET_XFRM_MODE_BEET is not set
+-# CONFIG_INET_LRO is not set
+ # CONFIG_INET_DIAG is not set
+ CONFIG_IPV6_PRIVACY=y
++CONFIG_NETFILTER=y
++CONFIG_NF_CONNTRACK=m
++CONFIG_NF_CONNTRACK_ZONES=y
++CONFIG_NF_CONNTRACK_EVENTS=y
++CONFIG_NF_CONNTRACK_TIMESTAMP=y
++CONFIG_NF_CT_PROTO_DCCP=m
++CONFIG_NF_CT_PROTO_SCTP=m
++CONFIG_NF_CT_PROTO_UDPLITE=m
++CONFIG_NF_CONNTRACK_AMANDA=m
++CONFIG_NF_CONNTRACK_FTP=m
++CONFIG_NF_CONNTRACK_H323=m
++CONFIG_NF_CONNTRACK_IRC=m
++CONFIG_NF_CONNTRACK_NETBIOS_NS=m
++CONFIG_NF_CONNTRACK_SNMP=m
++CONFIG_NF_CONNTRACK_PPTP=m
++CONFIG_NF_CONNTRACK_SANE=m
++CONFIG_NF_CONNTRACK_SIP=m
++CONFIG_NF_CONNTRACK_TFTP=m
++CONFIG_NF_CT_NETLINK=m
++CONFIG_NETFILTER_TPROXY=m
++CONFIG_NETFILTER_XT_SET=m
++CONFIG_NETFILTER_XT_TARGET_AUDIT=m
++CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
++CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
++CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
++CONFIG_NETFILTER_XT_TARGET_CT=m
++CONFIG_NETFILTER_XT_TARGET_DSCP=m
++CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
++CONFIG_NETFILTER_XT_TARGET_LED=m
++CONFIG_NETFILTER_XT_TARGET_MARK=m
++CONFIG_NETFILTER_XT_TARGET_NFLOG=m
++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
++CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
++CONFIG_NETFILTER_XT_TARGET_TEE=m
++CONFIG_NETFILTER_XT_TARGET_TPROXY=m
++CONFIG_NETFILTER_XT_TARGET_TRACE=m
++CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
++CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
++CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
++CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
++CONFIG_NETFILTER_XT_MATCH_COMMENT=m
++CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
++CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
++CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
++CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
++CONFIG_NETFILTER_XT_MATCH_CPU=m
++CONFIG_NETFILTER_XT_MATCH_DCCP=m
++CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
++CONFIG_NETFILTER_XT_MATCH_DSCP=m
++CONFIG_NETFILTER_XT_MATCH_ESP=m
++CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
++CONFIG_NETFILTER_XT_MATCH_HELPER=m
++CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
++CONFIG_NETFILTER_XT_MATCH_LENGTH=m
++CONFIG_NETFILTER_XT_MATCH_LIMIT=m
++CONFIG_NETFILTER_XT_MATCH_MAC=m
++CONFIG_NETFILTER_XT_MATCH_MARK=m
++CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
++CONFIG_NETFILTER_XT_MATCH_OSF=m
++CONFIG_NETFILTER_XT_MATCH_OWNER=m
++CONFIG_NETFILTER_XT_MATCH_POLICY=m
++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
++CONFIG_NETFILTER_XT_MATCH_QUOTA=m
++CONFIG_NETFILTER_XT_MATCH_RATEEST=m
++CONFIG_NETFILTER_XT_MATCH_REALM=m
++CONFIG_NETFILTER_XT_MATCH_RECENT=m
++CONFIG_NETFILTER_XT_MATCH_SCTP=m
++CONFIG_NETFILTER_XT_MATCH_SOCKET=m
++CONFIG_NETFILTER_XT_MATCH_STATE=m
++CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
++CONFIG_NETFILTER_XT_MATCH_STRING=m
++CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
++CONFIG_NETFILTER_XT_MATCH_TIME=m
++CONFIG_NETFILTER_XT_MATCH_U32=m
++CONFIG_IP_SET=m
++CONFIG_IP_SET_BITMAP_IP=m
++CONFIG_IP_SET_BITMAP_IPMAC=m
++CONFIG_IP_SET_BITMAP_PORT=m
++CONFIG_IP_SET_HASH_IP=m
++CONFIG_IP_SET_HASH_IPPORT=m
++CONFIG_IP_SET_HASH_IPPORTIP=m
++CONFIG_IP_SET_HASH_IPPORTNET=m
++CONFIG_IP_SET_HASH_NET=m
++CONFIG_IP_SET_HASH_NETPORT=m
++CONFIG_IP_SET_HASH_NETIFACE=m
++CONFIG_IP_SET_LIST_SET=m
++CONFIG_NF_CONNTRACK_IPV4=m
++CONFIG_IP_NF_IPTABLES=m
++CONFIG_IP_NF_MATCH_AH=m
++CONFIG_IP_NF_MATCH_ECN=m
++CONFIG_IP_NF_MATCH_TTL=m
++CONFIG_IP_NF_FILTER=m
++CONFIG_IP_NF_TARGET_REJECT=m
++CONFIG_IP_NF_TARGET_LOG=m
++CONFIG_IP_NF_TARGET_ULOG=m
++CONFIG_IP_NF_MANGLE=m
++CONFIG_IP_NF_TARGET_ECN=m
++CONFIG_IP_NF_TARGET_TTL=m
++CONFIG_IP_NF_RAW=m
++CONFIG_IP_NF_ARPTABLES=m
++CONFIG_IP_NF_ARPFILTER=m
++CONFIG_IP_NF_ARP_MANGLE=m
++CONFIG_NF_CONNTRACK_IPV6=m
++CONFIG_IP6_NF_IPTABLES=m
++CONFIG_IP6_NF_MATCH_AH=m
++CONFIG_IP6_NF_MATCH_EUI64=m
++CONFIG_IP6_NF_MATCH_FRAG=m
++CONFIG_IP6_NF_MATCH_OPTS=m
++CONFIG_IP6_NF_MATCH_HL=m
++CONFIG_IP6_NF_MATCH_IPV6HEADER=m
++CONFIG_IP6_NF_MATCH_MH=m
++CONFIG_IP6_NF_MATCH_RT=m
++CONFIG_IP6_NF_TARGET_HL=m
++CONFIG_IP6_NF_TARGET_LOG=m
++CONFIG_IP6_NF_FILTER=m
++CONFIG_IP6_NF_TARGET_REJECT=m
++CONFIG_IP6_NF_MANGLE=m
++CONFIG_IP6_NF_RAW=m
+ CONFIG_NET_PKTGEN=m
+ CONFIG_IRDA=m
+ CONFIG_IRLAN=m
++CONFIG_IRNET=m
+ CONFIG_IRCOMM=m
+ CONFIG_IRDA_ULTRA=y
+ CONFIG_IRDA_CACHE_LAST_LSAP=y
+@@ -99,7 +223,8 @@ CONFIG_WIMAX=m
+ CONFIG_NET_9P=m
+ CONFIG_NFC=m
+ CONFIG_NFC_PN533=m
+-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
++CONFIG_DEVTMPFS=y
++CONFIG_CONNECTOR=m
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_CRYPTOLOOP=m
+ CONFIG_BLK_DEV_NBD=m
+@@ -132,6 +257,7 @@ CONFIG_ATH9K=m
+ CONFIG_ATH9K_HTC=m
+ CONFIG_CARL9170=m
+ CONFIG_B43=m
++CONFIG_B43_PHY_N=y
+ CONFIG_B43LEGACY=m
+ CONFIG_HOSTAP=m
+ CONFIG_IWM=m
+@@ -183,6 +309,7 @@ CONFIG_PPP_ASYNC=m
+ CONFIG_PPP_SYNC_TTY=m
+ CONFIG_PPP_DEFLATE=m
+ CONFIG_PPP_BSDCOMP=m
++CONFIG_PPPOE=m
+ CONFIG_SLIP=m
+ CONFIG_SLIP_COMPRESSED=y
+ CONFIG_NETCONSOLE=m
+@@ -214,6 +341,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
+ # CONFIG_DEVKMEM is not set
+ CONFIG_SERIAL_AMBA_PL011=y
+ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
++CONFIG_TTY_PRINTK=y
+ # CONFIG_HW_RANDOM is not set
+ CONFIG_RAW_DRIVER=y
+ CONFIG_GPIO_SYSFS=y
+@@ -273,6 +401,10 @@ CONFIG_USB_PWC=m
+ CONFIG_USB_ZR364XX=m
+ CONFIG_USB_STKWEBCAM=m
+ CONFIG_USB_S2255=m
++CONFIG_USB_DSBR=m
++CONFIG_RADIO_SI470X=y
++CONFIG_USB_SI470X=m
++CONFIG_USB_MR800=m
+ CONFIG_FB=y
+ CONFIG_FB_BCM2708=y
+ CONFIG_FRAMEBUFFER_CONSOLE=y
+@@ -448,6 +580,11 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+ CONFIG_UIO=m
+ CONFIG_UIO_PDRV=m
+ CONFIG_UIO_PDRV_GENIRQ=m
++CONFIG_STAGING=y
++CONFIG_W35UND=m
++CONFIG_PRISM2_USB=m
++CONFIG_R8712U=m
++CONFIG_ZRAM=m
+ # CONFIG_IOMMU_SUPPORT is not set
+ CONFIG_EXT4_FS=y
+ CONFIG_EXT4_FS_POSIX_ACL=y
+@@ -549,13 +686,14 @@ CONFIG_NLS_UTF8=m
+ CONFIG_PRINTK_TIME=y
+ CONFIG_DETECT_HUNG_TASK=y
+ CONFIG_TIMER_STATS=y
+-CONFIG_DEBUG_STACK_USAGE=y
+-CONFIG_DEBUG_INFO=y
++# CONFIG_DEBUG_PREEMPT is not set
+ CONFIG_DEBUG_MEMORY_INIT=y
+ CONFIG_BOOT_PRINTK_DELAY=y
+ CONFIG_LATENCYTOP=y
+ CONFIG_SYSCTL_SYSCALL_CHECK=y
++# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
+ CONFIG_IRQSOFF_TRACER=y
++CONFIG_PREEMPT_TRACER=y
+ CONFIG_SCHED_TRACER=y
+ CONFIG_STACK_TRACER=y
+ CONFIG_BLK_DEV_IO_TRACE=y
+@@ -582,3 +720,4 @@ CONFIG_CRYPTO_DEFLATE=m
+ # CONFIG_CRYPTO_HW is not set
+ CONFIG_CRC_ITU_T=y
+ CONFIG_LIBCRC32C=y
++
diff --git a/patches/linux-3.1.9/series b/patches/linux-3.1.9/series
index c1fed58..6f6e61b 100644
--- a/patches/linux-3.1.9/series
+++ b/patches/linux-3.1.9/series
@@ -52,3 +52,6 @@
 0052-Added-support-for-USB-webcams.patch
 0053-Enable-ipv6-due-to-popular-demand.patch
 0054-Fix-regression-in-debug-kernel-config-options.patch
+0055-bcm2835-ctl-fix-alsamixer-control.patch
+0056-bcm2835-ctl-limit-maximal-volume-to-4db.patch
+0057-Add-iptables-and-devtmpfs_mount-to-non-cutdown-confi.patch