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

Commit 0d69ae5f authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents 13d1ef29 9bc39bec

arch/arm/kernel/sys_arm.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ long execve(const char *filename, char **argv, char **envp) 
		  "Ir" (THREAD_START_SP - sizeof(regs)),

		  "r" (&regs),

		  "Ir" (sizeof(regs))

		: "r0", "r1", "r2", "r3", "ip", "memory");

		: "r0", "r1", "r2", "r3", "ip", "lr", "memory");



 out:

	return ret;

arch/arm/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) 


		bad_access:

		spin_unlock(&mm->page_table_lock);

		/* simulate a read access fault */

		/* simulate a write access fault */

		do_DataAbort(addr, 15 + (1 << 11), regs);

		return -1;

	}

arch/arm/mach-imx/generic.c

+12 −11
Original line number Diff line number Diff line
@@ -28,14 +28,15 @@ 
#include <linux/module.h>

#include <asm/arch/imxfb.h>

#include <asm/hardware.h>

#include <asm/arch/imx-regs.h>



#include <asm/mach/map.h>



void imx_gpio_mode(int gpio_mode)

{

	unsigned int pin = gpio_mode & GPIO_PIN_MASK;

	unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> 5;

	unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> 10;

	unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;

	unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> GPIO_OCR_SHIFT;

	unsigned int tmp;



	/* Pullup enable */
@@ -57,7 +58,7 @@ void imx_gpio_mode(int gpio_mode) 
		GPR(port) &= ~(1<<pin);



	/* use as gpio? */

	if( ocr == 3 )

	if(gpio_mode &  GPIO_GIUS)

		GIUS(port) |= (1<<pin);

	else

		GIUS(port) &= ~(1<<pin);
@@ -72,20 +73,20 @@ void imx_gpio_mode(int gpio_mode) 
		tmp |= (ocr << (pin*2));

		OCR1(port) = tmp;



		if( gpio_mode &	GPIO_AOUT )

		ICONFA1(port) &= ~( 3<<(pin*2));

		if( gpio_mode &	GPIO_BOUT )

		ICONFA1(port) |= ((gpio_mode >> GPIO_AOUT_SHIFT) & 3) << (pin * 2);

		ICONFB1(port) &= ~( 3<<(pin*2));

		ICONFB1(port) |= ((gpio_mode >> GPIO_BOUT_SHIFT) & 3) << (pin * 2);

	} else {

		tmp = OCR2(port);

		tmp &= ~( 3<<((pin-16)*2));

		tmp |= (ocr << ((pin-16)*2));

		OCR2(port) = tmp;



		if( gpio_mode &	GPIO_AOUT )

		ICONFA2(port) &= ~( 3<<((pin-16)*2));

		if( gpio_mode &	GPIO_BOUT )

		ICONFA2(port) |= ((gpio_mode >> GPIO_AOUT_SHIFT) & 3) << ((pin-16) * 2);

		ICONFB2(port) &= ~( 3<<((pin-16)*2));

		ICONFB2(port) |= ((gpio_mode >> GPIO_BOUT_SHIFT) & 3) << ((pin-16) * 2);

	}

}

arch/arm/mach-imx/mx1ads.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void __init 
mx1ads_init(void)

{

#ifdef CONFIG_LEDS

	imx_gpio_mode(GPIO_PORTA | GPIO_OUT | GPIO_GPIO | 2);

	imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2);

#endif

	platform_add_devices(devices, ARRAY_SIZE(devices));

}

arch/sparc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ void __init time_init(void) 
	sbus_time_init();

}



extern __inline__ unsigned long do_gettimeoffset(void)

static inline unsigned long do_gettimeoffset(void)

{

	return (*master_l10_counter >> 10) & 0x1fffff;

}