Commit eb0df9b7 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Alexandre Belloni
Browse files

ARM: at91: pm: move SAM9X60's PM under its own SoC config flag 



Move SAM9X60's PM part under SoC config flag. This allows the building
of SAM9X60 platform withouth depending on CONFIG_SOC_AT91SAM9 flag,
allowing us to select only necessary config flags for SAM9X60.

Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/1575035505-6310-4-git-send-email-claudiu.beznea@microchip.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent fe7ff55d

arch/arm/mach-at91/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
# CPU-specific support

obj-$(CONFIG_SOC_AT91RM9200)	+= at91rm9200.o

obj-$(CONFIG_SOC_AT91SAM9)	+= at91sam9.o

obj-$(CONFIG_SOC_SAM9X60)	+= sam9x60.o

obj-$(CONFIG_SOC_SAMA5)		+= sama5.o

obj-$(CONFIG_SOC_SAMV7)		+= samv7.o

arch/arm/mach-at91/at91sam9.c

+0 −18
Original line number Diff line number Diff line
@@ -31,21 +31,3 @@ DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9") 
	.init_machine	= at91sam9_init,

	.dt_compat	= at91_dt_board_compat,

MACHINE_END
 


static void __init sam9x60_init(void)

{

	of_platform_default_populate(NULL, NULL, NULL);



	sam9x60_pm_init();

}



static const char *const sam9x60_dt_board_compat[] __initconst = {

	"microchip,sam9x60",

	NULL

};



DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60")

	/* Maintainer: Microchip */

	.init_machine	= sam9x60_init,

	.dt_compat	= sam9x60_dt_board_compat,

MACHINE_END

arch/arm/mach-at91/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ void __init at91rm9200_pm_init(void) 


void __init sam9x60_pm_init(void)

{

	if (!IS_ENABLED(CONFIG_SOC_AT91SAM9))

	if (!IS_ENABLED(CONFIG_SOC_SAM9X60))

		return;



	at91_pm_modes_init();

arch/arm/mach-at91/sam9x60.c

0 → 100644
+34 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Setup code for SAM9X60.

 *

 * Copyright (C) 2019 Microchip Technology Inc. and its subsidiaries

 *

 * Author: Claudiu Beznea <claudiu.beznea@microchip.com>

 */



#include <linux/of.h>

#include <linux/of_platform.h>



#include <asm/mach/arch.h>

#include <asm/system_misc.h>



#include "generic.h"



static void __init sam9x60_init(void)

{

	of_platform_default_populate(NULL, NULL, NULL);



	sam9x60_pm_init();

}



static const char *const sam9x60_dt_board_compat[] __initconst = {

	"microchip,sam9x60",

	NULL

};



DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60")

	/* Maintainer: Microchip */

	.init_machine	= sam9x60_init,

	.dt_compat	= sam9x60_dt_board_compat,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE