Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=linux-2.6.35.y 2010-05-30T16:12:43+00:00 2010-05-30T16:12:43+00:00 Linus Torvalds torvalds@linux-foundation.org 2010-05-30T16:12:43+00:00 urn:sha1:e38c1e54ce51059a1aa8744c895762906cf43b32 * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: DMAENGINE: DMA40 U8500 platform configuration DMA: PL330: Add dma api driver 2010-05-25T06:38:26+00:00 Grant Likely grant.likely@secretlab.ca 2010-05-25T06:38:26+00:00 urn:sha1:b1e50ebcf24668e57f058deb48b0704b5391ed0f 2010-05-25T06:23:14+00:00 Linus Walleij linus.walleij@stericsson.com 2010-05-07T08:40:53+00:00 urn:sha1:781c7b129b1beb876905f7212927aa0ee1b022e5 This adds support for a further ST variant of the PL022 called PL023. Some differences in the control registers due to being stripped down to SPI mode only, and a new clock feedback sample delay config setting is available. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> 2010-05-25T06:23:13+00:00 Linus Walleij linus.walleij@stericsson.com 2010-05-05T09:28:15+00:00 urn:sha1:556f4aeb7d9dfac8573d0281dd555bd3210d8366 The PL022 SPI driver did not cleanly separate between the original unmodified ARM version and the ST Microelectronics versions. Split this more cleanly and fix some whitespace moaning from checkpatch at the same time. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> 2010-05-24T03:28:19+00:00 Jassi Brar jassi.brar@samsung.com 2010-05-24T03:28:19+00:00 urn:sha1:b3040e40675ec2c43542331cd30d4ee3dae797e8 Add DMA Engine API driver for the PL330 DMAC. This driver is supposed to be reusable by various platforms that have one or more PL330 DMACs. Atm, DMA_SLAVE and DMA_MEMCPY capabilities have been implemented. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Reviewed-by: Linus Walleij <linus.walleij@stericsson.com> [dan.j.williams@intel.com: missing slab.h and ->device_control() fixups] Signed-off-by: Dan Williams <dan.j.williams@intel.com> 2010-05-17T16:24:04+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-05-17T16:24:04+00:00 urn:sha1:ac1d426e825ab5778995f2f6f053ca2e6b45c622 Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig 2010-04-14T15:08:18+00:00 Linus Walleij linus.walleij@stericsson.com 2010-04-08T06:39:38+00:00 urn:sha1:808d97ccbe8e8251b1435e86c762965fd7e8a75e This introduce the field f_max into the mmci_platform_data, making it possible to pass in a desired block clocking frequency from a board configuration. This is often more desirable than using a module parameter. We keep the module parameter as a fallback as well as the default frequency specified for this parameter if a parameter is not provided. This also adds some kerneldoc style documentation to the platform data struct in mmci.h. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 2010-03-29T16:33:33+00:00 viresh kumar viresh.kumar@st.com 2010-03-29T04:29:56+00:00 urn:sha1:367d6acceaacff1adc44f121543effb9c060e575 pl061.h is using u8 type. including <linux/types.h> in pl061.h to avoid warning. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 2010-03-29T16:33:31+00:00 viresh kumar viresh.kumar@st.com 2010-03-29T04:28:32+00:00 urn:sha1:c36207a4624f15020f2918324405c1c88a5d4cbc linux/amba/bus.h have dependencies on linux/device.h and linux/resource.h, but it doesn't include them. We get compilation errors in our files which include bus.h but doesn't include device.h and resource.h. This patch includes device.h and resource.h in linux/amba/bus.h file. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: Linux Walleij <linux.ml.walleij@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 2010-03-14T19:42:44+00:00 Russell King rmk+kernel@arm.linux.org.uk 2010-02-12T14:32:01+00:00 urn:sha1:3f17522ce461a31e7ced6311b28fcf5b8a763316 On PL111, as found on Realview and other platforms, these registers are always arranged as CNTL then IENB. On PL110, these registers are IENB then CNTL, except on Versatile platforms. Re-arrange the handling of these register swaps so that PL111 always gets it right without resorting to ifdefs, leaving the only case needing special handling being PL110 on Versatile. Fill out amba/clcd.h with the PL110/PL111 register definition differences in case someone tries to use the PL110 specific definitions on PL111. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>