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

Commit 30d41bfb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3473/1: Use numbers 0-15 for the VFP double registers
  [ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6
  [ARM] 3471/1: FTOSI functions should return 0 for NaN
  [ARM] 3470/1: Clear the HWCAP bits for the disabled kernel features
  [ARM] 3469/1: S3C24XX: clkout missing hclk selector
  [ARM] 3468/1: S3C2410: SMDK common include fix
  [ARM] 3461/1: ARM: OMAP: Fix clk_get() when using id and name
  [ARM] 3460/1: ARM: OMAP: Remove unnecessary nop_release()
  [ARM] 3459/1: ixp23xx: fix debug serial macros for big-endian operation
  [ARM] Allow decompressor to be built with -ffunction-sections
  [ARM] Fix SA110/SA1100 cache flushing
  [ARM] ebsa110: Fix incorrect serial port address
  [ARM] Fix ebsa110 debug macros
  [ARM] Move FLUSH_BASE macros to asm/arch/memory.h
  [ARM] Remove unnecessary extra parens in include/asm-arm/memory.h
  [ARM] arm's arch_local_page_offset() fix against 2.6.17-rc1
parents e38d5578 1356c194

arch/arm/boot/compressed/vmlinux.lds.in

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ SECTIONS 
    _start = .;

    *(.start)

    *(.text)

    *(.text.*)

    *(.fixup)

    *(.gnu.warning)

    *(.rodata)

arch/arm/kernel/setup.c

+6 −0
Original line number Diff line number Diff line
@@ -322,6 +322,12 @@ static void __init setup_processor(void) 
	sprintf(system_utsname.machine, "%s%c", list->arch_name, ENDIANNESS);

	sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);

	elf_hwcap = list->elf_hwcap;

#ifndef CONFIG_ARM_THUMB

	elf_hwcap &= ~HWCAP_THUMB;

#endif

#ifndef CONFIG_VFP

	elf_hwcap &= ~HWCAP_VFP;

#endif



	cpu_proc_init();

}

arch/arm/mach-omap1/devices.c

+0 −11
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ 
#include <asm/arch/mux.h>

#include <asm/arch/gpio.h>



extern void omap_nop_release(struct device *dev);



/*-------------------------------------------------------------------------*/



#if	defined(CONFIG_OMAP1610_IR) || defined(CONFIG_OMAP161O_IR_MODULE)



static u64 irda_dmamask = 0xffffffff;
@@ -37,7 +33,6 @@ static struct platform_device omap1610ir_device = { 
	.name = "omap1610-ir",

	.id = -1,

	.dev = {

		.release	= omap_nop_release,

		.dma_mask	= &irda_dmamask,

	},

};
@@ -84,9 +79,6 @@ static struct resource rtc_resources[] = { 
static struct platform_device omap_rtc_device = {

	.name           = "omap_rtc",

	.id             = -1,

	.dev = {

		.release        = omap_nop_release,

	},

	.num_resources	= ARRAY_SIZE(rtc_resources),

	.resource	= rtc_resources,

};
@@ -124,9 +116,6 @@ static struct resource sti_resources[] = { 
static struct platform_device sti_device = {

	.name		= "sti",

	.id		= -1,

	.dev = {

		.release	= omap_nop_release,

	},

	.num_resources	= ARRAY_SIZE(sti_resources),

	.resource	= sti_resources,

};

arch/arm/mach-omap2/devices.c

+0 −10
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ 
#include <asm/arch/mux.h>

#include <asm/arch/gpio.h>



extern void omap_nop_release(struct device *dev);



/*-------------------------------------------------------------------------*/



#if 	defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)



#define OMAP2_I2C_BASE2		0x48072000
@@ -49,9 +45,6 @@ static struct resource i2c_resources2[] = { 
static struct platform_device omap_i2c_device2 = {

        .name           = "i2c_omap",

        .id             = 2,

        .dev = {

                .release        = omap_nop_release,

        },

	.num_resources	= ARRAY_SIZE(i2c_resources2),

	.resource	= i2c_resources2,

};
@@ -100,9 +93,6 @@ static struct resource sti_resources[] = { 
static struct platform_device sti_device = {

	.name		= "sti",

	.id		= -1,

	.dev = {

		.release	= omap_nop_release,

	},

	.num_resources	= ARRAY_SIZE(sti_resources),

	.resource	= sti_resources,

};

arch/arm/mach-s3c2410/clock.c

+4 −0
Original line number Diff line number Diff line
@@ -367,6 +367,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent) 
		source = S3C2410_MISCCR_CLK0_UPLL;

	else if (parent == &clk_f)

		source = S3C2410_MISCCR_CLK0_FCLK;

	else if (parent == &clk_h)

		source = S3C2410_MISCCR_CLK0_HCLK;

	else if (parent == &clk_p)

		source = S3C2410_MISCCR_CLK0_PCLK;

	else if (clk == &s3c24xx_clkout0 && parent == &s3c24xx_dclk0)
@@ -376,6 +378,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent) 
	else

		return -EINVAL;



	clk->parent = parent;



	if (clk == &s3c24xx_dclk0)

		mask = S3C2410_MISCCR_CLK0_MASK;

	else {