Commit 5a55029f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.13-soc' of... 

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

SoC for 4.13:

 - New suspend/resume mode for sama5d2
 - Initial support for armv7m based SoCs

* tag 'at91-ab-4.13-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

:
  ARM: at91: remove atmel_nand_data
  ARM: at91: fix at91_suspend_entering_slow_clock link error
  ARM: at91: debug: add samv7x support
  ARM: at91: add armv7m SoC detection
  ARM: at91: handle CONFIG_PM for armv7m configurations
  ARM: at91: Add armv7m support
  ARM: at91: Document armv7m compatibles
  ARM: at91: Documentation: add armv7m families
  ARM: at91: pm: fallback to slowclock when backup mode fails
  ARM: at91: pm: allow selecting standby and suspend modes
  ARM: at91: pm: Add sama5d2 backup mode

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 51683571 8a3d8093

Documentation/arm/Atmel/README

+37 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ git branches/tags and email subject always contain this "at91" sub-string. 


AT91 SoCs

---------

Documentation and detailled datasheet for each product are available on

Documentation and detailed datasheet for each product are available on

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



  Flavors:
@@ -101,6 +101,42 @@ the Atmel website: http://www.atmel.com. 
        + Datasheet

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



    * ARM Cortex-M7 MCUs

      - sams70 family

        - sams70j19

        - sams70j20

        - sams70j21

        - sams70n19

        - sams70n20

        - sams70n21

        - sams70q19

        - sams70q20

        - sams70q21

        + Datasheet

          http://www.atmel.com/Images/Atmel-11242-32-bit-Cortex-M7-Microcontroller-SAM-S70Q-SAM-S70N-SAM-S70J_Datasheet.pdf



      - samv70 family

        - samv70j19

        - samv70j20

        - samv70n19

        - samv70n20

        - samv70q19

        - samv70q20

        + Datasheet

          http://www.atmel.com/Images/Atmel-11297-32-bit-Cortex-M7-Microcontroller-SAM-V70Q-SAM-V70N-SAM-V70J_Datasheet.pdf



      - samv71 family

        - samv71j19

        - samv71j20

        - samv71j21

        - samv71n19

        - samv71n20

        - samv71n21

        - samv71q19

        - samv71q20

        - samv71q21

        + Datasheet

          http://www.atmel.com/Images/Atmel-44003-32-bit-Cortex-M7-Microcontroller-SAM-V71Q-SAM-V71N-SAM-V71J_Datasheet.pdf



Linux kernel information

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

Documentation/devicetree/bindings/arm/atmel-at91.txt

+30 −0
Original line number Diff line number Diff line
@@ -41,6 +41,36 @@ compatible: must be one of: 
       - "atmel,sama5d43"

       - "atmel,sama5d44"



 * "atmel,samv7" for MCUs using a Cortex-M7, shall be extended with the specific

   SoC family:

    o "atmel,sams70" shall be extended with the specific MCU compatible:

       - "atmel,sams70j19"

       - "atmel,sams70j20"

       - "atmel,sams70j21"

       - "atmel,sams70n19"

       - "atmel,sams70n20"

       - "atmel,sams70n21"

       - "atmel,sams70q19"

       - "atmel,sams70q20"

       - "atmel,sams70q21"

    o "atmel,samv70" shall be extended with the specific MCU compatible:

       - "atmel,samv70j19"

       - "atmel,samv70j20"

       - "atmel,samv70n19"

       - "atmel,samv70n20"

       - "atmel,samv70q19"

       - "atmel,samv70q20"

    o "atmel,samv71" shall be extended with the specific MCU compatible:

       - "atmel,samv71j19"

       - "atmel,samv71j20"

       - "atmel,samv71j21"

       - "atmel,samv71n19"

       - "atmel,samv71n20"

       - "atmel,samv71n21"

       - "atmel,samv71q19"

       - "atmel,samv71q20"

       - "atmel,samv71q21"



Chipid required properties:

- compatible: Should be "atmel,sama5d2-chipid"

- reg : Should contain registers location and length

arch/arm/Kconfig.debug

+10 −0
Original line number Diff line number Diff line
@@ -145,6 +145,15 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on the USART3 port of sama5d4.



	config DEBUG_AT91_SAMV7_USART1

		bool "Kernel low-level debugging via SAMV7 USART1"

		select DEBUG_AT91_UART

		depends on SOC_SAMV7

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the USART1 port on SAMV7 based

		  machines.



	config DEBUG_BCM2835

		bool "Kernel low-level debugging on BCM2835 PL011 UART"

		depends on ARCH_BCM2835 && ARCH_MULTI_V6
@@ -1509,6 +1518,7 @@ config DEBUG_UART_PHYS 
	default 0x3f201000 if DEBUG_BCM2836

	default 0x3e000000 if DEBUG_BCM_KONA_UART

	default 0x4000e400 if DEBUG_LL_UART_EFM32

	default 0x40028000 if DEBUG_AT91_SAMV7_USART1

	default 0x40081000 if DEBUG_LPC18XX_UART0

	default 0x40090000 if DEBUG_LPC32XX

	default 0x40100000 if DEBUG_PXA_UART1

arch/arm/mach-at91/Kconfig

+15 −1
Original line number Diff line number Diff line 
menuconfig ARCH_AT91

	bool "Atmel SoCs"

	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7

	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M

	select COMMON_CLK_AT91

	select GPIOLIB

	select PINCTRL

	select SOC_BUS



if ARCH_AT91

config SOC_SAMV7

	bool "SAM Cortex-M7 family" if ARM_SINGLE_ARMV7M

	select COMMON_CLK_AT91

	select PINCTRL_AT91

	help

	  Select this if you are using an SoC from Atmel's SAME7, SAMS7 or SAMV7

	  families.



config SOC_SAMA5D2

	bool "SAMA5D2 family"

	depends on ARCH_MULTI_V7
@@ -52,6 +60,7 @@ config SOC_AT91RM9200 
	bool "AT91RM9200"

	depends on ARCH_MULTI_V4T

	select ATMEL_AIC_IRQ

	select ATMEL_PM if PM

	select ATMEL_ST

	select CPU_ARM920T

	select HAVE_AT91_USB_CLK
@@ -65,6 +74,7 @@ config SOC_AT91SAM9 
	bool "AT91SAM9"

	depends on ARCH_MULTI_V5

	select ATMEL_AIC_IRQ

	select ATMEL_PM if PM

	select ATMEL_SDRAMC

	select CPU_ARM926T

	select HAVE_AT91_SMD
@@ -123,9 +133,13 @@ config SOC_SAM_V7 
config SOC_SAMA5

	bool

	select ATMEL_AIC5_IRQ

	select ATMEL_PM if PM

	select ATMEL_SDRAMC

	select MEMORY

	select SOC_SAM_V7

	select SRAM if PM



config ATMEL_PM

	bool



endif

arch/arm/mach-at91/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 
obj-$(CONFIG_SOC_AT91RM9200)	+= at91rm9200.o

obj-$(CONFIG_SOC_AT91SAM9)	+= at91sam9.o

obj-$(CONFIG_SOC_SAMA5)		+= sama5.o

obj-$(CONFIG_SOC_SAMV7)		+= samv7.o



# Power Management

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_PM)		+= pm_suspend.o

obj-$(CONFIG_ATMEL_PM)		+= pm.o pm_suspend.o



ifeq ($(CONFIG_CPU_V7),y)

AFLAGS_pm_suspend.o := -march=armv7-a

CRA Git | Maintained and supported by SUSTech CRA and CCSE