diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 02:02:54 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 02:56:18 +0300 |
commit | 22ba14f41ca6b7f96fe3d4a8eb116358060595fd (patch) | |
tree | fbc59ebf82556cd604b1946304c61e64c4469caf /drivers/soc | |
parent | 7379d96bdabdfb2bf619c174fb6160a9c0a00ca3 (diff) | |
parent | 5420b4b156179ec634d9e42279b6898b85852960 (diff) | |
download | linux-22ba14f41ca6b7f96fe3d4a8eb116358060595fd.tar.xz |
Merge tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/multiplatform
Merge "Realview multiplatform support" from Linus Walleij:
The board and infrastructure changes for RealView
multiplatform and extended DT support.
* tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: realview: add an DT SMP boot method
ARM: realview: select SP810 and ICST for the DT variant
soc: versatile: add support for the PB11MPCore
clk: versatile-icst: add device tree support
clk: versatile-icst: refactor to allocate regmap separately
clk: versatile-icst: convert to use regmap
ARM: realview: remove private barrier implementation
ARM: no longer force unbuffered DMA for realview
clk/realview: stop using machine headers
ARM: realview: don't map undefined PCI registers
ARM: realview: remove sparsemem hack
Conflicts:
drivers/clk/versatile/Kconfig
Diffstat (limited to 'drivers/soc')
-rw-r--r-- | drivers/soc/versatile/soc-realview.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/soc/versatile/soc-realview.c b/drivers/soc/versatile/soc-realview.c index e642c4540dda..c337764de867 100644 --- a/drivers/soc/versatile/soc-realview.c +++ b/drivers/soc/versatile/soc-realview.c @@ -36,6 +36,8 @@ static const char *realview_board_str(u32 id) switch ((id >> 16) & 0xfff) { case 0x0147: return "HBI-0147"; + case 0x0159: + return "HBI-0159"; default: return "Unknown"; } @@ -44,6 +46,8 @@ static const char *realview_board_str(u32 id) static const char *realview_arch_str(u32 id) { switch ((id >> 8) & 0xf) { + case 0x04: + return "AHB"; case 0x05: return "Multi-layer AXI"; default: |