Commit 1bbecc8c authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

SoC for 4.12:

 - huge PM cleanup
 - Move SoC detection to its own driver

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

:
  ARM: at91: move SoC detection to its own driver
  ARM: at91: pm: correct typo
  ARM: at91: pm: Remove at91_pm_set_standby
  ARM: at91: pm: Merge all at91sam9*_pm_init
  ARM: at91: pm: Tie the USB clock mask to the pmc
  ARM: at91: pm: Tie the memory controller type to the ramc id
  ARM: at91: pm: Workaround DDRSDRC self-refresh bug with LPDDR1 memories.
  ARM: at91: pm: Simplify at91rm9200_standby
  ARM: at91: pm: Use struct at91_pm_data in pm_suspend.S
  ARM: at91: pm: Move global variables into at91_pm_data
  ARM: at91: pm: Move at91_ramc_read/write to pm.c
  ARM: at91: pm: Cleanup headers
  MAINTAINERS: Add memory drivers to AT91 entry
  MAINTAINERS: Update AT91 entry
  ARM: at91: pm: cpu_idle: switch DDR to power-down mode
  Revert "ARM: at91/dt: sama5d2: Use new compatible for ohci node"

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,6 @@ F: drivers/*/*aspeed* 
ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>

M:	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.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
@@ -1116,6 +1115,7 @@ 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*



ARM/ATMEL AT91 Clock Support

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

arch/arm/boot/dts/sama5d2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ 
		};



		usb1: ohci@00400000 {

			compatible = "atmel,sama5d2-ohci", "usb-ohci";

			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00400000 0x100000>;

			interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;

			clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;

arch/arm/mach-at91/Makefile

+33 −1
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#

obj-y		:= soc.o



# CPU-specific support

obj-$(CONFIG_SOC_AT91RM9200)	+= at91rm9200.o
@@ -18,3 +17,36 @@ endif 
ifeq ($(CONFIG_PM_DEBUG),y)

CFLAGS_pm.o += -DDEBUG

endif



# Default sed regexp - multiline due to syntax constraints

define sed-y

	"/^->/{s:->#\(.*\):/* \1 */:; \

	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:->::; p;}"

endef



# Use filechk to avoid rebuilds when a header changes, but the resulting file

# does not

define filechk_offsets

	(set -e; \

	 echo "#ifndef $2"; \

	 echo "#define $2"; \

	 echo "/*"; \

	 echo " * DO NOT MODIFY."; \

	 echo " *"; \

	 echo " * This file was generated by Kbuild"; \

	 echo " */"; \

	 echo ""; \

	 sed -ne $(sed-y); \

	 echo ""; \

	 echo "#endif" )

endef



arch/arm/mach-at91/pm_data-offsets.s: arch/arm/mach-at91/pm_data-offsets.c

	$(call if_changed_dep,cc_s_c)



include/generated/at91_pm_data-offsets.h: arch/arm/mach-at91/pm_data-offsets.s FORCE

	$(call filechk,offsets,__PM_DATA_OFFSETS_H__)



arch/arm/mach-at91/pm_suspend.o: include/generated/at91_pm_data-offsets.h

arch/arm/mach-at91/at91rm9200.c

+1 −14
Original line number Diff line number Diff line
@@ -14,23 +14,10 @@ 
#include <asm/mach/arch.h>



#include "generic.h"

#include "soc.h"



static const struct at91_soc rm9200_socs[] = {

	AT91_SOC(AT91RM9200_CIDR_MATCH, 0, "at91rm9200 BGA", "at91rm9200"),

	{ /* sentinel */ },

};



static void __init at91rm9200_dt_device_init(void)

{

	struct soc_device *soc;

	struct device *soc_dev = NULL;



	soc = at91_soc_init(rm9200_socs);

	if (soc != NULL)

		soc_dev = soc_device_to_device(soc);



	of_platform_default_populate(NULL, NULL, soc_dev);

	of_platform_default_populate(NULL, NULL, NULL);



	at91rm9200_pm_init();

}

arch/arm/mach-at91/at91sam9.c

+4 −87
Original line number Diff line number Diff line
@@ -14,60 +14,12 @@ 
#include <asm/system_misc.h>



#include "generic.h"

#include "soc.h"



