[oe-commits] org.oe.dev merge of '586ec17f18bdda716ffd9874de3224e053eedf13'
xora commit
openembedded-commits at lists.openembedded.org
Fri Mar 7 10:46:16 UTC 2008
merge of '586ec17f18bdda716ffd9874de3224e053eedf13'
and 'b7110cfd27ca2bf8f5d938f1e4ffcaaa6468ea4d'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: b6cd024b4842d4bc6006549f1ea6cf823b448660
ViewMTN: http://monotone.openembedded.org/revision/info/b6cd024b4842d4bc6006549f1ea6cf823b448660
Files:
1
packages/linux/linux-rp-2.6.24/tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch
packages/linux/linux-rp-2.6.24/tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch
packages/linux/linux-rp-2.6.24/tosa/0003-Core-MFD-support.patch
packages/linux/linux-rp-2.6.24/tosa/0004-Add-support-for-tc6393xb-MFD-core.patch
packages/linux/linux-rp-2.6.24/tosa/0005-Add-support-for-tc6387xb-MFD-core.patch
packages/linux/linux-rp-2.6.24/tosa/0006-Add-support-for-t7l66xb-MFD-core.patch
packages/linux/linux-rp-2.6.24/tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch
packages/linux/linux-rp-2.6.24/tosa/0008-Nand-driver-for-TMIO-devices.patch
packages/linux/linux-rp-2.6.24/tosa/0009-FB-driver-for-TMIO-devices.patch
packages/linux/linux-rp-2.6.24/tosa/0010-OHCI-driver-for-TMIO-devices.patch
packages/linux/linux-rp-2.6.24/tosa/0011-MMC-driver-for-TMIO-devices.patch
packages/linux/linux-rp-2.6.24/tosa/0012-Tosa-keyboard-support.patch
packages/linux/linux-rp-2.6.24/tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch
packages/linux/linux-rp-2.6.24/tosa/0014-tosa_udc_use_gpio_vbus.patch.patch
packages/linux/linux-rp-2.6.24/tosa/0015-sharpsl-export-params.patch
packages/linux/linux-rp-2.6.24/tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch
packages/linux/linux-rp-2.6.24/tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch
packages/linux/linux-rp-2.6.24/tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch
packages/linux/linux-rp-2.6.24/tosa/0019-pxa-remove-periodic-mode-emulation-support.patch
packages/linux/linux-rp-2.6.24/tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch
packages/linux/linux-rp-2.6.24/tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch
packages/linux/linux-rp-2.6.24/tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch
packages/linux/linux-rp-2.6.24/tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch
packages/linux/linux-rp-2.6.24/tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch
packages/linux/linux-rp-2.6.24/tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch
packages/linux/linux-rp-2.6.24/tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch
packages/linux/linux-rp-2.6.24/tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch
packages/linux/linux-rp-2.6.24/tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch
packages/linux/linux-rp-2.6.24/tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch
packages/linux/linux-rp-2.6.24/tosa/0030-Core-driver-for-WM97xx-touchscreens.patch
packages/linux/linux-rp-2.6.24/tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch
packages/linux/linux-rp-2.6.24/tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch
packages/linux/linux-rp-2.6.24/tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch
packages/linux/linux-rp-2.6.24/tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch
packages/linux/linux-rp-2.6.24/tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch
packages/linux/linux-rp-2.6.24/tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch
packages/linux/linux-rp-2.6.24/tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch
packages/linux/linux-rp-2.6.24/tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch
packages/linux/linux-rp-2.6.24/tosa/0039-Add-generic-framework-for-managing-clocks.patch
packages/linux/linux-rp-2.6.24/tosa/0040-Clocklib-debugfs-support.patch
packages/linux/linux-rp-2.6.24/tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch
packages/linux/linux-rp-2.6.24/tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch
packages/linux/linux-rp-2.6.24/tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch
packages/linux/linux-rp-2.6.24/tosa/0044-fix-tmio_mmc-debug-compilation.patch
packages/linux/linux-rp-2.6.24/tosa/0045-Update-tmio_ohci.patch
packages/linux/linux-rp-2.6.24/tosa/0046-patch-tc6393xb-cleanup.patch
packages/linux/linux-rp-2.6.24/tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch
packages/linux/linux-rp-2.6.24/tosa/0048-tc6393xb-GPIO-support.patch
packages/linux/linux-rp-2.6.24/tosa/0049-platform-support-for-TMIO-on-tosa.patch
packages/linux/linux-rp-2.6.24/tosa/0050-tosa-update-for-tc6393xb-gpio.patch
packages/linux/linux-rp-2.6.24/tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch
packages/linux/linux-rp-2.6.24/tosa/0052-tosa-platform-backlight-support.patch
packages/linux/linux-rp-2.6.24/tosa/0053-sound-soc-codecs-wm9712.c-28.patch
packages/linux/linux-rp-2.6.24/tosa/0054-sound-soc-codecs-wm9712.c-2.patch
packages/linux/linux-rp-2.6.24/tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch
packages/linux/linux-rp-2.6.24/tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch
packages/linux/linux-rp-2.6.24/tosa/0057-Clean-up-tosa-resetting.patch
packages/linux/linux-rp-2.6.24/tosa/0058-Fix-tosakbd-suspend.patch
packages/linux/linux-rp-2.6.24/tosa/0059-patch-tosa-wakeup-test.patch
packages/linux/linux-rp-2.6.24/tosa/0060-Add-support-for-power_supply-on-tosa.patch
packages/linux/linux-rp-2.6.24/tosa/0061-tosa-bat-unify.patch
packages/linux/linux-rp-2.6.24/tosa/0062-tosa-bat-fix-charging.patch
packages/linux/linux-rp-2.6.24/tosa/0063-patch-tosa-bat-jacket-detect.patch
packages/linux/linux-rp-2.6.24/tosa/0064-Export-modes-via-sysfs.patch
packages/linux/linux-rp-2.6.24/tosa/0065-wm97xx-core-fixes.patch
packages/linux/linux-rp-2.6.24/tosa/0066-tmiofb_probe-should-be-__devinit.patch
packages/linux/linux-rp-2.6.24/tosa/0067-modeswitching.patch
packages/linux/linux-rp-2.6.24/tosa/0068-Preliminary-tosa-denoiser.patch
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
conf/distro/include/preferred-om-2008-versions.inc
Diffs:
#
# mt diff -r586ec17f18bdda716ffd9874de3224e053eedf13 -rb6cd024b4842d4bc6006549f1ea6cf823b448660
#
#
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch"
# content [05291e8e8e355e5955f2d86aa227f1a79c436f53]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0002-Modify-dma_alloc_coherent-on-ARM-so-that-it-supports.patch"
# content [02369f2518531611a94fea23f03b5b9e7d954009]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0003-Core-MFD-support.patch"
# content [e1a57b95e7ece7fa5fdec0d4471599e37393c9ce]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0004-Add-support-for-tc6393xb-MFD-core.patch"
# content [8909278c9293c7284d352f646c2311846bad0165]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0005-Add-support-for-tc6387xb-MFD-core.patch"
# content [c247cfd6f8918d031abb807e674296447e70af08]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0006-Add-support-for-t7l66xb-MFD-core.patch"
# content [72a5c23529ee38b47e911469b2c3fbaace1203e2]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0007-Common-headers-for-TMIO-MFD-subdevices.patch"
# content [7f9b1176449c439c69db333e16eee0c4c5586469]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0008-Nand-driver-for-TMIO-devices.patch"
# content [d5fece6c2510982f343e4efde1e569786f04d84b]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0009-FB-driver-for-TMIO-devices.patch"
# content [29f09715c4f5f1e3316653f657ec0b5eb0c819ac]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0010-OHCI-driver-for-TMIO-devices.patch"
# content [65db2b022d960f778d1901894887acce8ff35533]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0011-MMC-driver-for-TMIO-devices.patch"
# content [6f8c45acf7bf0949145ca804791488f0584b1633]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0012-Tosa-keyboard-support.patch"
# content [60731e76a5171d5e87d8496f5090592c820ab529]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0013-USB-gadget-pxa2xx_udc-supports-inverted-vbus.patch"
# content [752a61c2113098bc0523e80bb2d0a4d3ec80c4a4]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0014-tosa_udc_use_gpio_vbus.patch.patch"
# content [c76511e1be4977e94fbd46bd00ed5ca11a4df689]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0015-sharpsl-export-params.patch"
# content [95c8f67735b1eefbfadfca38a9b7b7fea221eea7]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0016-This-patch-fixes-the-pxa25x-clocks-definitions-to-ad.patch"
# content [8ffb40f52d93a479373c4388b2e669aaed21ba63]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0017-Convert-pxa2xx-UDC-to-use-debugfs.patch"
# content [d9e757ae69c16831623ec057513d64d0a9bf8212]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0018-Fix-the-pxa2xx_udc-to-balance-calls-to-clk_enable-cl.patch"
# content [48664b02e020f219f7010b4ce121a6a375f4080a]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0019-pxa-remove-periodic-mode-emulation-support.patch"
# content [b47ebe52595789fe4b902ba277223372d6620478]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0020-Provide-dew-device-clock-backports-from-2.6.24-git.patch"
# content [0129e7721f1786f55dc636abd3ad6f01bc302d6e]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0021-Add-an-empty-drivers-gpio-directory-for-gpiolib-infr.patch"
# content [a42f41cff1720fa81af3027f7b77013723b4f1a8]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0022-Provide-new-implementation-infrastructure-that-platf.patch"
# content [e9473b898a4ca1f5ba0bce7d845f82475188b979]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0023-This-adds-gpiolib-support-for-the-PXA-architecture.patch"
# content [bd43eced6dc834819ed60a2d24a771dd460a744e]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0024-Update-Documentation-gpio.txt-primarily-to-include.patch"
# content [91a4e3b7b6154a29d1931a8f9c677fc1eb9cc1d3]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0025-Signed-off-by-Dmitry-Baryshkov-dbaryshkov-gmail.co.patch"
# content [d912abd50c5a712059710ed53ee3b521cf28904f]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0026-I-don-t-think-we-should-check-for-IRQs-when-determin.patch"
# content [4443173866eff6d6f9cb85089cd5e66ec9d7085b]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0027-Add-LiMn-one-of-the-most-common-for-small-non-recha.patch"
# content [f3dfd161f8cc5fec2ba319d42308f95a6b670e39]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0028-Add-suspend-resume-wakeup-support-for-pda_power.patch"
# content [4094cb5b98d72fba7f2bb8911fec918f2447121c]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0029-Support-using-VOLTAGE_-properties-for-apm-calculati.patch"
# content [49075f0c5452da02692a5399130001f1816bf643]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0030-Core-driver-for-WM97xx-touchscreens.patch"
# content [5f05bee568c15dbb5ceec6727693ba0cca25694f]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0031-Add-chip-driver-for-WM9705-touchscreen.patch"
# content [e9be72ef1b500a20cea4af456cd339961e5081df]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0032-Add-chip-driver-for-WM9712-touchscreen.patch"
# content [d01a2eef8bf4ff2f78cce92fabcb99883d700c1c]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0033-Add-chip-driver-for-WM9713-touchscreen.patch"
# content [7227d3360f4b2523346819b3949c9bdb641216c3]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0034-Driver-for-WM97xx-touchscreens-in-streaming-mode-on.patch"
# content [278a32be6add69121a505c402c8daeadbb42ca14]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0035-Build-system-and-MAINTAINERS-entry-for-WM97xx-touchs.patch"
# content [1b3f64f3e71cb64bc3481e150249c557aa278a00]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0036-Set-id-to-1-for-wm97xx-subdevices.patch"
# content [b2e322657173a0b90a81a2abb6f3cb56b2e09a3e]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0037-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch"
# content [da5c1c5b82f9ebff9b43b2ed6c5d0f83d2347a66]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0038-Don-t-lock-the-codec-list-in-snd_soc_dapm_new_widget.patch"
# content [299f3a0e5ffe6a0bfef8225a5d765368aff71d89]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0039-Add-generic-framework-for-managing-clocks.patch"
# content [394b02cce3e969ffdd8fc70c3de5fd5a11649a76]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0040-Clocklib-debugfs-support.patch"
# content [9bb15aea1d4137b26ef43fd99591267a78cfd90d]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0041-From-80a359e60c2aec59ccf4fca0a7fd20495f82b1d2-Mon-Se.patch"
# content [20778e4502d9ca30f96599dd228619c254823375]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0042-Use-correct-clock-for-IrDA-on-pxa.patch"
# content [af2635bd05b4501a10ea1b61636f42b031fbdfcf]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0043-Use-clocklib-for-sa1100-sub-arch.patch"
# content [d7b0f30da5e043507d681858a0f70b480b7fa798]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0044-fix-tmio_mmc-debug-compilation.patch"
# content [9536515ebbc0c42f00ad442c65ad9ee05cbf8379]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0045-Update-tmio_ohci.patch"
# content [d275d35e95c5ff284134ed5bf7e387dceeb05c8b]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0046-patch-tc6393xb-cleanup.patch"
# content [a57d83a536fc535b7800af1b44e43d8ad63f413b]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0047-tc6393xb-use-bitmasks-instead-of-bit-field-structs.patch"
# content [4b734d45298106e32805cda210ed379a09dc328b]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0048-tc6393xb-GPIO-support.patch"
# content [b63f75550e2f125e50e83f43941f4b8f10e502eb]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0049-platform-support-for-TMIO-on-tosa.patch"
# content [03f338292da03ab4115167ab85aa81d9ad8b72b1]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0050-tosa-update-for-tc6393xb-gpio.patch"
# content [ec7e5a376e9a50fa5680a886119b98498fbb9348]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0051-fix-sound-soc-pxa-tosa.c-to-new-gpio-api.patch"
# content [1d395c1cde40b58520b6ed0a43815fdd9f9c18f1]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0052-tosa-platform-backlight-support.patch"
# content [d992b13790a47f23fc5dd7007edad6a772a08ea6]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0053-sound-soc-codecs-wm9712.c-28.patch"
# content [1ef8c9520a6fb9b83f0f5c41d4986a4b2257421c]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0054-sound-soc-codecs-wm9712.c-2.patch"
# content [c08d3697672796439a5c32db6fc2cf5febfca489]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0055-Add-GPIO_POWERON-to-the-list-of-devices-that-we-supp.patch"
# content [dc696444e6c69127c8209f153c68f56647ef8b48]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0056-Support-resetting-by-asserting-GPIO-pin.patch"
# content [41b8a54ccc4d2c9f9e333c3376fc39441dfd62d3]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0057-Clean-up-tosa-resetting.patch"
# content [89ea6baacb3497f3ecd45ee45aa5991c0474e3ae]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0058-Fix-tosakbd-suspend.patch"
# content [a61ca5ed6db0aab214d0e7c4d1011d81117d848e]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0059-patch-tosa-wakeup-test.patch"
# content [0e8b6ca581771272a7c103b066a9925b8596fc06]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0060-Add-support-for-power_supply-on-tosa.patch"
# content [2c6e7f1dabce1930b44eedd3baef821cd933b8c5]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0061-tosa-bat-unify.patch"
# content [6df3860e3b73cf66aa7717d120004355b444cd85]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0062-tosa-bat-fix-charging.patch"
# content [463a3127e4bd387670c35489f14d7d20d7100298]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0063-patch-tosa-bat-jacket-detect.patch"
# content [9d5e2706e5cc49ef9838bc3380d49fc318af6f4e]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0064-Export-modes-via-sysfs.patch"
# content [27d5386b95eef1a74b22817b9a534d87904e9efd]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0065-wm97xx-core-fixes.patch"
# content [ebd16a6cd4def27e0fb1084ab3dabeff2dd7092d]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0066-tmiofb_probe-should-be-__devinit.patch"
# content [7aaa36a4d2e01fee0279e8d544b739f364dfcd30]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0067-modeswitching.patch"
# content [3633075a59da83ccb0df852282d44af659a94caf]
#
# add_file "packages/linux/linux-rp-2.6.24/tosa/0068-Preliminary-tosa-denoiser.patch"
# content [7a466562270f5779c37e3326ce6870cd4caf3e11]
#
============================================================
--- packages/linux/linux-rp-2.6.24/tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch 05291e8e8e355e5955f2d86aa227f1a79c436f53
+++ packages/linux/linux-rp-2.6.24/tosa/0001-Allow-runtime-registration-of-regions-of-memory-that.patch 05291e8e8e355e5955f2d86aa227f1a79c436f53
@@ -0,0 +1,201 @@
+From d48a09b301d9a460d5ce027433e8cb8872e7b5c3 Mon Sep 17 00:00:00 2001
+From: Ian Molton <spyro at f2s.com>
+Date: Fri, 4 Jan 2008 18:26:38 +0000
+Subject: [PATCH 01/64] Allow runtime registration of regions of memory that require dma bouncing.
+
+---
+ arch/arm/common/Kconfig | 4 ++
+ arch/arm/common/dmabounce.c | 82 ++++++++++++++++++++++++++++++++++++-
+ arch/arm/common/sa1111.c | 2 +-
+ arch/arm/mach-ixp4xx/Kconfig | 1 +
+ arch/arm/mach-ixp4xx/common-pci.c | 2 +-
+ 5 files changed, 87 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
+index 3e07346..5f357fb 100644
+--- a/arch/arm/common/Kconfig
++++ b/arch/arm/common/Kconfig
+@@ -13,10 +13,14 @@ config ICST307
+ config SA1111
+ bool
+ select DMABOUNCE
++ select PLATFORM_DMABOUNCE
+
+ config DMABOUNCE
+ bool
+
++config PLATFORM_DMABOUNCE
++ bool
++
+ config TIMER_ACORN
+ bool
+
+diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
+index 52fc6a8..ed80abe 100644
+--- a/arch/arm/common/dmabounce.c
++++ b/arch/arm/common/dmabounce.c
+@@ -16,6 +16,7 @@
+ *
+ * Copyright (C) 2002 Hewlett Packard Company.
+ * Copyright (C) 2004 MontaVista Software, Inc.
++ * Copyright (C) 2007 Dmitry Baryshkov <dbaryshkov at gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+@@ -24,6 +25,7 @@
+
+ #include <linux/module.h>
+ #include <linux/init.h>
++#include <linux/rwsem.h>
+ #include <linux/slab.h>
+ #include <linux/device.h>
+ #include <linux/dma-mapping.h>
+@@ -80,6 +82,80 @@ struct dmabounce_device_info {
+ rwlock_t lock;
+ };
+
++struct dmabounce_check_entry {
++ struct list_head list;
++ dmabounce_check checker;
++ void *data;
++};
++
++static struct list_head checkers = LIST_HEAD_INIT(checkers);
++static rwlock_t checkers_lock = RW_LOCK_UNLOCKED;
++
++int
++dmabounce_register_checker(dmabounce_check function, void *data)
++{
++ unsigned long flags;
++ struct dmabounce_check_entry *entry =
++ kzalloc(sizeof(struct dmabounce_check_entry), GFP_ATOMIC);
++
++ if (!entry)
++ return ENOMEM;
++
++ INIT_LIST_HEAD(&entry->list);
++ entry->checker = function;
++ entry->data = data;
++
++ write_lock_irqsave(&checkers_lock, flags);
++ list_add(&entry->list, &checkers);
++ write_unlock_irqrestore(&checkers_lock, flags);
++
++ return 0;
++}
++
++void
++dmabounce_remove_checker(dmabounce_check function, void *data)
++{
++ unsigned long flags;
++ struct list_head *pos;
++
++ write_lock_irqsave(&checkers_lock, flags);
++ __list_for_each(pos, &checkers) {
++ struct dmabounce_check_entry *entry = container_of(pos,
++ struct dmabounce_check_entry, list);
++ if (entry->checker == function && entry->data == data) {
++ list_del(pos);
++ write_unlock_irqrestore(&checkers_lock, flags);
++ kfree(entry);
++ return;
++ }
++ }
++
++ write_unlock_irqrestore(&checkers_lock, flags);
++ printk(KERN_WARNING "dmabounce checker not found: %p\n", function);
++}
++
++static int dma_needs_bounce(struct device *dev, dma_addr_t dma, size_t size)
++{
++ unsigned long flags;
++ struct list_head *pos;
++
++ read_lock_irqsave(&checkers_lock, flags);
++ __list_for_each(pos, &checkers) {
++ struct dmabounce_check_entry *entry = container_of(pos,
++ struct dmabounce_check_entry, list);
++ if (entry->checker(dev, dma, size, entry->data)) {
++ read_unlock_irqrestore(&checkers_lock, flags);
++ return 1;
++ }
++ }
++
++ read_unlock_irqrestore(&checkers_lock, flags);
++#ifdef CONFIG_PLATFORM_DMABOUNCE
++ return platform_dma_needs_bounce(dev, dma, size);
++#else
++ return 0;
++#endif
++}
+ #ifdef STATS
+ static ssize_t dmabounce_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+@@ -239,7 +315,7 @@ map_single(struct device *dev, void *ptr, size_t size,
+ struct safe_buffer *buf;
+
+ buf = alloc_safe_buffer(device_info, ptr, size, dir);
+- if (buf == 0) {
++ if (buf == NULL) {
+ dev_err(dev, "%s: unable to map unsafe buffer %p!\n",
+ __func__, ptr);
+ return 0;
+@@ -643,7 +719,6 @@ dmabounce_unregister_dev(struct device *dev)
+ dev->bus_id, dev->bus->name);
+ }
+
+-
+ EXPORT_SYMBOL(dma_map_single);
+ EXPORT_SYMBOL(dma_unmap_single);
+ EXPORT_SYMBOL(dma_map_sg);
+@@ -653,6 +728,9 @@ EXPORT_SYMBOL(dma_sync_single_for_device);
+ EXPORT_SYMBOL(dma_sync_sg);
+ EXPORT_SYMBOL(dmabounce_register_dev);
+ EXPORT_SYMBOL(dmabounce_unregister_dev);
++EXPORT_SYMBOL(dmabounce_register_checker);
++EXPORT_SYMBOL(dmabounce_remove_checker);
++
+
+ MODULE_AUTHOR("Christopher Hoover <ch at hpl.hp.com>, Deepak Saxena <dsaxena at plexity.net>");
+ MODULE_DESCRIPTION("Special dma_{map/unmap/dma_sync}_* routines for systems with limited DMA windows");
+diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
+index eb06d0b..3b8fbdd 100644
+--- a/arch/arm/common/sa1111.c
++++ b/arch/arm/common/sa1111.c
+@@ -778,7 +778,7 @@ static void __sa1111_remove(struct sa1111 *sachip)
+ * This should only get called for sa1111_device types due to the
+ * way we configure our device dma_masks.
+ */
+-int dma_needs_bounce(struct device *dev, dma_addr_t addr, size_t size)
++int platform_dma_needs_bounce(struct device *dev, dma_addr_t addr, size_t size)
+ {
+ /*
+ * Section 4.6 of the "Intel StrongARM SA-1111 Development Module
+diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
+index 61b2dfc..5870371 100644
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig
+@@ -161%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rb7110cfd27ca2bf8f5d938f1e4ffcaaa6468ea4d -rb6cd024b4842d4bc6006549f1ea6cf823b448660
#
#
#
# patch "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
# from [6d3aaaaa7a79cacb60e353fc0bd6e8a27dc724c3]
# to [ae4988778be75b17285f062feec134dc23ae432f]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [e76b4f1d90a877c2f946524c27d7e7035df3d66b]
# to [ec064cf6915151b8ae2e72c80c9b0b938053ada1]
#
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko-versions.inc 6d3aaaaa7a79cacb60e353fc0bd6e8a27dc724c3
+++ conf/distro/include/angstrom-2007-for-openmoko-versions.inc ae4988778be75b17285f062feec134dc23ae432f
@@ -224,12 +224,12 @@ PREFERRED_VERSION_db3-native ?= "3.2.9"
PREFERRED_VERSION_db-native ?= "4.3.29"
PREFERRED_VERSION_db3 ?= "3.2.9"
PREFERRED_VERSION_db3-native ?= "3.2.9"
-PREFERRED_VERSION_dbench ?= "3.04"
+PREFERRED_VERSION_dbench ?= "4.0"
PREFERRED_VERSION_dbh ?= "1.0-18"
PREFERRED_VERSION_dbus ?= "1.0.2"
PREFERRED_VERSION_dbus-glib ?= "0.74"
PREFERRED_VERSION_dbus-glib-native ?= "0.74"
-PREFERRED_VERSION_dbus-native ?= "1.0.1"
+PREFERRED_VERSION_dbus-native ?= "1.0.3"
PREFERRED_VERSION_dbus-python ?= "0.71"
PREFERRED_VERSION_dcetest ?= "1.2"
PREFERRED_VERSION_dcopidl-native ?= "3.5.4"
@@ -884,7 +884,7 @@ PREFERRED_VERSION_libgc ?= "6.7"
PREFERRED_VERSION_libg15render ?= "1.2"
PREFERRED_VERSION_libgalago ?= "0.3.3"
PREFERRED_VERSION_libgc ?= "6.7"
-PREFERRED_VERSION_libgcrypt ?= "1.2.3"
+PREFERRED_VERSION_libgcrypt ?= "1.4.0"
PREFERRED_VERSION_libgeda ?= "20050820"
PREFERRED_VERSION_libgemwidget ?= "1.0"
PREFERRED_VERSION_libglade ?= "2.6.2"
@@ -985,7 +985,7 @@ PREFERRED_VERSION_libparams-validate-per
PREFERRED_VERSION_libparams-util-perl-native ?= "0.20"
PREFERRED_VERSION_libparams-validate-perl ?= "0.86"
PREFERRED_VERSION_libparams-validate-perl-native ?= "0.86"
-PREFERRED_VERSION_libpcap ?= "0.9.6"
+PREFERRED_VERSION_libpcap ?= "0.9.8"
PREFERRED_VERSION_libpcl ?= "1.4"
PREFERRED_VERSION_libpcre ?= "4.4"
PREFERRED_VERSION_libpcre-native ?= "4.4"
@@ -1023,7 +1023,7 @@ PREFERRED_VERSION_libspf2 ?= "1.0.4"
PREFERRED_VERSION_libsoundgen ?= "0.6"
PREFERRED_VERSION_libsoup ?= "2.2.100"
PREFERRED_VERSION_libspf2 ?= "1.0.4"
-PREFERRED_VERSION_libspiff ?= "0.7.2"
+PREFERRED_VERSION_libspiff ?= "0.8.2"
PREFERRED_VERSION_libssh ?= "0.11"
PREFERRED_VERSION_libsub-exporter-perl ?= "0.970"
PREFERRED_VERSION_libsub-exporter-perl-native ?= "0.970"
@@ -1404,7 +1404,7 @@ PREFERRED_VERSION_pairs ?= "1.1.1"
PREFERRED_VERSION_package-index ?= "1.0"
PREFERRED_VERSION_pad-native ?= "1.0"
PREFERRED_VERSION_pairs ?= "1.1.1"
-PREFERRED_VERSION_pango ?= "1.18.1"
+PREFERRED_VERSION_pango ?= "1.18.3"
PREFERRED_VERSION_panoramixext ?= "1.1"
PREFERRED_VERSION_parted ?= "1.8.7"
PREFERRED_VERSION_patch ?= "2.5.9"
@@ -1492,7 +1492,7 @@ PREFERRED_VERSION_python-constraint ?= "
PREFERRED_VERSION_python ?= "2.5.2"
PREFERRED_VERSION_python-ao ?= "0.82"
PREFERRED_VERSION_python-constraint ?= "1.1"
-PREFERRED_VERSION_python-dbus ?= "0.81.1"
+PREFERRED_VERSION_python-dbus ?= "0.82.4"
PREFERRED_VERSION_python-fam ?= "1.1.1"
PREFERRED_VERSION_python-fnorb ?= "1.3"
PREFERRED_VERSION_python-fpconst ?= "0.6.0"
@@ -1862,7 +1862,7 @@ PREFERRED_VERSION_ttf-bitstream-vera ?=
PREFERRED_VERSION_tsclient ?= "0.140"
PREFERRED_VERSION_tslib ?= "1.0"
PREFERRED_VERSION_ttf-bitstream-vera ?= "1.10"
-PREFERRED_VERSION_ttf-dejavu ?= "2.18"
+PREFERRED_VERSION_ttf-dejavu ?= "2.23"
PREFERRED_VERSION_ttf-gentium ?= "1.02"
PREFERRED_VERSION_ttf-hunkyfonts ?= "0.3.0"
PREFERRED_VERSION_ttf-liberation ?= "0.2"
@@ -1876,8 +1876,8 @@ PREFERRED_VERSION_tximage ?= "0.2"
PREFERRED_VERSION_twutils ?= "0.2"
PREFERRED_VERSION_txdrug ?= "0.1"
PREFERRED_VERSION_tximage ?= "0.2"
-PREFERRED_VERSION_tzcode-native ?= "2007e"
-PREFERRED_VERSION_tzdata ?= "2007e"
+PREFERRED_VERSION_tzcode-native ?= "2007k"
+PREFERRED_VERSION_tzdata ?= "2007k"
PREFERRED_VERSION_u-boot ?= "1.2.0"
PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
PREFERRED_VERSION_u2nl ?= "1.3"
@@ -1944,7 +1944,7 @@ PREFERRED_VERSION_vsftpd ?= "2.0.5"
PREFERRED_VERSION_vorbis-tools ?= "1.0.1"
PREFERRED_VERSION_vpnc ?= "0.3.3"
PREFERRED_VERSION_vsftpd ?= "2.0.5"
-PREFERRED_VERSION_vte ?= "0.16.8"
+PREFERRED_VERSION_vte ?= "0.16.9"
PREFERRED_VERSION_vtun ?= "2.6"
PREFERRED_VERSION_w3cam ?= "0.7.2"
PREFERRED_VERSION_wakelan ?= "1.1"
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc e76b4f1d90a877c2f946524c27d7e7035df3d66b
+++ conf/distro/include/preferred-om-2008-versions.inc ec064cf6915151b8ae2e72c80c9b0b938053ada1
@@ -8,5 +8,5 @@ PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_libtool = "1.5.24"
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_vte = "0.16.10"
+PREFERRED_VERSION_vte = "0.16.9"
More information about the Openembedded-commits
mailing list