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

Commit 1810b6cb 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: (27 commits)
  [ARM] 3433/1: ARM: OMAP: 8/8 Update board files
  [ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2
  [ARM] 3454/1: ARM: OMAP: 6/8 Update framebuffer low-level init code, take 2
  [ARM] 3430/1: ARM: OMAP: 5/8 Update PM
  [ARM] 3429/1: ARM: OMAP: 4/8 Update GPIO
  [ARM] 3428/1: ARM: OMAP: 3/8 Update pin multiplexing
  [ARM] 3427/1: ARM: OMAP: 2/8 Update timers
  [ARM] 3426/1: ARM: OMAP: 1/8 Update clock framework
  [ARM] 3396/2: AT91RM9200 Platform devices update
  [ARM] 3395/2: AT91RM9200 Dataflash Card vs MMC selection
  [ARM] 3393/2: AT91RM9200 LED support
  [ARM] 3453/1: Poodle: Correctly set the memory size
  [ARM] 3446/1: i.MX: MMC/SD SDHC controller registration for i.MX/MX1 MX1ADS board
  [ARM] 3444/1: i.MX: Scatter-gather DMA emulation for i.MX/MX1
  [ARM] 3451/1: ep93xx: use the m48t86 rtc driver on the ts72xx platform
  [ARM] 3450/1: ep93xx: use the ep93xx rtc driver
  [ARM] 3452/1: [S3C2410] RX3715 - add nand information
  [ARM] 3449/1: [S3C2410] Anubis - fix NAND timings
  [ARM] 3448/1: [S3C2410] Settle delay when _enabling_ USB PLL
  [ARM] 3442/1: [S3C2410] SMDK: NAND device setup
  ...
parents ef7a4567 9b6553cd

arch/arm/configs/at91rm9200dk_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 
# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

CONFIG_MTD_AT91_DATAFLASH=y

CONFIG_MTD_AT91_DATAFLASH_CARD=y

# CONFIG_MTD_AT91_DATAFLASH_CARD is not set



#

# NAND Flash Device Drivers

arch/arm/configs/at91rm9200ek_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 
# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

CONFIG_MTD_AT91_DATAFLASH=y

CONFIG_MTD_AT91_DATAFLASH_CARD=y

# CONFIG_MTD_AT91_DATAFLASH_CARD is not set



#

# NAND Flash Device Drivers

arch/arm/kernel/armksyms.c

+0 −13
Original line number Diff line number Diff line
@@ -100,23 +100,12 @@ EXPORT_SYMBOL(__raw_writesl); 
#endif



	/* string / mem functions */

EXPORT_SYMBOL(strcpy);

EXPORT_SYMBOL(strncpy);

EXPORT_SYMBOL(strcat);

EXPORT_SYMBOL(strncat);

EXPORT_SYMBOL(strcmp);

EXPORT_SYMBOL(strncmp);

EXPORT_SYMBOL(strchr);

EXPORT_SYMBOL(strlen);

EXPORT_SYMBOL(strnlen);

EXPORT_SYMBOL(strpbrk);

EXPORT_SYMBOL(strrchr);

EXPORT_SYMBOL(strstr);

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(memcmp);

EXPORT_SYMBOL(memscan);

EXPORT_SYMBOL(memchr);

EXPORT_SYMBOL(__memzero);
@@ -190,8 +179,6 @@ EXPORT_SYMBOL(_find_next_bit_be); 


	/* syscalls */

EXPORT_SYMBOL(sys_write);

EXPORT_SYMBOL(sys_read);

EXPORT_SYMBOL(sys_lseek);

EXPORT_SYMBOL(sys_open);

EXPORT_SYMBOL(sys_exit);

EXPORT_SYMBOL(sys_wait4);

arch/arm/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -252,6 +252,9 @@ static void __init dump_cpu_info(int cpu) 
			dump_cache("cache", cpu, CACHE_ISIZE(info));

		}

	}



	if (arch_is_coherent())

		printk("Cache coherency enabled\n");

}



int cpu_architecture(void)

arch/arm/mach-at91rm9200/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -16,11 +16,12 @@ obj-$(CONFIG_MACH_CSB637) += board-csb637.o 
#obj-$(CONFIG_MACH_KB9200)	+= board-kb9202.o



# LEDs support

#led-$(CONFIG_ARCH_AT91RM9200DK)	+= leds.o

#led-$(CONFIG_MACH_AT91RM9200EK)	+= leds.o

#led-$(CONFIG_MACH_CSB337)	+= leds.o

#led-$(CONFIG_MACH_CSB637)	+= leds.o

led-$(CONFIG_ARCH_AT91RM9200DK)	+= leds.o

led-$(CONFIG_MACH_AT91RM9200EK)	+= leds.o

led-$(CONFIG_MACH_CSB337)	+= leds.o

led-$(CONFIG_MACH_CSB637)	+= leds.o

#led-$(CONFIG_MACH_KB9200)	+= leds.o

#led-$(CONFIG_MACH_KAFA)	+= leds.o

obj-$(CONFIG_LEDS) += $(led-y)



# VGA support