From: David Brown Date: Thu, 17 Mar 2011 05:13:16 +0000 (-0700) Subject: Merge remote branch 'rmk/for-linus' into for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=92c260f755c42337c550d8ac1f8ccd1b32bffb20;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge remote branch 'rmk/for-linus' into for-linus * rmk/for-linus: (1557 commits) ARM: 6806/1: irq: introduce entry and exit functions for chained handlers ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas ARM: 6747/1: P2V: Thumb2 support ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9 ARM: 6772/1: errata: possible fault MMU translations following an ASID switch ARM: 6776/1: mach-ux500: activate fix for errata 753970 ARM: 6794/1: SPEAr: Append UL to device address macros. ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files. ARM: 6681/1: SPEAr: add debugfs support to clk API ARM: 6703/1: SPEAr: update clk API support ARM: 6679/1: SPEAr: make clk API functions more generic ARM: 6737/1: SPEAr: formalized timer support ... Conflicts: arch/arm/mach-msm/board-msm7x27.c arch/arm/mach-msm/board-msm7x30.c arch/arm/mach-msm/board-qsd8x50.c arch/arm/mach-msm/board-sapphire.c arch/arm/mach-msm/include/mach/memory.h --- 92c260f755c42337c550d8ac1f8ccd1b32bffb20 diff --cc arch/arm/mach-msm/board-msm7x27.c index 16d75807e3aa,08fcd40a8cbd..c03f269e2e4b --- a/arch/arm/mach-msm/board-msm7x27.c +++ b/arch/arm/mach-msm/board-msm7x27.c @@@ -130,7 -130,9 +130,7 @@@ static void __init msm7x2x_map_io(void } MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF") - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .map_io = msm7x2x_map_io, .init_irq = msm7x2x_init_irq, .init_machine = msm7x2x_init, @@@ -138,7 -140,9 +138,7 @@@ MACHINE_END MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA") - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .map_io = msm7x2x_map_io, .init_irq = msm7x2x_init_irq, .init_machine = msm7x2x_init, @@@ -146,7 -150,9 +146,7 @@@ MACHINE_END MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF") - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .map_io = msm7x2x_map_io, .init_irq = msm7x2x_init_irq, .init_machine = msm7x2x_init, @@@ -154,7 -160,9 +154,7 @@@ MACHINE_END MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA") - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .map_io = msm7x2x_map_io, .init_irq = msm7x2x_init_irq, .init_machine = msm7x2x_init, diff --cc arch/arm/mach-msm/board-msm7x30.c index cf15889ab613,25db8fd71a70..b7a84966b711 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c @@@ -106,7 -83,9 +106,7 @@@ static void __init msm7x30_map_io(void } MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF") - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .map_io = msm7x30_map_io, .init_irq = msm7x30_init_irq, .init_machine = msm7x30_init, @@@ -114,7 -93,9 +114,7 @@@ MACHINE_END MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA") - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .map_io = msm7x30_map_io, .init_irq = msm7x30_init_irq, .init_machine = msm7x30_init, @@@ -122,7 -103,9 +122,7 @@@ MACHINE_END MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID") - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .map_io = msm7x30_map_io, .init_irq = msm7x30_init_irq, .init_machine = msm7x30_init, diff --cc arch/arm/mach-msm/board-qsd8x50.c index 127ee6df2421,15c2bbd2ef81..7f568611547e --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c @@@ -196,7 -116,9 +196,7 @@@ static void __init qsd8x50_init(void } MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF") - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .map_io = qsd8x50_map_io, .init_irq = qsd8x50_init_irq, .init_machine = qsd8x50_init, @@@ -204,7 -126,9 +204,7 @@@ MACHINE_END MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5") - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .map_io = qsd8x50_map_io, .init_irq = qsd8x50_init_irq, .init_machine = qsd8x50_init, diff --cc arch/arm/mach-msm/board-sapphire.c index 6781ca844f2c,83604f526f0f..68f930f07d77 --- a/arch/arm/mach-msm/board-sapphire.c +++ b/arch/arm/mach-msm/board-sapphire.c @@@ -105,7 -105,9 +105,7 @@@ static void __init sapphire_map_io(void MACHINE_START(SAPPHIRE, "sapphire") /* Maintainer: Brian Swetland */ - .boot_params = PHYS_OFFSET + 0x100, -#ifdef CONFIG_MSM_DEBUG_UART -#endif + .boot_params = PLAT_PHYS_OFFSET + 0x100, .fixup = sapphire_fixup, .map_io = sapphire_map_io, .init_irq = sapphire_init_irq, diff --cc arch/arm/mach-msm/include/mach/memory.h index 014bbd3ac1d4,176875df241f..f2f8d299ba95 --- a/arch/arm/mach-msm/include/mach/memory.h +++ b/arch/arm/mach-msm/include/mach/memory.h @@@ -18,17 -18,15 +18,17 @@@ /* physical offset of RAM */ #if defined(CONFIG_ARCH_QSD8X50) && defined(CONFIG_MSM_SOC_REV_A) - #define PHYS_OFFSET UL(0x00000000) + #define PLAT_PHYS_OFFSET UL(0x00000000) #elif defined(CONFIG_ARCH_QSD8X50) - #define PHYS_OFFSET UL(0x20000000) + #define PLAT_PHYS_OFFSET UL(0x20000000) #elif defined(CONFIG_ARCH_MSM7X30) - #define PHYS_OFFSET UL(0x00200000) + #define PLAT_PHYS_OFFSET UL(0x00200000) #elif defined(CONFIG_ARCH_MSM8X60) - #define PHYS_OFFSET UL(0x40200000) + #define PLAT_PHYS_OFFSET UL(0x40200000) +#elif defined(CONFIG_ARCH_MSM8960) - #define PHYS_OFFSET UL(0x40200000) ++#define PLAT_PHYS_OFFSET UL(0x40200000) #else - #define PHYS_OFFSET UL(0x10000000) + #define PLAT_PHYS_OFFSET UL(0x10000000) #endif #endif