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

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

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4117/1: S3C2412: Fix writel() usage in selection code
  [ARM] 4111/1: Allow VFP to work with thread migration on SMP
  [ARM] 4112/1: Only ioremap to supersections if DOMAIN_IO is zero
  [ARM] 4106/1: S3C2410: typo fixes in register definitions
  [ARM] 4102/1: Allow for PHYS_OFFSET on any valid 2MiB address
  [ARM] Fix AMBA serial drivers for non-first serial ports
  [ARM] 4100/1: iop3xx: fix cpu mask for iop333
  [ARM] Update mach-types
  [ARM] Fix show_mem() for discontigmem
  [ARM] 4096/1: S3C24XX: change return code form s3c2410_gpio_getcfg()
  [ARM] 4095/1: S3C24XX: Fix GPIO set for Bank A
  [ARM] 4092/1: i.MX/MX1 CPU Frequency scaling latency definition
  [ARM] 4089/1: AT91: GPIO wake IRQ cleanup
  [ARM] 4088/1: AT91: Unbalanced IRQ in serial driver suspend/resume
  [ARM] 4087/1: AT91: CPU reset for SAM9x processors
  [ARM] 4086/1: AT91: Whitespace cleanup
  [ARM] 4085/1: AT91: Header fixes.
  [ARM] 4084/1: Remove CONFIG_DEBUG_WAITQ
parents 59df3230 b9d1902c

arch/arm/configs/at91sam9260ek_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -923,7 +923,6 @@ CONFIG_FORCED_INLINING=y 
# CONFIG_HEADERS_CHECK is not set

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_USER=y

# CONFIG_DEBUG_WAITQ is not set

# CONFIG_DEBUG_ERRORS is not set

CONFIG_DEBUG_LL=y

# CONFIG_DEBUG_ICEDCC is not set

arch/arm/configs/at91sam9261ek_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,6 @@ CONFIG_FORCED_INLINING=y 
# CONFIG_HEADERS_CHECK is not set

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_USER=y

# CONFIG_DEBUG_WAITQ is not set

# CONFIG_DEBUG_ERRORS is not set

CONFIG_DEBUG_LL=y

# CONFIG_DEBUG_ICEDCC is not set

arch/arm/kernel/head.S

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,10 @@ 
#include <asm/thread_info.h>

#include <asm/system.h>



#if (PHYS_OFFSET & 0x001fffff)

#error "PHYS_OFFSET must be at an even 2MiB boundary!"

#endif



#define KERNEL_RAM_VADDR	(PAGE_OFFSET + TEXT_OFFSET)

#define KERNEL_RAM_PADDR	(PHYS_OFFSET + TEXT_OFFSET)
@@ -251,7 +255,8 @@ __create_page_tables: 
	 * Then map first 1MB of ram in case it contains our boot params.

	 */

	add	r0, r4, #PAGE_OFFSET >> 18

	orr	r6, r7, #PHYS_OFFSET

	orr	r6, r7, #(PHYS_OFFSET & 0xff000000)

	orr	r6, r6, #(PHYS_OFFSET & 0x00e00000)

	str	r6, [r0]



#ifdef CONFIG_XIP_KERNEL

arch/arm/mach-at91rm9200/at91sam9260.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/mach/map.h>

#include <asm/arch/at91sam9260.h>

#include <asm/arch/at91_pmc.h>

#include <asm/arch/at91_rstc.h>



#include "generic.h"

#include "clock.h"
@@ -212,7 +213,7 @@ static struct at91_gpio_bank at91sam9260_gpio[] = { 


static void at91sam9260_reset(void)

{

#warning "Implement CPU reset"

	at91_sys_write(AT91_RSTC_CR, (0xA5 << 24) | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);

}

arch/arm/mach-at91rm9200/at91sam9261.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/mach/map.h>

#include <asm/arch/at91sam9261.h>

#include <asm/arch/at91_pmc.h>

#include <asm/arch/at91_rstc.h>



#include "generic.h"

#include "clock.h"
@@ -207,7 +208,7 @@ static struct at91_gpio_bank at91sam9261_gpio[] = { 


static void at91sam9261_reset(void)

{

#warning "Implement CPU reset"

	at91_sys_write(AT91_RSTC_CR, (0xA5 << 24) | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);

}