Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
commitlog-requ...@lists.openmoko.org
You can reach the person managing the list at
commitlog-ow...@lists.openmoko.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4949 - developers/werner/gta03/cam/patches
(wer...@docs.openmoko.org)
2. r4950 - developers/werner/gta03/cam/patches
(wer...@docs.openmoko.org)
3. r4951 - trunk/src/target/audio/om-gta02
(shora...@docs.openmoko.org)
--- Begin Message ---
Author: werner
Date: 2009-03-04 15:48:46 +0100 (Wed, 04 Mar 2009)
New Revision: 4949
Modified:
developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
developers/werner/gta03/cam/patches/add-64xx-hclk2.patch
developers/werner/gta03/cam/patches/add-s3c-cam-config.patch
developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
developers/werner/gta03/cam/patches/add-s3c-camif-original.patch
developers/werner/gta03/cam/patches/add-s5k4-original.patch
developers/werner/gta03/cam/patches/add-samsung-cams-i2c.patch
developers/werner/gta03/cam/patches/fix-s3c-camif.patch
developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
developers/werner/gta03/cam/patches/fix-s5k4.patch
developers/werner/gta03/cam/patches/hacks.patch
developers/werner/gta03/cam/patches/mach-om3d7k-add-cam.patch
developers/werner/gta03/cam/patches/series
developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
Log:
Final revision for submission.
Modified: developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,7 @@
Add CAMIF clock to S3C6410.
+Add camera interface clock to S3C6410.
+
Signed-off-by: Werner Almesberger <wer...@openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/add-64xx-hclk2.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-64xx-hclk2.patch 2009-03-04
12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-64xx-hclk2.patch 2009-03-04
14:48:46 UTC (rev 4949)
@@ -1,5 +1,7 @@
Add HCLKx2 to S3C64xx.
+Add doubled HCLK to S3C64xx.
+
Signed-off-by: Werner Almesberger <wer...@openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/add-s3c-cam-config.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-cam-config.patch
2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-s3c-cam-config.patch
2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,6 @@
-Add Samsung S3C video driver to kernel configuration and build process.
+Samsung S3C camera subsystem config and Makefile
+Add Samsung S3C camera subsystem to kernel configuration and build process.
Original code is from Samsung's BSP.
Signed-off-by: Werner Almesberger <wer...@openmoko.org>
Modified: developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,6 @@
+Add Samsung S3C CAMIF driver
+
Add Samsung S3C camera interface driver.
-
Original code is from Samsung's BSP and was written for 2.6.21.
Only tested on S3C6410.
@@ -12,9 +13,14 @@
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ cam/arch/arm/plat-s3c/dev-camif.c 2009-03-03 19:06:20.000000000 +0800
-@@ -0,0 +1,59 @@
-+/* linux/arch/arm/plat-s3c/dev-hsmmc.c
+@@ -0,0 +1,65 @@
++/* linux/arch/arm/plat-s3c/dev-camif.c
+ *
++ * Copyright 2009 Openmoko, Inc.
++ * Werner Almesberger <wer...@openmoko.org>
++ *
++ * based on dev-hsmmc.c which is
++ *
+ * Copyright (c) 2008 Simtec Electronics
+ * Ben Dooks <b...@simtec.co.uk>
+ * http://armlinux.simtec.co.uk/
Modified: developers/werner/gta03/cam/patches/add-s3c-camif-original.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-camif-original.patch
2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-s3c-camif-original.patch
2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,9 +1,9 @@
-Add Samsung S3C camera driver for V4L.
+Add Samsung S3C camera driver for V4L
-This is the original code from Samsung's 2.6.21 BSP.
+This is the original Samsung S3C camera driver code from the 2.6.21 BSP.
+The changes that are needed to make this work in 2.6.29 are in the next
+patch.
-The changes that are needed to make this work are in the next patch.
-
Signed-off-by: Werner Almesberger <wer...@openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/add-s5k4-original.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s5k4-original.patch 2009-03-04
12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-s5k4-original.patch 2009-03-04
14:48:46 UTC (rev 4949)
@@ -1,9 +1,9 @@
-Add Samsung S5K4BA camera driver.
+Add Samsung S5K4BA camera driver
-This is the original code from Samsung's 2.6.21 BSP.
+This is the original Samsung S5K4BA camera driver code from the 2.6.21
+BSP. The changes that are needed to make this work in 2.6.29 are in
+the next patch.
-The changes that are needed to make this work are in the next patch.
-
Signed-off-by: Werner Almesberger <wer...@openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/add-samsung-cams-i2c.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-samsung-cams-i2c.patch
2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/add-samsung-cams-i2c.patch
2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,6 +1,7 @@
-Add I2C IDs for Samsung S5K series cameras.
+Add I2C IDs for Samsung S5K series cameras
-This code is directly from Samsung's BSP.
+These are te I2C IDs for all the Samsung S5K series cameras. This code
+is directly from Samsung's BSP.
Signed-off-by: Werner Almesberger <wer...@openmoko.org>
Modified: developers/werner/gta03/cam/patches/fix-s3c-camif.patch
===================================================================
--- developers/werner/gta03/cam/patches/fix-s3c-camif.patch 2009-03-04
12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/fix-s3c-camif.patch 2009-03-04
14:48:46 UTC (rev 4949)
@@ -1,7 +1,7 @@
-This updates the Samsung S3C camera interface driver from 2.6.21 to
-2.6.29 and fixes some trivial issues.
+Update Samsung S3C camera interface driver
-There are still a few ugly spots, marked with "@@@ - WA".
+Update the camera interface driver from 2.6.21 to 2.6.29 and fix some
+trivial issues. There are still a few ugly spots, marked with "@@@".
Only tested on S3C6410.
Modified: developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
===================================================================
--- developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,3 +1,8 @@
+Fix s3c64xx_setrate_clksrc
+
+Note: this patch is already on the way upstream but is currently missing
+in the Openmoko kernel.
+
Some of the rate selection logic in s3c64xx_setrate_clksrc uses what
appears to be parent clock selection logic. This patch corrects it.
Modified: developers/werner/gta03/cam/patches/fix-s5k4.patch
===================================================================
--- developers/werner/gta03/cam/patches/fix-s5k4.patch 2009-03-04 12:21:28 UTC
(rev 4948)
+++ developers/werner/gta03/cam/patches/fix-s5k4.patch 2009-03-04 14:48:46 UTC
(rev 4949)
@@ -1,5 +1,8 @@
-Fix Samsung S5K4BA camera driver. Mainly trailing whitespace issues.
+Fix Samsung S5K4BA camera driver.
+This patch makes the Samsung S5K4BA driver work in 2.6.29 and also solves
+a few minor issues, such as trailing whitespace.
+
Signed-off-by: Werner Almesberger <wer...@openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/hacks.patch
===================================================================
--- developers/werner/gta03/cam/patches/hacks.patch 2009-03-04 12:21:28 UTC
(rev 4948)
+++ developers/werner/gta03/cam/patches/hacks.patch 2009-03-04 14:48:46 UTC
(rev 4949)
@@ -1,3 +1,5 @@
+Dirty hacks to make it all work
+
A few dirty hacks to make the camera driver work:
- because V4L no longer guarantees that minor numbers provided by the
@@ -14,8 +16,8 @@
Index: cam/drivers/media/video/s3c_camera_driver.c
===================================================================
---- cam.orig/drivers/media/video/s3c_camera_driver.c 2009-03-04
18:05:16.000000000 +0800
-+++ cam/drivers/media/video/s3c_camera_driver.c 2009-03-04
18:05:53.000000000 +0800
+--- cam.orig/drivers/media/video/s3c_camera_driver.c 2009-03-04
20:52:03.000000000 +0800
++++ cam/drivers/media/video/s3c_camera_driver.c 2009-03-04
20:54:08.000000000 +0800
@@ -74,6 +74,7 @@
default:
@@ -26,11 +28,11 @@
return ret;
Index: cam/arch/arm/mach-s3c6410/mach-om-3d7k.c
===================================================================
---- cam.orig/arch/arm/mach-s3c6410/mach-om-3d7k.c 2009-03-04
18:05:47.000000000 +0800
-+++ cam/arch/arm/mach-s3c6410/mach-om-3d7k.c 2009-03-04 18:06:18.000000000
+0800
-@@ -422,6 +422,10 @@
- unsigned int power)
- {
+--- cam.orig/arch/arm/mach-s3c6410/mach-om-3d7k.c 2009-03-04
20:52:03.000000000 +0800
++++ cam/arch/arm/mach-s3c6410/mach-om-3d7k.c 2009-03-04 20:56:40.000000000
+0800
+@@ -1025,6 +1025,10 @@
+ pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 0x01);
+ pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
+ /* @@@ do this properly later - WA */
+ pcf50633_reg_write(om_3d7k_pcf, 0x30, 0x21);
@@ -38,4 +40,4 @@
+ pcf50633_reg_write(om_3d7k_pcf, 0x3a, 0x21);
}
- static struct plat_lcd_data om_3d7k_lcd_power_data = {
+ static void om_3d7k_l1k002_pwronoff(int level)
Modified: developers/werner/gta03/cam/patches/mach-om3d7k-add-cam.patch
===================================================================
--- developers/werner/gta03/cam/patches/mach-om3d7k-add-cam.patch
2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/mach-om3d7k-add-cam.patch
2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,5 +1,8 @@
-Add camera interface driver to 3D7K machine.
+Add camera interface driver to 3D7K
+This patch adds the camera interface driver and the corresponding
+configuration option to the 3D7K machine.
+
Signed-off-by: Werner Almesberger <wer...@openmoko.org>
---
Modified: developers/werner/gta03/cam/patches/series
===================================================================
--- developers/werner/gta03/cam/patches/series 2009-03-04 12:21:28 UTC (rev
4948)
+++ developers/werner/gta03/cam/patches/series 2009-03-04 14:48:46 UTC (rev
4949)
@@ -1,7 +1,14 @@
+# submit with
+#
+# quilt mail --mbox foo --prefix PATCH \
+# --sender 'Werner Almesberger <wer...@openmoko.org>' \
+# --subject 'Samsung camera driver for 3D7K' \
+# --to openmoko-ker...@lists.openmoko.org
+#
+
fix-s3c64xx_setrate_clksrc.patch
add-64xx-hclk2.patch
add-64xx-cam-clock.patch
-#add-s3c-camif-regs.patch
add-s3c-camif-original.patch
fix-s3c-camif.patch
add-s3c-cam-platform.patch
@@ -10,6 +17,5 @@
fix-s5k4.patch
add-s3c-cam-config.patch
mach-om3d7k-add-cam.patch
-# defconfig
update-om3d7k-defconfig.patch
hacks.patch
Modified: developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
===================================================================
--- developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
2009-03-04 12:21:28 UTC (rev 4948)
+++ developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
2009-03-04 14:48:46 UTC (rev 4949)
@@ -1,3 +1,5 @@
+Enable camera in 3D7K defconfig
+
Enable V4L and camera driver in 3D7K default configuration.
Signed-off-by: Werner Almesberger <wer...@openmoko.org>
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2009-03-05 04:59:05 +0100 (Thu, 05 Mar 2009)
New Revision: 4950
Modified:
developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
developers/werner/gta03/cam/patches/add-64xx-hclk2.patch
developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
developers/werner/gta03/cam/patches/series
developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
Log:
Now, really the final submission.
Modified: developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
2009-03-04 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/add-64xx-cam-clock.patch
2009-03-05 03:59:05 UTC (rev 4950)
@@ -8,9 +8,9 @@
Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c
===================================================================
---- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-04
19:24:55.000000000 +0800
-+++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-04 19:24:58.000000000
+0800
-@@ -595,6 +595,33 @@
+--- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-05
11:22:20.000000000 +0800
++++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-05 11:22:24.000000000
+0800
+@@ -520,6 +520,33 @@
.reg_divider = S3C_CLK_DIV2,
};
@@ -44,7 +44,7 @@
/* Clock initialisation code */
static struct clksrc_clk *init_parents[] = {
-@@ -611,6 +638,7 @@
+@@ -536,6 +563,7 @@
&clk_audio0,
&clk_audio1,
&clk_irda,
@@ -52,10 +52,10 @@
};
static void __init_or_cpufreq s3c6400_set_clksrc(struct clksrc_clk *clk)
-@@ -712,6 +740,7 @@
+@@ -636,6 +664,7 @@
+ &clk_audio0.clk,
&clk_audio1.clk,
&clk_irda.clk,
- &clk_arm,
+ &clk_camif.clk,
};
Modified: developers/werner/gta03/cam/patches/add-64xx-hclk2.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-64xx-hclk2.patch 2009-03-04
14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/add-64xx-hclk2.patch 2009-03-05
03:59:05 UTC (rev 4950)
@@ -8,8 +8,8 @@
Index: cam/arch/arm/plat-s3c/include/plat/clock.h
===================================================================
---- cam.orig/arch/arm/plat-s3c/include/plat/clock.h 2009-03-04
19:24:46.000000000 +0800
-+++ cam/arch/arm/plat-s3c/include/plat/clock.h 2009-03-04 19:24:55.000000000
+0800
+--- cam.orig/arch/arm/plat-s3c/include/plat/clock.h 2009-03-05
11:22:09.000000000 +0800
++++ cam/arch/arm/plat-s3c/include/plat/clock.h 2009-03-05 11:22:20.000000000
+0800
@@ -50,6 +50,7 @@
extern struct clk clk_ext;
@@ -20,8 +20,8 @@
Index: cam/arch/arm/plat-s3c64xx/clock.c
===================================================================
---- cam.orig/arch/arm/plat-s3c64xx/clock.c 2009-03-04 19:24:46.000000000
+0800
-+++ cam/arch/arm/plat-s3c64xx/clock.c 2009-03-04 19:24:55.000000000 +0800
+--- cam.orig/arch/arm/plat-s3c64xx/clock.c 2009-03-05 11:22:09.000000000
+0800
++++ cam/arch/arm/plat-s3c64xx/clock.c 2009-03-05 11:22:20.000000000 +0800
@@ -27,6 +27,12 @@
#include <plat/devs.h>
#include <plat/clock.h>
@@ -45,9 +45,9 @@
void s3c64xx_register_clocks(void)
Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c
===================================================================
---- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-04
19:24:49.000000000 +0800
-+++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-04 19:24:55.000000000
+0800
-@@ -683,6 +683,7 @@
+--- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-05
11:22:13.000000000 +0800
++++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-05 11:22:20.000000000
+0800
+@@ -608,6 +608,7 @@
clk_fout_epll.rate = epll;
clk_fout_apll.rate = apll;
Modified: developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
===================================================================
--- developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
2009-03-04 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/add-s3c-cam-platform.patch
2009-03-05 03:59:05 UTC (rev 4950)
@@ -13,7 +13,7 @@
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ cam/arch/arm/plat-s3c/dev-camif.c 2009-03-03 19:06:20.000000000 +0800
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,64 @@
+/* linux/arch/arm/plat-s3c/dev-camif.c
+ *
+ * Copyright 2009 Openmoko, Inc.
Modified: developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
===================================================================
--- developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
2009-03-04 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/fix-s3c64xx_setrate_clksrc.patch
2009-03-05 03:59:05 UTC (rev 4950)
@@ -15,9 +15,9 @@
Index: cam/arch/arm/plat-s3c64xx/s3c6400-clock.c
===================================================================
---- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-04
19:24:46.000000000 +0800
-+++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-04 19:24:49.000000000
+0800
-@@ -314,10 +314,12 @@
+--- cam.orig/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-05
11:22:09.000000000 +0800
++++ cam/arch/arm/plat-s3c64xx/s3c6400-clock.c 2009-03-05 11:22:13.000000000
+0800
+@@ -239,10 +239,12 @@
rate = clk_round_rate(clk, rate);
div = clk_get_rate(clk->parent) / rate;
Modified: developers/werner/gta03/cam/patches/series
===================================================================
--- developers/werner/gta03/cam/patches/series 2009-03-04 14:48:46 UTC (rev
4949)
+++ developers/werner/gta03/cam/patches/series 2009-03-05 03:59:05 UTC (rev
4950)
@@ -1,14 +1,19 @@
# submit with
#
# quilt mail --mbox foo --prefix PATCH \
-# --sender 'Werner Almesberger <wer...@openmoko.org>' \
-# --subject 'Samsung camera driver for 3D7K' \
+# --from 'Werner Almesberger <wer...@openmoko.org>' \
+# --sender wer...@openmoko.org \
+# --subject 'Samsung camera driver for 3D7K, 3rd try' \
# --to openmoko-ker...@lists.openmoko.org
#
+# Then DO NOT
+# formail -ds sendmail openmoko-ker...@lists.openmoko.org <foo
+#
fix-s3c64xx_setrate_clksrc.patch
add-64xx-hclk2.patch
add-64xx-cam-clock.patch
+add-s3c-camif-regs.patch
add-s3c-camif-original.patch
fix-s3c-camif.patch
add-s3c-cam-platform.patch
Modified: developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
===================================================================
--- developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
2009-03-04 14:48:46 UTC (rev 4949)
+++ developers/werner/gta03/cam/patches/update-om3d7k-defconfig.patch
2009-03-05 03:59:05 UTC (rev 4950)
@@ -8,17 +8,8 @@
Index: cam/arch/arm/configs/om_3d7k_defconfig
===================================================================
---- cam.orig/arch/arm/configs/om_3d7k_defconfig 2009-03-03
21:52:58.000000000 +0800
-+++ cam/arch/arm/configs/om_3d7k_defconfig 2009-03-03 21:53:04.000000000
+0800
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.29-rc3
--# Mon Mar 2 16:20:27 2009
-+# Tue Mar 3 19:23:50 2009
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+--- cam.orig/arch/arm/configs/om_3d7k_defconfig 2009-03-05
11:22:08.000000000 +0800
++++ cam/arch/arm/configs/om_3d7k_defconfig 2009-03-05 11:22:32.000000000
+0800
@@ -204,6 +204,7 @@
CONFIG_S3C_DEV_HSMMC1=y
CONFIG_S3C_DEV_I2C1=y
@@ -27,7 +18,7 @@
CONFIG_CPU_S3C6410=y
CONFIG_S3C6410_SETUP_SDHCI=y
# CONFIG_MACH_SMDK6410 is not set
-@@ -1010,13 +1011,101 @@
+@@ -991,13 +992,101 @@
#
# Multimedia core support
#
--- End Message ---
--- Begin Message ---
Author: shoragan
Date: 2009-03-05 11:03:37 +0100 (Thu, 05 Mar 2009)
New Revision: 4951
Added:
trunk/src/target/audio/om-gta02/gsmbluetooth.state
Log:
add working GSM to Bluetooth headset state file
Added: trunk/src/target/audio/om-gta02/gsmbluetooth.state
===================================================================
--- trunk/src/target/audio/om-gta02/gsmbluetooth.state
(rev 0)
+++ trunk/src/target/audio/om-gta02/gsmbluetooth.state 2009-03-05 10:03:37 UTC
(rev 4951)
@@ -0,0 +1,885 @@
+state.neo1973gta02 {
+ control.1 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+ value.0 235
+ value.1 235
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'ADC Capture Volume'
+ value.0 195
+ value.1 195
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Speaker Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+ value 79
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Playback Volume'
+ value.0 6
+ value.1 6
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Playback Volume'
+ value.0 6
+ value.1 6
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Playback Volume'
+ value.0 7
+ value.1 7
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Bypass Playback Volume'
+ value 5
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Sidetone Playback Volume'
+ value 5
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Voice Playback Volume'
+ value 4
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+ control.15 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Linear Control'
+ comment.item.1 'Adaptive Boost'
+ iface MIXER
+ name 'Bass Boost'
+ value 'Linear Control'
+ }
+ control.16 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '130Hz @ 48kHz'
+ comment.item.1 '200Hz @ 48kHz'
+ comment.item.2 '100Hz @ 16kHz'
+ comment.item.3 '400Hz @ 48kHz'
+ comment.item.4 '100Hz @ 8kHz'
+ comment.item.5 '200Hz @ 8kHz'
+ iface MIXER
+ name 'Bass Filter'
+ value '130Hz @ 48kHz'
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Bass Volume'
+ value 8
+ }
+ control.18 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+ value 8
+ }
+ control.19 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '8kHz'
+ comment.item.1 '4kHz'
+ iface MIXER
+ name 'Treble Cut-off'
+ value '8kHz'
+ }
+ control.20 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Capture Volume'
+ value.0 0
+ value.1 0
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Sidetone Capture Volume'
+ value 2
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 63'
+ iface MIXER
+ name 'Capture Volume'
+ value.0 48
+ value.1 48
+ }
+ control.23 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.24 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 true
+ value.1 true
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '3.4Hz @ 48kHz'
+ comment.item.1 '82Hz @ 16k'
+ comment.item.2 '82Hz @ 8kHz'
+ comment.item.3 '170Hz @ 8kHz'
+ iface MIXER
+ name 'Capture Filter Select'
+ value '82Hz @ 8kHz'
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 HiFi
+ comment.item.1 Voice
+ iface MIXER
+ name 'Capture Filter Cut-off'
+ value Voice
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture Filter Switch'
+ value true
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Target Volume'
+ value 4
+ }
+ control.29 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Max Volume'
+ value 5
+ }
+ control.30 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Off
+ comment.item.1 Right
+ comment.item.2 Left
+ comment.item.3 Stereo
+ iface MIXER
+ name 'ALC Capture Function'
+ value Off
+ }
+ control.31 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+ value false
+ }
+ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+ value 4
+ }
+ control.33 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+ value 8
+ }
+ control.34 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+ value 2
+ }
+ control.35 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ iface MIXER
+ name 'ALC Capture NG Threshold'
+ value 7
+ }
+ control.36 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Constant PGA Gain'
+ comment.item.1 'Mute ADC Output'
+ iface MIXER
+ name 'ALC Capture NG Type'
+ value 'Constant PGA Gain'
+ }
+ control.37 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture NG Switch'
+ value false
+ }
+ control.38 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Capture
+ comment.item.1 Playback
+ iface MIXER
+ name '3D Function'
+ value Capture
+ }
+ control.39 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name '3D Upper Cut-off'
+ value '2.2kHz'
+ }
+ control.40 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '200Hz'
+ comment.item.1 '500Hz'
+ iface MIXER
+ name '3D Lower Cut-off'
+ value '200Hz'
+ }
+ control.41 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name '3D Volume'
+ value 8
+ }
+ control.42 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name '3D Switch'
+ value false
+ }
+ control.43 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture 6dB Attenuate'
+ value false
+ }
+ control.44 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback 6dB Attenuate'
+ value false
+ }
+ control.45 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 None
+ comment.item.1 '32kHz'
+ comment.item.2 '44.1kHz'
+ comment.item.3 '48kHz'
+ iface MIXER
+ name De-emphasis
+ value None
+ }
+ control.46 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 Mono
+ iface MIXER
+ name 'Playback Mono Mix'
+ value Stereo
+ }
+ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'Playback Phase'
+ value 'Non Inverted'
+ }
+ control.48 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic2 Capture Volume'
+ value 3
+ }
+ control.49 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic1 Capture Volume'
+ value 3
+ }
+ control.50 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'DAI 0'
+ comment.item.1 'DAI 1'
+ comment.item.2 'DAI 2'
+ comment.item.3 'DAI 3'
+ iface MIXER
+ name 'DAI Mode'
+ value 'DAI 0'
+ }
+ control.51 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Left ADC'
+ comment.item.2 'Right ADC'
+ comment.item.3 'Channel Swap'
+ iface MIXER
+ name 'ADC Data Select'
+ value 'Left ADC'
+ }
+ control.52 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'ROUT2 Phase'
+ value Inverted
+ }
+ control.53 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Mic 1'
+ comment.item.1 'Mic 2'
+ comment.item.2 'Mic 3'
+ iface MIXER
+ name 'Mic Selection Mux'
+ value 'Mic 1'
+ }
+ control.54 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'RXP - RXN'
+ comment.item.1 'RXP + RXN'
+ comment.item.2 RXP
+ comment.item.3 RXN
+ iface MIXER
+ name 'Rx Mixer'
+ value 'RXP - RXN'
+ }
+ control.55 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1 + 2'
+ comment.item.1 'Line 1 - 2'
+ comment.item.2 'Line 1'
+ comment.item.3 'Line 2'
+ iface MIXER
+ name 'Line Mixer'
+ value 'Line 1 - 2'
+ }
+ control.56 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line Mix'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Mono Mux'
+ value 'Rx Mix'
+ }
+ control.57 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 2'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Right Mux'
+ value 'Rx Mix'
+ }
+ control.58 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Left Mux'
+ value 'Rx Mix'
+ }
+ control.59 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Line Capture Switch'
+ value false
+ }
+ control.60 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic2 Capture Switch'
+ value false
+ }
+ control.61 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic1 Capture Switch'
+ value false
+ }
+ control.62 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Rx Capture Switch'
+ value true
+ }
+ control.63 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Left PGA'
+ comment.item.1 'Mic 1'
+ comment.item.2 'Mic 2'
+ comment.item.3 'Right PGA'
+ iface MIXER
+ name 'Mic Sidetone Mux'
+ value 'Left PGA'
+ }
+ control.64 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Sidetone
+ iface MIXER
+ name 'Capture Right Mux'
+ value Sidetone
+ }
+ control.65 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Line
+ iface MIXER
+ name 'Capture Left Mux'
+ value PGA
+ }
+ control.66 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Right Mixer'
+ value 'Analogue Mix Left'
+ }
+ control.67 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Left Mixer'
+ value 'Analogue Mix Left'
+ }
+ control.68 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Voice Capture Sw'
+ value true
+ }
+ control.69 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Left Capture Swi'
+ value true
+ }
+ control.70 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Right Capture Sw'
+ value true
+ }
+ control.71 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 'Capture ST'
+ comment.item.2 LOUT2
+ iface MIXER
+ name 'Out4 Mux'
+ value VREF
+ }
+ control.72 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 ROUT2
+ comment.item.2 'Left + Right'
+ iface MIXER
+ name 'Out3 Mux'
+ value VREF
+ }
+ control.73 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Inverted Mono 1'
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 'Left + Right'
+ iface MIXER
+ name 'Mono 2 Mux'
+ value 'Inverted Mono 1'
+ }
+ control.74 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Left Playback Switch'
+ value false
+ }
+ control.75 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Right Playback Switc'
+ value false
+ }
+ control.76 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Voice Playback Switc'
+ value true
+ }
+ control.77 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Sidetone Playback Sw'
+ value false
+ }
+ control.78 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Bypass Playback Swit'
+ value false
+ }
+ control.79 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Voice Playback Swit'
+ value false
+ }
+ control.80 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Sidetone Playback S'
+ value false
+ }
+ control.81 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Right Playback Swit'
+ value false
+ }
+ control.82 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Bypass Playback Swi'
+ value false
+ }
+ control.83 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Voice Playback Switc'
+ value false
+ }
+ control.84 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Sidetone Playback Sw'
+ value false
+ }
+ control.85 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Left Playback Switch'
+ value false
+ }
+ control.86 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Bypass Playback Swit'
+ value false
+ }
+ control.87 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Stereo Out Switch'
+ value false
+ }
+ control.88 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line Out Switch'
+ value true
+ }
+ control.89 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line In Switch'
+ value true
+ }
+ control.90 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Headset Mic Switch'
+ value false
+ }
+ control.91 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Mic Switch'
+ value false
+ }
+ control.92 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Spk Switch'
+ value true
+ }
+ control.93 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Amp State Switch'
+ value false
+ }
+ control.94 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Amp Spk Switch'
+ value false
+ }
+}
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
