Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b03adc1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into next 

Pull Microblaze updates from Michal Simek:
 - cleanup PCI and DMA handling
 - use generic device.h
 - some cleanups

* tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix typo in head.S s/substract/subtract/
  microblaze: remove check for CONFIG_XILINX_CONSOLE
  microblaze: Use generic device.h
  microblaze: Do not setup empty unmap_sg function
  microblaze: Remove device_to_mask
  microblaze: Clean device dma_ops structure
  microblaze: Cleanup PCI_DRAM_OFFSET handling
  microblaze: Do not setup pci_dma_ops
  microblaze: Return default dma operations
  microblaze: Enable SERIAL_OF_PLATFORM
parents eb3d3ec5 225fba21

arch/microblaze/configs/mmu_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ CONFIG_SERIAL_8250=y 
CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_UARTLITE=y

CONFIG_SERIAL_UARTLITE_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

CONFIG_XILINX_HWICAP=y

CONFIG_I2C=y

arch/microblaze/configs/nommu_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ CONFIG_SERIAL_8250=y 
CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_UARTLITE=y

CONFIG_SERIAL_UARTLITE_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

CONFIG_XILINX_HWICAP=y

CONFIG_I2C=y

arch/microblaze/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
generic-y += barrier.h

generic-y += clkdev.h

generic-y += cputime.h

generic-y += device.h

generic-y += exec.h

generic-y += hash.h

generic-y += mcs_spinlock.h

arch/microblaze/include/asm/device.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * Arch specific extensions to struct device

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License v2. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_DEVICE_H

#define _ASM_MICROBLAZE_DEVICE_H



struct device_node;



struct dev_archdata {

	/* DMA operations on that device */

	struct dma_map_ops	*dma_ops;

	void                    *dma_data;

};



struct pdev_archdata {

	u64 dma_mask;

};



#endif /* _ASM_MICROBLAZE_DEVICE_H */

arch/microblaze/include/asm/dma-mapping.h

+1 −24
Original line number Diff line number Diff line
@@ -35,16 +35,6 @@ 
#define __dma_alloc_coherent(dev, gfp, size, handle)	NULL

#define __dma_free_coherent(size, addr)		((void)0)



static inline unsigned long device_to_mask(struct device *dev)

{

	if (dev->dma_mask && *dev->dma_mask)

		return *dev->dma_mask;

	/* Assume devices without mask can take 32 bit addresses */

	return 0xfffffffful;

}



extern struct dma_map_ops *dma_ops;



/*

 * Available generic sets of operations

 */
@@ -52,20 +42,7 @@ extern struct dma_map_ops dma_direct_ops; 


static inline struct dma_map_ops *get_dma_ops(struct device *dev)

{

	/* We don't handle the NULL dev case for ISA for now. We could

	 * do it via an out of line call but it is not needed for now. The

	 * only ISA DMA device we support is the floppy and we have a hack

	 * in the floppy driver directly to get a device for us.

	 */

	if (unlikely(!dev) || !dev->archdata.dma_ops)

		return NULL;



	return dev->archdata.dma_ops;

}



static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)

{

	dev->archdata.dma_ops = ops;

	return &dma_direct_ops;

}



static inline int dma_supported(struct device *dev, u64 mask)