Commit 37c5a9f7 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 2655e828 40e3e672

Documentation/arm/sti/overview.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
			STi ARM Linux Overview

			==========================



Introduction

------------



  The ST Microelectronics Multimedia and Application Processors range of

  CortexA9 System-on-Chip are supported by the 'STi' platform of

  ARM Linux. Currently STiH415, STiH416 SOCs are supported with both

  B2000 and B2020 Reference boards.





  configuration

  -------------



  A generic configuration is provided for both STiH415/416, and can be used as the

  default by

	make stih41x_defconfig



  Layout

  ------

  All the files for multiple machine families (STiH415, STiH416, and STiG125)

  are located in the platform code contained in arch/arm/mach-sti



  There is a generic board board-dt.c in the mach folder which support

  Flattened Device Tree, which means, It works with any compatible board with

  Device Trees.





  Document Author

  ---------------



  Srinivas Kandagatla <srinivas.kandagatla@st.com>, (c) 2013 ST Microelectronics

Documentation/arm/sti/stih415-overview.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
			STiH415 Overview

			================



Introduction

------------



    The STiH415 is the next generation of HD, AVC set-top box processors

    for satellite, cable, terrestrial and IP-STB markets.



    Features

    - ARM Cortex-A9 1.0 GHz, dual-core CPU

    - SATA2x2,USB 2.0x3, PCIe, Gbit Ethernet MACx2

Documentation/arm/sti/stih416-overview.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
			STiH416 Overview

			================



Introduction

------------



    The STiH416 is the next generation of HD, AVC set-top box processors

    for satellite, cable, terrestrial and IP-STB markets.



    Features

    - ARM Cortex-A9 1.2 GHz dual core CPU

    - SATA2x2,USB 2.0x3, PCIe, Gbit Ethernet MACx2

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -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)

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -991,6 +991,8 @@ source "arch/arm/mach-socfpga/Kconfig" 


source "arch/arm/mach-spear/Kconfig"



source "arch/arm/mach-sti/Kconfig"



source "arch/arm/mach-s3c24xx/Kconfig"



if ARCH_S3C64XX

CRA Git | Maintained and supported by SUSTech CRA and CCSE