Skip to content

Commit 1675693

Browse files
committed
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates from Arnd Bergmann: "This release brings up a new platform based on the old ARM9 core: the Nuvoton NPCM is used as a baseboard management controller, competing with the better known ASpeed AST2xx series. Another important change is the addition of ARMv7-A based chips in mach-stm32. The older parts in this platform are ARMv7-M based microcontrollers, now they are expanding to general-purpose workloads. The other changes are the usual defconfig updates to enable additional drivers, lesser bugfixes. The largest updates as often are the ongoing OMAP cleanups, but we also have a number of changes for the older PXA and davinci platforms this time. For the Renesas shmobile/r-car platform, some new infrastructure is needed to make the watchdog work correctly. Supporting Multiprocessing on Allwinner A80 required a significant amount of new code, but is not doing anything unexpected" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (179 commits) arm: npcm: modify configuration for the NPCM7xx BMC. MAINTAINERS: update entry for ARM/berlin ARM: omap2: fix am43xx build without L2X0 ARM: davinci: da8xx: simplify CFGCHIP regmap_config ARM: davinci: da8xx: fix oops in USB PHY driver due to stack allocated platform_data ARM: multi_v7_defconfig: add NXP FlexCAN IP support ARM: multi_v7_defconfig: enable thermal driver for i.MX devices ARM: multi_v7_defconfig: add RN5T618 PMIC family support ARM: multi_v7_defconfig: add NXP graphics drivers ARM: multi_v7_defconfig: add GPMI NAND controller support ARM: multi_v7_defconfig: add OCOTP driver for NXP SoCs ARM: multi_v7_defconfig: configure I2C driver built-in arm64: defconfig: add CONFIG_UNIPHIER_THERMAL and CONFIG_SNI_AVE ARM: imx: fix imx6sll-only build ARM: imx: select ARM_CPU_SUSPEND for CPU_IDLE as well ARM: mxs_defconfig: Re-sync defconfig ARM: imx_v4_v5_defconfig: Use the generic fsl-asoc-card driver ARM: imx_v4_v5_defconfig: Re-sync defconfig arm64: defconfig: enable stmmac ethernet to defconfig ARM: EXYNOS: Simplify code in coupled CPU idle hot path ...
2 parents b240b41 + cd90371 commit 1675693

File tree

189 files changed

+4973
-3960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+4973
-3960
lines changed

Documentation/arm/Atmel/README renamed to Documentation/arm/Microchip/README

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
ARM Atmel SoCs (aka AT91)
2-
=========================
1+
ARM Microchip SoCs (aka AT91)
2+
=============================
33

44

55
Introduction
66
------------
7-
This document gives useful information about the ARM Atmel SoCs that are
7+
This document gives useful information about the ARM Microchip SoCs that are
88
currently supported in Linux Mainline (you know, the one on kernel.org).
99

10-
It is important to note that the Atmel | SMART ARM-based MPU product line is
11-
historically named "AT91" or "at91" throughout the Linux kernel development
12-
process even if this product prefix has completely disappeared from the
13-
official Atmel product name. Anyway, files, directories, git trees,
10+
It is important to note that the Microchip (previously Atmel) ARM-based MPU
11+
product line is historically named "AT91" or "at91" throughout the Linux kernel
12+
development process even if this product prefix has completely disappeared from
13+
the official Microchip product name. Anyway, files, directories, git trees,
1414
git branches/tags and email subject always contain this "at91" sub-string.
1515

1616

1717
AT91 SoCs
1818
---------
1919
Documentation and detailed datasheet for each product are available on
20-
the Atmel website: http://www.atmel.com.
20+
the Microchip website: http://www.microchip.com.
2121

2222
Flavors:
2323
* ARM 920 based SoC
2424
- at91rm9200
2525
+ Datasheet
26-
http://www.atmel.com/Images/doc1768.pdf
26+
http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-1768-32-bit-ARM920T-Embedded-Microprocessor-AT91RM9200_Datasheet.pdf
2727

2828
* ARM 926 based SoCs
2929
- at91sam9260
3030
+ Datasheet
31-
http://www.atmel.com/Images/doc6221.pdf
31+
http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6221-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9260_Datasheet.pdf
3232

3333
- at91sam9xe
3434
+ Datasheet
35-
http://www.atmel.com/Images/Atmel-6254-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9XE_Datasheet.pdf
35+
http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6254-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9XE_Datasheet.pdf
3636

3737
- at91sam9261
3838
+ Datasheet
39-
http://www.atmel.com/Images/doc6062.pdf
39+
http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6062-ARM926EJ-S-Microprocessor-SAM9261_Datasheet.pdf
4040

4141
- at91sam9263
4242
+ Datasheet
43-
http://www.atmel.com/Images/Atmel_6249_32-bit-ARM926EJ-S-Microcontroller_SAM9263_Datasheet.pdf
43+
http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6249-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9263_Datasheet.pdf
4444

