Commit 217c55db authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.8-soc2' of... 

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

SoC changes for 4.8 #2:
 - Add final documentation for sama5d2
 - Fix some compilation warnings

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

:
  ARM: at91: fix warnings in pm.c
  ARM: at91: Documentation: update the sama5d2 entry

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c2383b04 ab6778ee

Documentation/arm/Atmel/README

+8 −2
Original line number Diff line number Diff line
@@ -91,9 +91,15 @@ the Atmel website: http://www.atmel.com. 
          http://www.atmel.com/Images/Atmel-11238-32-bit-Cortex-A5-Microcontroller-SAMA5D4_Datasheet.pdf



      - sama5d2 family

        - sama5d27

        - sama5d21

        - sama5d22

        - sama5d23

        - sama5d24

        - sama5d26

        - sama5d27 (device superset)

        - sama5d28 (device superset + environmental monitors)

        + Datasheet

          Coming soon

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





Linux kernel information

arch/arm/mach-at91/pm.c

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/of_platform.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>

#include <linux/platform_data/atmel.h>

#include <linux/io.h>

#include <linux/clk/at91_pmc.h>
@@ -355,7 +356,7 @@ static __init void at91_dt_ramc(void) 
	at91_pm_set_standby(standby);

}



void at91rm9200_idle(void)

static void at91rm9200_idle(void)

{

	/*

	 * Disable the processor clock.  The processor will be automatically
@@ -364,7 +365,7 @@ void at91rm9200_idle(void) 
	writel(AT91_PMC_PCK, pmc + AT91_PMC_SCDR);

}



void at91sam9_idle(void)

static void at91sam9_idle(void)

{

	writel(AT91_PMC_PCK, pmc + AT91_PMC_SCDR);

	cpu_do_idle();