[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-252-g2e441b3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-252-g2e441b3
|
From: Julien B a. A. <ar...@us...> - 2012-04-05 06:33:38
|
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 2e441b36386725d8a96d5f4418cd5c733f3bf9b1 (commit)
via 8794db1c437e23d439addb368a168c8d01f4d9f7 (commit)
from ae7a076dba024b51182e16fc9926ff970dba3b26 (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 2e441b36386725d8a96d5f4418cd5c733f3bf9b1
Merge: 8794db1 ae7a076
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 5 08:32:34 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 8794db1c437e23d439addb368a168c8d01f4d9f7
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 5 08:31:35 2012 +0200
[LINUX] Add mxc_v4l2.h include needed by gst-fsl-plugin
-----------------------------------------------------------------------
Summary of changes:
.../446-armadeus-add_freescale_ipu3_driver.patch | 106 +++++++++++++++-----
1 files changed, 82 insertions(+), 24 deletions(-)
diff --git a/patches/linux/2.6.38/446-armadeus-add_freescale_ipu3_driver.patch b/patches/linux/2.6.38/446-armadeus-add_freescale_ipu3_driver.patch
index 2d30abd..04f45d9 100644
--- a/patches/linux/2.6.38/446-armadeus-add_freescale_ipu3_driver.patch
+++ b/patches/linux/2.6.38/446-armadeus-add_freescale_ipu3_driver.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38.8/drivers/mxc/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-03-13 18:15:38.000000000 +0100
-+++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-03-13 19:00:15.000000000 +0100
+--- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-04-03 16:58:29.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-04-03 16:58:29.000000000 +0200
@@ -4,6 +4,21 @@
menu "MXC support drivers"
@@ -30,8 +30,8 @@ Index: linux-2.6.38.8/drivers/mxc/Kconfig
source "drivers/mxc/security/Kconfig"
Index: linux-2.6.38.8/drivers/mxc/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-03-13 18:15:38.000000000 +0100
-+++ linux-2.6.38.8/drivers/mxc/Makefile 2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-04-03 16:58:29.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Makefile 2012-04-03 16:58:29.000000000 +0200
@@ -1,3 +1,4 @@
+obj-$(CONFIG_MXC_IPU_V3) += ipu3/
obj-$(CONFIG_MXC_VPU) += vpu/
@@ -40,7 +40,7 @@ Index: linux-2.6.38.8/drivers/mxc/Makefile
Index: linux-2.6.38.8/drivers/mxc/ipu3/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/Kconfig 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/Kconfig 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,5 @@
+config MXC_IPU_V3
+ bool
@@ -50,7 +50,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/Kconfig
Index: linux-2.6.38.8/drivers/mxc/ipu3/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/Makefile 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/Makefile 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,4 @@
+obj-$(CONFIG_MXC_IPU_V3) = mxc_ipu.o
+
@@ -59,7 +59,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/Makefile
Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,376 @@
+/*
+ * Copyright 2009-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -440,7 +440,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_calc_stripes_sizes.c
Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_capture.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_capture.c 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_capture.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,805 @@
+/*
+ * Copyright 2008-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -1250,7 +1250,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_capture.c
Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_common.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_common.c 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_common.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,2840 @@
+/*
+ * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4095,7 +4095,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_common.c
Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_device.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_device.c 2012-03-13 18:52:59.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_device.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,514 @@
+/*
+ * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4614,7 +4614,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_device.c
Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_disp.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_disp.c 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_disp.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,1942 @@
+/*
+ * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6561,7 +6561,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_disp.c
Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_ic.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_ic.c 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_ic.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,839 @@
+/*
+ * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -7405,7 +7405,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_ic.c
Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_param_mem.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_param_mem.h 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_param_mem.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,735 @@
+/*
+ * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -8145,7 +8145,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_param_mem.h
Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_prv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_prv.h 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_prv.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -8257,7 +8257,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_prv.h
Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_regs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_regs.h 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/drivers/mxc/ipu3/ipu_regs.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,694 @@
+/*
+ * Copyright (C) 2005-2011 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -8956,7 +8956,7 @@ Index: linux-2.6.38.8/drivers/mxc/ipu3/ipu_regs.h
Index: linux-2.6.38.8/include/linux/ipu.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/include/linux/ipu.h 2012-03-13 18:23:02.000000000 +0100
++++ linux-2.6.38.8/include/linux/ipu.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,1297 @@
+/*
+ * Copyright 2005-2011 Freescale Semiconductor, Inc.
@@ -10257,8 +10257,8 @@ Index: linux-2.6.38.8/include/linux/ipu.h
+#endif
Index: linux-2.6.38.8/include/linux/fsl_devices.h
===================================================================
---- linux-2.6.38.8.orig/include/linux/fsl_devices.h 2012-03-13 18:15:39.000000000 +0100
-+++ linux-2.6.38.8/include/linux/fsl_devices.h 2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/include/linux/fsl_devices.h 2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/include/linux/fsl_devices.h 2012-04-03 17:12:07.000000000 +0200
@@ -104,6 +104,13 @@
u32 sysclk;
};
@@ -10275,8 +10275,8 @@ Index: linux-2.6.38.8/include/linux/fsl_devices.h
int(*voltage_set)(int slot, int vcc, int vpp);
Index: linux-2.6.38.8/arch/arm/mach-mx5/system.c
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/system.c 2012-03-13 18:15:38.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/mach-mx5/system.c 2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/system.c 2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/system.c 2012-04-03 16:58:29.000000000 +0200
@@ -88,7 +88,10 @@
if (pdev == NULL)
return;
@@ -10305,8 +10305,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/system.c
dev_dbg(&pdev->dev, "power gating successful\n");
Index: linux-2.6.38.8/arch/arm/plat-mxc/clock.c
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/clock.c 2012-03-13 18:15:39.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/plat-mxc/clock.c 2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/clock.c 2012-04-03 16:58:26.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/clock.c 2012-04-03 16:58:29.000000000 +0200
@@ -110,6 +110,21 @@
}
EXPORT_SYMBOL(clk_disable);
@@ -10331,8 +10331,8 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/clock.c
* its parent and so on, until one is able to return
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/clock.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/clock.h 2012-03-13 18:15:38.000000000 +0100
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/clock.h 2012-03-13 18:23:02.000000000 +0100
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/clock.h 2012-04-03 16:57:48.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/clock.h 2012-04-03 16:58:29.000000000 +0200
@@ -59,6 +59,7 @@
int clk_register(struct clk *clk);
@@ -10341,3 +10341,61 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/clock.h
unsigned long mxc_decode_pll(unsigned int pll, u32 f_ref);
+Index: linux-2.6.38.8/include/linux/mxc_v4l2.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/include/linux/mxc_v4l2.h 2012-04-03 17:12:30.000000000 +0200
+@@ -0,0 +1,53 @@
++/*
++ * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
++ */
++
++/*
++ * The code contained herein is licensed under the GNU Lesser General
++ * Public License. You may obtain a copy of the GNU Lesser General
++ * Public License Version 2.1 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/lgpl-license.html
++ * http://www.gnu.org/copyleft/lgpl.html
++ */
++
++/*!
++ * @file arch-mxc/mxc_v4l2.h
++ *
++ * @brief mxc V4L2 private structures
++ *
++ * @ingroup MXC_V4L2_CAPTURE
++ */
++
++#ifndef __ASM_ARCH_MXC_V4L2_H__
++#define __ASM_ARCH_MXC_V4L2_H__
++
++/*
++ * For IPUv1 and IPUv3, V4L2_CID_MXC_ROT means encoder ioctl ID.
++ * And V4L2_CID_MXC_VF_ROT is viewfinder ioctl ID only for IPUv1 and IPUv3.
++ */
++#define V4L2_CID_MXC_ROT (V4L2_CID_PRIVATE_BASE + 0)
++#define V4L2_CID_MXC_FLASH (V4L2_CID_PRIVATE_BASE + 1)
++#define V4L2_CID_MXC_VF_ROT (V4L2_CID_PRIVATE_BASE + 2)
++#define V4L2_CID_MXC_MOTION (V4L2_CID_PRIVATE_BASE + 3)
++
++#define V4L2_MXC_ROTATE_NONE 0
++#define V4L2_MXC_ROTATE_VERT_FLIP 1
++#define V4L2_MXC_ROTATE_HORIZ_FLIP 2
++#define V4L2_MXC_ROTATE_180 3
++#define V4L2_MXC_ROTATE_90_RIGHT 4
++#define V4L2_MXC_ROTATE_90_RIGHT_VFLIP 5
++#define V4L2_MXC_ROTATE_90_RIGHT_HFLIP 6
++#define V4L2_MXC_ROTATE_90_LEFT 7
++
++#define V4L2_MXC_CAM_ROTATE_NONE 8
++#define V4L2_MXC_CAM_ROTATE_VERT_FLIP 9
++#define V4L2_MXC_CAM_ROTATE_HORIZ_FLIP 10
++#define V4L2_MXC_CAM_ROTATE_180 11
++
++struct v4l2_mxc_offset {
++ uint32_t u_offset;
++ uint32_t v_offset;
++};
++
++#endif
hooks/post-receive
--
armadeus
|
