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

Commit bfd412db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91 

* 'for-linus' of git://github.com/at91linux/linux-2.6-at91:
  at91: Add ARCH_ID and basic cpu macros definition for 5series chips family.
  arm: at91: fix compiler warning for eb01 board build
  arm: at91: minimal defconfig for at91x40 SoC
  ARM: at91: AT91CAP9 has a macb device
parents a1fde08c 9baeb7e4

arch/arm/configs/at91x40_defconfig

0 → 100644
+48 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EMBEDDED=y

# CONFIG_HOTPLUG is not set

# CONFIG_ELF_CORE is not set

# CONFIG_FUTEX is not set

# CONFIG_TIMERFD is not set

# CONFIG_VM_EVENT_COUNTERS is not set

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_MMU is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91X40=y

CONFIG_MACH_AT91EB01=y

CONFIG_AT91_EARLY_USART0=y

CONFIG_CPU_ARM7TDMI=y

CONFIG_SET_MEM_PARAM=y

CONFIG_DRAM_BASE=0x01000000

CONFIG_DRAM_SIZE=0x00400000

CONFIG_FLASH_MEM_BASE=0x01400000

CONFIG_PROCESSOR_ID=0x14000040

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_BINFMT_FLAT=y

# CONFIG_SUSPEND is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_RAM=y

CONFIG_MTD_ROM=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_DEVKMEM is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_ROMFS_FS=y

# CONFIG_ENABLE_MUST_CHECK is not set

arch/arm/mach-at91/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ config ARCH_AT91CAP9 
	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB



config ARCH_AT572D940HF

	bool "AT572D940HF"

arch/arm/mach-at91/board-eb01.c

+6 −1
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ 
#include <mach/board.h>

#include "generic.h"



static void __init at91eb01_init_irq(void)

{

	at91x40_init_interrupts(NULL);

}



static void __init at91eb01_map_io(void)

{

	at91x40_initialize(40000000);
@@ -38,7 +43,7 @@ static void __init at91eb01_map_io(void) 
MACHINE_START(AT91EB01, "Atmel AT91 EB01")

	/* Maintainer: Greg Ungerer <gerg@snapgear.com> */

	.timer		= &at91x40_timer,

	.init_irq	= at91x40_init_interrupts,

	.init_irq	= at91eb01_init_irq,

	.map_io		= at91eb01_map_io,

MACHINE_END

arch/arm/mach-at91/include/mach/cpu.h

+28 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define ARCH_ID_AT91SAM9G45	0x819b05a0

#define ARCH_ID_AT91SAM9G45MRL	0x819b05a2	/* aka 9G45-ES2 & non ES lots */

#define ARCH_ID_AT91SAM9G45ES	0x819b05a1	/* 9G45-ES (Engineering Sample) */

#define ARCH_ID_AT91SAM9X5	0x819a05a0

#define ARCH_ID_AT91CAP9	0x039A03A0



#define ARCH_ID_AT91SAM9XE128	0x329973a0
@@ -55,6 +56,12 @@ static inline unsigned long at91_cpu_fully_identify(void) 
#define ARCH_EXID_AT91SAM9G46	0x00000003

#define ARCH_EXID_AT91SAM9G45	0x00000004



#define ARCH_EXID_AT91SAM9G15	0x00000000

#define ARCH_EXID_AT91SAM9G35	0x00000001

#define ARCH_EXID_AT91SAM9X35	0x00000002

#define ARCH_EXID_AT91SAM9G25	0x00000003

#define ARCH_EXID_AT91SAM9X25	0x00000004



static inline unsigned long at91_exid_identify(void)

{

	return at91_sys_read(AT91_DBGU_EXID);
@@ -143,6 +150,27 @@ static inline unsigned long at91cap9_rev_identify(void) 
#define cpu_is_at91sam9m11()	(0)

#endif



#ifdef CONFIG_ARCH_AT91SAM9X5

#define cpu_is_at91sam9x5()	(at91_cpu_identify() == ARCH_ID_AT91SAM9X5)

#define cpu_is_at91sam9g15()	(cpu_is_at91sam9x5() && \

				(at91_exid_identify() == ARCH_EXID_AT91SAM9G15))

#define cpu_is_at91sam9g35()	(cpu_is_at91sam9x5() && \

				(at91_exid_identify() == ARCH_EXID_AT91SAM9G35))

#define cpu_is_at91sam9x35()	(cpu_is_at91sam9x5() && \

				(at91_exid_identify() == ARCH_EXID_AT91SAM9X35))

#define cpu_is_at91sam9g25()	(cpu_is_at91sam9x5() && \

				(at91_exid_identify() == ARCH_EXID_AT91SAM9G25))

#define cpu_is_at91sam9x25()	(cpu_is_at91sam9x5() && \

				(at91_exid_identify() == ARCH_EXID_AT91SAM9X25))

#else

#define cpu_is_at91sam9x5()	(0)

#define cpu_is_at91sam9g15()	(0)

#define cpu_is_at91sam9g35()	(0)

#define cpu_is_at91sam9x35()	(0)

#define cpu_is_at91sam9g25()	(0)

#define cpu_is_at91sam9x25()	(0)

#endif



#ifdef CONFIG_ARCH_AT91CAP9

#define cpu_is_at91cap9()	(at91_cpu_identify() == ARCH_ID_AT91CAP9)

#define cpu_is_at91cap9_revB()	(at91cap9_rev_identify() == ARCH_REVISION_CAP9_B)