[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-414-g28c5f48

[Gwenhael Goavec-M. <gwe...@us...>]

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  28c5f48965af24cc4b4fb2df5128de522a8665dc (commit)
       via  5d89823ea31b72edd165746442f3d4e27143ac02 (commit)
      from  f1cdec8322ff513486068a20752886e824c39522 (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 28c5f48965af24cc4b4fb2df5128de522a8665dc
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 23 15:50:38 2012 +0200

    [LINUX][APF9328] 3.4.2: add registration function for UDC

commit 5d89823ea31b72edd165746442f3d4e27143ac02
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Sat Jun 23 15:45:24 2012 +0200

    [LINUX][APF9328] 3.4.2: adapt patch 029 from 2.6.38

-----------------------------------------------------------------------

Summary of changes:
 .../029-armadeus-add_csi_and_spi_registers.patch   |   43 ++++++++++++++++++++
 ...rmadeus-devices-imx1-add_udc_registration.patch |   17 ++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.4/029-armadeus-add_csi_and_spi_registers.patch
 create mode 100644 patches/linux/3.4/030-armadeus-devices-imx1-add_udc_registration.patch

diff --git a/patches/linux/3.4/029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.4/029-armadeus-add_csi_and_spi_registers.patch
new file mode 100644
index 0000000..71de754
--- /dev/null
+++ b/patches/linux/3.4/029-armadeus-add_csi_and_spi_registers.patch
@@ -0,0 +1,43 @@
+Index: linux-3.3.5/drivers/spi/spi-imx.c
+===================================================================
+--- linux-3.3.5.orig/drivers/spi/spi-imx.c
++++ linux-3.3.5/drivers/spi/spi-imx.c
+@@ -46,6 +46,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
+ 
+ /* generic defines to abstract from the different register layouts */
+Index: linux-3.3.5/drivers/media/video/mx1_camera.c
+===================================================================
+--- linux-3.3.5.orig/drivers/media/video/mx1_camera.c
++++ linux-3.3.5/drivers/media/video/mx1_camera.c
+@@ -49,9 +49,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)
+@@ -59,8 +63,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)
diff --git a/patches/linux/3.4/030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.4/030-armadeus-devices-imx1-add_udc_registration.patch
new file mode 100644
index 0000000..16b7376
--- /dev/null
+++ b/patches/linux/3.4/030-armadeus-devices-imx1-add_udc_registration.patch
@@ -0,0 +1,17 @@
+Add registration functions for UDC.
+
+Signed-off-by: Gwenhael Goavec-Merou <gw...@tr...>
+---
+
+Index: linux-3.3.5/arch/arm/mach-imx/devices-imx1.h
+===================================================================
+--- linux-3.3.5.orig/arch/arm/mach-imx/devices-imx1.h
++++ linux-3.3.5/arch/arm/mach-imx/devices-imx1.h
+@@ -29,3 +29,7 @@ extern const struct imx_spi_imx_data imx
+ 
+ #define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)
+ #define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)
++
++extern const struct imx_imx_udc_data imx1_imx_udc_data;
++#define imx1_add_udc(pdata)	\
++	imx_add_imx_udc(&imx1_imx_udc_data, pdata)


hooks/post-receive
-- 
armadeus