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

Commit 86822f81 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'clps711x/cleanup' into next/cleanup 



A single patch from Alexander Shiyan <shc_work@mail.ru>:

* clps711x/cleanup:
  ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d211093f 304b2c68

arch/arm/include/asm/hardware/clps7111.h

+1 −10
Original line number Original line Diff line number Diff line
@@ -23,16 +23,7 @@ 
#ifndef __ASM_HARDWARE_CLPS7111_H

#ifndef __ASM_HARDWARE_CLPS7111_H

#define __ASM_HARDWARE_CLPS7111_H

#define __ASM_HARDWARE_CLPS7111_H





#define CLPS7111_PHYS_BASE	(0x80000000)

#define CLPS711X_PHYS_BASE	(0x80000000)



#ifndef __ASSEMBLY__

#define clps_readb(off)		__raw_readb(CLPS7111_BASE + (off))

#define clps_readw(off)		__raw_readw(CLPS7111_BASE + (off))

#define clps_readl(off)		__raw_readl(CLPS7111_BASE + (off))

#define clps_writeb(val,off)	__raw_writeb(val, CLPS7111_BASE + (off))

#define clps_writew(val,off)	__raw_writew(val, CLPS7111_BASE + (off))

#define clps_writel(val,off)	__raw_writel(val, CLPS7111_BASE + (off))

#endif





#define PADR		(0x0000)

#define PADR		(0x0000)

#define PBDR		(0x0001)

#define PBDR		(0x0001)

arch/arm/include/asm/hardware/ep7211.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -23,15 +23,6 @@ 
#ifndef __ASM_HARDWARE_EP7211_H

#ifndef __ASM_HARDWARE_EP7211_H

#define __ASM_HARDWARE_EP7211_H

#define __ASM_HARDWARE_EP7211_H





#include <asm/hardware/clps7111.h>



/*

 * define EP7211_BASE to be the base address of the region

 * you want to access.

 */



#define EP7211_PHYS_BASE	(0x80000000)



/*

/*

 * XXX miket@bluemug.com: need to introduce EP7211 registers (those not

 * XXX miket@bluemug.com: need to introduce EP7211 registers (those not

 * present in 7212) here.

 * present in 7212) here.

arch/arm/include/asm/hardware/ep7212.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -23,18 +23,6 @@ 
#ifndef __ASM_HARDWARE_EP7212_H

#ifndef __ASM_HARDWARE_EP7212_H

#define __ASM_HARDWARE_EP7212_H

#define __ASM_HARDWARE_EP7212_H





/*

 * define EP7212_BASE to be the base address of the region

 * you want to access.

 */



#define EP7212_PHYS_BASE	(0x80000000)



#ifndef __ASSEMBLY__

#define ep_readl(off)		__raw_readl(EP7212_BASE + (off))

#define ep_writel(val,off)	__raw_writel(val, EP7212_BASE + (off))

#endif



/*

/*

 * These registers are specific to the EP7212 only

 * These registers are specific to the EP7212 only

 */

 */

arch/arm/mach-clps711x/common.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <asm/page.h>

#include <asm/page.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <asm/mach/time.h>

#include <asm/hardware/clps7111.h>

#include <asm/system_misc.h>

#include <asm/system_misc.h>





/*

/*
@@ -44,8 +43,8 @@ 
 */

 */

static struct map_desc clps711x_io_desc[] __initdata = {

static struct map_desc clps711x_io_desc[] __initdata = {

	{

	{

		.virtual	= CLPS7111_VIRT_BASE,

		.virtual	= (unsigned long)CLPS711X_VIRT_BASE,

		.pfn		= __phys_to_pfn(CLPS7111_PHYS_BASE),

		.pfn		= __phys_to_pfn(CLPS711X_PHYS_BASE),

		.length		= SZ_1M,

		.length		= SZ_1M,

		.type		= MT_DEVICE

		.type		= MT_DEVICE

	}

	}

arch/arm/mach-clps711x/include/mach/debug-macro.S

+2 −3
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ 
*/

*/





#include <mach/hardware.h>

#include <mach/hardware.h>

#include <asm/hardware/clps7111.h>





		.macro	addruart, rp, rv, tmp

		.macro	addruart, rp, rv, tmp

#ifndef CONFIG_DEBUG_CLPS711X_UART2

#ifndef CONFIG_DEBUG_CLPS711X_UART2
@@ -20,8 +19,8 @@ 
#else

#else

		mov	\rp, #0x1000	@ UART2

		mov	\rp, #0x1000	@ UART2

#endif

#endif

		orr	\rv, \rp, #CLPS7111_VIRT_BASE

		orr	\rv, \rp, #CLPS711X_VIRT_BASE

		orr	\rp, \rp, #CLPS7111_PHYS_BASE

		orr	\rp, \rp, #CLPS711X_PHYS_BASE

		.endm

		.endm





		.macro	senduart,rd,rx

		.macro	senduart,rd,rx