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

Commit 0b177ab5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup' into late/kirkwood 

By Arnd Bergmann (21) and Wei Yongjun (1)
via Olof Johansson (2) and Haojian Zhuang (1)
* next/cleanup: (22 commits)
  ARM: mmp: using for_each_set_bit to simplify the code
  net: seeq: use __iomem pointers for MMIO
  video: da8xx-fb: use __iomem pointers for MMIO
  scsi: eesox: use __iomem pointers for MMIO
  serial: ks8695: use __iomem pointers for MMIO
  input: rpcmouse: use __iomem pointers for MMIO
  ARM: samsung: use __iomem pointers for MMIO
  ARM: spear13xx: use __iomem pointers for MMIO
  ARM: sa1100: use __iomem pointers for MMIO
  ARM: prima2: use __iomem pointers for MMIO
  ARM: nomadik: use __iomem pointers for MMIO
  ARM: msm: use __iomem pointers for MMIO
  ARM: lpc32xx: use __iomem pointers for MMIO
  ARM: ks8695: use __iomem pointers for MMIO
  ARM: ixp4xx: use __iomem pointers for MMIO
  ARM: iop32x: use __iomem pointers for MMIO
  ARM: iop13xx: use __iomem pointers for MMIO
  ARM: integrator: use __iomem pointers for MMIO
  ARM: imx: use __iomem pointers for MMIO
  ARM: ebsa110: use __iomem pointers for MMIO
  ...
parents 25468fe8 268aebe4

arch/arm/mach-at91/at91x40.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void at91x40_idle(void) 
	 * Disable the processor clock.  The processor will be automatically

	 * re-enabled by an interrupt or by a reset.

	 */

	__raw_writel(AT91_PS_CR_CPU, AT91_PS_CR);

	__raw_writel(AT91_PS_CR_CPU, AT91_IO_P2V(AT91_PS_CR));

	cpu_do_idle();

}

arch/arm/mach-at91/at91x40_time.c

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
#include <mach/at91_tc.h>



#define at91_tc_read(field) \

	__raw_readl(AT91_TC + field)

	__raw_readl(AT91_IO_P2V(AT91_TC) + field)



#define at91_tc_write(field, value) \

	__raw_writel(value, AT91_TC + field);

	__raw_writel(value, AT91_IO_P2V(AT91_TC) + field);



/*

 *	3 counter/timer units present.

arch/arm/mach-at91/include/mach/hardware.h

+2 −2
Original line number Diff line number Diff line
@@ -67,13 +67,13 @@ 
 * to 0xFEF78000 .. 0xFF000000.  (544Kb)

 */

#define AT91_IO_PHYS_BASE	0xFFF78000

#define AT91_IO_VIRT_BASE	(0xFF000000 - AT91_IO_SIZE)

#define AT91_IO_VIRT_BASE	IOMEM(0xFF000000 - AT91_IO_SIZE)

#else

/*

 * Identity mapping for the non MMU case.

 */

#define AT91_IO_PHYS_BASE	AT91_BASE_SYS

#define AT91_IO_VIRT_BASE	AT91_IO_PHYS_BASE

#define AT91_IO_VIRT_BASE	IOMEM(AT91_IO_PHYS_BASE)

#endif



#define AT91_IO_SIZE		(0xFFFFFFFF - AT91_IO_PHYS_BASE + 1)

arch/arm/mach-at91/include/mach/uncompress.h

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static const u32 uarts_sam9x5[] = { 
	0,

};



static inline const u32* decomp_soc_detect(u32 dbgu_base)

static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)

{

	u32 cidr, socid;
@@ -142,10 +142,10 @@ static inline void arch_decomp_setup(void) 
	int i = 0;

	const u32* usarts;



	usarts = decomp_soc_detect(AT91_BASE_DBGU0);

	usarts = decomp_soc_detect((void __iomem *)AT91_BASE_DBGU0);



	if (!usarts)

		usarts = decomp_soc_detect(AT91_BASE_DBGU1);

		usarts = decomp_soc_detect((void __iomem *)AT91_BASE_DBGU1);

	if (!usarts) {

		at91_uart = NULL;

		return;

arch/arm/mach-at91/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length) 
{

	struct map_desc *desc = &sram_desc[bank];



	desc->virtual = AT91_IO_VIRT_BASE - length;

	desc->virtual = (unsigned long)AT91_IO_VIRT_BASE - length;

	if (bank > 0)

		desc->virtual -= sram_desc[bank - 1].length;
@@ -88,7 +88,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length) 
}



static struct map_desc at91_io_desc __initdata = {

	.virtual	= AT91_VA_BASE_SYS,

	.virtual	= (unsigned long)AT91_VA_BASE_SYS,

	.pfn		= __phys_to_pfn(AT91_BASE_SYS),

	.length		= SZ_16K,

	.type		= MT_DEVICE,