diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-19 11:50:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-19 11:51:24 -0700 |
| commit | 61b464aef0e306f141dbc0bb3f9c58049a987a7e (patch) | |
| tree | e4a43e5b52f72df8e8417aa918f2fe3ea57d0071 /arch/arm/mach-at91/include | |
| parent | a71efd61db6368629b1b3e403076c957207f79bd (diff) | |
| parent | f5fa4098c3fcc0e504fbc0682dccd331dbbcf197 (diff) | |
| download | blackbird-op-linux-61b464aef0e306f141dbc0bb3f9c58049a987a7e.tar.gz blackbird-op-linux-61b464aef0e306f141dbc0bb3f9c58049a987a7e.zip | |
Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/cleanup
From Nicolas Ferre:
Little modification in SoC presentation in kernel log.
Removing of a long-standing warning in sam9263 PM code.
* tag 'at91-soc' of git://github.com/at91linux/linux-at91:
ARM: at91: suspend both memory controllers on at91sam9263
ARM: at91: change "Unknown" qualifier SoC subtype handling
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-at91/include')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/cpu.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h index 0f3379fe645f..d3d7b993846b 100644 --- a/arch/arm/mach-at91/include/mach/cpu.h +++ b/arch/arm/mach-at91/include/mach/cpu.h @@ -86,7 +86,7 @@ enum at91_soc_type { AT91_SOC_SAMA5D3, /* Unknown type */ - AT91_SOC_NONE + AT91_SOC_UNKNOWN, }; enum at91_soc_subtype { @@ -107,8 +107,11 @@ enum at91_soc_subtype { AT91_SOC_SAMA5D31, AT91_SOC_SAMA5D33, AT91_SOC_SAMA5D34, AT91_SOC_SAMA5D35, + /* No subtype for this SoC */ + AT91_SOC_SUBTYPE_NONE, + /* Unknown subtype */ - AT91_SOC_SUBTYPE_NONE + AT91_SOC_SUBTYPE_UNKNOWN, }; struct at91_socinfo { @@ -122,7 +125,7 @@ const char *at91_get_soc_subtype(struct at91_socinfo *c); static inline int at91_soc_is_detected(void) { - return at91_soc_initdata.type != AT91_SOC_NONE; + return at91_soc_initdata.type != AT91_SOC_UNKNOWN; } #ifdef CONFIG_SOC_AT91RM9200 |