4545
- at91sam9rl
4646
+ Datasheet
47-
http://www.atmel.com/Images/doc6289.pdf
47+
http://ww1.microchip.com/downloads/en/DeviceDoc/doc6289.pdf
4848

4949
- at91sam9g20
5050
+ Datasheet
51-
http://www.atmel.com/Images/doc6384.pdf
51+
http://ww1.microchip.com/downloads/en/DeviceDoc/DS60001516A.pdf
5252

5353
- at91sam9g45 family
5454
- at91sam9g45
5555
- at91sam9g46
5656
- at91sam9m10
5757
- at91sam9m11 (device superset)
5858
+ Datasheet
59-
http://www.atmel.com/Images/Atmel-6437-32-bit-ARM926-Embedded-Microprocessor-SAM9M11_Datasheet.pdf
59+
http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6437-32-bit-ARM926-Embedded-Microprocessor-SAM9M11_Datasheet.pdf
6060

6161
- at91sam9x5 family (aka "The 5 series")
6262
- at91sam9g15
@@ -65,11 +65,11 @@ the Atmel website: http://www.atmel.com.
6565
- at91sam9x25
6666
- at91sam9x35
6767
+ Datasheet (can be considered as covering the whole family)
68-
http://www.atmel.com/Images/Atmel_11055_32-bit-ARM926EJ-S-Microcontroller_SAM9X35_Datasheet.pdf
68+
http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-11055-32-bit-ARM926EJ-S-Microcontroller-SAM9X35_Datasheet.pdf
6969

7070
- at91sam9n12
7171
+ Datasheet
72-
http://www.atmel.com/Images/Atmel_11063_32-bit-ARM926EJ-S-Microcontroller_SAM9N12CN11CN12_Datasheet.pdf
72+
http://ww1.microchip.com/downloads/en/DeviceDoc/DS60001517A.pdf
7373

7474
* ARM Cortex-A5 based SoCs
7575
- sama5d3 family
@@ -79,7 +79,7 @@ the Atmel website: http://www.atmel.com.
7979
- sama5d35
8080
- sama5d36 (device superset)
8181
+ Datasheet
82-
http://www.atmel.com/Images/Atmel-11121-32-bit-Cortex-A5-Microcontroller-SAMA5D3_Datasheet.pdf
82+
http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-11121-32-bit-Cortex-A5-Microcontroller-SAMA5D3_Datasheet.pdf
8383

8484
* ARM Cortex-A5 + NEON based SoCs
8585
- sama5d4 family
@@ -88,7 +88,7 @@ the Atmel website: http://www.atmel.com.
8888
- sama5d43
8989
- sama5d44 (device superset)
9090
+ Datasheet
91-
http://www.atmel.com/Images/Atmel-11238-32-bit-Cortex-A5-Microcontroller-SAMA5D4_Datasheet.pdf
91+
http://ww1.microchip.com/downloads/en/DeviceDoc/60001525A.pdf
9292

9393
- sama5d2 family
9494
- sama5d21
@@ -99,7 +99,7 @@ the Atmel website: http://www.atmel.com.
9999
- sama5d27 (device superset)
100100
- sama5d28 (device superset + environmental monitors)
101101
+ Datasheet
102-
http://www.atmel.com/Images/Atmel-11267-32-bit-Cortex-A5-Microcontroller-SAMA5D2_Datasheet.pdf
102+
http://ww1.microchip.com/downloads/en/DeviceDoc/DS60001476B.pdf
103103

104104
* ARM Cortex-M7 MCUs
105105
- sams70 family
@@ -112,8 +112,6 @@ the Atmel website: http://www.atmel.com.
112112
- sams70q19
113113
- sams70q20
114114
- sams70q21
115-
+ Datasheet
116-
http://www.atmel.com/Images/Atmel-11242-32-bit-Cortex-M7-Microcontroller-SAM-S70Q-SAM-S70N-SAM-S70J_Datasheet.pdf
117115

118116
- samv70 family
119117
- samv70j19
@@ -122,8 +120,6 @@ the Atmel website: http://www.atmel.com.
122120
- samv70n20
123121
- samv70q19
124122
- samv70q20
125-
+ Datasheet
126-
http://www.atmel.com/Images/Atmel-11297-32-bit-Cortex-M7-Microcontroller-SAM-V70Q-SAM-V70N-SAM-V70J_Datasheet.pdf
127123

128124
- samv71 family
129125
- samv71j19
@@ -135,13 +131,15 @@ the Atmel website: http://www.atmel.com.
135131
- samv71q19
136132
- samv71q20
137133
- samv71q21
134+
138135
+ Datasheet
139-
http://www.atmel.com/Images/Atmel-44003-32-bit-Cortex-M7-Microcontroller-SAM-V71Q-SAM-V71N-SAM-V71J_Datasheet.pdf
136+
http://ww1.microchip.com/downloads/en/DeviceDoc/60001527A.pdf
137+
140138

