qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 05:03:20 +02:00
Code

linux: update 3.1 to 3.1.1

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jogo 2011-11-13 10:48:05 +00:00
parent e5c40dc4c3
commit 85ec5ce98d
34 changed files with 211 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -32,8 +32,8 @@ endif
ifeq ($(LINUX_VERSION),3.0.3)
LINUX_KERNEL_MD5SUM:=6a8af5f6733b3db970197e65b3db712c
endif
ifeq ($(LINUX_VERSION),3.1)
LINUX_KERNEL_MD5SUM:=8d43453f8159b2332ad410b19d86a931
ifeq ($(LINUX_VERSION),3.1.1)
LINUX_KERNEL_MD5SUM:=4db653798a325f759b8cf49a1b5e6011
endif
# disable the md5sum check for unknown kernel versions

2
target/linux/brcm63xx/patches-3.1/011-add_bcm63xx_ehci_controller.patch
View File

@ -165,7 +165,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
+MODULE_ALIAS("platform:bcm63xx_ehci");
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1291,6 +1291,11 @@ MODULE_LICENSE ("GPL");
@@ -1319,6 +1319,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_grlib_driver
#endif

2
target/linux/generic/patches-3.1/100-overlayfs_v11.patch
View File

@ -254,7 +254,7 @@
rc = PTR_ERR(inode);
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1494,6 +1494,23 @@ void drop_collected_mounts(struct vfsmou
@@ -1495,6 +1495,23 @@ void drop_collected_mounts(struct vfsmou
release_mounts(&umount_list);
}

4
target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch
View File

@ -31,10 +31,10 @@
/*
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -139,6 +139,7 @@ struct ehci_hcd { /* one per controlle
unsigned fs_i_thresh:1; /* Intel iso scheduling */
@@ -140,6 +140,7 @@ struct ehci_hcd { /* one per controlle
unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/
unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */
+ unsigned ignore_oc:1;
/* required for usb32 quirk */

2
target/linux/generic/patches-3.1/400-rootfs_split.patch
View File

@ -257,7 +257,7 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -948,6 +948,12 @@ static int mtd_ioctl(struct file *file,
@@ -949,6 +949,12 @@ static int mtd_ioctl(struct file *file,
break;
}

4
target/linux/generic/patches-3.1/950-vm_exports.patch
View File

@ -97,7 +97,7 @@
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
@@ -1347,6 +1348,7 @@ struct vm_struct *get_vm_area(unsigned l
@@ -1369,6 +1370,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}
@ -107,7 +107,7 @@
void *caller)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -872,6 +872,7 @@ extern bool skip_free_areas_node(unsigne
@@ -871,6 +871,7 @@ extern bool skip_free_areas_node(unsigne
int shmem_lock(struct file *file, int lock, struct user_struct *user);
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);

2
target/linux/lantiq/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Lantiq GPON/XWAY
FEATURES:=squashfs jffs2
DEFAULT_SUBTARGET:=danube
LINUX_VERSION:=3.1
LINUX_VERSION:=3.1.1
CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves

4
target/linux/lantiq/patches/0015-MIPS-lantiq-adds-etop-support-for-ase-ar9.patch
View File

@ -69,7 +69,7 @@ Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
/* DMA */
#define LTQ_DMA_BASE_ADDR 0x1E104100
#define LTQ_DMA_SIZE 0x800
@@ -148,6 +153,11 @@ extern void ltq_pmu_enable(unsigned int
@@ -146,6 +151,11 @@ extern void ltq_pmu_enable(unsigned int
extern void ltq_pmu_disable(unsigned int module);
extern void ltq_cgu_enable(unsigned int clk);
@ -83,7 +83,7 @@ Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
return (ltq_get_soc_type() == SOC_TYPE_AR9);
--- a/arch/mips/lantiq/xway/devices.c
+++ b/arch/mips/lantiq/xway/devices.c
@@ -77,18 +77,23 @@ void __init ltq_register_ase_asc(void)
@@ -74,18 +74,23 @@ void __init ltq_register_ase_asc(void)
}
/* ethernet */

2
target/linux/lantiq/patches/0016-MIPS-lantiq-adds-xway-nand-driver.patch
View File

@ -26,7 +26,7 @@ TODO : memory ranges
--- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
@@ -140,6 +140,8 @@
@@ -138,6 +138,8 @@
/* register access macros for EBU and CGU */
#define ltq_ebu_w32(x, y) ltq_w32((x), ltq_ebu_membase + (y))
#define ltq_ebu_r32(x) ltq_r32(ltq_ebu_membase + (x))

2
target/linux/lantiq/patches/0026-MIPS-lantiq-adds-GPIO3-support-on-AR9.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
--- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
@@ -113,7 +113,9 @@
@@ -121,7 +121,9 @@
#define LTQ_GPIO0_BASE_ADDR 0x1E100B10
#define LTQ_GPIO1_BASE_ADDR 0x1E100B40
#define LTQ_GPIO2_BASE_ADDR 0x1E100B70

6
target/linux/lantiq/patches/110-sdk-compat.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h 2011-11-13 00:18:10.316010867 +0100
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/falcon/sysctrl.h
@@ -0,0 +1,60 @@
+/*
+ * This program is free software; you can redistribute it and/or

50
target/linux/lantiq/patches/210-machtypes.patch
View File

@ -1,8 +1,6 @@
Index: linux-3.1/arch/mips/lantiq/machtypes.h
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/machtypes.h 2011-11-03 10:32:53.117317313 +0100
+++ linux-3.1/arch/mips/lantiq/machtypes.h 2011-11-03 15:57:57.106151011 +0100
@@ -20,9 +20,34 @@
--- a/arch/mips/lantiq/machtypes.h
+++ b/arch/mips/lantiq/machtypes.h
@@ -20,9 +20,34 @@ enum lantiq_mach_type {
LANTIQ_MACH_EASY98000, /* Falcon Eval Board, NOR Flash */
LANTIQ_MACH_EASY98000SF, /* Falcon Eval Board, Serial Flash */
LANTIQ_MACH_EASY98000NAND, /* Falcon Eval Board, NAND Flash */
@ -37,11 +35,9 @@ Index: linux-3.1/arch/mips/lantiq/machtypes.h
};
#endif
Index: linux-3.1/arch/mips/lantiq/xway/Kconfig
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/xway/Kconfig 2011-11-03 10:32:53.117317313 +0100
+++ linux-3.1/arch/mips/lantiq/xway/Kconfig 2011-11-03 10:32:53.409317325 +0100
@@ -6,6 +6,22 @@
--- a/arch/mips/lantiq/xway/Kconfig
+++ b/arch/mips/lantiq/xway/Kconfig
@@ -6,6 +6,22 @@ config LANTIQ_MACH_EASY50712
bool "Easy50712 - Danube"
default y
@ -64,11 +60,9 @@ Index: linux-3.1/arch/mips/lantiq/xway/Kconfig
endmenu
endif
Index: linux-3.1/arch/mips/lantiq/xway/Makefile
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/xway/Makefile 2011-11-03 10:32:53.117317313 +0100
+++ linux-3.1/arch/mips/lantiq/xway/Makefile 2011-11-03 15:57:59.222151170 +0100
@@ -7,3 +7,7 @@
--- a/arch/mips/lantiq/xway/Makefile
+++ b/arch/mips/lantiq/xway/Makefile
@@ -7,3 +7,7 @@ obj-$(CONFIG_SOC_VR9) += clk-vr9.o prom-
obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o
obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o
obj-$(CONFIG_LANTIQ_MACH_FRITZ3370) += mach-fritz.o
@ -76,11 +70,9 @@ Index: linux-3.1/arch/mips/lantiq/xway/Makefile
+obj-$(CONFIG_LANTIQ_MACH_NETGEAR) += mach-netgear.o
+obj-$(CONFIG_LANTIQ_MACH_GIGASX76X) += mach-gigasx76x.o
+obj-$(CONFIG_LANTIQ_MACH_WBMR) += mach-wbmr.o
Index: linux-3.1/arch/mips/lantiq/falcon/Kconfig
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/falcon/Kconfig 2011-11-03 10:32:52.697317294 +0100
+++ linux-3.1/arch/mips/lantiq/falcon/Kconfig 2011-11-03 10:32:53.409317325 +0100
@@ -6,6 +6,14 @@
--- a/arch/mips/lantiq/falcon/Kconfig
+++ b/arch/mips/lantiq/falcon/Kconfig
@@ -6,6 +6,14 @@ config LANTIQ_MACH_EASY98000
bool "Easy98000"
default y
@ -95,10 +87,8 @@ Index: linux-3.1/arch/mips/lantiq/falcon/Kconfig
endmenu
endif
Index: linux-3.1/arch/mips/lantiq/falcon/Makefile
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/falcon/Makefile 2011-11-03 10:32:53.033317309 +0100
+++ linux-3.1/arch/mips/lantiq/falcon/Makefile 2011-11-03 10:32:53.409317325 +0100
--- a/arch/mips/lantiq/falcon/Makefile
+++ b/arch/mips/lantiq/falcon/Makefile
@@ -1,2 +1,6 @@
obj-y := clk.o prom.o reset.o sysctrl.o devices.o gpio.o softdog_vpe.o
+obj-$(CONFIG_LANTIQ_MACH_EASY98000) += addon-easy98000.o
@ -106,10 +96,8 @@ Index: linux-3.1/arch/mips/lantiq/falcon/Makefile
obj-$(CONFIG_LANTIQ_MACH_EASY98000) += mach-easy98000.o
+obj-$(CONFIG_LANTIQ_MACH_EASY98020) += mach-easy98020.o
+obj-$(CONFIG_LANTIQ_MACH_95C3AM1) += mach-95C3AM1.o
Index: linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/falcon/mach-easy98000.c 2011-11-03 10:32:52.805317298 +0100
+++ linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c 2011-11-03 10:32:53.413317324 +0100
--- a/arch/mips/lantiq/falcon/mach-easy98000.c
+++ b/arch/mips/lantiq/falcon/mach-easy98000.c
@@ -1,23 +1,38 @@
-/*
- * This program is free software; you can redistribute it and/or modify it
@ -159,7 +147,7 @@ Index: linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c
{
.name = "uboot",
.offset = 0x0,
@@ -35,7 +50,7 @@
@@ -35,7 +50,7 @@ static struct mtd_partition easy98000_no
},
};
@ -168,7 +156,7 @@ Index: linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c
.nr_parts = ARRAY_SIZE(easy98000_nor_partitions),
.parts = easy98000_nor_partitions,
};
@@ -55,12 +70,105 @@
@@ -55,12 +70,105 @@ static struct spi_board_info easy98000_s
.platform_data = &easy98000_spi_flash_platform_data
};
@ -279,7 +267,7 @@ Index: linux-3.1/arch/mips/lantiq/falcon/mach-easy98000.c
#define SPI_GPIO_BUS_NUM 1
static struct spi_gpio_platform_data easy98000_spi_gpio_data = {
@@ -93,29 +201,36 @@
@@ -93,29 +201,36 @@ static struct spi_board_info easy98000_s
.platform_data = &at25160n,
};

42
target/linux/lantiq/patches/211-devices.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/mips/lantiq/devices.c
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/devices.c 2011-11-12 18:06:54.712192370 +0100
+++ linux-3.1/arch/mips/lantiq/devices.c 2011-11-12 18:06:55.544192390 +0100
--- a/arch/mips/lantiq/devices.c
+++ b/arch/mips/lantiq/devices.c
@@ -18,6 +18,7 @@
#include <linux/time.h>
#include <linux/io.h>
@ -10,7 +8,7 @@ Index: linux-3.1/arch/mips/lantiq/devices.c
#include <asm/bootinfo.h>
#include <asm/irq.h>
@@ -100,3 +101,20 @@
@@ -100,3 +101,20 @@ void __init ltq_register_pci(struct ltq_
pr_err("kernel is compiled without PCI support\n");
}
#endif
@ -31,21 +29,17 @@ Index: linux-3.1/arch/mips/lantiq/devices.c
+ cp1_base =
+ (void*)CPHYSADDR(dma_alloc_coherent(NULL, CP1_SIZE, &dma, GFP_ATOMIC));
+}
Index: linux-3.1/arch/mips/lantiq/devices.h
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/devices.h 2011-11-12 18:06:54.712192370 +0100
+++ linux-3.1/arch/mips/lantiq/devices.h 2011-11-12 18:06:55.544192390 +0100
@@ -23,5 +23,6 @@
--- a/arch/mips/lantiq/devices.h
+++ b/arch/mips/lantiq/devices.h
@@ -23,5 +23,6 @@ extern void ltq_register_nor(struct phys
extern void ltq_register_wdt(void);
extern void ltq_register_asc(int port);
extern void ltq_register_pci(struct ltq_pci_data *data);
+extern void ltq_register_tapi(void);
#endif
Index: linux-3.1/arch/mips/lantiq/xway/Makefile
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/xway/Makefile 2011-11-12 18:06:55.520192389 +0100
+++ linux-3.1/arch/mips/lantiq/xway/Makefile 2011-11-12 18:06:55.544192390 +0100
--- a/arch/mips/lantiq/xway/Makefile
+++ b/arch/mips/lantiq/xway/Makefile
@@ -1,5 +1,7 @@
obj-y := sysctrl.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o nand.o timer.o
@ -54,10 +48,8 @@ Index: linux-3.1/arch/mips/lantiq/xway/Makefile
obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o
obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o
obj-$(CONFIG_SOC_VR9) += clk-vr9.o prom-vr9.o
Index: linux-3.1/arch/mips/lantiq/xway/devices.c
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/xway/devices.c 2011-11-12 18:06:55.304192384 +0100
+++ linux-3.1/arch/mips/lantiq/xway/devices.c 2011-11-12 18:06:55.544192390 +0100
--- a/arch/mips/lantiq/xway/devices.c
+++ b/arch/mips/lantiq/xway/devices.c
@@ -19,6 +19,7 @@
#include <linux/time.h>
#include <linux/io.h>
@ -66,7 +58,7 @@ Index: linux-3.1/arch/mips/lantiq/xway/devices.c
#include <asm/bootinfo.h>
#include <asm/irq.h>
@@ -99,3 +100,98 @@
@@ -99,3 +100,98 @@ ltq_register_etop(struct ltq_eth_data *e
platform_device_register(&ltq_etop);
}
}
@ -165,10 +157,8 @@ Index: linux-3.1/arch/mips/lantiq/xway/devices.c
+ ltq_spi.dev.platform_data = pdata;
+ platform_device_register(&ltq_spi);
+}
Index: linux-3.1/arch/mips/lantiq/xway/devices.h
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/xway/devices.h 2011-10-24 09:10:05.000000000 +0200
+++ linux-3.1/arch/mips/lantiq/xway/devices.h 2011-11-12 18:06:55.544192390 +0100
--- a/arch/mips/lantiq/xway/devices.h
+++ b/arch/mips/lantiq/xway/devices.h
@@ -11,10 +11,17 @@
#include "../devices.h"
@ -187,10 +177,8 @@ Index: linux-3.1/arch/mips/lantiq/xway/devices.h
+extern void ltq_register_gpio_buttons(struct gpio_button *buttons, int cnt);
#endif
Index: linux-3.1/arch/mips/lantiq/Makefile
===================================================================
--- linux-3.1.orig/arch/mips/lantiq/Makefile 2011-11-12 18:06:54.780192371 +0100
+++ linux-3.1/arch/mips/lantiq/Makefile 2011-11-12 19:52:32.700339384 +0100
--- a/arch/mips/lantiq/Makefile
+++ b/arch/mips/lantiq/Makefile
@@ -4,7 +4,7 @@
# under the terms of the GNU General Public License version 2 as published
# by the Free Software Foundation.

2
target/linux/omap24xx/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP-24xx
MAINTAINER:=Michael Buesch <m@bues.ch>
FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio
LINUX_VERSION:=3.1
LINUX_VERSION:=3.1.1
define Target/Description
TI OMAP-24xx

48
target/linux/omap24xx/patches-3.1/200-omap-platform.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/arm/plat-omap/bootreason.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/arch/arm/plat-omap/bootreason.c 2011-10-30 00:48:34.877053219 +0200
--- /dev/null
+++ b/arch/arm/plat-omap/bootreason.c
@@ -0,0 +1,79 @@
+/*
+ * linux/arch/arm/plat-omap/bootreason.c
@ -82,10 +80,8 @@ Index: linux-3.1/arch/arm/plat-omap/bootreason.c
+}
+
+late_initcall(bootreason_init);
Index: linux-3.1/arch/arm/plat-omap/common.c
===================================================================
--- linux-3.1.orig/arch/arm/plat-omap/common.c 2011-10-30 00:48:32.781054651 +0200
+++ linux-3.1/arch/arm/plat-omap/common.c 2011-10-30 00:48:34.877053219 +0200
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -21,18 +21,90 @@
#include <plat/vram.h>
#include <plat/dsp.h>
@ -177,10 +173,8 @@ Index: linux-3.1/arch/arm/plat-omap/common.c
/* Try to find the config from the board-specific structures
* in the kernel. */
for (i = 0; i < omap_board_config_size; i++) {
Index: linux-3.1/arch/arm/plat-omap/component-version.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/arch/arm/plat-omap/component-version.c 2011-10-30 00:48:34.877053219 +0200
--- /dev/null
+++ b/arch/arm/plat-omap/component-version.c
@@ -0,0 +1,64 @@
+/*
+ * linux/arch/arm/plat-omap/component-version.c
@ -246,10 +240,8 @@ Index: linux-3.1/arch/arm/plat-omap/component-version.c
+MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>");
+MODULE_DESCRIPTION("Component version driver");
+MODULE_LICENSE("GPL");
Index: linux-3.1/arch/arm/plat-omap/Kconfig
===================================================================
--- linux-3.1.orig/arch/arm/plat-omap/Kconfig 2011-10-30 00:48:32.933054543 +0200
+++ linux-3.1/arch/arm/plat-omap/Kconfig 2011-10-30 00:48:34.877053219 +0200
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -82,6 +82,38 @@ config OMAP_RESET_CLOCKS
probably do not want this option enabled until your
device drivers work properly.
@ -289,10 +281,8 @@ Index: linux-3.1/arch/arm/plat-omap/Kconfig
config OMAP_MUX
bool "OMAP multiplexing support"
depends on ARCH_OMAP
Index: linux-3.1/arch/arm/plat-omap/Makefile
===================================================================
--- linux-3.1.orig/arch/arm/plat-omap/Makefile 2011-10-30 00:48:32.953054530 +0200
+++ linux-3.1/arch/arm/plat-omap/Makefile 2011-10-30 00:48:34.877053219 +0200
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -23,6 +23,9 @@ obj-$(CONFIG_OMAP_IOMMU_DEBUG) += iommu-
obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
@ -303,10 +293,8 @@ Index: linux-3.1/arch/arm/plat-omap/Makefile
obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
Index: linux-3.1/arch/arm/include/asm/setup.h
===================================================================
--- linux-3.1.orig/arch/arm/include/asm/setup.h 2011-10-30 00:48:32.965054522 +0200
+++ linux-3.1/arch/arm/include/asm/setup.h 2011-10-30 00:48:34.877053219 +0200
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -136,6 +136,13 @@ struct tag_acorn {
__u8 adfsdrives;
};
@ -333,10 +321,8 @@ Index: linux-3.1/arch/arm/include/asm/setup.h
* DC21285 specific
*/
struct tag_memclk memclk;
Index: linux-3.1/arch/arm/plat-omap/gpio-switch.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/arch/arm/plat-omap/gpio-switch.c 2011-10-30 00:48:34.877053219 +0200
--- /dev/null
+++ b/arch/arm/plat-omap/gpio-switch.c
@@ -0,0 +1,554 @@
+/*
+ * linux/arch/arm/plat-omap/gpio-switch.c
@ -892,10 +878,8 @@ Index: linux-3.1/arch/arm/plat-omap/gpio-switch.c
+MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>, Paul Mundt <paul.mundt@nokia.com");
+MODULE_DESCRIPTION("GPIO switch driver");
+MODULE_LICENSE("GPL");
Index: linux-3.1/arch/arm/plat-omap/include/plat/board.h
===================================================================
--- linux-3.1.orig/arch/arm/plat-omap/include/plat/board.h 2011-10-30 00:48:32.949054532 +0200
+++ linux-3.1/arch/arm/plat-omap/include/plat/board.h 2011-10-30 00:48:34.877053219 +0200
--- a/arch/arm/plat-omap/include/plat/board.h
+++ b/arch/arm/plat-omap/include/plat/board.h
@@ -151,6 +151,14 @@ struct omap_board_config_kernel {
const void *data;
};

90
target/linux/omap24xx/patches-3.1/250-cbus.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/drivers/cbus/cbus.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/cbus.c 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/cbus.c
@@ -0,0 +1,333 @@
+/*
+ * drivers/cbus/cbus.c
@ -336,10 +334,8 @@ Index: linux-3.1/drivers/cbus/cbus.c
+MODULE_AUTHOR("Mikko Ylinen");
+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
+
Index: linux-3.1/drivers/cbus/cbus.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/cbus.h 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/cbus.h
@@ -0,0 +1,30 @@
+/*
+ * drivers/cbus/cbus.h
@ -371,10 +367,8 @@ Index: linux-3.1/drivers/cbus/cbus.h
+ unsigned val);
+
+#endif /* __DRIVERS_CBUS_CBUS_H */
Index: linux-3.1/drivers/cbus/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/Kconfig 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/Kconfig
@@ -0,0 +1,86 @@
+#
+# CBUS device configuration
@ -462,10 +456,8 @@ Index: linux-3.1/drivers/cbus/Kconfig
+endif # CBUS_RETU
+
+endmenu
Index: linux-3.1/drivers/cbus/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/Makefile 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for CBUS.
@ -480,10 +472,8 @@ Index: linux-3.1/drivers/cbus/Makefile
+obj-$(CONFIG_CBUS_RETU_RTC) += retu-rtc.o
+obj-$(CONFIG_CBUS_RETU_WDT) += retu-wdt.o
+obj-$(CONFIG_CBUS_RETU_HEADSET) += retu-headset.o
Index: linux-3.1/drivers/cbus/retu.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/retu.c 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/retu.c
@@ -0,0 +1,549 @@
+/**
+ * drivers/cbus/retu.c
@ -1034,10 +1024,8 @@ Index: linux-3.1/drivers/cbus/retu.c
+MODULE_AUTHOR("Juha Yrjölä");
+MODULE_AUTHOR("David Weinehall");
+MODULE_AUTHOR("Mikko Ylinen");
Index: linux-3.1/drivers/cbus/retu.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/retu.h 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/retu.h
@@ -0,0 +1,85 @@
+/**
+ * drivers/cbus/retu.h
@ -1124,10 +1112,8 @@ Index: linux-3.1/drivers/cbus/retu.h
+int retu_read_adc(struct device *child, int channel);
+
+#endif /* __DRIVERS_CBUS_RETU_H */
Index: linux-3.1/drivers/cbus/retu-headset.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/retu-headset.c 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/retu-headset.c
@@ -0,0 +1,359 @@
+/**
+ * Retu/Vilma headset detection
@ -1488,10 +1474,8 @@ Index: linux-3.1/drivers/cbus/retu-headset.c
+MODULE_DESCRIPTION("Retu/Vilma headset detection");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Juha Yrjölä");
Index: linux-3.1/drivers/cbus/retu-pwrbutton.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/retu-pwrbutton.c 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/retu-pwrbutton.c
@@ -0,0 +1,165 @@
+/**
+ * drivers/cbus/retu-pwrbutton.c
@ -1658,10 +1642,8 @@ Index: linux-3.1/drivers/cbus/retu-pwrbutton.c
+MODULE_AUTHOR("Ari Saastamoinen");
+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
+
Index: linux-3.1/drivers/cbus/retu-rtc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/retu-rtc.c 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/retu-rtc.c
@@ -0,0 +1,287 @@
+/**
+ * drivers/cbus/retu-rtc.c
@ -1950,10 +1932,8 @@ Index: linux-3.1/drivers/cbus/retu-rtc.c
+MODULE_AUTHOR("Igor Stoppa");
+MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
+
Index: linux-3.1/drivers/cbus/retu-wdt.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/retu-wdt.c 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/retu-wdt.c
@@ -0,0 +1,272 @@
+/**
+ * drivers/cbus/retu-wdt.c
@ -2227,10 +2207,8 @@ Index: linux-3.1/drivers/cbus/retu-wdt.c
+MODULE_DESCRIPTION("Retu WatchDog");
+MODULE_AUTHOR("Amit Kucheria");
+MODULE_LICENSE("GPL");
Index: linux-3.1/drivers/cbus/tahvo.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/tahvo.c 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/tahvo.c
@@ -0,0 +1,423 @@
+/**
+ * drivers/cbus/tahvo.c
@ -2655,10 +2633,8 @@ Index: linux-3.1/drivers/cbus/tahvo.c
+MODULE_AUTHOR("David Weinehall");
+MODULE_AUTHOR("Mikko Ylinen");
+
Index: linux-3.1/drivers/cbus/tahvo.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/tahvo.h 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/tahvo.h
@@ -0,0 +1,58 @@
+/*
+ * drivers/cbus/tahvo.h
@ -2718,10 +2694,8 @@ Index: linux-3.1/drivers/cbus/tahvo.h
+ u16 clear);
+
+#endif /* __DRIVERS_CBUS_TAHVO_H */
Index: linux-3.1/drivers/cbus/tahvo-usb.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/tahvo-usb.c 2011-10-30 00:48:42.989047642 +0200
--- /dev/null
+++ b/drivers/cbus/tahvo-usb.c
@@ -0,0 +1,740 @@
+/**
+ * drivers/cbus/tahvo-usb.c
@ -3463,10 +3437,8 @@ Index: linux-3.1/drivers/cbus/tahvo-usb.c
+MODULE_DESCRIPTION("Tahvo USB OTG Transceiver Driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Juha Yrjölä, Tony Lindgren, and Timo Teräs");
Index: linux-3.1/drivers/Makefile
===================================================================
--- linux-3.1.orig/drivers/Makefile 2011-10-30 00:48:29.709056726 +0200
+++ linux-3.1/drivers/Makefile 2011-10-30 00:48:42.989047642 +0200
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -76,7 +76,7 @@ obj-$(CONFIG_GAMEPORT) += input/gamepor
obj-$(CONFIG_INPUT) += input/
obj-$(CONFIG_I2O) += message/
@ -3476,10 +3448,8 @@ Index: linux-3.1/drivers/Makefile
obj-$(CONFIG_PPS) += pps/
obj-$(CONFIG_PTP_1588_CLOCK) += ptp/
obj-$(CONFIG_W1) += w1/
Index: linux-3.1/drivers/Kconfig
===================================================================
--- linux-3.1.orig/drivers/Kconfig 2011-10-30 00:48:29.653056764 +0200
+++ linux-3.1/drivers/Kconfig 2011-10-30 00:48:42.989047642 +0200
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -2,6 +2,8 @@ menu "Device Drivers"
source "drivers/base/Kconfig"

6
target/linux/omap24xx/patches-3.1/251-cbus-tahvo-lock-fix.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/drivers/cbus/tahvo.c
===================================================================
--- linux-3.1.orig/drivers/cbus/tahvo.c 2011-11-05 17:03:39.598846119 +0100
+++ linux-3.1/drivers/cbus/tahvo.c 2011-11-05 17:04:36.274768324 +0100
--- a/drivers/cbus/tahvo.c
+++ b/drivers/cbus/tahvo.c
@@ -104,7 +104,9 @@ void tahvo_write_reg(struct device *chil
{
struct tahvo *tahvo = dev_get_drvdata(child->parent);

12
target/linux/omap24xx/patches-3.1/300-cbus-platform.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 21:04:56.008818251 +0100
+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 21:14:31.600257909 +0100
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -15,8 +15,11 @@
#include <linux/delay.h>
#include <linux/gpio.h>
@ -134,10 +132,8 @@ Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
/* FIXME: add n810 spi devices */
spi_register_board_info(n800_spi_board_info,
ARRAY_SIZE(n800_spi_board_info));
Index: linux-3.1/include/linux/platform_data/cbus.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/include/linux/platform_data/cbus.h 2011-10-30 21:05:07.540709042 +0100
--- /dev/null
+++ b/include/linux/platform_data/cbus.h
@@ -0,0 +1,38 @@
+/*
+ * cbus.h - CBUS platform_data definition

18
target/linux/omap24xx/patches-3.1/310-n810-lcd.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 21:14:31.600257909 +0100
+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 21:14:46.712140689 +0100
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -24,6 +24,7 @@
#include <linux/spi/spi.h>
#include <linux/usb/musb.h>
@ -124,10 +122,8 @@ Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
gpmc_onenand_init(board_onenand_data);
n8x0_mmc_init();
n8x0_usb_init();
Index: linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-30 21:14:46.712140689 +0100
--- /dev/null
+++ b/arch/arm/mach-omap2/board-n8x0-lcd.c
@@ -0,0 +1,231 @@
+/*
+ * linux/arch/arm/mach-omap2/board-n8x0.c
@ -360,10 +356,8 @@ Index: linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c
+
+ printk(KERN_INFO "N8x0 Blizzard initialized");
+}
Index: linux-3.1/arch/arm/mach-omap2/Makefile
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/Makefile 2011-10-30 21:14:31.608257847 +0100
+++ linux-3.1/arch/arm/mach-omap2/Makefile 2011-10-30 21:14:46.712140689 +0100
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -209,6 +209,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar
hsmmc.o \
board-flash.o

12
target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/drivers/video/omap/dispc.c
===================================================================
--- linux-3.1.orig/drivers/video/omap/dispc.c 2011-10-30 21:14:30.228268542 +0100
+++ linux-3.1/drivers/video/omap/dispc.c 2011-10-30 21:14:49.416119695 +0100
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -922,14 +922,14 @@ static int get_dss_clocks(void)
return PTR_ERR(dispc.dss_ick);
}
@ -19,10 +17,8 @@ Index: linux-3.1/drivers/video/omap/dispc.c
if (IS_ERR(dispc.dss_54m_fck)) {
dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
clk_put(dispc.dss_ick);
Index: linux-3.1/drivers/video/omap/rfbi.c
===================================================================
--- linux-3.1.orig/drivers/video/omap/rfbi.c 2011-10-30 21:14:30.220268604 +0100
+++ linux-3.1/drivers/video/omap/rfbi.c 2011-10-30 21:14:49.416119695 +0100
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -90,7 +90,7 @@ static int rfbi_get_clocks(void)
return PTR_ERR(rfbi.dss_ick);
}

6
target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/arm/mach-omap2/omap_hwmod.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/omap_hwmod.c 2011-10-30 21:20:19.205515660 +0100
+++ linux-3.1/arch/arm/mach-omap2/omap_hwmod.c 2011-10-30 21:28:16.769945954 +0100
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -145,6 +145,8 @@
#include <plat/omap_hwmod.h>
#include <plat/prcm.h>

66
target/linux/omap24xx/patches-3.1/315-n800-touchscreen-and-keypad-drivers.patch
View File

@ -24,10 +24,8 @@ Touchscreen and keypad are fully functional, audio part only provides power mana
create mode 100644 drivers/spi/tsc2301-mixer.c
create mode 100644 include/linux/spi/tsc2301.h
Index: linux-3.1/drivers/input/keyboard/Kconfig
===================================================================
--- linux-3.1.orig/drivers/input/keyboard/Kconfig 2011-10-30 00:48:29.357056963 +0200
+++ linux-3.1/drivers/input/keyboard/Kconfig 2011-10-30 00:48:48.989043470 +0200
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -530,6 +530,12 @@ config KEYBOARD_TNETV107X
To compile this driver as a module, choose M here: the
module will be called tnetv107x-keypad.
@ -41,10 +39,8 @@ Index: linux-3.1/drivers/input/keyboard/Kconfig
config KEYBOARD_TWL4030
tristate "TI TWL4030/TWL5030/TPS659x0 keypad support"
depends on TWL4030_CORE
Index: linux-3.1/drivers/input/keyboard/Makefile
===================================================================
--- linux-3.1.orig/drivers/input/keyboard/Makefile 2011-10-30 00:48:29.365056957 +0200
+++ linux-3.1/drivers/input/keyboard/Makefile 2011-10-30 00:48:48.989043470 +0200
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd
obj-$(CONFIG_KEYBOARD_TC3589X) += tc3589x-keypad.o
obj-$(CONFIG_KEYBOARD_TEGRA) += tegra-kbc.o
@ -53,10 +49,8 @@ Index: linux-3.1/drivers/input/keyboard/Makefile
obj-$(CONFIG_KEYBOARD_TWL4030) += twl4030_keypad.o
obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o
obj-$(CONFIG_KEYBOARD_W90P910) += w90p910_keypad.o
Index: linux-3.1/drivers/input/keyboard/tsc2301_kp.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/input/keyboard/tsc2301_kp.c 2011-10-30 00:48:48.989043470 +0200
--- /dev/null
+++ b/drivers/input/keyboard/tsc2301_kp.c
@@ -0,0 +1,475 @@
+/*
+ * TSC2301 keypad driver
@ -533,10 +527,8 @@ Index: linux-3.1/drivers/input/keyboard/tsc2301_kp.c
+
+ kfree(kp);
+}
Index: linux-3.1/drivers/input/touchscreen/Kconfig
===================================================================
--- linux-3.1.orig/drivers/input/touchscreen/Kconfig 2011-10-30 00:48:29.341056972 +0200
+++ linux-3.1/drivers/input/touchscreen/Kconfig 2011-10-30 00:48:48.989043470 +0200
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -673,6 +673,12 @@ config TOUCHSCREEN_TSC2007
To compile this driver as a module, choose M here: the
module will be called tsc2007.
@ -550,10 +542,8 @@ Index: linux-3.1/drivers/input/touchscreen/Kconfig
config TOUCHSCREEN_W90X900
tristate "W90P910 touchscreen driver"
depends on HAVE_CLK
Index: linux-3.1/drivers/input/touchscreen/Makefile
===================================================================
--- linux-3.1.orig/drivers/input/touchscreen/Makefile 2011-10-30 00:48:29.349056969 +0200
+++ linux-3.1/drivers/input/touchscreen/Makefile 2011-10-30 00:48:48.989043470 +0200
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) +=
obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o
obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o
@ -562,10 +552,8 @@ Index: linux-3.1/drivers/input/touchscreen/Makefile
obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o
obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o
obj-$(CONFIG_TOUCHSCREEN_WM831X) += wm831x-ts.o
Index: linux-3.1/drivers/input/touchscreen/tsc2301_ts.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/input/touchscreen/tsc2301_ts.c 2011-10-30 00:48:48.989043470 +0200
--- /dev/null
+++ b/drivers/input/touchscreen/tsc2301_ts.c
@@ -0,0 +1,676 @@
+/*
+ * TSC2301 touchscreen driver
@ -1243,10 +1231,8 @@ Index: linux-3.1/drivers/input/touchscreen/tsc2301_ts.c
+}
+MODULE_AUTHOR("Jarkko Oikarinen <jarkko.oikarinen@nokia.com>");
+MODULE_LICENSE("GPL");
Index: linux-3.1/drivers/spi/Kconfig
===================================================================
--- linux-3.1.orig/drivers/spi/Kconfig 2011-10-30 00:48:29.373056952 +0200
+++ linux-3.1/drivers/spi/Kconfig 2011-10-30 00:48:48.989043470 +0200
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -435,6 +435,28 @@ config SPI_TLE62X0
sysfs interface, with each line presented as a kind of GPIO
exposing both switch control and diagnostic feedback.
@ -1276,10 +1262,8 @@ Index: linux-3.1/drivers/spi/Kconfig
#
# Add new SPI protocol masters in alphabetical order above this line
#
Index: linux-3.1/drivers/spi/Makefile
===================================================================
--- linux-3.1.orig/drivers/spi/Makefile 2011-10-30 00:48:29.385056944 +0200
+++ linux-3.1/drivers/spi/Makefile 2011-10-30 00:48:48.989043470 +0200
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -59,4 +59,6 @@ obj-$(CONFIG_SPI_TLE62X0) += spi-tle62x
obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi-topcliff-pch.o
obj-$(CONFIG_SPI_TXX9) += spi-txx9.o
@ -1288,10 +1272,8 @@ Index: linux-3.1/drivers/spi/Makefile
+obj-$(CONFIG_SPI_TSC2301) += tsc2301.o
+tsc2301-objs := tsc2301-core.o
+tsc2301-$(CONFIG_SPI_TSC2301_AUDIO) += tsc2301-mixer.o
Index: linux-3.1/drivers/spi/tsc2301-core.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/spi/tsc2301-core.c 2011-10-30 00:48:48.989043470 +0200
--- /dev/null
+++ b/drivers/spi/tsc2301-core.c
@@ -0,0 +1,297 @@
+/*
+ * TSC2301 driver
@ -1590,10 +1572,8 @@ Index: linux-3.1/drivers/spi/tsc2301-core.c
+
+MODULE_AUTHOR("Juha Yrjölä <juha.yrjola@nokia.com>");
+MODULE_LICENSE("GPL");
Index: linux-3.1/drivers/spi/tsc2301-mixer.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/spi/tsc2301-mixer.c 2011-10-30 00:48:48.989043470 +0200
--- /dev/null
+++ b/drivers/spi/tsc2301-mixer.c
@@ -0,0 +1,1003 @@
+/*
+ * ALSA Mixer implementation for TSC2301
@ -2598,10 +2578,8 @@ Index: linux-3.1/drivers/spi/tsc2301-mixer.c
+
+MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");
+MODULE_LICENSE("GPL");
Index: linux-3.1/include/linux/spi/tsc2301.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/include/linux/spi/tsc2301.h 2011-10-30 00:48:48.989043470 +0200
--- /dev/null
+++ b/include/linux/spi/tsc2301.h
@@ -0,0 +1,208 @@
+#ifndef _LINUX_SPI_TSC2301_H
+#define _LINUX_SPI_TSC2301_H

6
target/linux/omap24xx/patches-3.1/320-nokia-various.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:31:56.000000000 +0100
+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:22.288178756 +0100
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -25,6 +25,8 @@
#include <linux/usb/musb.h>
#include <sound/tlv320aic3x.h>

6
target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch
View File

@ -8,10 +8,8 @@ This patch adds TSC2301 init logic to N800 board file
arch/arm/mach-omap2/board-n8x0.c | 141 ++++++++++++++++++++++++++++++++++++--
1 files changed, 135 insertions(+), 6 deletions(-)
Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:22.288178756 +0100
+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:26.840094004 +0100
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -27,6 +27,7 @@
#include <linux/spi/tsc2005.h>
#include <linux/input.h>

6
target/linux/omap24xx/patches-3.1/350-n8x0-gpioswitch-input.patch
View File

@ -2,10 +2,8 @@
arch/arm/mach-omap2/board-n8x0.c | 73 +++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:50.813042079 +0200
+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:51.565042059 +0200
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -316,6 +316,77 @@ void __init n8x0_bt_init(void)
BUG();
}

60
target/linux/omap24xx/patches-3.1/400-bluetooth-hci_h4p.patch
View File

@ -11,10 +11,8 @@
drivers/bluetooth/hci_h4p/uart.c | 169 +++++
10 files changed, 1891 insertions(+)
Index: linux-3.1/drivers/bluetooth/hci_h4p/core.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/bluetooth/hci_h4p/core.c 2011-10-30 00:48:52.285041210 +0200
--- /dev/null
+++ b/drivers/bluetooth/hci_h4p/core.c
@@ -0,0 +1,1043 @@
+/*
+ * This file is part of hci_h4p bluetooth driver
@ -1059,10 +1057,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/core.c
+MODULE_DESCRIPTION("h4 driver with nokia extensions");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Ville Tervo");
Index: linux-3.1/drivers/bluetooth/hci_h4p/fw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/bluetooth/hci_h4p/fw.c 2011-10-30 00:48:52.285041210 +0200
--- /dev/null
+++ b/drivers/bluetooth/hci_h4p/fw.c
@@ -0,0 +1,155 @@
+/*
+ * This file is part of hci_h4p bluetooth driver
@ -1219,10 +1215,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/fw.c
+
+ return;
+}
Index: linux-3.1/drivers/bluetooth/hci_h4p/fw-csr.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/bluetooth/hci_h4p/fw-csr.c 2011-10-30 00:48:52.285041210 +0200
--- /dev/null
+++ b/drivers/bluetooth/hci_h4p/fw-csr.c
@@ -0,0 +1,149 @@
+/*
+ * This file is part of hci_h4p bluetooth driver
@ -1373,10 +1367,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/fw-csr.c
+
+ return 0;
+}
Index: linux-3.1/drivers/bluetooth/hci_h4p/fw-ti.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/bluetooth/hci_h4p/fw-ti.c 2011-10-30 00:48:52.285041210 +0200
--- /dev/null
+++ b/drivers/bluetooth/hci_h4p/fw-ti.c
@@ -0,0 +1,90 @@
+/*
+ * This file is part of hci_h4p bluetooth driver
@ -1468,10 +1460,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/fw-ti.c
+
+ return 0;
+}
Index: linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h 2011-10-30 00:48:52.285041210 +0200
--- /dev/null
+++ b/drivers/bluetooth/hci_h4p/hci_h4p.h
@@ -0,0 +1,183 @@
+/*
+ * This file is part of hci_h4p bluetooth driver
@ -1656,10 +1646,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h
+int hci_h4p_init_uart(struct hci_h4p_info *info);
+
+#endif /* __DRIVERS_BLUETOOTH_HCI_H4P_H */
Index: linux-3.1/drivers/bluetooth/hci_h4p/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/bluetooth/hci_h4p/Makefile 2011-10-30 00:48:52.285041210 +0200
--- /dev/null
+++ b/drivers/bluetooth/hci_h4p/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Linux Bluetooth HCI device drivers.
@ -1668,10 +1656,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/Makefile
+obj-$(CONFIG_BT_HCIH4P) += hci_h4p.o
+
+hci_h4p-objs := core.o fw.o uart.o sysfs.o fw-ti.o fw-csr.o
Index: linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c 2011-10-30 00:48:52.285041210 +0200
--- /dev/null
+++ b/drivers/bluetooth/hci_h4p/sysfs.c
@@ -0,0 +1,84 @@
+/*
+ * This file is part of hci_h4p bluetooth driver
@ -1757,10 +1743,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c
+}
+
+#endif
Index: linux-3.1/drivers/bluetooth/hci_h4p/uart.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/bluetooth/hci_h4p/uart.c 2011-10-30 00:48:52.285041210 +0200
--- /dev/null
+++ b/drivers/bluetooth/hci_h4p/uart.c
@@ -0,0 +1,169 @@
+/*
+ * This file is part of hci_h4p bluetooth driver
@ -1931,10 +1915,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/uart.c
+
+ return 0;
+}
Index: linux-3.1/drivers/bluetooth/Kconfig
===================================================================
--- linux-3.1.orig/drivers/bluetooth/Kconfig 2011-10-30 00:48:29.105057133 +0200
+++ linux-3.1/drivers/bluetooth/Kconfig 2011-10-30 00:48:52.285041210 +0200
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -173,6 +173,16 @@ config BT_HCIBTUART
Say Y here to compile support for HCI UART devices into the
kernel or say M to compile it as module (btuart_cs).
@ -1952,10 +1934,8 @@ Index: linux-3.1/drivers/bluetooth/Kconfig
config BT_HCIVHCI
tristate "HCI VHCI (Virtual HCI device) driver"
help
Index: linux-3.1/drivers/bluetooth/Makefile
===================================================================
--- linux-3.1.orig/drivers/bluetooth/Makefile 2011-10-30 00:48:29.141057108 +0200
+++ linux-3.1/drivers/bluetooth/Makefile 2011-10-30 00:48:52.285041210 +0200
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_BT_HCIDTL1) += dtl1_cs.o
obj-$(CONFIG_BT_HCIBT3C) += bt3c_cs.o
obj-$(CONFIG_BT_HCIBLUECARD) += bluecard_cs.o

18
target/linux/omap24xx/patches-3.1/410-hci-h4p-fixes.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/drivers/bluetooth/hci_h4p/core.c
===================================================================
--- linux-3.1.orig/drivers/bluetooth/hci_h4p/core.c 2011-10-30 00:48:52.285041210 +0200
+++ linux-3.1/drivers/bluetooth/hci_h4p/core.c 2011-10-30 00:48:53.101040400 +0200
--- a/drivers/bluetooth/hci_h4p/core.c
+++ b/drivers/bluetooth/hci_h4p/core.c
@@ -36,9 +36,9 @@
#include <linux/clk.h>
#include <linux/gpio.h>
@ -15,10 +13,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/core.c
#include <plat/serial.h>
#include <net/bluetooth/bluetooth.h>
Index: linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h
===================================================================
--- linux-3.1.orig/drivers/bluetooth/hci_h4p/hci_h4p.h 2011-10-30 00:48:52.285041210 +0200
+++ linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h 2011-10-30 00:48:53.101040400 +0200
--- a/drivers/bluetooth/hci_h4p/hci_h4p.h
+++ b/drivers/bluetooth/hci_h4p/hci_h4p.h
@@ -21,7 +21,7 @@
*
*/
@ -28,10 +24,8 @@ Index: linux-3.1/drivers/bluetooth/hci_h4p/hci_h4p.h
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
Index: linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c
===================================================================
--- linux-3.1.orig/drivers/bluetooth/hci_h4p/sysfs.c 2011-10-30 00:48:52.285041210 +0200
+++ linux-3.1/drivers/bluetooth/hci_h4p/sysfs.c 2011-10-30 00:48:53.101040400 +0200
--- a/drivers/bluetooth/hci_h4p/sysfs.c
+++ b/drivers/bluetooth/hci_h4p/sysfs.c
@@ -48,15 +48,8 @@ static ssize_t hci_h4p_store_bdaddr(stru
return -EINVAL;
}

12
target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/arm/mach-omap2/serial.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/serial.c 2011-10-30 00:48:28.997057205 +0200
+++ linux-3.1/arch/arm/mach-omap2/serial.c 2011-10-30 00:48:53.917039979 +0200
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -546,10 +546,12 @@ static void omap_uart_idle_init(struct o
uart->padconf = 0;
}
@ -43,10 +41,8 @@ Index: linux-3.1/arch/arm/mach-omap2/serial.c
}
}
}
Index: linux-3.1/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c 2011-10-30 00:48:29.005057199 +0200
+++ linux-3.1/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c 2011-10-30 00:48:53.917039979 +0200
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
@@ -253,7 +253,7 @@ struct omap_hwmod_irq_info omap2_timer11
};

