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

Commit 706d4b12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (215 commits)
  ARM: memblock: setup lowmem mappings using memblock
  ARM: memblock: move meminfo into find_limits directly
  ARM: memblock: convert free_highpages() to use memblock
  ARM: move freeing of highmem pages out of mem_init()
  ARM: memblock: convert memory detail printing to use memblock
  ARM: memblock: use memblock to free memory into arm_bootmem_init()
  ARM: memblock: use memblock when initializing memory allocators
  ARM: ensure membank array is always sorted
  ARM: 6466/1: implement flush_icache_all for the rest of the CPUs
  ARM: 6464/2: fix spinlock recursion in adjust_pte()
  ARM: fix memblock breakage
  ARM: 6465/1: Fix data abort accessing proc_info from __lookup_processor_type
  ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt
  ARM: 6449/1: Fix for compiler warning of uninitialized variable.
  ARM: 6445/1: fixup TCM memory types
  ARM: imx: Add wake functionality to GPIO
  ARM: mx5: Add gpio-keys to mx51 babbage board
  ARM: imx: Add gpio-keys to plat-mxc
  mx31_3ds: Fix spi registration
  mx31_3ds: Fix the logic for detecting the debug board
  ...
parents 3af54c9b 9bafc741

arch/arm/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -720,9 +720,11 @@ config ARCH_S5PC100 
config ARCH_S5PV210

	bool "Samsung S5PV210/S5PC110"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select GENERIC_GPIO

	select HAVE_CLK

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_HAS_CPUFREQ

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC
@@ -733,9 +735,13 @@ config ARCH_S5PV210 
config ARCH_S5PV310

	bool "Samsung S5PV310/S5PC210"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select GENERIC_GPIO

	select HAVE_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_S3C_RTC

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S5PV310 series based systems
@@ -1662,6 +1668,12 @@ if ARCH_HAS_CPUFREQ 


source "drivers/cpufreq/Kconfig"



config CPU_FREQ_IMX

	tristate "CPUfreq driver for i.MX CPUs"

	depends on ARCH_MXC && CPU_FREQ

	help

	  This enables the CPUfreq driver for i.MX CPUs.



config CPU_FREQ_SA1100

	bool

arch/arm/configs/mx51_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ CONFIG_FEC=y 
CONFIG_INPUT_FF_MEMLESS=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_INPUT_EVBUG=m

CONFIG_MOUSE_PS2=m

CONFIG_MOUSE_PS2_ELANTECH=y

arch/arm/include/asm/hardware/cache-l2x0.h

+10 −3
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ 
#define __ASM_ARM_HARDWARE_L2X0_H



#define L2X0_CACHE_ID			0x000

#define   L2X0_CACHE_ID_PART_MASK	(0xf << 6)

#define   L2X0_CACHE_ID_PART_L210	(1 << 6)

#define   L2X0_CACHE_ID_PART_L310	(3 << 6)

#define L2X0_CACHE_TYPE			0x004

#define L2X0_CTRL			0x100

#define L2X0_AUX_CTRL			0x104
@@ -53,6 +50,16 @@ 
#define L2X0_LINE_DATA			0xF10

#define L2X0_LINE_TAG			0xF30

#define L2X0_DEBUG_CTRL			0xF40

#define L2X0_PREFETCH_CTRL		0xF60

#define L2X0_POWER_CTRL			0xF80

#define   L2X0_DYNAMIC_CLK_GATING_EN	(1 << 1)

#define   L2X0_STNDBY_MODE_EN		(1 << 0)



/* Registers shifts and masks */

#define L2X0_CACHE_ID_PART_MASK		(0xf << 6)

#define L2X0_CACHE_ID_PART_L210		(1 << 6)

#define L2X0_CACHE_ID_PART_L310		(3 << 6)

#define L2X0_AUX_CTRL_WAY_SIZE_MASK	(0x3 << 17)



#ifndef __ASSEMBLY__

extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask);

arch/arm/include/asm/memblock.h

+0 −7
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_MEMBLOCK_H

#define _ASM_ARM_MEMBLOCK_H



#ifdef CONFIG_MMU

extern phys_addr_t lowmem_end_addr;

#define MEMBLOCK_REAL_LIMIT	lowmem_end_addr

#else

#define MEMBLOCK_REAL_LIMIT	0

#endif



struct meminfo;

struct machine_desc;

arch/arm/include/asm/outercache.h

+24 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ struct outer_cache_fns { 
	void (*inv_range)(unsigned long, unsigned long);

	void (*clean_range)(unsigned long, unsigned long);

	void (*flush_range)(unsigned long, unsigned long);

	void (*flush_all)(void);

	void (*inv_all)(void);

	void (*disable)(void);

#ifdef CONFIG_OUTER_CACHE_SYNC

	void (*sync)(void);

#endif
@@ -50,6 +53,24 @@ static inline void outer_flush_range(unsigned long start, unsigned long end) 
		outer_cache.flush_range(start, end);

}



static inline void outer_flush_all(void)

{

	if (outer_cache.flush_all)

		outer_cache.flush_all();

}



static inline void outer_inv_all(void)

{

	if (outer_cache.inv_all)

		outer_cache.inv_all();

}



static inline void outer_disable(void)

{

	if (outer_cache.disable)

		outer_cache.disable();

}



#else



static inline void outer_inv_range(unsigned long start, unsigned long end)
@@ -58,6 +79,9 @@ static inline void outer_clean_range(unsigned long start, unsigned long end) 
{ }

static inline void outer_flush_range(unsigned long start, unsigned long end)

{ }

static inline void outer_flush_all(void) { }

static inline void outer_inv_all(void) { }

static inline void outer_disable(void) { }



#endif