Commit 0c0497c2 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: Move all the silicon rev handling to one place 



Move all the silicon rev handling to one place (Kconfig) and
make sure we warn if you are running on silicon that has not been tested on

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 664d0403

arch/blackfin/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -166,6 +166,19 @@ config BF561 


endchoice



config BF_REV_MIN

	int

	default 0 if (BF52x || BF54x)

	default 2 if (BF537 || BF536 || BF534)

	default 3 if (BF561 ||BF533 || BF532 || BF531)



config BF_REV_MAX

	int

	default 2 if (BF52x || BF54x)

	default 3 if (BF537 || BF536 || BF534)

	default 5 if (BF561)

	default 6 if (BF533 || BF532 || BF531)



choice

	prompt "Silicon Rev"

	default BF_REV_0_1 if (BF52x || BF54x)

arch/blackfin/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -821,9 +821,10 @@ void __init setup_arch(char **cmdline_p) 
			printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",

			       bfin_compiled_revid(), bfin_revid());

	}

	if (bfin_revid() < SUPPORTED_REVID)

	if (bfin_revid() <= CONFIG_BF_REV_MIN || bfin_revid() > CONFIG_BF_REV_MAX)

		printk(KERN_ERR "Warning: Unsupported Chip Revision ADSP-%s Rev 0.%d detected\n",

		       CPU, bfin_revid());



	printk(KERN_INFO "Blackfin Linux support by http://blackfin.uclinux.org/\n");



	printk(KERN_INFO "Processor Speed: %lu MHz core clock and %lu MHz System Clock\n",

arch/blackfin/mach-bf527/include/mach/bf527.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#ifndef __MACH_BF527_H__

#define __MACH_BF527_H__



#define SUPPORTED_REVID 2



#define OFFSET_(x) ((x) & 0x0000FFFF)



/*some misc defines*/

arch/blackfin/mach-bf533/include/mach/bf533.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#ifndef __MACH_BF533_H__

#define __MACH_BF533_H__



#define SUPPORTED_REVID 2



#define OFFSET_(x) ((x) & 0x0000FFFF)



/*some misc defines*/

arch/blackfin/mach-bf537/include/mach/bf537.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#ifndef __MACH_BF537_H__

#define __MACH_BF537_H__



#define SUPPORTED_REVID 2



/* Masks for generic ERROR IRQ demultiplexing used in int-priority-sc.c */



#define SPI_ERR_MASK (TXCOL | RBSY | MODF | TXE)	/* SPI_STAT */