6
target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:29.896037143 +0100
+++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:32.839982394 +0100
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -41,6 +41,7 @@
#include <plat/mmc.h>
#include <plat/serial.h>

6
target/linux/omap24xx/patches-3.1/710-evdev-events-without-grab.patch
View File

@ -2,10 +2,8 @@
drivers/input/evdev.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Index: linux-3.1/drivers/input/evdev.c
===================================================================
--- linux-3.1.orig/drivers/input/evdev.c 2011-10-30 00:48:28.025057860 +0200
+++ linux-3.1/drivers/input/evdev.c 2011-10-30 00:48:55.309039009 +0200
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -92,7 +92,7 @@ static void evdev_event(struct input_han
unsigned int type, unsigned int code, int value)
{

18
target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/drivers/mmc/host/omap.c
===================================================================
--- linux-3.1.orig/drivers/mmc/host/omap.c 2011-10-30 00:48:27.429058258 +0200
+++ linux-3.1/drivers/mmc/host/omap.c 2011-10-30 00:48:55.981038523 +0200
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1456,6 +1456,7 @@ static int __init mmc_omap_probe(struct
host->dma_ch = -1;
@ -21,10 +19,8 @@ Index: linux-3.1/drivers/mmc/host/omap.c
return 0;
Index: linux-3.1/drivers/mmc/core/core.c
===================================================================
--- linux-3.1.orig/drivers/mmc/core/core.c 2011-10-30 00:48:27.437058255 +0200
+++ linux-3.1/drivers/mmc/core/core.c 2011-10-30 00:48:55.981038523 +0200
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -76,12 +76,13 @@ static int mmc_schedule_delayed_work(str
}
@ -41,10 +37,8 @@ Index: linux-3.1/drivers/mmc/core/core.c
/**
* mmc_request_done - finish processing an MMC request
Index: linux-3.1/include/linux/mmc/host.h
===================================================================
--- linux-3.1.orig/include/linux/mmc/host.h 2011-10-30 00:48:27.445058249 +0200
+++ linux-3.1/include/linux/mmc/host.h 2011-10-30 00:48:55.981038523 +0200
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -394,4 +394,7 @@ static inline int mmc_host_cmd23(struct
{
return host->caps & MMC_CAP_CMD23;

6
target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/arch/arm/mach-omap2/serial.c
===================================================================
--- linux-3.1.orig/arch/arm/mach-omap2/serial.c 2011-10-30 00:48:53.917039979 +0200
+++ linux-3.1/arch/arm/mach-omap2/serial.c 2011-10-30 00:48:57.341037539 +0200
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -660,6 +660,8 @@ static void serial_out_override(struct u
}
#endif

24
target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/drivers/usb/musb/tusb6010.c
===================================================================
--- linux-3.1.orig/drivers/usb/musb/tusb6010.c 2011-10-30 00:48:24.637060127 +0200
+++ linux-3.1/drivers/usb/musb/tusb6010.c 2011-10-30 00:48:58.045037045 +0200
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -56,6 +56,7 @@ u8 tusb_get_revision(struct musb *musb)
return rev;
@ -52,10 +50,8 @@ Index: linux-3.1/drivers/usb/musb/tusb6010.c
}
-module_exit(tusb_exit);
+EXPORT_SYMBOL(musb_hdrc_glue_exit);
Index: linux-3.1/drivers/usb/musb/musb_core.c
===================================================================
--- linux-3.1.orig/drivers/usb/musb/musb_core.c 2011-10-30 00:48:24.629060132 +0200
+++ linux-3.1/drivers/usb/musb/musb_core.c 2011-10-30 00:48:58.045037045 +0200
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -207,7 +207,7 @@ static struct otg_io_access_ops musb_ulp
/*-------------------------------------------------------------------------*/
@ -123,10 +119,8 @@ Index: linux-3.1/drivers/usb/musb/musb_core.c
+ musb_hdrc_glue_exit();
}
module_exit(musb_cleanup);
Index: linux-3.1/drivers/usb/Makefile
===================================================================
--- linux-3.1.orig/drivers/usb/Makefile 2011-10-30 00:48:24.625060136 +0200
+++ linux-3.1/drivers/usb/Makefile 2011-10-30 00:48:58.045037045 +0200
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -47,7 +47,7 @@ obj-$(CONFIG_EARLY_PRINTK_DBGP) += early
obj-$(CONFIG_USB_ATM) += atm/
obj-$(CONFIG_USB_SPEEDTOUCH) += atm/
@ -136,10 +130,8 @@ Index: linux-3.1/drivers/usb/Makefile
obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/
obj-$(CONFIG_USB_OTG_UTILS) += otg/
obj-$(CONFIG_USB_GADGET) += gadget/
Index: linux-3.1/drivers/usb/musb/Makefile
===================================================================
--- linux-3.1.orig/drivers/usb/musb/Makefile 2011-10-30 00:48:24.645060124 +0200
+++ linux-3.1/drivers/usb/musb/Makefile 2011-10-30 00:48:58.045037045 +0200
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -13,7 +13,7 @@ musb_hdrc-$(CONFIG_DEBUG_FS) += musb_d
# Hardware Glue Layer
obj-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o

54
target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.1/drivers/cbus/Kconfig
===================================================================
--- linux-3.1.orig/drivers/cbus/Kconfig 2011-11-05 17:03:39.578846146 +0100
+++ linux-3.1/drivers/cbus/Kconfig 2011-11-05 17:06:51.589348749 +0100
--- a/drivers/cbus/Kconfig
+++ b/drivers/cbus/Kconfig
@@ -83,4 +83,12 @@ config CBUS_RETU_HEADSET
endif # CBUS_RETU
@ -15,10 +13,8 @@ Index: linux-3.1/drivers/cbus/Kconfig
+ If unsure, say N.
+
endmenu
Index: linux-3.1/drivers/cbus/Makefile
===================================================================
--- linux-3.1.orig/drivers/cbus/Makefile 2011-11-05 17:03:39.618846091 +0100
+++ linux-3.1/drivers/cbus/Makefile 2011-11-05 17:06:51.589348749 +0100
--- a/drivers/cbus/Makefile
+++ b/drivers/cbus/Makefile
@@ -11,3 +11,6 @@ obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += r
obj-$(CONFIG_CBUS_RETU_RTC) += retu-rtc.o
obj-$(CONFIG_CBUS_RETU_WDT) += retu-wdt.o
@ -26,10 +22,8 @@ Index: linux-3.1/drivers/cbus/Makefile
+n810bm-y += n810bm_main.o
+n810bm-y += lipocharge.o
+obj-$(CONFIG_N810BM) += n810bm.o
Index: linux-3.1/drivers/cbus/n810bm_main.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/n810bm_main.c 2011-11-05 17:06:51.589348749 +0100
--- /dev/null
+++ b/drivers/cbus/n810bm_main.c
@@ -0,0 +1,1572 @@
+/*
+ * Nokia n810 battery management
@ -1603,10 +1597,8 @@ Index: linux-3.1/drivers/cbus/n810bm_main.c
+MODULE_FIRMWARE(N810BM_PMM_BLOCK_FILENAME);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Michael Buesch");
Index: linux-3.1/drivers/cbus/lipocharge.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/lipocharge.c 2011-11-05 17:06:51.589348749 +0100
--- /dev/null
+++ b/drivers/cbus/lipocharge.c
@@ -0,0 +1,183 @@
+/*
+ * Generic LIPO battery charger
@ -1791,10 +1783,8 @@ Index: linux-3.1/drivers/cbus/lipocharge.c
+
+ return 0;
+}
Index: linux-3.1/drivers/cbus/lipocharge.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.1/drivers/cbus/lipocharge.h 2011-11-05 17:06:51.589348749 +0100
--- /dev/null
+++ b/drivers/cbus/lipocharge.h
@@ -0,0 +1,60 @@
+#ifndef LIPOCHARGE_H_
+#define LIPOCHARGE_H_
@ -1856,10 +1846,8 @@ Index: linux-3.1/drivers/cbus/lipocharge.h
+}
+
+#endif /* LIPOCHARGE_H_ */
Index: linux-3.1/drivers/cbus/cbus.c
===================================================================
--- linux-3.1.orig/drivers/cbus/cbus.c 2011-11-05 17:03:39.610846102 +0100
+++ linux-3.1/drivers/cbus/cbus.c 2011-11-05 17:06:51.589348749 +0100
--- a/drivers/cbus/cbus.c
+++ b/drivers/cbus/cbus.c
@@ -34,6 +34,7 @@
#include <linux/gpio.h>
#include <linux/platform_device.h>
@ -1882,10 +1870,8 @@ Index: linux-3.1/drivers/cbus/cbus.c
MODULE_DESCRIPTION("CBUS serial protocol");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Juha Yrjölä");
Index: linux-3.1/drivers/cbus/cbus.h
===================================================================
--- linux-3.1.orig/drivers/cbus/cbus.h 2011-11-05 17:03:39.590846131 +0100
+++ linux-3.1/drivers/cbus/cbus.h 2011-11-05 17:06:51.589348749 +0100
--- a/drivers/cbus/cbus.h
+++ b/drivers/cbus/cbus.h
@@ -27,4 +27,6 @@ extern int cbus_read_reg(struct device *
extern int cbus_write_reg(struct device *, unsigned dev, unsigned reg,
unsigned val);
@ -1893,10 +1879,8 @@ Index: linux-3.1/drivers/cbus/cbus.h
+NORET_TYPE void cbus_emergency(void) ATTRIB_NORET;
+
#endif /* __DRIVERS_CBUS_CBUS_H */
Index: linux-3.1/drivers/cbus/retu.c
===================================================================
--- linux-3.1.orig/drivers/cbus/retu.c 2011-11-05 17:03:39.606846106 +0100
+++ linux-3.1/drivers/cbus/retu.c 2011-11-05 17:06:51.589348749 +0100
--- a/drivers/cbus/retu.c
+++ b/drivers/cbus/retu.c
@@ -417,6 +417,11 @@ static int retu_allocate_children(struct
if (!child)
return -ENOMEM;
@ -1909,10 +1893,8 @@ Index: linux-3.1/drivers/cbus/retu.c
return 0;
}
Index: linux-3.1/drivers/cbus/tahvo.c
===================================================================
--- linux-3.1.orig/drivers/cbus/tahvo.c 2011-11-05 17:04:36.274768324 +0100
+++ linux-3.1/drivers/cbus/tahvo.c 2011-11-05 17:06:51.589348749 +0100
--- a/drivers/cbus/tahvo.c
+++ b/drivers/cbus/tahvo.c
@@ -131,6 +131,7 @@ void tahvo_set_clear_reg_bits(struct dev
__tahvo_write_reg(tahvo, reg, w);
mutex_unlock(&tahvo->mutex);