Commit 675e6e6b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-cleanup' of... 

Merge tag 'at91-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup

Merge "at91: cleanup for 3.20 #1" from Nicolas Ferre:

First batch of cleanup for 3.20:
- Documentation for AT91 SoC
- Config options, files and functions removal to continue the big !DT
  cleanup done in 3.19
- move of debug-macro.S to its usual location

* tag 'at91-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

:
  ARM: at91: remove useless at91rm9200_set_type()
  ARM: at91: remove useless at91rm9200_dt_initialize()
  ARM: at91: move debug-macro.S into the common space
  ARM: at91: remove useless at91_sysirq_mask_rtx
  ARM: at91: remove useless config MACH_AT91SAM9_DT
  ARM: at91: remove useless config MACH_AT91RM9200_DT
  ARM: at91: remove unused mach/memory.h
  ARM: at91: remove useless header file includes
  ARM: at91: remove unneeded header file
  rtc: at91/Kconfig: remove useless options
  ARM: at91/Documentation: add a README for Atmel SoCs

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4986abaa bd873732

Documentation/arm/Atmel/README

0 → 100644
+124 −0
Original line number Diff line number Diff line 
ARM Atmel SoCs (aka AT91)

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





Introduction

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

This document gives useful information about the ARM Atmel SoCs that are

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

historically named "AT91" or "at91" throughout the Linux kernel development

process even if this product prefix has completely disappeared from the

official Atmel product name. Anyway, files, directories, git trees,

git branches/tags and email subject always contain this "at91" sub-string.





AT91 SoCs

---------

Documentation and detailled datasheet for each product are available on

the Atmel website: http://www.atmel.com.



  Flavors:

    * ARM 920 based SoC

      - at91rm9200

        + Datasheet

          http://www.atmel.com/Images/doc1768.pdf



    * ARM 926 based SoCs

      - at91sam9260

        + Datasheet

          http://www.atmel.com/Images/doc6221.pdf



      - at91sam9xe

        + Datasheet

          http://www.atmel.com/Images/Atmel-6254-32-bit-ARM926EJ-S-Embedded-Microprocessor-SAM9XE_Datasheet.pdf



      - at91sam9261

        + Datasheet

          http://www.atmel.com/Images/doc6062.pdf



      - at91sam9263

        + Datasheet

          http://www.atmel.com/Images/Atmel_6249_32-bit-ARM926EJ-S-Microcontroller_SAM9263_Datasheet.pdf



      - at91sam9rl

        + Datasheet

          http://www.atmel.com/Images/doc6289.pdf



      - at91sam9g20

        + Datasheet

          http://www.atmel.com/Images/doc6384.pdf



      - at91sam9g45 family

        - at91sam9g45

        - at91sam9g46

        - at91sam9m10

        - at91sam9m11 (device superset)

        + Datasheet

          http://www.atmel.com/Images/Atmel-6437-32-bit-ARM926-Embedded-Microprocessor-SAM9M11_Datasheet.pdf



      - at91sam9x5 family (aka "The 5 series")

        - at91sam9g15

        - at91sam9g25

        - at91sam9g35

        - at91sam9x25

        - at91sam9x35

        + Datasheet (can be considered as covering the whole family)

          http://www.atmel.com/Images/Atmel_11055_32-bit-ARM926EJ-S-Microcontroller_SAM9X35_Datasheet.pdf



      - at91sam9n12

        + Datasheet

          http://www.atmel.com/Images/Atmel_11063_32-bit-ARM926EJ-S-Microcontroller_SAM9N12CN11CN12_Datasheet.pdf



    * ARM Cortex-A5 based SoCs

      - sama5d3 family

        - sama5d31

        - sama5d33

        - sama5d34

        - sama5d35

        - sama5d36 (device superset)

        + Datasheet

          http://www.atmel.com/Images/Atmel-11121-32-bit-Cortex-A5-Microcontroller-SAMA5D3_Datasheet.pdf



    * ARM Cortex-A5 + NEON based SoCs

      - sama5d4 family

        - sama5d41

        - sama5d42

        - sama5d43

        - sama5d44 (device superset)

        + Datasheet

          http://www.atmel.com/Images/Atmel-11238-32-bit-Cortex-A5-Microcontroller-SAMA5D4_Datasheet.pdf





Linux kernel information

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

Linux kernel mach directory: arch/arm/mach-at91

MAINTAINERS entry is: "ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES"





Device Tree for AT91 SoCs and boards

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

All AT91 SoCs are converted to Device Tree. Since Linux 3.19, these products

must use this method to boot the Linux kernel.



Work In Progress statement:

Device Tree files and Device Tree bindings that apply to AT91 SoCs and boards are

considered as "Unstable". To be completely clear, any at91 binding can change at

any time. So, be sure to use a Device Tree Binary and a Kernel Image generated from

the same source tree.

Please refer to the Documentation/devicetree/bindings/ABI.txt file for a

