kernel: update linux 3.3 to 3.3.3

SVN-Revision: 31460
This commit is contained in:
Jonas Gorski
2012-04-24 09:25:38 +00:00
parent 22b4e6b882
commit 8fd383ae2e
17 changed files with 26 additions and 30 deletions

View File

@@ -14,7 +14,7 @@ FEATURES:=squashfs jffs2 targz ext2 usb
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves
SUBTARGETS:=9g20 9260 9263
LINUX_VERSION:=3.3.2
LINUX_VERSION:=3.3.3
DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk

View File

@@ -1,6 +1,6 @@
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -318,6 +318,12 @@ config MACH_NEOCORE926
@@ -335,6 +335,12 @@ config MACH_NEOCORE926
help
Select this if you are using the Adeneo Neocore 926 board.
@@ -15,9 +15,9 @@
# ----------------------------------------------------------
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar
@@ -58,6 +58,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar
obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
obj-$(CONFIG_MACH_USB_A9263) += board-usb-a9263.o
obj-$(CONFIG_MACH_USB_A9263) += board-usb-a926x.o
obj-$(CONFIG_MACH_NEOCORE926) += board-neocore926.o
+obj-$(CONFIG_MACH_TQMA9263) += board-tqma9263.o

View File

@@ -1,6 +1,6 @@
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -571,7 +571,7 @@ static struct platform_device at91sam926
@@ -579,7 +579,7 @@ static struct platform_device at91sam926
.num_resources = ARRAY_SIZE(spi1_resources),
};

View File

@@ -1,7 +1,5 @@
Index: linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c
===================================================================
--- linux-2.6.37.6.orig/arch/arm/mach-at91/board-flexibity.c 2011-05-07 10:07:03.112684983 +0100
+++ linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c 2011-05-07 10:07:33.480684982 +0100
--- a/arch/arm/mach-at91/board-flexibity.c
+++ b/arch/arm/mach-at91/board-flexibity.c
@@ -1,7 +1,7 @@
/*
* linux/arch/arm/mach-at91/board-flexibity.c
@@ -11,8 +9,8 @@ Index: linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c
* Copyright (C) 2005 SAN People
* Copyright (C) 2006 Atmel
*
@@ -65,6 +65,13 @@
.pullup_pin = 0, /* pull-up driven by UDC */
@@ -62,6 +62,13 @@ static struct at91_udc_data __initdata f
.pullup_pin = -EINVAL, /* pull-up driven by UDC */
};
+/* I2C devices */
@@ -25,7 +23,7 @@ Index: linux-2.6.37.6/arch/arm/mach-at91/board-flexibity.c
/* SPI devices */
static struct spi_board_info flexibity_spi_devices[] = {
{ /* DataFlash chip */
@@ -143,6 +150,9 @@
@@ -141,6 +148,9 @@ static void __init flexibity_board_init(
at91_add_device_usbh(&flexibity_usbh_data);
/* USB Device */
at91_add_device_udc(&flexibity_udc_data);

View File

@@ -1,8 +1,6 @@
Index: linux-2.6.39/arch/arm/mach-at91/board-flexibity.c
===================================================================
--- linux-2.6.39.orig/arch/arm/mach-at91/board-flexibity.c 2011-06-17 11:02:11.335016002 +0100
+++ linux-2.6.39/arch/arm/mach-at91/board-flexibity.c 2011-06-17 11:02:20.395016002 +0100
@@ -96,49 +96,49 @@
--- a/arch/arm/mach-at91/board-flexibity.c
+++ b/arch/arm/mach-at91/board-flexibity.c
@@ -94,49 +94,49 @@ static struct gpio_led flexibity_leds[]
.name = "usb1:green",
.gpio = AT91_PIN_PA12,
.active_low = 1,