Messages in this thread | | | From | Marek Szyprowski <> | Subject | [GIT PULL] DMA-mapping updates for v3.12 | Date | Mon, 09 Sep 2013 16:27:51 +0200 |
| |
Hi Linus,
I would like to ask You for pulling an update of Contiguous Memory Allocator driver for dma-mapping subsystem for v3.12.
The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092:
Linux 3.11-rc1 (2013-07-14 15:18:27 -0700)
are available in the git repository at:
git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git for-v3.12
for you to fetch changes up to 10bcdfb8ba24760f715f0a700c3812747eddddf5:
ARM: init: add support for reserved memory defined by device tree (2013-08-27 10:53:45 +0200)
---------------------------------------------------------------- Aneesh Kumar K.V (1): mm/cma: Move dma contiguous changes into a seperate config
Marek Szyprowski (5): Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next drivers: dma-contiguous: clean source code and prepare for device tree drivers: of: add function to scan fdt nodes given by path drivers: of: add initialization code for dma reserved memory ARM: init: add support for reserved memory defined by device tree
Documentation/devicetree/bindings/memory.txt | 168 +++++++++++++++++++++++++ arch/arm/include/asm/dma-contiguous.h | 3 +- arch/arm/mm/dma-mapping.c | 6 +- arch/arm/mm/init.c | 3 + arch/x86/include/asm/dma-contiguous.h | 1 - drivers/base/Kconfig | 20 +-- drivers/base/Makefile | 2 +- drivers/base/dma-contiguous.c | 119 +++++++----------- drivers/of/Kconfig | 6 + drivers/of/Makefile | 1 + drivers/of/fdt.c | 76 +++++++++++ drivers/of/of_reserved_mem.c | 175 ++++++++++++++++++++++++++ drivers/of/platform.c | 4 + include/asm-generic/dma-contiguous.h | 28 ----- include/linux/device.h | 2 +- include/linux/dma-contiguous.h | 64 +++++++++- include/linux/of_fdt.h | 3 + include/linux/of_reserved_mem.h | 14 +++ mm/Kconfig | 24 ++++ 19 files changed, 589 insertions(+), 130 deletions(-) create mode 100644 Documentation/devicetree/bindings/memory.txt create mode 100644 drivers/of/of_reserved_mem.c delete mode 100644 include/asm-generic/dma-contiguous.h create mode 100644 include/linux/of_reserved_mem.h
----------------------------------------------------------------
This pull request contains an addition of Device Tree support for reserved memory regions (Contiguous Memory Allocator is one of the drivers for it) and changes required by the KVM extensions for PowerPC architectue.
This pull will conflict with your tree, please resolve it in the following way: mm/Kconfig: use the whole file from your tree drivers/base/dma-contiguous.c: use the whole file from my tree (it already contains the changes merged to Your tree)
Thanks!
Best regards Marek Szyprowski Samsung Poland R&D Center
| |