aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/arm/SPEAr/overview.txt32
-rw-r--r--Documentation/devicetree/bindings/arm/spear.txt14
-rw-r--r--MAINTAINERS13
3 files changed, 37 insertions, 22 deletions
diff --git a/Documentation/arm/SPEAr/overview.txt b/Documentation/arm/SPEAr/overview.txt
index 28a9af953b9..57aae7765c7 100644
--- a/Documentation/arm/SPEAr/overview.txt
+++ b/Documentation/arm/SPEAr/overview.txt
@@ -8,9 +8,8 @@ Introduction
8 weblink : http://www.st.com/spear 8 weblink : http://www.st.com/spear
9 9
10 The ST Microelectronics SPEAr range of ARM9/CortexA9 System-on-Chip CPUs are 10 The ST Microelectronics SPEAr range of ARM9/CortexA9 System-on-Chip CPUs are
11 supported by the 'spear' platform of ARM Linux. Currently SPEAr300, 11 supported by the 'spear' platform of ARM Linux. Currently SPEAr1310,
12 SPEAr310, SPEAr320 and SPEAr600 SOCs are supported. Support for the SPEAr13XX 12 SPEAr1340, SPEAr300, SPEAr310, SPEAr320 and SPEAr600 SOCs are supported.
13 series is in progress.
14 13
15 Hierarchy in SPEAr is as follows: 14 Hierarchy in SPEAr is as follows:
16 15
@@ -26,33 +25,36 @@ Introduction
26 - SPEAr600 (SOC) 25 - SPEAr600 (SOC)
27 - SPEAr600 Evaluation Board 26 - SPEAr600 Evaluation Board
28 - SPEAr13XX (13XX SOC series, based on ARM CORTEXA9) 27 - SPEAr13XX (13XX SOC series, based on ARM CORTEXA9)
29 - SPEAr1300 (SOC) 28 - SPEAr1310 (SOC)
29 - SPEAr1310 Evaluation Board
30 - SPEAr1340 (SOC)
31 - SPEAr1340 Evaluation Board
30 32
31 Configuration 33 Configuration
32 ------------- 34 -------------
33 35
34 A generic configuration is provided for each machine, and can be used as the 36 A generic configuration is provided for each machine, and can be used as the
35 default by 37 default by
36 make spear600_defconfig 38 make spear13xx_defconfig
37 make spear300_defconfig 39 make spear3xx_defconfig
38 make spear310_defconfig 40 make spear6xx_defconfig
39 make spear320_defconfig
40 41
41 Layout 42 Layout
42 ------ 43 ------
43 44
44 The common files for multiple machine families (SPEAr3XX, SPEAr6XX and 45 The common files for multiple machine families (SPEAr3xx, SPEAr6xx and
45 SPEAr13XX) are located in the platform code contained in arch/arm/plat-spear 46 SPEAr13xx) are located in the platform code contained in arch/arm/plat-spear
46 with headers in plat/. 47 with headers in plat/.
47 48
48 Each machine series have a directory with name arch/arm/mach-spear followed by 49 Each machine series have a directory with name arch/arm/mach-spear followed by
49 series name. Like mach-spear3xx, mach-spear6xx and mach-spear13xx. 50 series name. Like mach-spear3xx, mach-spear6xx and mach-spear13xx.
50 51
51 Common file for machines of spear3xx family is mach-spear3xx/spear3xx.c and for 52 Common file for machines of spear3xx family is mach-spear3xx/spear3xx.c, for
52 spear6xx is mach-spear6xx/spear6xx.c. mach-spear* also contain soc/machine 53 spear6xx is mach-spear6xx/spear6xx.c and for spear13xx family is
53 specific files, like spear300.c, spear310.c, spear320.c and spear600.c. 54 mach-spear13xx/spear13xx.c. mach-spear* also contain soc/machine specific
54 mach-spear* doesn't contains board specific files as they fully support 55 files, like spear1310.c, spear1340.c spear300.c, spear310.c, spear320.c and
55 Flattened Device Tree. 56 spear600.c. mach-spear* doesn't contains board specific files as they fully
57 support Flattened Device Tree.
56 58
57 59
58 Document Author 60 Document Author
diff --git a/Documentation/devicetree/bindings/arm/spear.txt b/Documentation/devicetree/bindings/arm/spear.txt
index aa5f355cc94..0d42949df6c 100644
--- a/Documentation/devicetree/bindings/arm/spear.txt
+++ b/Documentation/devicetree/bindings/arm/spear.txt
@@ -2,25 +2,25 @@ ST SPEAr Platforms Device Tree Bindings
2--------------------------------------- 2---------------------------------------
3 3
4Boards with the ST SPEAr600 SoC shall have the following properties: 4Boards with the ST SPEAr600 SoC shall have the following properties:
5
6Required root node property: 5Required root node property:
7
8compatible = "st,spear600"; 6compatible = "st,spear600";
9 7
10Boards with the ST SPEAr300 SoC shall have the following properties: 8Boards with the ST SPEAr300 SoC shall have the following properties:
11
12Required root node property: 9Required root node property:
13
14compatible = "st,spear300"; 10compatible = "st,spear300";
15 11
16Boards with the ST SPEAr310 SoC shall have the following properties: 12Boards with the ST SPEAr310 SoC shall have the following properties:
17
18Required root node property: 13Required root node property:
19
20compatible = "st,spear310"; 14compatible = "st,spear310";
21 15
22Boards with the ST SPEAr320 SoC shall have the following properties: 16Boards with the ST SPEAr320 SoC shall have the following properties:
17Required root node property:
18compatible = "st,spear320";
23 19
20Boards with the ST SPEAr1310 SoC shall have the following properties:
24Required root node property: 21Required root node property:
22compatible = "st,spear1310";
25 23
26compatible = "st,spear320"; 24Boards with the ST SPEAr1340 SoC shall have the following properties:
25Required root node property:
26compatible = "st,spear1340";
diff --git a/MAINTAINERS b/MAINTAINERS
index 27085a75162..3139e56f879 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6316,14 +6316,25 @@ F: include/linux/compiler.h
6316 6316
6317SPEAR PLATFORM SUPPORT 6317SPEAR PLATFORM SUPPORT
6318M: Viresh Kumar <viresh.kumar@st.com> 6318M: Viresh Kumar <viresh.kumar@st.com>
6319M: Shiraz Hashim <shiraz.hashim@st.com>
6319L: spear-devel@list.st.com 6320L: spear-devel@list.st.com
6320L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 6321L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6321W: http://www.st.com/spear 6322W: http://www.st.com/spear
6322S: Maintained 6323S: Maintained
6323F: arch/arm/plat-spear/ 6324F: arch/arm/plat-spear/
6324 6325
6326SPEAR13XX MACHINE SUPPORT
6327M: Viresh Kumar <viresh.kumar@st.com>
6328M: Shiraz Hashim <shiraz.hashim@st.com>
6329L: spear-devel@list.st.com
6330L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6331W: http://www.st.com/spear
6332S: Maintained
6333F: arch/arm/mach-spear13xx/
6334
6325SPEAR3XX MACHINE SUPPORT 6335SPEAR3XX MACHINE SUPPORT
6326M: Viresh Kumar <viresh.kumar@st.com> 6336M: Viresh Kumar <viresh.kumar@st.com>
6337M: Shiraz Hashim <shiraz.hashim@st.com>
6327L: spear-devel@list.st.com 6338L: spear-devel@list.st.com
6328L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 6339L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6329W: http://www.st.com/spear 6340W: http://www.st.com/spear
@@ -6332,6 +6343,8 @@ F: arch/arm/mach-spear3xx/
6332 6343
6333SPEAR6XX MACHINE SUPPORT 6344SPEAR6XX MACHINE SUPPORT
6334M: Rajeev Kumar <rajeev-dlh.kumar@st.com> 6345M: Rajeev Kumar <rajeev-dlh.kumar@st.com>
6346M: Shiraz Hashim <shiraz.hashim@st.com>
6347M: Viresh Kumar <viresh.kumar@st.com>
6335L: spear-devel@list.st.com 6348L: spear-devel@list.st.com
6336L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 6349L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6337W: http://www.st.com/spear 6350W: http://www.st.com/spear