Commit 60dc45dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-arm-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull arm platform SoC code updates from Arnd Bergmann:
 "These are mainly code cleanups, dropping some unneeded code, plus a
  reference counting leak fix"

* tag 'soc-arm-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: at91: remove unnecessary of_platform_default_populate calls
  ARM: at91: Move PM init functions to .init_late hook
  ARM: omap1: drop unused Kconfig symbol
  ARM: omap2: Fix reference count leaks in omap_control_init()
parents bdbddf72 16868b35

arch/arm/mach-at91/at91rm9200.c

+1 −11
Original line number Diff line number Diff line
@@ -7,26 +7,16 @@ 
 *                2012 Joachim Eastwood <manabian@gmail.com>

 */



#include <linux/of.h>

#include <linux/of_platform.h>



#include <asm/mach/arch.h>



#include "generic.h"



static void __init at91rm9200_dt_device_init(void)

{

	of_platform_default_populate(NULL, NULL, NULL);



	at91rm9200_pm_init();

}



static const char *const at91rm9200_dt_board_compat[] __initconst = {

	"atmel,at91rm9200",

	NULL

};



DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200")

	.init_machine	= at91rm9200_dt_device_init,

	.init_late	= at91rm9200_pm_init,

	.dt_compat	= at91rm9200_dt_board_compat,

MACHINE_END

arch/arm/mach-at91/at91sam9.c

+1 −11
Original line number Diff line number Diff line
@@ -6,21 +6,11 @@ 
 *                2011 Nicolas Ferre <nicolas.ferre@atmel.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 at91sam9_init(void)

{

	of_platform_default_populate(NULL, NULL, NULL);



	at91sam9_pm_init();

}



static const char *const at91_dt_board_compat[] __initconst = {

	"atmel,at91sam9",

	NULL
@@ -28,6 +18,6 @@ static const char *const at91_dt_board_compat[] __initconst = { 


DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")

	/* Maintainer: Atmel */

	.init_machine	= at91sam9_init,

	.init_late	= at91sam9_pm_init,

	.dt_compat	= at91_dt_board_compat,

MACHINE_END

arch/arm/mach-at91/sam9x60.c

+1 −11
Original line number Diff line number Diff line
@@ -7,21 +7,11 @@ 
 * 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
@@ -29,6 +19,6 @@ static const char *const sam9x60_dt_board_compat[] __initconst = { 


DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60")

	/* Maintainer: Microchip */

	.init_machine	= sam9x60_init,

	.init_late	= sam9x60_pm_init,

	.dt_compat	= sam9x60_dt_board_compat,

MACHINE_END

arch/arm/mach-at91/sam9x7.c

+1 −11
Original line number Diff line number Diff line
@@ -7,20 +7,10 @@ 
 * Author: Varshini Rajendran <varshini.rajendran@microchip.com>

 */



#include <linux/of.h>

#include <linux/of_platform.h>



#include <asm/mach/arch.h>



#include "generic.h"



static void __init sam9x7_init(void)

{

	of_platform_default_populate(NULL, NULL, NULL);



	sam9x7_pm_init();

}



static const char * const sam9x7_dt_board_compat[] __initconst = {

	"microchip,sam9x7",

	NULL
@@ -28,6 +18,6 @@ static const char * const sam9x7_dt_board_compat[] __initconst = { 


DT_MACHINE_START(sam9x7_dt, "Microchip SAM9X7")

	/* Maintainer: Microchip */

	.init_machine	= sam9x7_init,

	.init_late	= sam9x7_pm_init,

	.dt_compat	= sam9x7_dt_board_compat,

MACHINE_END

arch/arm/mach-at91/sama5.c

+3 −18
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ 
 *                2013 Ludovic Desroches <ludovic.desroches@atmel.com>

 */



#include <linux/of.h>

#include <linux/of_platform.h>



#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -30,12 +27,6 @@ static void __init sama5_secure_cache_init(void) 
		outer_cache.write_sec = sama5_l2c310_write_sec;

}



static void __init sama5_dt_device_init(void)

{

	of_platform_default_populate(NULL, NULL, NULL);

	sama5_pm_init();

}



static const char *const sama5_dt_board_compat[] __initconst = {

	"atmel,sama5",

	NULL
@@ -43,7 +34,7 @@ static const char *const sama5_dt_board_compat[] __initconst = { 


DT_MACHINE_START(sama5_dt, "Atmel SAMA5")

	/* Maintainer: Atmel */

	.init_machine	= sama5_dt_device_init,

	.init_late	= sama5_pm_init,

	.dt_compat	= sama5_dt_board_compat,

MACHINE_END
@@ -54,17 +45,11 @@ static const char *const sama5_alt_dt_board_compat[] __initconst = { 


DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5")

	/* Maintainer: Atmel */

	.init_machine	= sama5_dt_device_init,

	.init_late	= sama5_pm_init,

	.dt_compat	= sama5_alt_dt_board_compat,

	.l2c_aux_mask	= ~0UL,

MACHINE_END



static void __init sama5d2_init(void)

{

	of_platform_default_populate(NULL, NULL, NULL);

	sama5d2_pm_init();

}



static const char *const sama5d2_compat[] __initconst = {

	"atmel,sama5d2",

	NULL
@@ -72,8 +57,8 @@ static const char *const sama5d2_compat[] __initconst = { 


DT_MACHINE_START(sama5d2, "Atmel SAMA5")

	/* Maintainer: Atmel */

	.init_machine	= sama5d2_init,

	.init_early	= sama5_secure_cache_init,

	.init_late	= sama5d2_pm_init,

	.dt_compat	= sama5d2_compat,

	.l2c_aux_mask	= ~0UL,

MACHINE_END