[ARM] Merge AT91 and devel branches (e9ccb799) · Commits · e / devices / android_kernel_samsung_universal8895

arch/arm/Kconfig

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -740,7 +740,7 @@ config XIP_PHYS_ADDR

	endmenu		endmenu

	if (ARCH_SA1100 \|\| ARCH_INTEGRATOR \|\| ARCH_OMAP)		if (ARCH_SA1100 \|\| ARCH_INTEGRATOR \|\| ARCH_OMAP \|\| ARCH_IMX )

	menu "CPU Frequency scaling"		menu "CPU Frequency scaling"

	@@ -767,6 +767,15 @@ config CPU_FREQ_INTEGRATOR

	If in doubt, say Y.		If in doubt, say Y.

			config CPU_FREQ_IMX
			tristate "CPUfreq driver for i.MX CPUs"
			depends on ARCH_IMX && CPU_FREQ
			default n
			help
			This enables the CPUfreq driver for i.MX CPUs.

			If in doubt, say N.

	endmenu		endmenu

	endif		endif
	@@ -945,6 +954,8 @@ source "drivers/video/Kconfig"

	source "sound/Kconfig"		source "sound/Kconfig"

			source "drivers/hid/Kconfig"

	source "drivers/usb/Kconfig"		source "drivers/usb/Kconfig"

	source "drivers/mmc/Kconfig"		source "drivers/mmc/Kconfig"

arch/arm/kernel/calls.S

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -331,6 +331,19 @@
	CALL(sys_mbind)		CALL(sys_mbind)
	/* 320 */ CALL(sys_get_mempolicy)		/* 320 */ CALL(sys_get_mempolicy)
	CALL(sys_set_mempolicy)		CALL(sys_set_mempolicy)
			CALL(sys_openat)
			CALL(sys_mkdirat)
			CALL(sys_mknodat)
			/* 325 */ CALL(sys_fchownat)
			CALL(sys_futimesat)
			CALL(sys_fstatat64)
			CALL(sys_unlinkat)
			CALL(sys_renameat)
			/* 330 */ CALL(sys_linkat)
			CALL(sys_symlinkat)
			CALL(sys_readlinkat)
			CALL(sys_fchmodat)
			CALL(sys_faccessat)
	#ifndef syscalls_counted		#ifndef syscalls_counted
	.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls		.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
	#define syscalls_counted		#define syscalls_counted

arch/arm/kernel/head.S

+10 −9

Original line number	Original line	Diff line number	Diff line
	@@ -22,30 +22,31 @@
	#include <asm/thread_info.h>		#include <asm/thread_info.h>
	#include <asm/system.h>		#include <asm/system.h>

	#define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET)		#define KERNEL_RAM_VADDR (PAGE_OFFSET + TEXT_OFFSET)
			#define KERNEL_RAM_PADDR (PHYS_OFFSET + TEXT_OFFSET)

	/*		/*
	* swapper_pg_dir is the virtual address of the initial page table.		* swapper_pg_dir is the virtual address of the initial page table.
	* We place the page tables 16K below KERNEL_RAM_ADDR. Therefore, we must		* We place the page tables 16K below KERNEL_RAM_VADDR. Therefore, we must
	* make sure that KERNEL_RAM_ADDR is correctly set. Currently, we expect		* make sure that KERNEL_RAM_VADDR is correctly set. Currently, we expect
	* the least significant 16 bits to be 0x8000, but we could probably		* the least significant 16 bits to be 0x8000, but we could probably
	* relax this restriction to KERNEL_RAM_ADDR >= PAGE_OFFSET + 0x4000.		* relax this restriction to KERNEL_RAM_VADDR >= PAGE_OFFSET + 0x4000.
	*/		*/
	#if (KERNEL_RAM_ADDR & 0xffff) != 0x8000		#if (KERNEL_RAM_VADDR & 0xffff) != 0x8000
	#error KERNEL_RAM_ADDR must start at 0xXXXX8000		#error KERNEL_RAM_VADDR must start at 0xXXXX8000
	#endif		#endif

	.globl swapper_pg_dir		.globl swapper_pg_dir
	.equ swapper_pg_dir, KERNEL_RAM_ADDR - 0x4000		.equ swapper_pg_dir, KERNEL_RAM_VADDR - 0x4000

	.macro pgtbl, rd		.macro pgtbl, rd
	ldr \rd, =(__virt_to_phys(KERNEL_RAM_ADDR - 0x4000))		ldr \rd, =(KERNEL_RAM_PADDR - 0x4000)
	.endm		.endm

	#ifdef CONFIG_XIP_KERNEL		#ifdef CONFIG_XIP_KERNEL
	#define TEXTADDR XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)		#define TEXTADDR XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)
	#else		#else
	#define TEXTADDR KERNEL_RAM_ADDR		#define TEXTADDR KERNEL_RAM_VADDR
	#endif		#endif

	/*		/*

arch/arm/kernel/setup.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -354,9 +354,6 @@ static void __init setup_processor(void)
	#ifndef CONFIG_ARM_THUMB		#ifndef CONFIG_ARM_THUMB
	elf_hwcap &= ~HWCAP_THUMB;		elf_hwcap &= ~HWCAP_THUMB;
	#endif		#endif
	#ifndef CONFIG_VFP
	elf_hwcap &= ~HWCAP_VFP;
	#endif

	cpu_proc_init();		cpu_proc_init();
	}		}

arch/arm/mach-at91rm9200/at91sam9260_devices.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@
	#include <asm/arch/gpio.h>		#include <asm/arch/gpio.h>
	#include <asm/arch/at91sam9260.h>		#include <asm/arch/at91sam9260.h>
	#include <asm/arch/at91sam926x_mc.h>		#include <asm/arch/at91sam926x_mc.h>
			#include <asm/arch/at91sam9260_matrix.h>

	#include "generic.h"		#include "generic.h"