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

Commit 43a60c17 authored by Russell King's avatar Russell King
Browse files

Merge branch 'cleanup' into for-linus 

Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
parents 0d7614f0 9fc31ddc

arch/arm/include/asm/hardware/linkup-l1110.h

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

*

* Definitions for H3600 Handheld Computer

*

* Copyright 2001 Compaq Computer Corporation.

*

* Use consistent with the GNU GPL is permitted,

* provided that this copyright notice is

* preserved in its entirety in all copies and derived works.

*

* COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED,

* AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS

* FITNESS FOR ANY PARTICULAR PURPOSE.

*

* Author: Jamey Hicks.

*

*/



/* LinkUp Systems PCCard/CompactFlash Interface for SA-1100 */



/* PC Card Status Register */

#define LINKUP_PRS_S1	(1 << 0) /* voltage control bits S1-S4 */

#define LINKUP_PRS_S2	(1 << 1)

#define LINKUP_PRS_S3	(1 << 2)

#define LINKUP_PRS_S4	(1 << 3)

#define LINKUP_PRS_BVD1	(1 << 4)

#define LINKUP_PRS_BVD2	(1 << 5)

#define LINKUP_PRS_VS1	(1 << 6)

#define LINKUP_PRS_VS2	(1 << 7)

#define LINKUP_PRS_RDY	(1 << 8)

#define LINKUP_PRS_CD1	(1 << 9)

#define LINKUP_PRS_CD2	(1 << 10)



/* PC Card Command Register */

#define LINKUP_PRC_S1	(1 << 0)

#define LINKUP_PRC_S2	(1 << 1)

#define LINKUP_PRC_S3	(1 << 2)

#define LINKUP_PRC_S4	(1 << 3)

#define LINKUP_PRC_RESET (1 << 4)

#define LINKUP_PRC_APOE	(1 << 5) /* Auto Power Off Enable: clears S1-S4 when either nCD goes high */

#define LINKUP_PRC_CFE	(1 << 6) /* CompactFlash mode Enable: addresses A[10:0] only, A[25:11] high */

#define LINKUP_PRC_SOE	(1 << 7) /* signal output driver enable */

#define LINKUP_PRC_SSP	(1 << 8) /* sock select polarity: 0 for socket 0, 1 for socket 1 */

#define LINKUP_PRC_MBZ	(1 << 15) /* must be zero */



struct linkup_l1110 {

	volatile short prc;

};

arch/arm/include/asm/thread_info.h

+2 −0
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ struct thread_info { 
	__u32			syscall;	/* syscall number */

	__u8			used_cp[16];	/* thread used copro */

	unsigned long		tp_value;

#ifdef CONFIG_CRUNCH

	struct crunch_state	crunchstate;

#endif

	union fp_state		fpstate __attribute__((aligned(8)));

	union vfp_state		vfpstate;

#ifdef CONFIG_ARM_THUMBEE

arch/arm/kernel/asm-offsets.c

+2 −0
Original line number Diff line number Diff line
@@ -59,10 +59,12 @@ int main(void) 
  DEFINE(TI_USED_CP,		offsetof(struct thread_info, used_cp));

  DEFINE(TI_TP_VALUE,		offsetof(struct thread_info, tp_value));

  DEFINE(TI_FPSTATE,		offsetof(struct thread_info, fpstate));

#ifdef CONFIG_VFP

  DEFINE(TI_VFPSTATE,		offsetof(struct thread_info, vfpstate));

#ifdef CONFIG_SMP

  DEFINE(VFP_CPU,		offsetof(union vfp_state, hard.cpu));

#endif

#endif

#ifdef CONFIG_ARM_THUMBEE

  DEFINE(TI_THUMBEE_STATE,	offsetof(struct thread_info, thumbee_state));

#endif

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

+2 −4
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ 
#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/leds.h>

#include <linux/memblock.h>

#include <media/soc_camera.h>

#include <sound/tlv320aic32x4.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/system_info.h>

#include <asm/memblock.h>

#include <mach/common.h>

#include <mach/hardware.h>

#include <mach/iomux-mx27.h>
@@ -233,10 +233,8 @@ static void __init visstrim_camera_init(void) 
static void __init visstrim_reserve(void)

{

	/* reserve 4 MiB for mx2-camera */

	mx2_camera_base = memblock_alloc(MX2_CAMERA_BUF_SIZE,

	mx2_camera_base = memblock_steal(MX2_CAMERA_BUF_SIZE,

			MX2_CAMERA_BUF_SIZE);

	memblock_free(mx2_camera_base, MX2_CAMERA_BUF_SIZE);

	memblock_remove(mx2_camera_base, MX2_CAMERA_BUF_SIZE);

}



/* GPIOs used as events for applications */

arch/arm/mach-sa1100/include/mach/SA-1111.h

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
/*

 * Moved to new location

 */

#warning using old SA-1111.h - update to <asm/hardware/sa1111.h>

#include <asm/hardware/sa1111.h>