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

Commit 2bc856c4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into devel/io-cleanup 

* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
  ARM: __io abuse cleanup
  ARM: create a common IOMEM definition
  ARM: iop13xx: fix missing declaration of iop13xx_init_early
  ARM: fix ioremap/iounmap for !CONFIG_MMU
parents 13d0dff8 a2a47ca3

arch/arm/include/asm/assembler.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <asm/ptrace.h>

#include <asm/domain.h>



#define IOMEM(x)	(x)



/*

 * Endian independent macros for shifting bytes within registers.

 */

arch/arm/include/asm/io.h

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ static inline void __iomem *__typesafe_io(unsigned long addr) 
	return (void __iomem *)addr;

}



#define IOMEM(x)	((void __force __iomem *)(x))



/* IO barriers */

#ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE

#define __iormb()		rmb()

arch/arm/kernel/debug.S

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 *  32-bit debugging code

 */

#include <linux/linkage.h>

#include <asm/assembler.h>



		.text

arch/arm/kernel/entry-armv.S

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 *  that causes it to save wrong values...  Be aware!

 */



#include <asm/assembler.h>

#include <asm/memory.h>

#include <asm/glue-df.h>

#include <asm/glue-pf.h>

arch/arm/mach-cns3xxx/core.c

+4 −4
Original line number Diff line number Diff line
@@ -72,13 +72,13 @@ void __init cns3xxx_map_io(void) 
/* used by entry-macro.S */

void __init cns3xxx_init_irq(void)

{

	gic_init(0, 29, __io(CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT),

		 __io(CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT));

	gic_init(0, 29, IOMEM(CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT),

		 IOMEM(CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT));

}



void cns3xxx_power_off(void)

{

	u32 __iomem *pm_base = __io(CNS3XXX_PM_BASE_VIRT);

	u32 __iomem *pm_base = IOMEM(CNS3XXX_PM_BASE_VIRT);

	u32 clkctrl;



	printk(KERN_INFO "powering system down...\n");
@@ -237,7 +237,7 @@ static void __init __cns3xxx_timer_init(unsigned int timer_irq) 


static void __init cns3xxx_timer_init(void)

{

	cns3xxx_tmr1 = __io(CNS3XXX_TIMER1_2_3_BASE_VIRT);

	cns3xxx_tmr1 = IOMEM(CNS3XXX_TIMER1_2_3_BASE_VIRT);



	__cns3xxx_timer_init(IRQ_CNS3XXX_TIMER0);

}