Merge tag 'tags/drivers_for_v3.10' into mvebu/soc

menu "Bus devices"

config MVEBU_MBUS

	bool

	depends on PLAT_ORION

	help

	  Driver needed for the MBus configuration on Marvell EBU SoCs

	  (Kirkwood, Dove, Orion5x, MV78XX0 and Armada 370/XP).

config OMAP_OCP2SCP

	tristate "OMAP OCP2SCP DRIVER"

	depends on ARCH_OMAP2PLUS

# Makefile for the bus drivers.

#

obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o

obj-$(CONFIG_OMAP_OCP2SCP)	+= omap-ocp2scp.o

# Interconnect bus driver for OMAP SoCs.

	} cs[4];

};

/* Flags for PCI/PCIe address decoding regions */

#define MVEBU_MBUS_PCI_IO  0x1

#define MVEBU_MBUS_PCI_MEM 0x2

#define MVEBU_MBUS_PCI_WA  0x3

/*

 * Magic value that explicits that we don't need a remapping-capable

 * address decoding window.

 */

#define MVEBU_MBUS_NO_REMAP (0xffffffff)

/*

 * The Marvell mbus is to be found only on SOCs from the Orion family

 * at the moment.  Provide a dummy stub for other architectures.

	return NULL;

}

#endif

#endif

int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,

				      size_t size, phys_addr_t remap,

				      unsigned int flags);

int mvebu_mbus_add_window(const char *devname, phys_addr_t base,

			  size_t size);

int mvebu_mbus_del_window(phys_addr_t base, size_t size);

int mvebu_mbus_init(const char *soc, phys_addr_t mbus_phys_base,

		    size_t mbus_size, phys_addr_t sdram_phys_base,

		    size_t sdram_size);

#endif /* __LINUX_MBUS_H */