[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-343-g6b83bc2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-343-g6b83bc2
|
From: Gwenhael <gwe...@us...> - 2011-02-20 11:47:22
|
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 6b83bc2d5d5ccbf47be5c1b169404497f53f3bbe (commit)
via 75ce71199bd149ecca34e56fc05f0aa5091af475 (commit)
via 77a61db331b8e9b2f2c4e66f4b750ec08eda3339 (commit)
via a7fb02b5776dd434e6a81b90d4e3b7f1a28dfebe (commit)
from e286942d6a1f5ab26ef7cab9f6ed331a11253421 (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 6b83bc2d5d5ccbf47be5c1b169404497f53f3bbe
Author: gwenhael <gw...@tr...>
Date: Sun Feb 20 12:38:05 2011 +0100
[LINUX][2.6.38][APF9328] add data structure for SPI on IMX1.
commit 75ce71199bd149ecca34e56fc05f0aa5091af475
Author: gwenhael <gw...@tr...>
Date: Sun Feb 20 12:37:42 2011 +0100
Split 030-armadeus-imx-devices.tofix SPI part in a dedicated patch and adds functions for SPI registration
commit 77a61db331b8e9b2f2c4e66f4b750ec08eda3339
Author: gwenhael <gw...@tr...>
Date: Sun Feb 20 12:35:24 2011 +0100
[LINUX][2.6.38][APF9328] Adapt #define interrupt name and base address for SPI .
commit a7fb02b5776dd434e6a81b90d4e3b7f1a28dfebe
Author: gwenhael <gw...@tr...>
Date: Sun Feb 20 12:33:41 2011 +0100
[LINUX][2.6.38][APF9328] adapt 021-armadeus-apf9328.patch to 2.6.38-rc3 kernel
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/021-armadeus-apf9328.patch | 23 +++++------
.../029-armadeus-add_csi_and_spi_registers.patch | 42 +++++++++++++++----
...rmadeus-devices-imx1-add_spi_registration.patch | 15 +++++++
.../2.6.38/030-armadeus-imx-devices.tofix | 14 -------
...adeus-platform-spi_imx-add_data_structure.patch | 20 +++++++++
5 files changed, 78 insertions(+), 36 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-devices-imx1-add_spi_registration.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/075-armadeus-platform-spi_imx-add_data_structure.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
index 4a2164d..01a3e7d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c 2011-02-08 19:33:09.000000000 +0100
-@@ -0,0 +1,587 @@
+--- /dev/null
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
+@@ -0,0 +1,584 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
+ *
@@ -63,7 +63,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
+#endif
+#include <mach/imxfb.h>
+#include "devices-imx1.h"
-+#include "devices.h"
+
+#define IMX_FB_VIRT 0xF1000000
+#define IMX_FB_SIZE (256*1024)
@@ -582,8 +581,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
+
+MACHINE_START(APF9328, "Armadeus APF9328")
+ /* Maintainer: Julien Boibessot, Armadeus */
-+ .phys_io = MX1_IO_BASE_ADDR,
-+ .io_pg_offst = (MX1_IO_BASE_ADDR_VIRT >> 18) & 0xfffc,
+ .boot_params = MX1_PHYS_OFFSET + 0x100,
+ .map_io = apf9328_map_io,
+ .init_irq = apf9328_init_irq,
@@ -592,8 +589,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
+MACHINE_END
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h 2011-02-08 21:42:50.000000000 +0100
+--- /dev/null
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
@@ -0,0 +1,329 @@
+/*
+ *
@@ -926,8 +923,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+#endif /* APF_LCD_CONFIG_H */
Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h 2011-02-08 19:33:09.000000000 +0100
+--- /dev/null
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h
@@ -0,0 +1,71 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
@@ -1002,8 +999,8 @@ Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h
+#endif /* __ASM_ARCH_APF9328_H */
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c 2011-02-08 19:33:09.000000000 +0100
+--- /dev/null
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
@@ -0,0 +1,325 @@
+/*
+ * apf9328-dev.c
@@ -1059,7 +1056,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
+#include <mach/ssi.h>
+#include <mach/iomux-mx1.h>
+#include <mach/iomux-v1.h>
-+#include "devices.h"
++#include "devices-imx1.h"
+#include <mach/imxfb.h>
+//#include "generic.h"
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/029-armadeus-add_csi_and_spi_registers.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/029-armadeus-add_csi_and_spi_registers.patch
index d4dc5d3..101de48 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/029-armadeus-add_csi_and_spi_registers.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/029-armadeus-add_csi_and_spi_registers.patch
@@ -1,5 +1,7 @@
---- 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
+Index: linux-2.6.38-rc3/drivers/spi/spi_imx.c
+===================================================================
+--- linux-2.6.38-rc3.orig/drivers/spi/spi_imx.c
++++ linux-2.6.38-rc3/drivers/spi/spi_imx.c
@@ -43,6 +43,9 @@
#define MXC_CSPITXDATA 0x04
#define MXC_CSPICTRL 0x08
@@ -10,8 +12,10 @@
#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
+Index: linux-2.6.38-rc3/drivers/media/video/mx1_camera.c
+===================================================================
+--- linux-2.6.38-rc3.orig/drivers/media/video/mx1_camera.c
++++ linux-2.6.38-rc3/drivers/media/video/mx1_camera.c
@@ -50,9 +50,13 @@
* CSI registers
*/
@@ -37,13 +41,33 @@
#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 @@
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/mx1.h
+===================================================================
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/mx1.h
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/mx1.h
+@@ -54,13 +54,13 @@
+ #define MX1_AIPI2_BASE_ADDR (0x10000 + MX1_IO_BASE_ADDR)
+ #define MX1_SIM_BASE_ADDR (0x11000 + MX1_IO_BASE_ADDR)
+ #define MX1_USBD_BASE_ADDR (0x12000 + MX1_IO_BASE_ADDR)
+-#define MX1_SPI1_BASE_ADDR (0x13000 + MX1_IO_BASE_ADDR)
++#define MX1_CSPI1_BASE_ADDR (0x13000 + MX1_IO_BASE_ADDR)
+ #define MX1_MMC_BASE_ADDR (0x14000 + MX1_IO_BASE_ADDR)
+ #define MX1_ASP_BASE_ADDR (0x15000 + MX1_IO_BASE_ADDR)
+ #define MX1_BTA_BASE_ADDR (0x16000 + MX1_IO_BASE_ADDR)
+ #define MX1_I2C_BASE_ADDR (0x17000 + MX1_IO_BASE_ADDR)
+ #define MX1_SSI_BASE_ADDR (0x18000 + MX1_IO_BASE_ADDR)
+-#define MX1_SPI2_BASE_ADDR (0x19000 + MX1_IO_BASE_ADDR)
++#define MX1_CSPI2_BASE_ADDR (0x19000 + MX1_IO_BASE_ADDR)
+ #define MX1_MSHC_BASE_ADDR (0x1A000 + MX1_IO_BASE_ADDR)
+ #define MX1_CCM_BASE_ADDR (0x1B000 + MX1_IO_BASE_ADDR)
+ #define MX1_SCM_BASE_ADDR (0x1B804 + MX1_IO_BASE_ADDR)
+@@ -112,7 +112,8 @@
#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_CSPI_INT 41
++#define MX1_INT_CSPI2 40
++#define MX1_INT_CSPI1 41
#define MX1_SSI_TX_INT 42
#define MX1_SSI_TX_ERR_INT 43
+ #define MX1_SSI_RX_INT 44
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-devices-imx1-add_spi_registration.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-devices-imx1-add_spi_registration.patch
new file mode 100644
index 0000000..a4eb42a
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-devices-imx1-add_spi_registration.patch
@@ -0,0 +1,15 @@
+Add registration functions for SPI.
+diff -ru a/arch/arm/mach-imx/devices-imx1.h b/arch/arm/mach-imx/devices-imx1.h
+--- a/arch/arm/mach-imx/devices-imx1.h 2011-02-01 04:05:49.000000000 +0100
++++ b/arch/arm/mach-imx/devices-imx1.h 2011-02-07 06:53:23.000000000 +0100
+@@ -18,3 +18,10 @@
+ imx_add_imx_uart_3irq(&imx1_imx_uart_data[id], pdata)
+ #define imx1_add_imx_uart0(pdata) imx1_add_imx_uart(0, pdata)
+ #define imx1_add_imx_uart1(pdata) imx1_add_imx_uart(1, pdata)
++
++extern const struct imx_spi_imx_data imx1_cspi_data[] __initconst;
++#define imx1_add_cspi(id, pdata) \
++ imx_add_spi_imx(&imx1_cspi_data[id], pdata)
++
++#define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
++#define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-imx-devices.tofix b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-imx-devices.tofix
index a00785c..7e46de6 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-imx-devices.tofix
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-imx-devices.tofix
@@ -46,17 +46,3 @@
#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.38/075-armadeus-platform-spi_imx-add_data_structure.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/075-armadeus-platform-spi_imx-add_data_structure.patch
new file mode 100644
index 0000000..887bf1c
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/075-armadeus-platform-spi_imx-add_data_structure.patch
@@ -0,0 +1,20 @@
+MX1: Add data structure for SPI
+diff a/arch/arm/plat-mxc/devices/platform-spi_imx.c b/arch/arm/plat-mxc/devices/platform-spi_imx.c
+--- a/arch/arm/plat-mxc/devices/platform-spi_imx.c 2011-02-01 04:05:49.000000000 +0100
++++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c 2011-02-08 07:18:28.000000000 +0100
+@@ -21,6 +21,15 @@
+ #define imx_spi_imx_data_entry(soc, type, devid, id, hwid, size) \
+ [id] = imx_spi_imx_data_entry_single(soc, type, devid, id, hwid, size)
+
++#ifdef CONFIG_SOC_IMX1
++const struct imx_spi_imx_data imx1_cspi_data[] __initconst = {
++#define imx1_cspi_data_entry(_id, _hwid) \
++ imx_spi_imx_data_entry(MX1, CSPI, "imx1-cspi", _id, _hwid, SZ_4K)
++ imx1_cspi_data_entry(0, 1),
++ imx1_cspi_data_entry(1, 2),
++};
++#endif
++
+ #ifdef CONFIG_SOC_IMX21
+ const struct imx_spi_imx_data imx21_cspi_data[] __initconst = {
+ #define imx21_cspi_data_entry(_id, _hwid) \
hooks/post-receive
--
armadeus
|
