diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-06-21 00:01:26 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-07-12 12:24:08 +0300 |
| commit | cd1dc431d02afda521bed53b7c87a678a3ac246f (patch) | |
| tree | 0e08a9208cfb554de41d3781ef4c9669b004fc39 /arch/arm/mach-ux500/id.h | |
| parent | 4cf124f9a9d0d3505b6335d6061da54f83125b8e (diff) | |
| download | linux-cd1dc431d02afda521bed53b7c87a678a3ac246f.tar.xz | |
ARM: ux500: consolidate soc_device code in id.c
Nothing else uses the global dbx500_asic_id structure, so
we can merge the two small files that reference it into one.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/id.h')
| -rw-r--r-- | arch/arm/mach-ux500/id.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/arm/mach-ux500/id.h b/arch/arm/mach-ux500/id.h deleted file mode 100644 index 929f78ecf3df..000000000000 --- a/arch/arm/mach-ux500/id.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2010 - * - * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson - * License terms: GNU General Public License (GPL) version 2 - */ - -#ifndef __MACH_UX500_ID -#define __MACH_UX500_ID - -/** - * struct dbx500_asic_id - fields of the ASIC ID - * @process: the manufacturing process, 0x40 is 40 nm 0x00 is "standard" - * @partnumber: hithereto 0x8500 for DB8500 - * @revision: version code in the series - */ -struct dbx500_asic_id { - u16 partnumber; - u8 revision; - u8 process; -}; - -extern struct dbx500_asic_id dbx500_id; - -static inline unsigned int __attribute_const__ dbx500_partnumber(void) -{ - return dbx500_id.partnumber; -} - -static inline unsigned int __attribute_const__ dbx500_revision(void) -{ - return dbx500_id.revision; -} - -#define ux500_unknown_soc() BUG() - -#endif |