static const struct at91_soc at91sam9_socs[] = {

	AT91_SOC(AT91SAM9260_CIDR_MATCH, 0, "at91sam9260", NULL),

	AT91_SOC(AT91SAM9261_CIDR_MATCH, 0, "at91sam9261", NULL),

	AT91_SOC(AT91SAM9263_CIDR_MATCH, 0, "at91sam9263", NULL),

	AT91_SOC(AT91SAM9G20_CIDR_MATCH, 0, "at91sam9g20", NULL),

	AT91_SOC(AT91SAM9RL64_CIDR_MATCH, 0, "at91sam9rl64", NULL),

	AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9M11_EXID_MATCH,

		 "at91sam9m11", "at91sam9g45"),

	AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9M10_EXID_MATCH,

		 "at91sam9m10", "at91sam9g45"),

	AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9G46_EXID_MATCH,

		 "at91sam9g46", "at91sam9g45"),

	AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9G45_EXID_MATCH,

		 "at91sam9g45", "at91sam9g45"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G15_EXID_MATCH,

		 "at91sam9g15", "at91sam9x5"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G35_EXID_MATCH,

		 "at91sam9g35", "at91sam9x5"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9X35_EXID_MATCH,

		 "at91sam9x35", "at91sam9x5"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G25_EXID_MATCH,

		 "at91sam9g25", "at91sam9x5"),

	AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9X25_EXID_MATCH,

		 "at91sam9x25", "at91sam9x5"),

	AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9CN12_EXID_MATCH,

		 "at91sam9cn12", "at91sam9n12"),

	AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9N12_EXID_MATCH,

		 "at91sam9n12", "at91sam9n12"),

	AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9CN11_EXID_MATCH,

		 "at91sam9cn11", "at91sam9n12"),

	AT91_SOC(AT91SAM9XE128_CIDR_MATCH, 0, "at91sam9xe128", "at91sam9xe128"),

	AT91_SOC(AT91SAM9XE256_CIDR_MATCH, 0, "at91sam9xe256", "at91sam9xe256"),

	AT91_SOC(AT91SAM9XE512_CIDR_MATCH, 0, "at91sam9xe512", "at91sam9xe512"),

	{ /* sentinel */ },

};



static void __init at91sam9_common_init(void)

static void __init at91sam9_init(void)

{

	struct soc_device *soc;

	struct device *soc_dev = NULL;



	soc = at91_soc_init(at91sam9_socs);

	if (soc != NULL)

		soc_dev = soc_device_to_device(soc);

	of_platform_default_populate(NULL, NULL, NULL);



	of_platform_default_populate(NULL, NULL, soc_dev);

}



static void __init at91sam9_dt_device_init(void)

{

	at91sam9_common_init();

	at91sam9260_pm_init();

	at91sam9_pm_init();

}



static const char *const at91_dt_board_compat[] __initconst = {
@@ -77,41 +29,6 @@ static const char *const at91_dt_board_compat[] __initconst = { 


DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")

	/* Maintainer: Atmel */

	.init_machine	= at91sam9_dt_device_init,

	.init_machine	= at91sam9_init,

	.dt_compat	= at91_dt_board_compat,

MACHINE_END
 


static void __init at91sam9g45_dt_device_init(void)

{

	at91sam9_common_init();

	at91sam9g45_pm_init();

}



static const char *const at91sam9g45_board_compat[] __initconst = {

	"atmel,at91sam9g45",

	NULL

};



DT_MACHINE_START(at91sam9g45_dt, "Atmel AT91SAM9G45")

	/* Maintainer: Atmel */

	.init_machine	= at91sam9g45_dt_device_init,

	.dt_compat	= at91sam9g45_board_compat,

MACHINE_END



static void __init at91sam9x5_dt_device_init(void)

{

	at91sam9_common_init();

	at91sam9x5_pm_init();

}



static const char *const at91sam9x5_board_compat[] __initconst = {

	"atmel,at91sam9x5",

	"atmel,at91sam9n12",

	NULL

};



DT_MACHINE_START(at91sam9x5_dt, "Atmel AT91SAM9")

	/* Maintainer: Atmel */

	.init_machine	= at91sam9x5_dt_device_init,

	.dt_compat	= at91sam9x5_board_compat,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE