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

Commit 4584acc3 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus

parents f0c61d3d c7d3e9e8 b89cd71a

arch/arm/include/asm/hardware/cache-l2x0.h

+11 −1
Original line number Diff line number Diff line
@@ -59,7 +59,17 @@ 
#define L2X0_CACHE_ID_PART_MASK		(0xf << 6)

#define L2X0_CACHE_ID_PART_L210		(1 << 6)

#define L2X0_CACHE_ID_PART_L310		(3 << 6)



#define L2X0_AUX_CTRL_MASK			0xc0000fff

#define L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT	16

#define L2X0_AUX_CTRL_WAY_SIZE_SHIFT		17

#define L2X0_AUX_CTRL_WAY_SIZE_MASK		(0x3 << 17)

#define L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT	22

#define L2X0_AUX_CTRL_NS_LOCKDOWN_SHIFT		26

#define L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT		27

#define L2X0_AUX_CTRL_DATA_PREFETCH_SHIFT	28

#define L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT	29

#define L2X0_AUX_CTRL_EARLY_BRESP_SHIFT		30



#ifndef __ASSEMBLY__

extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask);

arch/arm/include/asm/io.h

+5 −8
Original line number Diff line number Diff line
@@ -241,18 +241,15 @@ extern void _memset_io(volatile void __iomem *, int, size_t); 
 *

 */

#ifndef __arch_ioremap

#define ioremap(cookie,size)		__arm_ioremap(cookie, size, MT_DEVICE)

#define ioremap_nocache(cookie,size)	__arm_ioremap(cookie, size, MT_DEVICE)

#define ioremap_cached(cookie,size)	__arm_ioremap(cookie, size, MT_DEVICE_CACHED)

#define ioremap_wc(cookie,size)		__arm_ioremap(cookie, size, MT_DEVICE_WC)

#define iounmap(cookie)			__iounmap(cookie)

#else

#define __arch_ioremap			__arm_ioremap

#define __arch_iounmap			__iounmap

#endif



#define ioremap(cookie,size)		__arch_ioremap((cookie), (size), MT_DEVICE)

#define ioremap_nocache(cookie,size)	__arch_ioremap((cookie), (size), MT_DEVICE)

#define ioremap_cached(cookie,size)	__arch_ioremap((cookie), (size), MT_DEVICE_CACHED)

#define ioremap_wc(cookie,size)		__arch_ioremap((cookie), (size), MT_DEVICE_WC)

#define iounmap(cookie)			__arch_iounmap(cookie)

#endif

#define iounmap				__arch_iounmap



/*

 * io{read,write}{8,16,32} macros

arch/arm/mach-davinci/include/mach/io.h

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#define __mem_isa(a)		(a)



#ifndef __ASSEMBLER__

#define __arch_ioremap(p, s, t)	davinci_ioremap(p, s, t)

#define __arch_iounmap(v)	davinci_iounmap(v)

#define __arch_ioremap		davinci_ioremap

#define __arch_iounmap		davinci_iounmap



void __iomem *davinci_ioremap(unsigned long phys, size_t size,

			      unsigned int type);

arch/arm/mach-iop13xx/include/mach/io.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ extern u32 iop13xx_atux_mem_base; 
extern size_t iop13xx_atue_mem_size;

extern size_t iop13xx_atux_mem_size;



#define __arch_ioremap(a, s, f) __iop13xx_ioremap(a, s, f)

#define __arch_iounmap(a)	 __iop13xx_iounmap(a)

#define __arch_ioremap	__iop13xx_ioremap

#define __arch_iounmap	__iop13xx_iounmap



#endif

arch/arm/mach-iop32x/include/mach/io.h

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ extern void __iop3xx_iounmap(void __iomem *addr); 
#define __io(p)		((void __iomem *)IOP3XX_PCI_IO_PHYS_TO_VIRT(p))

#define __mem_pci(a)		(a)



#define __arch_ioremap(a, s, f) __iop3xx_ioremap(a, s, f)

#define __arch_iounmap(a)	 __iop3xx_iounmap(a)

#define __arch_ioremap	__iop3xx_ioremap

#define __arch_iounmap	__iop3xx_iounmap



#endif