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

Commit 5466eb5d 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] 3362/1: [cleanup] - duplicate decleration of mem_fclk_21285
  [ARM] 3365/1: [cleanup] header for compat.c exported functions
  [ARM] 3364/1: [cleanup] warning fix - definitions for enable_hlt and disable_hlt
  [ARM] 3363/1: [cleanup] process.c - fix warnings
  [ARM] 3358/1: [S3C2410] add missing SPI DMA resources
  [ARM] 3357/1: enable frontlight on collie
  [ARM] Fix "thead" typo
parents 2d7f2ea9 43332989

arch/arm/common/locomo.c

+21 −0
Original line number Diff line number Diff line
@@ -629,6 +629,22 @@ static int locomo_resume(struct platform_device *dev) 
}

#endif





#define LCM_ALC_EN	0x8000



void frontlight_set(struct locomo *lchip, int duty, int vr, int bpwf)

{

	unsigned long flags;



	spin_lock_irqsave(&lchip->lock, flags);

	locomo_writel(bpwf, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);

	udelay(100);

	locomo_writel(duty, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);

	locomo_writel(bpwf | LCM_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);

	spin_unlock_irqrestore(&lchip->lock, flags);

}





/**

 *	locomo_probe - probe for a single LoCoMo chip.

 *	@phys_addr: physical address of device.
@@ -688,6 +704,11 @@ __locomo_probe(struct device *me, struct resource *mem, int irq) 
	/* FrontLight */

	locomo_writel(0, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);

	locomo_writel(0, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);



	/* Same constants can be used for collie and poodle

	   (depending on CONFIG options in original sharp code)? */

	frontlight_set(lchip, 163, 0, 148);



	/* Longtime timer */

	locomo_writel(0, lchip->base + LOCOMO_LTINT);

	/* SPI */

arch/arm/kernel/compat.c

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 


#include <asm/mach/arch.h>



#include "compat.h"



/*

 * Usage:

 *  - do not go blindly adding fields, add them at the end

arch/arm/kernel/compat.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/kernel/compat.h

 *

 *  Copyright (C) 2001 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



extern void convert_to_tag_list(struct tag *tags);



extern void squash_mem_tags(struct tag *tag);

arch/arm/kernel/process.c

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/kallsyms.h>

#include <linux/init.h>

#include <linux/cpu.h>

#include <linux/elfcore.h>



#include <asm/leds.h>

#include <asm/processor.h>
@@ -83,7 +84,7 @@ EXPORT_SYMBOL(pm_power_off); 
 * This is our default idle handler.  We need to disable

 * interrupts here to ensure we don't miss a wakeup call.

 */

void default_idle(void)

static void default_idle(void)

{

	if (hlt_counter)

		cpu_relax();

arch/arm/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static int ptrace_setwmmxregs(struct task_struct *tsk, void __user *ufp) 
	if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))

		return -EACCES;

	iwmmxt_task_release(thread);  /* force a reload */

	return copy_from_user(&thead->fpstate.iwmmxt, ufp, IWMMXT_SIZE)

	return copy_from_user(&thread->fpstate.iwmmxt, ufp, IWMMXT_SIZE)

		? -EFAULT : 0;

}