[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-167-gcfd43e2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-167-gcfd43e2
|
From: Gwenhael <gwe...@us...> - 2010-12-16 13:03:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via cfd43e2f11202dc4ff4605a55467468f93e2fb06 (commit)
via 73666a64fdc49d039e291d0b52b3599cfa46f31a (commit)
from eaa875b217a6d63e1947261a524d282a75ddca8c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cfd43e2f11202dc4ff4605a55467468f93e2fb06
Author: gwenhael <gw...@tr...>
Date: Thu Dec 16 14:06:00 2010 +0100
[LINUX] 2.6.36: adapt patches 029 et 030 from 2.6.29
commit 73666a64fdc49d039e291d0b52b3599cfa46f31a
Author: gwenhael <gw...@tr...>
Date: Thu Dec 16 14:05:31 2010 +0100
[LINUX] 2.6.36: import patches 023, 024, 050, 072, 098 from 2.6.29
-----------------------------------------------------------------------
Summary of changes:
.../023-armadeus-fblcd-kconfig.patch | 16 +----
...s-apf9328-add_board_to_linux_build_system.patch | 77 ++++++++++++++++++++
.../029-armadeus-add_csi_and_spi_registers.patch | 49 +++++++++++++
.../2.6.36/030-armadeus-imx-devices.patch | 72 ++++++++++++++++++
...50-armadeus-add_custom_drivers_to_kconfig.patch | 20 +++++
...madeus-add_backlight_machinfo_to_imxfb_h.patch} | 8 +-
...announce_imx_is_supporting_scatter_gather.patch | 12 +++
7 files changed, 237 insertions(+), 17 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/023-armadeus-fblcd-kconfig.patch (80%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/024-armadeus-apf9328-add_board_to_linux_build_system.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/029-armadeus-add_csi_and_spi_registers.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx-devices.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/050-armadeus-add_custom_drivers_to_kconfig.patch
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.27.13/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch => 2.6.36/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch} (50%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/098-armadeus-imx-dma-announce_imx_is_supporting_scatter_gather.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/023-armadeus-fblcd-kconfig.patch
similarity index 80%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/023-armadeus-fblcd-kconfig.patch
index d48188a..9abc9db 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/023-armadeus-fblcd-kconfig.patch
@@ -1,16 +1,6 @@
-Index: linux-2.6.29.6/drivers/video/Kconfig
-===================================================================
---- linux-2.6.29.6.orig/drivers/video/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/video/Kconfig 2009-10-19 15:29:06.000000000 +0200
-@@ -395,6 +395,7 @@
- If you plan to use the LCD display with your SA-1100 system, say
- Y here.
-
-+
- config FB_IMX
- tristate "Motorola i.MX LCD support"
- depends on FB && ARM && ARCH_IMX
-@@ -402,6 +403,80 @@
+--- a/drivers/video/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ b/drivers/video/Kconfig 2010-12-16 12:46:56.000000000 +0100
+@@ -410,6 +410,80 @@
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/024-armadeus-apf9328-add_board_to_linux_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/024-armadeus-apf9328-add_board_to_linux_build_system.patch
new file mode 100644
index 0000000..7ea85e4
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/024-armadeus-apf9328-add_board_to_linux_build_system.patch
@@ -0,0 +1,77 @@
+--- a/arch/arm/mach-imx/Kconfig 2010-11-29 07:34:56.000000000 +0100
++++ b/arch/arm/mach-imx/Kconfig 2010-11-27 14:51:34.000000000 +0100
+@@ -13,6 +13,9 @@
+ config MACH_MXLADS
+ bool
+
++choice
++ prompt "Development board selection"
++
+ config ARCH_MX1ADS
+ bool "MX1ADS platform"
+ select MACH_MXLADS
+@@ -27,6 +30,53 @@
+ help
+ Say Y here if you are using a Synertronixx scb9328 board
+
++config MACH_APF9328
++ bool "APF9328"
++ depends on ARCH_MX1
++ select IMX_HAVE_PLATFORM_IMX_UART
++ select IMX_HAVE_PLATFORM_IMX_I2C
++ select IMX_HAVE_PLATFORM_SPI_IMX
++ select HAVE_FB_IMX
++ select SERIAL_IMX_UART1
++ help
++ Say Yes here if you are using the Armadeus APF9328 development board
++
++endchoice
++
++config MACH_APF9328_FPGA
++ bool "Board has a FPGA"
++ depends on MACH_APF9328
++ help
++ Select this if your APF9328 has an onboard FPGA
++
++choice
++ prompt "Flash available on board"
++ depends on MACH_APF9328
++ default IMX_APF9328_FLASH_16MB
++
++config IMX_APF9328_FLASH_8MB
++ bool "8MB"
++
++config IMX_APF9328_FLASH_16MB
++ bool "16MB"
++
++endchoice
++
++choice
++ prompt "Baseboard"
++ depends on MACH_APF9328
++ default MACH_APF9328_DEV
++
++config MACH_APF9328_DEV
++ prompt "DevLight/DevFull"
++ bool
++ help
++ This selects the APF9328_DevLight/DevFull as baseboard. You have
++ to manually activates the devices you want to use if you have a
++ DevFull.
++
++endchoice
++
+ endif
+
+ if ARCH_MX2
+--- a/arch/arm/mach-imx/Makefile 2010-11-29 07:34:56.000000000 +0100
++++ b/arch/arm/mach-imx/Makefile 2010-11-22 18:41:14.000000000 +0100
+@@ -18,6 +18,8 @@
+ obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
+
+ obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
++obj-$(CONFIG_MACH_APF9328) += apf9328.o
++obj-$(CONFIG_MACH_APF9328_DEV) += apf9328-dev.o
+ obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
+
+ obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/029-armadeus-add_csi_and_spi_registers.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/029-armadeus-add_csi_and_spi_registers.patch
new file mode 100644
index 0000000..d4dc5d3
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/029-armadeus-add_csi_and_spi_registers.patch
@@ -0,0 +1,49 @@
+--- linux-2.6.36/drivers/spi/spi_imx.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36.new/drivers/spi/spi_imx.c 2010-11-29 08:00:31.000000000 +0100
+@@ -43,6 +43,9 @@
+ #define MXC_CSPITXDATA 0x04
+ #define MXC_CSPICTRL 0x08
+ #define MXC_CSPIINT 0x0c
++#define MXC_TEST 0x10
++#define MXC_PERIOD 0x14
++#define MXC_DMA 0x18
+ #define MXC_RESET 0x1c
+
+ #define MX3_CSPISTAT 0x14
+--- linux-2.6.36/drivers/media/video/mx1_camera.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36.new/drivers/media/video/mx1_camera.c 2010-11-29 08:04:20.000000000 +0100
+@@ -50,9 +50,13 @@
+ * CSI registers
+ */
+ #define CSICR1 0x00 /* CSI Control Register 1 */
++#define CSICR2 0x04 /* CSI Control Register 2 */
+ #define CSISR 0x08 /* CSI Status Register */
++#define CSISTATR 0x0C
+ #define CSIRXR 0x10 /* CSI RxFIFO Register */
+
++#define CSICR1_RXOR_INTEN (1 << 24)
++#define CSICR1_RXFF_INTEN (1 << 18)
+ #define CSICR1_RXFF_LEVEL(x) (((x) & 0x3) << 19)
+ #define CSICR1_SOF_POL (1 << 17)
+ #define CSICR1_SOF_INTEN (1 << 16)
+@@ -60,8 +64,10 @@
+ #define CSICR1_MCLKEN (1 << 9)
+ #define CSICR1_FCC (1 << 8)
+ #define CSICR1_BIG_ENDIAN (1 << 7)
++#define CSICR1_CLR_STATINFO (1 << 6)
+ #define CSICR1_CLR_RXFIFO (1 << 5)
+ #define CSICR1_GCLK_MODE (1 << 4)
++#define CSICR1_INV_DATA (1 << 3)
+ #define CSICR1_DATA_POL (1 << 2)
+ #define CSICR1_REDGE (1 << 1)
+ #define CSICR1_EN (1 << 0)
+--- a/arch/arm/plat-mxc/include/mach/mx1.h 2010-11-29 09:20:02.000000000 +0100
++++ b/arch/arm/plat-mxc/include/mach/mx1.h 2010-11-29 09:20:19.000000000 +0100
+@@ -109,6 +109,7 @@
+ #define MX1_PWM_INT 34
+ #define MX1_SDHC_INT 35
+ #define MX1_INT_I2C 39
++#define MX1_SPI2_INT 40
+ #define MX1_CSPI_INT 41
+ #define MX1_SSI_TX_INT 42
+ #define MX1_SSI_TX_ERR_INT 43
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx-devices.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx-devices.patch
new file mode 100644
index 0000000..164bce2
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx-devices.patch
@@ -0,0 +1,72 @@
+--- a/arch/arm/mach-imx/devices.h 2010-10-20 22:30:22.000000000 +0200
++++ b/arch/arm/mach-imx/devices.h 2010-11-22 18:44:10.000000000 +0100
+@@ -3,6 +3,7 @@
+ extern struct platform_device imx_rtc_device;
+ extern struct platform_device imx_wdt_device;
+ extern struct platform_device imx_usb_device;
++extern struct platform_device imx_mmc_device;
+ #endif
+
+ #if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)
+--- a/arch/arm/mach-imx/devices.c 2010-10-20 22:30:22.000000000 +0200
++++ b/arch/arm/mach-imx/devices.c 2010-12-02 18:20:38.000000000 +0100
+@@ -45,6 +45,7 @@
+ #include "devices.h"
+
+ #if defined(CONFIG_ARCH_MX1)
++#include <mach/mx1.h>
+ static struct resource imx1_camera_resources[] = {
+ {
+ .start = 0x00224000,
+@@ -184,6 +185,37 @@
+ {
+ return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports));
+ }
++
++static struct resource imx_mmc_resources[] = {
++ [0] = {
++ .start = 0x00214000,
++ .end = 0x002140FF,
++ .flags = IORESOURCE_MEM,
++ },
++ [1] = {
++ .start = (MX1_SDHC_INT),
++ .end = (MX1_SDHC_INT),
++ .flags = IORESOURCE_IRQ,
++ },
++ [2] = {
++ .start = MX1_DMA_REQ_SDHC,
++ .end = MX1_DMA_REQ_SDHC,
++ .flags = IORESOURCE_DMA,
++ },
++};
++static u64 imxmmmc_dmamask = 0xffffffffUL;
++
++struct platform_device imx_mmc_device = {
++ .name = "imx-mmc",
++ .id = 0,
++ .dev = {
++ .dma_mask = &imxmmmc_dmamask,
++ .coherent_dma_mask = 0xffffffff,
++ },
++ .num_resources = ARRAY_SIZE(imx_mmc_resources),
++ .resource = imx_mmc_resources,
++};
++
+ #endif
+
+ #if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)
+--- a/arch/arm/mach-imx/devices-imx1.h 2010-10-20 22:30:22.000000000 +0200
++++ b/arch/arm/mach-imx/devices-imx1.h 2010-11-22 18:41:14.000000000 +0100
+@@ -15,4 +15,10 @@
+ #define imx1_add_imx_uart0(pdata) \
+ imx_add_imx_uart_3irq(0, MX1_UART1_BASE_ADDR, 0xd0, MX1_INT_UART1RX, MX1_INT_UART1TX, MX1_INT_UART1RTS, pdata)
+ #define imx1_add_imx_uart1(pdata) \
+- imx_add_imx_uart_3irq(0, MX1_UART2_BASE_ADDR, 0xd0, MX1_INT_UART2RX, MX1_INT_UART2TX, MX1_INT_UART2RTS, pdata)
++ imx_add_imx_uart_3irq(1, MX1_UART2_BASE_ADDR, 0xd0, MX1_INT_UART2RX, MX1_INT_UART2TX, MX1_INT_UART2RTS, pdata)
++
++#define imx1_add_spi_imx0(pdata) \
++ imx_add_spi_imx(0, MX1_SPI1_BASE_ADDR, SZ_4K, MX1_CSPI_INT, pdata)
++#define imx1_add_spi_imx1(pdata) \
++ imx_add_spi_imx(1, MX1_SPI2_BASE_ADDR, SZ_4K, MX1_SPI2_INT, pdata)
++
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/050-armadeus-add_custom_drivers_to_kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/050-armadeus-add_custom_drivers_to_kconfig.patch
new file mode 100644
index 0000000..2d257bb
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/050-armadeus-add_custom_drivers_to_kconfig.patch
@@ -0,0 +1,20 @@
+This patch adds the possibility to have custom Armadeus drivers built in kernel or compiled as modules
+
+--- a/drivers/usb/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ b/drivers/usb/Kconfig 2010-11-11 16:02:03.000000000 +0100
+@@ -163,3 +163,5 @@
+ source "drivers/usb/otg/Kconfig"
+
+ endif # USB_SUPPORT
++
++source "drivers/armadeus/Kconfig"
+--- a/drivers/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ b/drivers/Makefile 2010-11-11 16:02:29.000000000 +0100
+@@ -109,6 +109,7 @@
+ obj-$(CONFIG_HID) += hid/
+ obj-$(CONFIG_PPC_PS3) += ps3/
+ obj-$(CONFIG_OF) += of/
++obj-$(CONFIG_ARMADEUS_DRIVERS) += armadeus/
+ obj-$(CONFIG_SSB) += ssb/
+ obj-$(CONFIG_VHOST_NET) += vhost/
+ obj-$(CONFIG_VLYNQ) += vlynq/
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch
similarity index 50%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch
index 765d9f0..e0459ed 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch
@@ -1,6 +1,6 @@
---- linux-2.6.27.2.original/arch/arm/plat-mxc/include/mach/imxfb.h 2008-12-19 16:20:18.000000000 +0100
-+++ linux-2.6.27.2.mod/arch/arm/plat-mxc/include/mach/imxfb.h 2008-12-19 16:18:44.000000000 +0100
-@@ -83,3 +83,13 @@
+--- a/arch/arm/plat-mxc/include/mach/imxfb.h 2010-11-06 18:56:13.000000000 +0100
++++ b/arch/arm/plat-mxc/include/mach/imxfb.h 2010-11-06 18:56:47.000000000 +0100
+@@ -79,3 +79,13 @@
};
void set_imx_fb_info(struct imx_fb_platform_data *);
@@ -9,7 +9,7 @@
+struct imxbl_machinfo {
+ int max_intensity;
+ int default_intensity;
-+ int limit_mask; // When battery is low
++ int limit_mask; /* When battery is low */
+ void (*set_bl_intensity)(int intensity);
+};
+extern void imxbl_limit_intensity(int limit);
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/098-armadeus-imx-dma-announce_imx_is_supporting_scatter_gather.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/098-armadeus-imx-dma-announce_imx_is_supporting_scatter_gather.patch
new file mode 100644
index 0000000..303ef62
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/098-armadeus-imx-dma-announce_imx_is_supporting_scatter_gather.patch
@@ -0,0 +1,12 @@
+--- a/arch/arm/plat-mxc/include/mach/hardware.h 2010-10-20 22:30:22.000000000 +0200
++++ b/arch/arm/plat-mxc/include/mach/hardware.h 2010-11-15 08:07:52.000000000 +0100
+@@ -48,6 +48,9 @@
+ #endif
+
+ #ifdef CONFIG_ARCH_MX1
++/* the DMA code supports SG list chaining */
++#define ARCH_HAS_SG_CHAIN
++
+ # include <mach/mx1.h>
+ #endif
+
hooks/post-receive
--
armadeus
|
