mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-22 17:01:14 +00:00
Code Issues Releases Wiki Activity

[ARM] 3947/1: AT91: cpu_is_XXX macro's

Browse source 
This patch replaces the arch_identify() in system.h with a set of
cpu_is_XXX() macro's.  This allows for compile-time checking of the
target AT91 processor.

Original patch from David Brownell.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Andrew Victor 2006-11-30 11:58:14 +01:00 committed by Russell King
parent 1f4fd0a0d2
commit 79da7a610a
3 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/serial/atmel_serial.c
View file

@ -138,7 +138,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl)
unsigned int mode;
#ifdef CONFIG_ARM
if (arch_identify() == ARCH_ID_AT91RM9200) {
if (cpu_is_at91rm9200()) {
/*
* AT91RM9200 Errata #39: RTS0 is not internally connected to PA21.
* We need to drive the pin manually.

49
include/asm-arm/arch-at91rm9200/cpu.h Normal file
View file

@ -0,0 +1,49 @@
/*
* include/asm-arm/arch-at91rm9200/cpu.h
*
* Copyright (C) 2006 SAN People
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*/
#ifndef __ASM_ARCH_CPU_H
#define __ASM_ARCH_CPU_H
#include <asm/hardware.h>
#include <asm/arch/at91_dbgu.h>
#define ARCH_ID_AT91RM9200 0x09290780
#define ARCH_ID_AT91SAM9260 0x019803a0
#define ARCH_ID_AT91SAM9261 0x019703a0
static inline unsigned long at91_cpu_identify(void)
{
return (at91_sys_read(AT91_DBGU_CIDR) & ~AT91_CIDR_VERSION);
}
#ifdef CONFIG_ARCH_AT91RM9200
#define cpu_is_at91rm9200() (at91_cpu_identify() == ARCH_ID_AT91RM9200)
#else
#define cpu_is_at91rm9200() (0)
#endif
#ifdef CONFIG_ARCH_AT91SAM9260
#define cpu_is_at91sam9260() (at91_cpu_identify() == ARCH_ID_AT91SAM9260)
#else
#define cpu_is_at91sam9260() (0)
#endif
#ifdef CONFIG_ARCH_AT91SAM9261
#define cpu_is_at91sam9261() (at91_cpu_identify() == ARCH_ID_AT91SAM9261)
#else
#define cpu_is_at91sam9261() (0)
#endif
#endif

8
include/asm-arm/arch-at91rm9200/system.h
View file

@ -50,12 +50,4 @@ static inline void arch_reset(char mode)
for (;;) {} /* wait fovever */
}
#define ARCH_ID_AT91RM9200 0x09200080
#define ARCH_ID_AT91SAM9261 0x019000a0
static inline unsigned long arch_identify(void)
{
return at91_sys_read(AT91_DBGU_CIDR) & (AT91_CIDR_EPROC | AT91_CIDR_ARCH);
}
#endif