diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-25 13:43:28 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-25 13:43:28 -0700 |
| commit | 37c5a9f7d73352650447c3984a39007304287303 (patch) | |
| tree | 67b00299aa0e2bbe9b879ad957eff17bfed72e4e /MAINTAINERS | |
| parent | 2655e828350cc7558d1a74cd4464e34b81e17f36 (diff) | |
| parent | 40e3e6725370481b7b81d969dbde056f50d870ae (diff) | |
| download | linux-37c5a9f7d73352650447c3984a39007304287303.tar.gz linux-37c5a9f7d73352650447c3984a39007304287303.tar.bz2 linux-37c5a9f7d73352650447c3984a39007304287303.zip | |
Merge branch 'sti/soc' into next/late
From Srinivas Kandagatla <srinivas.kandagatla@st.com>:
This patch-set adds basic support for STMicroelectronics STi series SOCs
which includes STiH415 and STiH416 with B2000 and B2020 board support.
STiH415 and STiH416 are dual-core ARM Cortex-A9 CPU, designed for
use in Set-top-boxes. The SOC support is available in mach-sti which
contains support code for STiH415, STiH416 SOCs including the generic
board support.
The reason for adding two SOCs at this patch set is to show that no new
C code is required for second SOC(STiH416) support.
* sti/soc:
ARM: stih41x: Add B2020 board support
ARM: stih41x: Add B2000 board support
ARM: sti: Add DEBUG_LL console support
ARM: sti: Add STiH416 SOC support
ARM: sti: Add STiH415 SOC support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5be702cc8449..599d50a8901e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1201,6 +1201,15 @@ M: Dinh Nguyen <dinguyen@altera.com> S: Maintained F: drivers/clk/socfpga/ +ARM/STI ARCHITECTURE +M: Srinivas Kandagatla <srinivas.kandagatla@st.com> +M: Stuart Menefy <stuart.menefy@st.com> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +L: kernel@stlinux.com +W: http://www.stlinux.com +S: Maintained +F: arch/arm/mach-sti/ + ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |