mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

AT91 SoC for 4.17:

Browse source 
- Rename Atmel to Microhip in MAINTAINERS, Documentation and Kconfig
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEXx9Viay1+e7J/aM4AyWl4gNJNJIFAlqjaZAACgkQAyWl4gNJ
 NJJ9tw//ZvOojGuvXokU++d1zlzyojhdZxLFrt/2X7ZX1IrlhP62wBEJ1YUFpGVM
 l8VcrOy5wCk/z2wn/Ji1kzHK9NiFzDzQ8IT7BB3n/QHx8Y9cd+1U1My2nDgKFFWe
 xie155JoxRcvfa9XuMaNjET1/nZaC4slsfaXFX5YlGpiCzJ1Cppne/DfUH8WI7qi
 j7ZslzeBz5F58qvH8OQM9+elg0q9rd7htzTM7EAjfK59UehNo/kSJJ74khqPUNYJ
 qeo03E1tz6e/Euy/NgJDpXstCDa78mM2/k+W99z0X0qsmEwdtBzzSdSVz2P3/rPX
 5VTBj7Gx5VlNCeJdPfKFMXTcKaNP1cqOC4kpMW36dHAYk0aV8q/j0j+skaUMHkLE
 cKO43Z/2PjqB7PznyGT24dhEbpCm8GWAFC8ewQ2WoeZJzpjsYvtsYzfWDI2f22/I
 VNZnAQDAyzphyoAeQ+RutO805VDnzYycjNHK04utDqEDcZylEftM7mBjSx4aBEBl
 1M4xM0yRVfOzD20sgr9qCEuIalCTeyduG5DdKU8zjfQB9kq7ELau8NUMqezgVHfz
 6yh+1Rn5Dgp0w0e0NF3qgmcped+JVKI2Fi+LbZ/xE7MIltJjwHtF0FI4drib+rJy
 l3rBwdfVqowu8otJa+VXJ/isIw+8IwJb4ipznCK2oVtm6yo8jIY=
 =oLw9
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-4.17-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc

Pull "AT91 SoC for 4.17: from Alexandre Belloni:

 - Rename Atmel to Microhip in MAINTAINERS, Documentation and Kconfig

* tag 'at91-ab-4.17-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91: Kconfig: Update company to Microchip
  Documentation: at91: Update Microchip SoC documentation
  MAINTAINERS: ARM: at91: update entry for ARM/Microchip
This commit is contained in:
Arnd Bergmann 2018-03-12 15:18:53 +01:00
commit 40590db64f
3 changed files with 53 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Documentation/arm/Atmel/README → Documentation/arm/Microchip/README
View file

@ -1,54 +1,54 @@
ARM Atmel SoCs (aka AT91) ARM Microchip SoCs (aka AT91)
========================= =============================
Introduction Introduction
------------ ------------
This document gives useful information about the ARM Atmel SoCs that are This document gives useful information about the ARM Microchip SoCs that are
currently supported in Linux Mainline (you know, the one on kernel.org). currently supported in Linux Mainline (you know, the one on kernel.org).
It is important to note that the Atmel | SMART ARM-based MPU product line is It is important to note that the Microchip (previously Atmel) ARM-based MPU
historically named "AT91" or "at91" throughout the Linux kernel development product line is historically named "AT91" or "at91" throughout the Linux kernel
process even if this product prefix has completely disappeared from the development process even if this product prefix has completely disappeared from
official Atmel product name. Anyway, files, directories, git trees, the official Microchip product name. Anyway, files, directories, git trees,
git branches/tags and email subject always contain this "at91" sub-string. git branches/tags and email subject always contain this "at91" sub-string.
AT91 SoCs AT91 SoCs
--------- ---------
Documentation and detailed datasheet for each product are available on Documentation and detailed datasheet for each product are available on
the Atmel website: http://www.atmel.com. the Microchip website: http://www.microchip.com.
Flavors: Flavors:
* ARM 920 based SoC * ARM 920 based SoC
- at91rm9200 - at91rm9200
+ Datasheet + Datasheet
http://www.atmel.com/Images/doc1768.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-1768-32-bit-ARM920T-Embedded-Microprocessor-AT91RM9200_Datasheet.pdf
* ARM 926 based SoCs * ARM 926 based SoCs
- at91sam9260 - at91sam9260
+ Datasheet + Datasheet
http://www.atmel.com/Images/doc6221.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6221-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9260_Datasheet.pdf
- at91sam9xe - at91sam9xe
+ Datasheet + Datasheet
http://www.atmel.com/Images/Atmel-6254-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9XE_Datasheet.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6254-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9XE_Datasheet.pdf
- at91sam9261 - at91sam9261
+ Datasheet + Datasheet
http://www.atmel.com/Images/doc6062.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6062-ARM926EJ-S-Microprocessor-SAM9261_Datasheet.pdf
- at91sam9263 - at91sam9263
+ Datasheet + Datasheet
http://www.atmel.com/Images/Atmel_6249_32-bit-ARM926EJ-S-Microcontroller_SAM9263_Datasheet.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6249-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9263_Datasheet.pdf
- at91sam9rl - at91sam9rl
+ Datasheet + Datasheet
http://www.atmel.com/Images/doc6289.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/doc6289.pdf
- at91sam9g20 - at91sam9g20
+ Datasheet + Datasheet
http://www.atmel.com/Images/doc6384.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/DS60001516A.pdf
- at91sam9g45 family - at91sam9g45 family
- at91sam9g45 - at91sam9g45
@ -56,7 +56,7 @@ the Atmel website: http://www.atmel.com.
- at91sam9m10 - at91sam9m10
- at91sam9m11 (device superset) - at91sam9m11 (device superset)
+ Datasheet + Datasheet
http://www.atmel.com/Images/Atmel-6437-32-bit-ARM926-Embedded-Microprocessor-SAM9M11_Datasheet.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-6437-32-bit-ARM926-Embedded-Microprocessor-SAM9M11_Datasheet.pdf
- at91sam9x5 family (aka "The 5 series") - at91sam9x5 family (aka "The 5 series")
- at91sam9g15 - at91sam9g15
@ -65,11 +65,11 @@ the Atmel website: http://www.atmel.com.
- at91sam9x25 - at91sam9x25
- at91sam9x35 - at91sam9x35
+ Datasheet (can be considered as covering the whole family) + Datasheet (can be considered as covering the whole family)
http://www.atmel.com/Images/Atmel_11055_32-bit-ARM926EJ-S-Microcontroller_SAM9X35_Datasheet.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-11055-32-bit-ARM926EJ-S-Microcontroller-SAM9X35_Datasheet.pdf
- at91sam9n12 - at91sam9n12
+ Datasheet + Datasheet
http://www.atmel.com/Images/Atmel_11063_32-bit-ARM926EJ-S-Microcontroller_SAM9N12CN11CN12_Datasheet.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/DS60001517A.pdf
* ARM Cortex-A5 based SoCs * ARM Cortex-A5 based SoCs
- sama5d3 family - sama5d3 family
@ -79,7 +79,7 @@ the Atmel website: http://www.atmel.com.
- sama5d35 - sama5d35
- sama5d36 (device superset) - sama5d36 (device superset)
+ Datasheet + Datasheet
http://www.atmel.com/Images/Atmel-11121-32-bit-Cortex-A5-Microcontroller-SAMA5D3_Datasheet.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-11121-32-bit-Cortex-A5-Microcontroller-SAMA5D3_Datasheet.pdf
* ARM Cortex-A5 + NEON based SoCs * ARM Cortex-A5 + NEON based SoCs
- sama5d4 family - sama5d4 family
@ -88,7 +88,7 @@ the Atmel website: http://www.atmel.com.
- sama5d43 - sama5d43
- sama5d44 (device superset) - sama5d44 (device superset)
+ Datasheet + Datasheet
http://www.atmel.com/Images/Atmel-11238-32-bit-Cortex-A5-Microcontroller-SAMA5D4_Datasheet.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/60001525A.pdf
- sama5d2 family - sama5d2 family
- sama5d21 - sama5d21
@ -99,7 +99,7 @@ the Atmel website: http://www.atmel.com.
- sama5d27 (device superset) - sama5d27 (device superset)
- sama5d28 (device superset + environmental monitors) - sama5d28 (device superset + environmental monitors)
+ Datasheet + Datasheet
http://www.atmel.com/Images/Atmel-11267-32-bit-Cortex-A5-Microcontroller-SAMA5D2_Datasheet.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/DS60001476B.pdf
* ARM Cortex-M7 MCUs * ARM Cortex-M7 MCUs
- sams70 family - sams70 family
@ -112,8 +112,6 @@ the Atmel website: http://www.atmel.com.
- sams70q19 - sams70q19
- sams70q20 - sams70q20
- sams70q21 - sams70q21
+ Datasheet
http://www.atmel.com/Images/Atmel-11242-32-bit-Cortex-M7-Microcontroller-SAM-S70Q-SAM-S70N-SAM-S70J_Datasheet.pdf
- samv70 family - samv70 family
- samv70j19 - samv70j19
@ -122,8 +120,6 @@ the Atmel website: http://www.atmel.com.
- samv70n20 - samv70n20
- samv70q19 - samv70q19
- samv70q20 - samv70q20
+ Datasheet
http://www.atmel.com/Images/Atmel-11297-32-bit-Cortex-M7-Microcontroller-SAM-V70Q-SAM-V70N-SAM-V70J_Datasheet.pdf
- samv71 family - samv71 family
- samv71j19 - samv71j19
@ -135,13 +131,15 @@ the Atmel website: http://www.atmel.com.
- samv71q19 - samv71q19
- samv71q20 - samv71q20
- samv71q21 - samv71q21
+ Datasheet + Datasheet
http://www.atmel.com/Images/Atmel-44003-32-bit-Cortex-M7-Microcontroller-SAM-V71Q-SAM-V71N-SAM-V71J_Datasheet.pdf http://ww1.microchip.com/downloads/en/DeviceDoc/60001527A.pdf
Linux kernel information Linux kernel information
------------------------ ------------------------
Linux kernel mach directory: arch/arm/mach-at91 Linux kernel mach directory: arch/arm/mach-at91
MAINTAINERS entry is: "ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES" MAINTAINERS entry is: "ARM/Microchip (AT91) SoC support"
Device Tree for AT91 SoCs and boards Device Tree for AT91 SoCs and boards

42
MAINTAINERS
View file

@ -1236,27 +1236,6 @@ M: Boris Brezillon <boris.brezillon@free-electrons.com>
S: Maintained S: Maintained
F: drivers/clk/at91 F: drivers/clk/at91
ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
M: Nicolas Ferre <nicolas.ferre@microchip.com>
M: Alexandre Belloni <alexandre.belloni@bootlin.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.linux4sam.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
S: Supported
N: at91
N: atmel
F: arch/arm/mach-at91/
F: include/soc/at91/
F: arch/arm/boot/dts/at91*.dts
F: arch/arm/boot/dts/at91*.dtsi
F: arch/arm/boot/dts/sama*.dts
F: arch/arm/boot/dts/sama*.dtsi
F: arch/arm/include/debug/at91.S
F: drivers/memory/atmel*
F: drivers/watchdog/sama5d4_wdt.c
X: drivers/input/touchscreen/atmel_mxt_ts.c
X: drivers/net/wireless/atmel/
ARM/CALXEDA HIGHBANK ARCHITECTURE ARM/CALXEDA HIGHBANK ARCHITECTURE
M: Rob Herring <robh@kernel.org> M: Rob Herring <robh@kernel.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@ -1656,6 +1635,27 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
F: arch/arm/mach-ks8695/ F: arch/arm/mach-ks8695/
S: Odd Fixes S: Odd Fixes
ARM/Microchip (AT91) SoC support
M: Nicolas Ferre <nicolas.ferre@microchip.com>
M: Alexandre Belloni <alexandre.belloni@bootlin.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.linux4sam.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
S: Supported
N: at91
N: atmel
F: arch/arm/mach-at91/
F: include/soc/at91/
F: arch/arm/boot/dts/at91*.dts
F: arch/arm/boot/dts/at91*.dtsi
F: arch/arm/boot/dts/sama*.dts
F: arch/arm/boot/dts/sama*.dtsi
F: arch/arm/include/debug/at91.S
F: drivers/memory/atmel*
F: drivers/watchdog/sama5d4_wdt.c
X: drivers/input/touchscreen/atmel_mxt_ts.c
X: drivers/net/wireless/atmel/
ARM/MIOA701 MACHINE SUPPORT ARM/MIOA701 MACHINE SUPPORT
M: Robert Jarzmik <robert.jarzmik@free.fr> M: Robert Jarzmik <robert.jarzmik@free.fr>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

14
arch/arm/mach-at91/Kconfig
View file

@ -1,5 +1,5 @@
menuconfig ARCH_AT91 menuconfig ARCH_AT91
bool "Atmel SoCs" bool "AT91/Microchip SoCs"
depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
select ARM_CPU_SUSPEND if PM && ARCH_MULTI_V7 select ARM_CPU_SUSPEND if PM && ARCH_MULTI_V7
select COMMON_CLK_AT91 select COMMON_CLK_AT91
@ -13,7 +13,7 @@ config SOC_SAMV7
select COMMON_CLK_AT91 select COMMON_CLK_AT91
select PINCTRL_AT91 select PINCTRL_AT91
help help
Select this if you are using an SoC from Atmel's SAME7, SAMS7 or SAMV7 Select this if you are using an SoC from Microchip's SAME7, SAMS7 or SAMV7
families. families.
config SOC_SAMA5D2 config SOC_SAMA5D2
@ -29,7 +29,7 @@ config SOC_SAMA5D2
select HAVE_AT91_AUDIO_PLL select HAVE_AT91_AUDIO_PLL
select PINCTRL_AT91PIO4 select PINCTRL_AT91PIO4
help help
Select this if ou are using one of Atmel's SAMA5D2 family SoC. Select this if ou are using one of Microchip's SAMA5D2 family SoC.
config SOC_SAMA5D3 config SOC_SAMA5D3
bool "SAMA5D3 family" bool "SAMA5D3 family"
@ -41,7 +41,7 @@ config SOC_SAMA5D3
select HAVE_AT91_USB_CLK select HAVE_AT91_USB_CLK
select PINCTRL_AT91 select PINCTRL_AT91
help help
Select this if you are using one of Atmel's SAMA5D3 family SoC. Select this if you are using one of Microchip's SAMA5D3 family SoC.
This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36. This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.
config SOC_SAMA5D4 config SOC_SAMA5D4
@ -56,7 +56,7 @@ config SOC_SAMA5D4
select HAVE_AT91_H32MX select HAVE_AT91_H32MX
select PINCTRL_AT91 select PINCTRL_AT91
help help
Select this if you are using one of Atmel's SAMA5D4 family SoC. Select this if you are using one of Microchip's SAMA5D4 family SoC.
config SOC_AT91RM9200 config SOC_AT91RM9200
bool "AT91RM9200" bool "AT91RM9200"
@ -70,7 +70,7 @@ config SOC_AT91RM9200
select SOC_SAM_V4_V5 select SOC_SAM_V4_V5
select SRAM if PM select SRAM if PM
help help
Select this if you are using Atmel's AT91RM9200 SoC. Select this if you are using Microchip's AT91RM9200 SoC.
config SOC_AT91SAM9 config SOC_AT91SAM9
bool "AT91SAM9" bool "AT91SAM9"
@ -88,7 +88,7 @@ config SOC_AT91SAM9
select SOC_SAM_V4_V5 select SOC_SAM_V4_V5
select SRAM if PM select SRAM if PM
help help
Select this if you are using one of those Atmel SoC: Select this if you are using one of those Microchip SoC:
AT91SAM9260 AT91SAM9260
AT91SAM9261 AT91SAM9261
AT91SAM9263 AT91SAM9263