definition of a "Stable" binding/ABI.

This statement will be removed by AT91 MAINTAINERS when appropriate.



Naming conventions and best practice:

- SoCs Device Tree Source Include files are named after the official name of

  the product (at91sam9g20.dtsi or sama5d33.dtsi for instance).

- Device Tree Source Include files (.dtsi) are used to collect common nodes that can be

  shared across SoCs or boards (sama5d3.dtsi or at91sam9x5cm.dtsi for instance).

  When collecting nodes for a particular peripheral or topic, the identifier have to

  be placed at the end of the file name, separated with a "_" (at91sam9x5_can.dtsi

  or sama5d3_gmac.dtsi for example).

- board Device Tree Source files (.dts) are prefixed by the string "at91-" so

  that they can be identified easily. Note that some files are historical exceptions

  to this rule (sama5d3[13456]ek.dts, usb_a9g20.dts or animeo_ip.dts for example).

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -877,6 +877,7 @@ 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



ARM/ATMEL AT91 Clock Support

M:	Boris Brezillon <boris.brezillon@free-electrons.com>

arch/arm/Kconfig.debug

+7 −2
Original line number Diff line number Diff line
@@ -115,15 +115,18 @@ choice 
		    0x80024000      | 0xf0024000     | UART9



	config AT91_DEBUG_LL_DBGU0

		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"

		bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10, 9rl, 9x5, 9n12"

		select DEBUG_AT91_UART

		depends on HAVE_AT91_DBGU0



	config AT91_DEBUG_LL_DBGU1

		bool "Kernel low-level debugging on 9263 and 9g45"

		bool "Kernel low-level debugging on 9263, 9g45 and sama5d3"

		select DEBUG_AT91_UART

		depends on HAVE_AT91_DBGU1



	config AT91_DEBUG_LL_DBGU2

		bool "Kernel low-level debugging on sama5d4"

		select DEBUG_AT91_UART

		depends on HAVE_AT91_DBGU2



	config DEBUG_BCM2835
@@ -1165,6 +1168,8 @@ config DEBUG_LL_INCLUDE 
	string

	default "debug/sa1100.S" if DEBUG_SA1100

	default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250

	default "debug/at91.S" if AT91_DEBUG_LL_DBGU0 || AT91_DEBUG_LL_DBGU1 || \

				AT91_DEBUG_LL_DBGU2

	default "debug/asm9260.S" if DEBUG_ASM9260_UART

	default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2

	default "debug/meson.S" if DEBUG_MESON_UARTAO

arch/arm/mach-at91/include/mach/debug-macro.S→arch/arm/include/debug/at91.S

+11 −8
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-at91/include/mach/debug-macro.S

 *

 *  Copyright (C) 2003-2005 SAN People

 *

 * Debugging macro include header
@@ -11,18 +9,23 @@ 
 *

*/



#include <mach/hardware.h>

#include <mach/at91_dbgu.h>



#if defined(CONFIG_AT91_DEBUG_LL_DBGU0)

#define AT91_DBGU AT91_BASE_DBGU0

#define AT91_DBGU 0xfffff200 /* AT91_BASE_DBGU0 */

#elif defined(CONFIG_AT91_DEBUG_LL_DBGU1)

#define AT91_DBGU AT91_BASE_DBGU1

#define AT91_DBGU 0xffffee00 /* AT91_BASE_DBGU1 */

#else

/* On sama5d4, use USART3 as low level serial console */

#define AT91_DBGU SAMA5D4_BASE_USART3

#define AT91_DBGU 0xfc00c000 /* SAMA5D4_BASE_USART3 */

#endif



/* Keep in sync with mach-at91/include/mach/hardware.h */

#define AT91_IO_P2V(x) ((x) - 0x01000000)



#define AT91_DBGU_SR		(0x14)	/* Status Register */

#define AT91_DBGU_THR		(0x1c)	/* Transmitter Holding Register */

#define AT91_DBGU_TXRDY		(1 << 1)	/* Transmitter Ready */

#define AT91_DBGU_TXEMPTY	(1 << 9)	/* Transmitter Empty */



	.macro	addruart, rp, rv, tmp

	ldr	\rp, =AT91_DBGU				@ System peripherals (phys address)

	ldr	\rv, =AT91_IO_P2V(AT91_DBGU)		@ System peripherals (virt address)

arch/arm/mach-at91/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -174,14 +174,6 @@ config SOC_AT91SAM9N12 
# ----------------------------------------------------------

endif # SOC_SAM_V4_V5



config MACH_AT91RM9200_DT

	def_bool SOC_AT91RM9200



config MACH_AT91SAM9_DT

	def_bool SOC_AT91SAM9



# ----------------------------------------------------------



comment "AT91 Feature Selections"



config AT91_SLOW_CLOCK

CRA Git | Maintained and supported by SUSTech CRA and CCSE