141139
Linux kernel information
142140
------------------------
143141
Linux kernel mach directory: arch/arm/mach-at91
144-
MAINTAINERS entry is: "ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES"
142+
MAINTAINERS entry is: "ARM/Microchip (AT91) SoC support"
145143

146144

147145
Device Tree for AT91 SoCs and boards

Documentation/arm/stm32/overview.rst

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
========================
2+
STM32 ARM Linux Overview
3+
========================
4+
5+
Introduction
6+
------------
7+
8+
The STMicroelectronics STM32 family of Cortex-A microprocessors (MPUs) and
9+
Cortex-M microcontrollers (MCUs) are supported by the 'STM32' platform of
10+
ARM Linux.
11+
12+
Configuration
13+
-------------
14+
15+
For MCUs, use the provided default configuration:
16+
make stm32_defconfig
17+
For MPUs, use multi_v7 configuration:
18+
make multi_v7_defconfig
19+
20+
Layout
21+
------
22+
23+
All the files for multiple machine families are located in the platform code
24+
contained in arch/arm/mach-stm32
25+
26+
There is a generic board board-dt.c in the mach folder which support
27+
Flattened Device Tree, which means, it works with any compatible board with
28+
Device Trees.
29+
30+
:Authors:
31+
32+
- Maxime Coquelin <[email protected]>
33+
- Ludovic Barre <[email protected]>
34+
- Gerald Baeza <[email protected]>

Documentation/arm/stm32/overview.txt

Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
STM32F429 Overview
2+
==================
3+
4+
Introduction
5+
------------
6+
7+
The STM32F429 is a Cortex-M4 MCU aimed at various applications.
8+
It features:
9+
10+
- ARM Cortex-M4 up to 180MHz with FPU
11+
- 2MB internal Flash Memory
12+
- External memory support through FMC controller (PSRAM, SDRAM, NOR, NAND)
13+
- I2C, SPI, SAI, CAN, USB OTG, Ethernet controllers
14+
- LCD controller & Camera interface
15+
- Cryptographic processor
16+
17+
Resources
18+
---------
19+
20+
Datasheet and reference manual are publicly available on ST website (STM32F429_).
21+
22+
.. _STM32F429: http://www.st.com/web/en/catalog/mmc/FM141/SC1169/SS1577/LN1806?ecmp=stm32f429-439_pron_pr-ces2014_nov2013
23+
24+
:Authors:
25+
26+
Maxime Coquelin <[email protected]>

Documentation/arm/stm32/stm32f429-overview.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
STM32F746 Overview
2+
==================
3+
4+
Introduction
5+
------------
6+
7+
The STM32F746 is a Cortex-M7 MCU aimed at various applications.
8+
It features:
9+
10+
- Cortex-M7 core running up to @216MHz
11+
- 1MB internal flash, 320KBytes internal RAM (+4KB of backup SRAM)
12+
- FMC controller to connect SDRAM, NOR and NAND memories
13+
- Dual mode QSPI
14+
- SD/MMC/SDIO support
15+
- Ethernet controller
16+
- USB OTFG FS & HS controllers
17+
- I2C, SPI, CAN busses support
18+
- Several 16 & 32 bits general purpose timers
19+
- Serial Audio interface
20+
- LCD controller
21+
- HDMI-CEC
22+
- SPDIFRX
23+
24+
Resources
25+
---------
26+
27+
Datasheet and reference manual are publicly available on ST website (STM32F746_).
28+
29+
.. _STM32F746: http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32f7-series/stm32f7x6/stm32f746ng.html
30+
31+
:Authors:
32+
33+
Alexandre Torgue <[email protected]>

Documentation/arm/stm32/stm32f746-overview.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
STM32F769 Overview
2+
==================
3+
4+
Introduction
5+
------------
6+
7+
The STM32F769 is a Cortex-M7 MCU aimed at various applications.
8+
It features:
9+
10+
- Cortex-M7 core running up to @216MHz
11+
- 2MB internal flash, 512KBytes internal RAM (+4KB of backup SRAM)
12+
- FMC controller to connect SDRAM, NOR and NAND memories
13+
- Dual mode QSPI
14+
- SD/MMC/SDIO support*2
15+
- Ethernet controller
16+
- USB OTFG FS & HS controllers
17+
- I2C*4, SPI*6, CAN*3 busses support
18+
- Several 16 & 32 bits general purpose timers
19+
- Serial Audio interface*2
20+
- LCD controller
21+
- HDMI-CEC
22+
- DSI
23+
- SPDIFRX
24+
- MDIO salave interface
25+
26+
Resources
27+
---------
28+
29+
Datasheet and reference manual are publicly available on ST website (STM32F769_).
30+
31+
.. _STM32F769: http://www.st.com/content/st_com/en/products/microcontrollers/stm32-32-bit-arm-cortex-mcus/stm32-high-performance-mcus/stm32f7-series/stm32f7x9/stm32f769ni.html
32+
33+
:Authors:
34+
35+
Alexandre Torgue <[email protected]>

0 commit comments

Comments
 (0)