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

Commit f701737d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4445/1: ANUBIS: Fix CPLD registers
  [ARM] 4444/2: OSIRIS: CPLD suspend fix
  [ARM] 4443/1: OSIRIS: Add watchdog device to machine devices
  [ARM] 4442/1: OSIRIS: Fix CPLD register definitions
  [ARM] VFP: fix section mismatch error
parents eedab661 6c1640d5

arch/arm/mach-s3c2440/mach-anubis.c

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ static struct map_desc anubis_iodesc[] __initdata = { 
	.length		= SZ_4K,

	.type		= MT_DEVICE,

  }, {

	.virtual	= (u32)ANUBIS_VA_CTRL2,

	.pfn		= __phys_to_pfn(ANUBIS_PA_CTRL2),

	.virtual	= (u32)ANUBIS_VA_IDREG,

	.pfn		= __phys_to_pfn(ANUBIS_PA_IDREG),

	.length		= SZ_4K,

	.type		= MT_DEVICE,

  },

arch/arm/mach-s3c2440/mach-osiris.c

+54 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/timer.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/sysdev.h>

#include <linux/serial_core.h>



#include <asm/mach/arch.h>
@@ -65,6 +66,11 @@ static struct map_desc osiris_iodesc[] __initdata = { 
  /* CPLD control registers */



  {

	  .virtual	= (u32)OSIRIS_VA_CTRL0,

	  .pfn		= __phys_to_pfn(OSIRIS_PA_CTRL0),

	  .length	= SZ_16K,

	  .type		= MT_DEVICE,

  }, {

	  .virtual	= (u32)OSIRIS_VA_CTRL1,

	  .pfn		= __phys_to_pfn(OSIRIS_PA_CTRL1),

	  .length	= SZ_16K,
@@ -74,6 +80,11 @@ static struct map_desc osiris_iodesc[] __initdata = { 
	  .pfn		= __phys_to_pfn(OSIRIS_PA_CTRL2),

	  .length	= SZ_16K,

	  .type		= MT_DEVICE,

  }, {

	  .virtual	= (u32)OSIRIS_VA_IDREG,

	  .pfn		= __phys_to_pfn(OSIRIS_PA_IDREG),

	  .length	= SZ_16K,

	  .type		= MT_DEVICE,

  },

};
@@ -195,13 +206,13 @@ static void osiris_nand_select(struct s3c2410_nand_set *set, int slot) 
	pr_debug("osiris_nand: selecting slot %d (set %p,%p)\n",

		 slot, set, set->nr_map);



	tmp = __raw_readb(OSIRIS_VA_CTRL1);

	tmp &= ~OSIRIS_CTRL1_NANDSEL;

	tmp = __raw_readb(OSIRIS_VA_CTRL0);

	tmp &= ~OSIRIS_CTRL0_NANDSEL;

	tmp |= slot;



	pr_debug("osiris_nand: ctrl1 now %02x\n", tmp);

	pr_debug("osiris_nand: ctrl0 now %02x\n", tmp);



	__raw_writeb(tmp, OSIRIS_VA_CTRL1);

	__raw_writeb(tmp, OSIRIS_VA_CTRL0);

}



static struct s3c2410_platform_nand osiris_nand_info = {
@@ -235,10 +246,45 @@ static struct platform_device osiris_pcmcia = { 
	.resource	= osiris_pcmcia_resource,

};



/* Osiris power management device */



#ifdef CONFIG_PM

static unsigned char pm_osiris_ctrl0;



static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)

{

	pm_osiris_ctrl0 = __raw_readb(OSIRIS_VA_CTRL0);

	return 0;

}



static int osiris_pm_resume(struct sys_device *sd)

{

	if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)

		__raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);



	return 0;

}



#else

#define osiris_pm_suspend NULL

#define osiris_pm_resume NULL

#endif



static struct sysdev_class osiris_pm_sysclass = {

	set_kset_name("mach-osiris"),

	.suspend	= osiris_pm_suspend,

	.resume		= osiris_pm_resume,

};



static struct sys_device osiris_pm_sysdev = {

	.cls		= &osiris_pm_sysclass,

};



/* Standard Osiris devices */



static struct platform_device *osiris_devices[] __initdata = {

	&s3c_device_i2c,

	&s3c_device_wdt,

	&s3c_device_nand,

	&osiris_pcmcia,

};
@@ -288,6 +334,9 @@ static void __init osiris_map_io(void) 


static void __init osiris_init(void)

{

	sysdev_class_register(&osiris_pm_sysclass);

	sysdev_register(&osiris_pm_sysdev);



	platform_add_devices(osiris_devices, ARRAY_SIZE(osiris_devices));

};
@@ -299,5 +348,6 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS") 
	.map_io		= osiris_map_io,

	.init_machine	= osiris_init,

	.init_irq	= s3c24xx_init_irq,

	.init_machine	= osiris_init,

	.timer		= &s3c24xx_timer,

MACHINE_END

arch/arm/vfp/entry.S

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ do_vfp: 
	add	r10, r10, #TI_VFPSTATE	@ r10 = workspace

	ldr	pc, [r4]		@ call VFP entry point



ENTRY(vfp_null_entry)

	mov	pc, lr

ENDPROC(vfp_null_entry)



.LCvfp:

	.word	vfp_vector

arch/arm/vfp/vfpmodule.c

+4 −1
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ 
 */

void vfp_testing_entry(void);

void vfp_support_entry(void);

void vfp_null_entry(void);



void (*vfp_vector)(void) = vfp_testing_entry;

void (*vfp_vector)(void) = vfp_null_entry;

union vfp_state *last_VFP_context[NR_CPUS];



/*
@@ -321,8 +322,10 @@ static int __init vfp_init(void) 
	 * The handler is already setup to just log calls, so

	 * we just need to read the VFPSID register.

	 */

	vfp_vector = vfp_testing_entry;

	vfpsid = fmrx(FPSID);

	barrier();

	vfp_vector = vfp_null_entry;



	printk(KERN_INFO "VFP support v0.3: ");

	if (VFP_arch) {

include/asm-arm/arch-s3c2410/anubis-cpld.h

+4 −0
Original line number Diff line number Diff line
@@ -18,4 +18,8 @@ 


#define ANUBIS_CTRL1_NANDSEL		(0x3)



/* IDREG - revision */



#define ANUBIS_IDREG_REVMASK		(0x7)



#endif /* __ASM_ARCH_ANUBISCPLD_H */