[oe-commits] org.oe.dev merge of '99fe2559bc0e5cf2850f8d44dd60d8b7d5e09756'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sat Nov 10 23:04:02 UTC 2007
merge of '99fe2559bc0e5cf2850f8d44dd60d8b7d5e09756'
and 'c1e310b63c858128195b8270be427146a86cbd75'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 8afe9578672a9f0739d21bb85aff532d4ffd2857
ViewMTN: http://monotone.openembedded.org/revision/info/8afe9578672a9f0739d21bb85aff532d4ffd2857
Files:
1
packages/libopie/libopie2/h4000_and_default_rot.patch
packages/libopie/libopie2_1.2.3.bb
packages/linux/linux-handhelds-2.6/asus620/defconfig
packages/linux/linux-handhelds-2.6/asus730/defconfig
packages/linux/linux-handhelds-2.6/aximx50/defconfig
packages/linux/linux-handhelds-2.6/eteng500/defconfig
packages/linux/linux-handhelds-2.6/h1910/defconfig
packages/linux/linux-handhelds-2.6/h2200/defconfig
packages/linux/linux-handhelds-2.6/h3600/defconfig
packages/linux/linux-handhelds-2.6/h3800/defconfig
packages/linux/linux-handhelds-2.6/h3900/defconfig
packages/linux/linux-handhelds-2.6/h4000/defconfig
packages/linux/linux-handhelds-2.6/h5000/defconfig
packages/linux/linux-handhelds-2.6/htcalpine/defconfig
packages/linux/linux-handhelds-2.6/htcapache/defconfig
packages/linux/linux-handhelds-2.6/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6/htcsable/defconfig
packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6/hx4700/defconfig
packages/linux/linux-handhelds-2.6/looxc550/defconfig
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux-handhelds-2.6/rx1950/defconfig
packages/linux/linux-handhelds-2.6/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
packages/linux/linux-openmoko/gta-vibro-pwm-suspend.patch
packages/linux/linux-openmoko/gta02-sound.patch
packages/linux/linux-openmoko/iis-suspend.patch
packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch
packages/linux/linux-openmoko/soc-core-suspend.patch
conf/distro/include/sane-srcrevs.inc
conf/machine/fic-gta02.conf
packages/linux/linux-openmoko/defconfig-2.6.22.5
packages/linux/linux-openmoko_2.6.22.5.bb
Diffs:
#
# mt diff -r99fe2559bc0e5cf2850f8d44dd60d8b7d5e09756 -r8afe9578672a9f0739d21bb85aff532d4ffd2857
#
#
#
# add_file "packages/libopie/libopie2/h4000_and_default_rot.patch"
# content [8d81a95f412a802e3dce484ccf80ea9f0a72c73e]
#
# patch "packages/libopie/libopie2_1.2.3.bb"
# from [86a2c8573c9dddbb66193f829954a1b838df3d82]
# to [63a7fc0db1279bd05e64e2b06c6e583e83ec1cca]
#
# patch "packages/linux/linux-handhelds-2.6/asus620/defconfig"
# from [5480504730606977c786cfa34c0e9262bef66fa6]
# to [25e597b7b4d198e03d0d13da080b7b6770a91494]
#
# patch "packages/linux/linux-handhelds-2.6/asus730/defconfig"
# from [5c3c278c9503d52d9e9adeaff6ec6532db522eaf]
# to [0e8d5cfdfde878a557606427897b95ca0ed89e05]
#
# patch "packages/linux/linux-handhelds-2.6/aximx50/defconfig"
# from [cc980b7f191f98dae38e3615fde9934df38bfa88]
# to [c9f1e7f6d4d88ad1489c2bdefbf6c9c836997811]
#
# patch "packages/linux/linux-handhelds-2.6/eteng500/defconfig"
# from [edaa277f640f1061e25ce562b0a9a59342fedd18]
# to [48d4f15c17a3acca48375951fa650888b11328b0]
#
# patch "packages/linux/linux-handhelds-2.6/h1910/defconfig"
# from [20c90ba133927d7d99065280a8044d6a8621235f]
# to [4edecb50b9ccde22ac6f11152eb079e4ddee7f59]
#
# patch "packages/linux/linux-handhelds-2.6/h2200/defconfig"
# from [7b078b455805a66bc22b8e46860e19f8ab9c1e19]
# to [be9ab6709d2cbacb25194cc8c418ef362d23cc83]
#
# patch "packages/linux/linux-handhelds-2.6/h3600/defconfig"
# from [c7a2fb8616c663f28a606838169cf2a36163ddd5]
# to [062fd682e93b2be2952ce6cd369694e8b1ac98b4]
#
# patch "packages/linux/linux-handhelds-2.6/h3800/defconfig"
# from [03237e114b7c68ad6a403781104f7877e40db711]
# to [53c0db328030e9c261b3c25335a476e0382bf159]
#
# patch "packages/linux/linux-handhelds-2.6/h3900/defconfig"
# from [6f5f028e331ddd89c42af12cc613271fcf815b9b]
# to [8968beac1464c9ac3f49cd96ca6d44fe7d1a8f44]
#
# patch "packages/linux/linux-handhelds-2.6/h4000/defconfig"
# from [41e89b487da8c03a4d56841f134894ccc4c54091]
# to [6679e336469fe518991a6713b58fcc6f01e283a6]
#
# patch "packages/linux/linux-handhelds-2.6/h5000/defconfig"
# from [1b0fc9751820752a9cd38d4927ee8b1eeefc09b9]
# to [829a8026372e855cabb67aae687021a5ec4807bd]
#
# patch "packages/linux/linux-handhelds-2.6/htcalpine/defconfig"
# from [e2a2562d03e04de80cfb2a9078ee332ab135fc8f]
# to [6d8cb5802383d1901b4757495e5d1a96a62ae90e]
#
# patch "packages/linux/linux-handhelds-2.6/htcapache/defconfig"
# from [f29b8e390b7c5718c67a361a5dc3452582b3a7c6]
# to [5a07e8000ae245a21252eef03de6d369324f1c26]
#
# patch "packages/linux/linux-handhelds-2.6/htcbeetles/defconfig"
# from [f10a7c1cf76509218a673ebaed8aefe5b6ba7042]
# to [90b63bec87cc48280fdcff164c76f901ee31a9a5]
#
# patch "packages/linux/linux-handhelds-2.6/htcblueangel/defconfig"
# from [c94328be341a3ace8f48abcdc6bd033c16953414]
# to [93877a6b119ac6ff9eac335f5209ace4526ebc26]
#
# patch "packages/linux/linux-handhelds-2.6/htchimalaya/defconfig"
# from [f1f0aabe49cd147bb8d9a7b975975a36e94cf506]
# to [15ed48296aeb843fb65397ab07c3c91b7f551329]
#
# patch "packages/linux/linux-handhelds-2.6/htcsable/defconfig"
# from [a0bae791857e9e9b76130fdeb17e680f125dad88]
# to [25c38ecbeefb000df27167a7f64c71575d4e3fd5]
#
# patch "packages/linux/linux-handhelds-2.6/htcuniversal/defconfig"
# from [df18d4eab0b906bd56f7cce68c284c446129c6a6]
# to [bad1578f36cf211ff37bf06ddd4814803093fde9]
#
# patch "packages/linux/linux-handhelds-2.6/htcwallaby/defconfig"
# from [50a353fc541d723c1122c207e4e9d08e6b541520]
# to [150bbd7fb1efe62256c73d94c9f73c7d2a573c78]
#
# patch "packages/linux/linux-handhelds-2.6/hx4700/defconfig"
# from [543816ac8842fd001cce338be41206cd3c2f7a2a]
# to [658007cf47d59e334d15c78614d0f579c9ee5186]
#
# patch "packages/linux/linux-handhelds-2.6/looxc550/defconfig"
# from [483644f28bac794d41473d64647931c71a18caa3]
# to [9173c6f7100182781b44a1b9cfa96d780acd7f44]
#
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
# from [4404225ab84877a2cc260e62c83a9d5878f8352d]
# to [7eef8e486c42fc9ae1aedc28705d3194e7aa50b7]
#
# patch "packages/linux/linux-handhelds-2.6/rx1950/defconfig"
# from [af6394a43d31bc9a0148f05e07f559e79f419360]
# to [27c732122cbbae9384cbed08a597d68154115f8e]
#
# patch "packages/linux/linux-handhelds-2.6/rx3000/defconfig"
# from [cf01a8c036fe966f824b6b71c55ab48ad146edce]
# to [efa192ab9c34739127619f4ce566b48b0fb6ecd2]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb"
# from [2e774376b648af5299a532253bd79480809c5e54]
# to [49685f54bf88b77f0c58a25c20ad416690435f97]
#
============================================================
--- packages/libopie/libopie2/h4000_and_default_rot.patch 8d81a95f412a802e3dce484ccf80ea9f0a72c73e
+++ packages/libopie/libopie2/h4000_and_default_rot.patch 8d81a95f412a802e3dce484ccf80ea9f0a72c73e
@@ -0,0 +1,25 @@
+--- libopie2/opiecore/device/odevice_ipaq.cpp.org 2007-09-09 02:44:41.000000000 +0300
++++ libopie2/opiecore/device/odevice_ipaq.cpp 2007-11-09 12:01:56.000000000 +0200
+@@ -178,6 +178,10 @@
+ d->m_model = Model_iPAQ_HX4700;
+ else if ( d->m_modelstr == "H4000" )
+ d->m_model = Model_iPAQ_H4xxx;
++ else if ( d->m_modelstr == "H4100" )
++ d->m_model = Model_iPAQ_H4xxx;
++ else if ( d->m_modelstr == "H4300" )
++ d->m_model = Model_iPAQ_H4xxx;
+
+ else
+ d->m_model = Model_Unknown;
+@@ -198,8 +202,10 @@
+ case Model_iPAQ_H36xx:
+ case Model_iPAQ_H37xx:
+ case Model_iPAQ_H39xx:
+- default:
+ d->m_rotation = Rot270;
++ break;
++ default:
++ d->m_rotation = Rot0;
+ break;
+
+ }
============================================================
--- packages/libopie/libopie2_1.2.3.bb 86a2c8573c9dddbb66193f829954a1b838df3d82
+++ packages/libopie/libopie2_1.2.3.bb 63a7fc0db1279bd05e64e2b06c6e583e83ec1cca
@@ -1,9 +1,10 @@ require ${PN}.inc
require ${PN}.inc
-PR = "r0"
+PR = "r2"
-SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
file://include.pro \
- file://gcc-syntax-fix.patch;patch=1"
+ file://gcc-syntax-fix.patch;patch=1 \
+ file://h4000_and_default_rot.patch;patch=1"
SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
============================================================
--- packages/linux/linux-handhelds-2.6/asus620/defconfig 5480504730606977c786cfa34c0e9262bef66fa6
+++ packages/linux/linux-handhelds-2.6/asus620/defconfig 25e597b7b4d198e03d0d13da080b7b6770a91494
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh16
-# Sun Sep 16 02:15:06 2007
+# Linux kernel version: 2.6.21-hh17
+# Sun Nov 11 00:39:25 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -267,13 +267,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_PXA=y
CONFIG_PXA25x_ALTERNATE_FREQS=y
============================================================
--- packages/linux/linux-handhelds-2.6/asus730/defconfig 5c3c278c9503d52d9e9adeaff6ec6532db522eaf
+++ packages/linux/linux-handhelds-2.6/asus730/defconfig 0e8d5cfdfde878a557606427897b95ca0ed89e05
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh16
-# Sun Sep 16 02:15:06 2007
+# Linux kernel version: 2.6.21-hh17
+# Sun Nov 11 00:39:26 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -273,13 +273,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_PXA=y
CONFIG_PXA25x_ALTERNATE_FREQS=y
============================================================
--- packages/linux/linux-handhelds-2.6/aximx50/defconfig cc980b7f191f98dae38e3615fde9934df38bfa88
+++ packages/linux/linux-handhelds-2.6/aximx50/defconfig c9f1e7f6d4d88ad1489c2bdefbf6c9c836997811
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh16
-# Sun Sep 16 02:15:07 2007
+# Linux kernel version: 2.6.21-hh17
+# Sun Nov 11 00:39:26 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -267,13 +267,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_PXA=y
CONFIG_PXA25x_ALTERNATE_FREQS=y
============================================================
--- packages/linux/linux-handhelds-2.6/eteng500/defconfig edaa277f640f1061e25ce562b0a9a59342fedd18
+++ packages/linux/linux-handhelds-2.6/eteng500/defconfig 48d4f15c17a3acca48375951fa650888b11328b0
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh16
-# Sun Sep 16 02:15:07 2007
+# Linux kernel version: 2.6.21-hh17
+# Sun Nov 11 00:39:27 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
============================================================
--- packages/linux/linux-handhelds-2.6/h1910/defconfig 20c90ba133927d7d99065280a8044d6a8621235f
+++ packages/linux/linux-handhelds-2.6/h1910/defconfig 4edecb50b9ccde22ac6f11152eb079e4ddee7f59
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh16
-# Sun Sep 16 02:15:08 2007
+# Linux kernel version: 2.6.21-hh17
+# Sun Nov 11 00:39:27 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -265,13 +265,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_PXA=y
CONFIG_PXA25x_ALTERNATE_FREQS=y
============================================================
--- packages/linux/linux-handhelds-2.6/h2200/defconfig 7b078b455805a66bc22b8e46860e19f8ab9c1e19
+++ packages/linux/linux-handhelds-2.6/h2200/defconfig be9ab6709d2cbacb25194cc8c418ef362d23cc83
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh16
-# Sun Sep 16 02:28:20 2007
+# Linux kernel version: 2.6.21-hh17
+# Sun Nov 11 00:39:28 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -273,13 +273,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_PXA=y
CONFIG_PXA25x_ALTERNATE_FREQS=y
============================================================
--- packages/linux/linux-handhelds-2.6/h3600/defconfig c7a2fb8616c663f28a606838169cf2a36163ddd5
+++ packages/linux/linux-handhelds-2.6/h3600/defconfig 062fd682e93b2be2952ce6cd369694e8b1ac98b4
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh16
-# Sun Sep 16 02:15:09 2007
+# Linux kernel version: 2.6.21-hh17
+# Sun Nov 11 00:39:28 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -245,13 +245,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_SA1110=y
#
============================================================
--- packages/linux/linux-handhelds-2.6/h3800/defconfig 03237e114b7c68ad6a403781104f7877e40db711
+++ packages/linux/linux-handhelds-2.6/h3800/defconfig 53c0db328030e9c261b3c25335a476e0382bf159
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh16
-# Sun Sep 16 02:15:09 2007
+# Linux kernel version: 2.6.21-hh17
+# Sun Nov 11 00:39:29 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -243,13 +243,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_SA1110=y
#
============================================================
--- packages/linux/linux-handhelds-2.6/h3900/defconfig 6f5f028e331ddd89c42af12cc613271fcf815b9b
+++ packages/linux/linux-handhelds-2.6/h3900/defconfig 8968beac1464c9ac3f49cd96ca6d44fe7d1a8f44
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh16
-# Sun Sep 16 02:15:10 2007
+# Linux kernel version: 2.6.21-hh17
+# Sun Nov 11 00:39:29 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -266,13 +266,13 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_PXA=%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rc1e310b63c858128195b8270be427146a86cbd75 -r8afe9578672a9f0739d21bb85aff532d4ffd2857
#
#
#
# add_file "packages/linux/linux-openmoko/gta-vibro-pwm-suspend.patch"
# content [16124a054cd4fc021edb33ec8252418f8e2684b8]
#
# add_file "packages/linux/linux-openmoko/gta02-sound.patch"
# content [dc9eb450c1546c84d1510d4b606a7ae621abedeb]
#
# add_file "packages/linux/linux-openmoko/iis-suspend.patch"
# content [32e149c8f956579350ce30b669ab7fcca71adc83]
#
# add_file "packages/linux/linux-openmoko/s3c24xx-pcm-suspend.patch"
# content [63da8560c9f0b0299c876f514a7d365a73e106ef]
#
# add_file "packages/linux/linux-openmoko/soc-core-suspend.patch"
# content [8c71c67eab5c1561242d0fa9f9646690b4adf530]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [f77e245ef0b0121bd27da5a99090503b3e4bd658]
# to [5042fe37776f355d5cf0a9f2c171ae0b34a9f9c0]
#
# patch "conf/machine/fic-gta02.conf"
# from [33570e2cd1fc3f48a20119d6de06621cd900b3ed]
# to [f42233c3d4edd1d5ef8baef9302ce69bfff8d4ec]
#
# patch "packages/linux/linux-openmoko/defconfig-2.6.22.5"
# from [9ce705f09c4f3ca5b6bf2e39a378fd35167af5e0]
# to [32e5ec1cebe56f60f3801d3cbcfe98120895d6ca]
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
# from [a346ec71a75efeddc7673df7f64fd3f4e8dbfad3]
# to [dc22701bab72ff440fe319db29a5b316f9f44f90]
#
============================================================
--- packages/linux/linux-openmoko/gta-vibro-pwm-suspend.patch 16124a054cd4fc021edb33ec8252418f8e2684b8
+++ packages/linux/linux-openmoko/gta-vibro-pwm-suspend.patch 16124a054cd4fc021edb33ec8252418f8e2684b8
@@ -0,0 +1,27 @@
+Index: linux-2.6.22/drivers/leds/leds-gta01.c
+===================================================================
+--- linux-2.6.22.orig/drivers/leds/leds-gta01.c 2007-11-09 16:27:03.000000000 +0000
++++ linux-2.6.22/drivers/leds/leds-gta01.c 2007-11-09 16:27:13.000000000 +0000
+@@ -33,6 +33,8 @@
+ struct s3c2410_pwm pwm;
+ };
+
++static int gta01vib_init_hw(struct gta01_vib_priv *vp);
++
+ static inline struct gta01_vib_priv *pdev_to_vpriv(struct platform_device *dev)
+ {
+ return platform_get_drvdata(dev);
+@@ -80,7 +82,13 @@
+
+ static int gta01vib_resume(struct platform_device *dev)
+ {
++ struct gta01_vib_priv *vp = pdev_to_vpriv(dev);
++
+ led_classdev_resume(>a01_vib_led);
++
++ if (vp->has_pwm)
++ gta01vib_init_hw(vp);
++
+ return 0;
+ }
+ #endif
============================================================
--- packages/linux/linux-openmoko/gta02-sound.patch dc9eb450c1546c84d1510d4b606a7ae621abedeb
+++ packages/linux/linux-openmoko/gta02-sound.patch dc9eb450c1546c84d1510d4b606a7ae621abedeb
@@ -0,0 +1,754 @@
+Index: linux-2.6.22/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.22/sound/soc/s3c24xx/neo1973_gta02_wm8753.c 2007-11-09 16:21:35.000000000 +0000
+@@ -0,0 +1,667 @@
++/*
++ * neo1973_gta02_wm8753.c -- SoC audio for Neo1973
++ *
++ * Copyright 2007 OpenMoko Inc
++ * Author: Graeme Gregory <graeme at openmoko.org>
++ * Copyright 2007 Wolfson Microelectronics PLC.
++ * Author: Graeme Gregory <linux at wolfsonmicro.com>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * Revision history
++ * 06th Nov 2007 Changed from GTA01 to GTA02
++ * 20th Jan 2007 Initial version.
++ * 05th Feb 2007 Rename all to Neo1973
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/timer.h>
++#include <linux/interrupt.h>
++#include <linux/platform_device.h>
++#include <linux/i2c.h>
++#include <sound/driver.h>
++#include <sound/core.h>
++#include <sound/pcm.h>
++#include <sound/soc.h>
++#include <sound/soc-dapm.h>
++
++#include <asm/mach-types.h>
++#include <asm/hardware/scoop.h>
++#include <asm/arch/regs-iis.h>
++#include <asm/arch/regs-clock.h>
++#include <asm/arch/regs-gpio.h>
++#include <asm/hardware.h>
++#include <asm/arch/audio.h>
++#include <asm/io.h>
++#include <asm/arch/spi-gpio.h>
++#include <asm/arch/regs-gpioj.h>
++#include <asm/arch/gta02.h>
++#include "../codecs/wm8753.h"
++#include "s3c24xx-pcm.h"
++#include "s3c24xx-i2s.h"
++
++/* define the scenarios */
++#define NEO_AUDIO_OFF 0
++#define NEO_GSM_CALL_AUDIO_HANDSET 1
++#define NEO_GSM_CALL_AUDIO_HEADSET 2
++#define NEO_GSM_CALL_AUDIO_BLUETOOTH 3
++#define NEO_STEREO_TO_SPEAKERS 4
++#define NEO_STEREO_TO_HEADPHONES 5
++#define NEO_CAPTURE_HANDSET 6
++#define NEO_CAPTURE_HEADSET 7
++#define NEO_CAPTURE_BLUETOOTH 8
++#define NEO_STEREO_TO_HANDSET_SPK 9
++
++static struct snd_soc_machine neo1973_gta02;
++
++static int neo1973_gta02_hifi_hw_params(struct snd_pcm_substream *substream,
++ struct snd_pcm_hw_params *params)
++{
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;
++ unsigned int pll_out = 0, bclk = 0;
++ int ret = 0;
++ unsigned long iis_clkrate;
++
++ iis_clkrate = s3c24xx_i2s_get_clockrate();
++
++ switch (params_rate(params)) {
++ case 8000:
++ case 16000:
++ pll_out = 12288000;
++ break;
++ case 48000:
++ bclk = WM8753_BCLK_DIV_4;
++ pll_out = 12288000;
++ break;
++ case 96000:
++ bclk = WM8753_BCLK_DIV_2;
++ pll_out = 12288000;
++ break;
++ case 11025:
++ bclk = WM8753_BCLK_DIV_16;
++ pll_out = 11289600;
++ break;
++ case 22050:
++ bclk = WM8753_BCLK_DIV_8;
++ pll_out = 11289600;
++ break;
++ case 44100:
++ bclk = WM8753_BCLK_DIV_4;
++ pll_out = 11289600;
++ break;
++ case 88200:
++ bclk = WM8753_BCLK_DIV_2;
++ pll_out = 11289600;
++ break;
++ }
++
++ /* set codec DAI configuration */
++ ret = codec_dai->dai_ops.set_fmt(codec_dai,
++ SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
++ SND_SOC_DAIFMT_CBM_CFM);
++ if (ret < 0)
++ return ret;
++
++ /* set cpu DAI configuration */
++ ret = cpu_dai->dai_ops.set_fmt(cpu_dai,
++ SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
++ SND_SOC_DAIFMT_CBM_CFM);
++ if (ret < 0)
++ return ret;
++
++ /* set the codec system clock for DAC and ADC */
++ ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_MCLK, pll_out,
++ SND_SOC_CLOCK_IN);
++ if (ret < 0)
++ return ret;
++
++ /* set MCLK division for sample rate */
++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK,
++ S3C2410_IISMOD_32FS );
++ if (ret < 0)
++ return ret;
++
++ /* set codec BCLK division for sample rate */
++ ret = codec_dai->dai_ops.set_clkdiv(codec_dai,
++ WM8753_BCLKDIV, bclk);
++ if (ret < 0)
++ return ret;
++
++ /* set prescaler division for sample rate */
++ ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_PRESCALER,
++ S3C24XX_PRESCALE(4,4));
++ if (ret < 0)
++ return ret;
++
++ /* codec PLL input is PCLK/4 */
++ ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1,
++ iis_clkrate / 4, pll_out);
++ if (ret < 0)
++ return ret;
++
++ return 0;
++}
++
++static int neo1973_gta02_hifi_hw_free(struct snd_pcm_substream *substream)
++{
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
++
++ /* disable the PLL */
++ return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1, 0, 0);
++}
++
++/*
++ * Neo1973 WM8753 HiFi DAI opserations.
++ */
++static struct snd_soc_ops neo1973_gta02_hifi_ops = {
++ .hw_params = neo1973_gta02_hifi_hw_params,
++ .hw_free = neo1973_gta02_hifi_hw_free,
++};
++
++static int neo1973_gta02_voice_hw_params(
++ struct snd_pcm_substream *substream,
++ struct snd_pcm_hw_params *params)
++{
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
++ unsigned int pcmdiv = 0;
++ int ret = 0;
++ unsigned long iis_clkrate;
++
++ iis_clkrate = s3c24xx_i2s_get_clockrate();
++
++ if (params_rate(params) != 8000)
++ return -EINVAL;
++ if (params_channels(params) != 1)
++ return -EINVAL;
++
++ pcmdiv = WM8753_PCM_DIV_6; /* 2.048 MHz */
++
++ /* todo: gg check mode (DSP_B) against CSR datasheet */
++ /* set codec DAI configuration */
++ ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B |
++ SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
++ if (ret < 0)
++ return ret;
++
++ /* set the codec system clock for DAC and ADC */
++ ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_PCMCLK,
++ 12288000, SND_SOC_CLOCK_IN);
++ if (ret < 0)
++ return ret;
++
++ /* set codec PCM division for sample rate */
++ ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8753_PCMDIV,
++ pcmdiv);
++ if (ret < 0)
++ return ret;
++
++ /* configue and enable PLL for 12.288MHz output */
++ ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2,
++ iis_clkrate / 4, 12288000);
++ if (ret < 0)
++ return ret;
++
++ return 0;
++}
++
++static int neo1973_gta02_voice_hw_free(struct snd_pcm_substream *substream)
++{
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
++
++ /* disable the PLL */
++ return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2, 0, 0);
++}
++
++static struct snd_soc_ops neo1973_gta02_voice_ops = {
++ .hw_params = neo1973_gta02_voice_hw_params,
++ .hw_free = neo1973_gta02_voice_hw_free,
++};
++
++#define LM4853_AMP 1
++#define LM4853_SPK 2
++
++static u8 lm4853_state=0;
++
++static int lm4853_set_state(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ int val = ucontrol->value.integer.value[0];
++
++ if(val) {
++ lm4853_state |= LM4853_AMP;
++ s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT,0);
++ } else {
++ lm4853_state &= ~LM4853_AMP;
++ s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT,1);
++ }
++
++ return 0;
++}
++
++static int lm4853_get_state(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ ucontrol->value.integer.value[0] = lm4853_state & LM4853_AMP;
++
++ return 0;
++}
++
++static int lm4853_set_spk(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ int val = ucontrol->value.integer.value[0];
++
++ if(val) {
++ lm4853_state |= LM4853_SPK;
++ s3c2410_gpio_setpin(GTA02_GPIO_HP_IN,0);
++ } else {
++ lm4853_state &= ~LM4853_SPK;
++ s3c2410_gpio_setpin(GTA02_GPIO_HP_IN,1);
++ }
++
++ return 0;
++}
++
++static int lm4853_get_spk(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ ucontrol->value.integer.value[0] = (lm4853_state & LM4853_AMP) >> 1;
++
++ return 0;
++}
++
++static int neo1973_gta02_set_stereo_out(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++ int val = ucontrol->value.integer.value[0];
++
++ snd_soc_dapm_set_endpoint(codec, "Stereo Out", val);
++
++ snd_soc_dapm_sync_endpoints(codec);
++
++ return 0;
++}
++
++static int neo1973_gta02_get_stereo_out(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++
++ ucontrol->value.integer.value[0] =
++ snd_soc_dapm_get_endpoint(codec, "Stereo Out");
++
++ return 0;
++}
++
++
++static int neo1973_gta02_set_gsm_out(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++ int val = ucontrol->value.integer.value[0];
++
++ snd_soc_dapm_set_endpoint(codec, "GSM Line Out", val);
++
++ snd_soc_dapm_sync_endpoints(codec);
++
++ return 0;
++}
++
++static int neo1973_gta02_get_gsm_out(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++
++ ucontrol->value.integer.value[0] =
++ snd_soc_dapm_get_endpoint(codec, "GSM Line Out");
++
++ return 0;
++}
++
++static int neo1973_gta02_set_gsm_in(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++ int val = ucontrol->value.integer.value[0];
++
++ snd_soc_dapm_set_endpoint(codec, "GSM Line In", val);
++
++ snd_soc_dapm_sync_endpoints(codec);
++
++ return 0;
++}
++
++static int neo1973_gta02_get_gsm_in(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++
++ ucontrol->value.integer.value[0] =
++ snd_soc_dapm_get_endpoint(codec, "GSM Line In");
++
++ return 0;
++}
++
++static int neo1973_gta02_set_headset_mic(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++ int val = ucontrol->value.integer.value[0];
++
++ snd_soc_dapm_set_endpoint(codec, "Headset Mic", val);
++
++ snd_soc_dapm_sync_endpoints(codec);
++
++ return 0;
++}
++
++static int neo1973_gta02_get_headset_mic(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++
++ ucontrol->value.integer.value[0] =
++ snd_soc_dapm_get_endpoint(codec, "Headset Mic");
++
++ return 0;
++}
++
++static int neo1973_gta02_set_handset_mic(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++ int val = ucontrol->value.integer.value[0];
++
++ snd_soc_dapm_set_endpoint(codec, "Handset Mic", val);
++
++ snd_soc_dapm_sync_endpoints(codec);
++
++ return 0;
++}
++
++static int neo1973_gta02_get_handset_mic(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++
++ ucontrol->value.integer.value[0] =
++ snd_soc_dapm_get_endpoint(codec, "Handset Mic");
++
++ return 0;
++}
++
++static int neo1973_gta02_set_handset_spk(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++ int val = ucontrol->value.integer.value[0];
++
++ snd_soc_dapm_set_endpoint(codec, "Handset Spk", val);
++
++ snd_soc_dapm_sync_endpoints(codec);
++
++ return 0;
++}
++
++static int neo1973_gta02_get_handset_spk(struct snd_kcontrol *kcontrol,
++ struct snd_ctl_elem_value *ucontrol)
++{
++ struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
++
++ ucontrol->value.integer.value[0] =
++ snd_soc_dapm_get_endpoint(codec, "Handset Spk");
++
++ return 0;
++}
++
++static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
++ SND_SOC_DAPM_LINE("Stereo Out", NULL),
++ SND_SOC_DAPM_LINE("GSM Line Out", NULL),
++ SND_SOC_DAPM_LINE("GSM Line In", NULL),
++ SND_SOC_DAPM_MIC("Headset Mic", NULL),
++ SND_SOC_DAPM_MIC("Handset Mic", NULL),
++ SND_SOC_DAPM_SPK("Handset Spk", NULL),
++};
++
++
++/* example machine audio_mapnections */
++static const char* audio_map[][3] = {
++
++ /* Connections to the lm4853 amp */
++ {"Stereo Out", NULL, "LOUT1"},
++ {"Stereo Out", NULL, "ROUT1"},
++
++ /* Connections to the GSM Module */
++ {"GSM Line Out", NULL, "MONO1"},
++ {"GSM Line Out", NULL, "MONO2"},
++ {"RXP", NULL, "GSM Line In"},
++ {"RXN", NULL, "GSM Line In"},
++
++ /* Connections to Headset */
++ {"MIC1", NULL, "Mic Bias"},
++ {"Mic Bias", NULL, "Headset Mic"},
++
++ /* Call Mic */
++ {"MIC2", NULL, "Mic Bias"},
++ {"MIC2N", NULL, "Mic Bias"},
++ {"Mic Bias", NULL, "Handset Mic"},
++
++ /* Call Speaker */
++ {"Handset Spk", NULL, "LOUT2"},
++ {"Handset Spk", NULL, "ROUT2"},
++
++ /* Connect the ALC pins */
++ {"ACIN", NULL, "ACOP"},
++
++ {NULL, NULL, NULL},
++};
++
++static const struct snd_kcontrol_new wm8753_neo1973_gta02_controls[] = {
++ SOC_SINGLE_EXT("DAPM Stereo Out Switch", 0, 0, 1, 0,
++ neo1973_gta02_get_stereo_out,
++ neo1973_gta02_set_stereo_out),
++ SOC_SINGLE_EXT("DAPM GSM Line Out Switch", 1, 0, 1, 0,
++ neo1973_gta02_get_gsm_out,
++ neo1973_gta02_set_gsm_out),
++ SOC_SINGLE_EXT("DAPM GSM Line In Switch", 2, 0, 1, 0,
++ neo1973_gta02_get_gsm_in,
++ neo1973_gta02_set_gsm_in),
++ SOC_SINGLE_EXT("DAPM Headset Mic Switch", 3, 0, 1, 0,
++ neo1973_gta02_get_headset_mic,
++ neo1973_gta02_set_headset_mic),
++ SOC_SINGLE_EXT("DAPM Handset Mic Switch", 4, 0, 1, 0,
++ neo1973_gta02_get_handset_mic,
++ neo1973_gta02_set_handset_mic),
++ SOC_SINGLE_EXT("DAPM Handset Spk Switch", 5, 0, 1, 0,
++ neo1973_gta02_get_handset_spk,
++ neo1973_gta02_set_handset_spk),
++ %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list