Skip to contentSkip to conversation

arch/microblaze changes for 3.16

GIT PULL Michal Simek 1 participant 1 message Jun 5, 2014

lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull these Microblaze changes to your tree.

Thanks,
Michal

The following changes since commit fad01e866afdbe01a1f3ec06a39c3a8b9e197014:

Linux 3.15-rc8 (2014-06-01 19:12:24 -0700)

are available in the git repository at:

git://git.monstr.eu/linux-2.6-microblaze.git tags/microblaze-3.16-rc1

for you to fetch changes up to 225fba216261b0e24273f5f4eee504e3c7bd0255:

microblaze: Fix typo in head.S s/substract/subtract/ (2014-06-05 13:02:02 +0200)

----------------------------------------------------------------
Microblaze patches for 3.16-rc1

- Clean PCI and DMA handling
- Use generic device.h
- Some cleanups

----------------------------------------------------------------
Antonio Ospite (1):
microblaze: Fix typo in head.S s/substract/subtract/

Michal Simek (8):
microblaze: Enable SERIAL_OF_PLATFORM
microblaze: Return default dma operations
microblaze: Do not setup pci_dma_ops
microblaze: Cleanup PCI_DRAM_OFFSET handling
microblaze: Clean device dma_ops structure
microblaze: Remove device_to_mask
microblaze: Do not setup empty unmap_sg function
microblaze: Use generic device.h

Paul Bolle (1):
microblaze: remove check for CONFIG_XILINX_CONSOLE

 arch/microblaze/configs/mmu_defconfig     |  1 +
 arch/microblaze/configs/nommu_defconfig   |  1 +
 arch/microblaze/include/asm/Kbuild        |  1 +
 arch/microblaze/include/asm/device.h      | 26 --------------------------
 arch/microblaze/include/asm/dma-mapping.h | 25 +------------------------
 arch/microblaze/include/asm/io.h          |  3 ---
 arch/microblaze/include/asm/pci.h         |  8 --------
 arch/microblaze/kernel/dma.c              | 30 +++---------------------------
 arch/microblaze/kernel/head.S             |  2 +-
 arch/microblaze/kernel/setup.c            | 34 +---------------------------------
 arch/microblaze/pci/pci-common.c          | 19 -------------------
 drivers/of/platform.c                     |  3 ---
 12 files changed, 9 insertions(+), 144 deletions(-)
 delete mode 100644 arch/microblaze/include/asm/device.h