From: Olof Johansson <olof@lixom.net>
Date: Mon, 28 Oct 2013 17:13:09 +0000 (-0700)
Subject: Merge tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux into next/soc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e086df92e21ac83e6a45933a205b62ad79097db5;p=linux-beck.git

Merge tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux into next/soc

From Maxime Ripard:
Allwinner sunXi SoCs machine additions for 3.13

Nothing outstanding here, mostly some documentation cleanup, and the split of
the previous generic machine declaration into three different machines to
handle the sun4i/sun5i, sun6i and sun7i separately.

* tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux:
  Documentation: dt: Remove clock gates IDs list for Allwinner SoCs
  Documentation: dt: Remove interrupt sources list for Allwinner SoCs
  Documentation: sunxi: Update Allwinner SoC documentation
  Documentation: sunxi: Update A13 user manual dead link
  ARM: sunxi: Order Kconfig options alphabetically
  ARM: sunxi: Simplify restart setup code
  ARM: sunxi: Split out the DT machines for sun6i and sun7i

Signed-off-by: Olof Johansson <olof@lixom.net>
---

e086df92e21ac83e6a45933a205b62ad79097db5
diff --cc arch/arm/mach-sunxi/sunxi.c
index 90dda6228510,f184f6c2fa33..ffac2f53fede
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@@ -106,13 -108,14 +105,8 @@@ static void sunxi_setup_restart(void
  
  	wdt_base = of_iomap(np, 0);
  	WARN(!wdt_base, "failed to map watchdog base address");
- 
- 	of_id = of_match_node(sunxi_restart_ids, np);
- 	WARN(!of_id, "restart function not available");
- 
- 	arm_pm_restart = of_id->data;
  }
  
 -static void __init sunxi_timer_init(void)
 -{
 -	sunxi_init_clocks();
 -	clocksource_of_init();
 -}
 -
  static void __init sunxi_dt_init(void)
  {
  	sunxi_setup_restart();
@@@ -131,5 -132,31 +123,30 @@@ static const char * const sunxi_board_d
  
  DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
  	.init_machine	= sunxi_dt_init,
 -	.init_time	= sunxi_timer_init,
  	.dt_compat	= sunxi_board_dt_compat,
+ 	.restart	= sun4i_restart,
+ MACHINE_END
+ 
+ static const char * const sun6i_board_dt_compat[] = {
+ 	"allwinner,sun6i-a31",
+ 	NULL,
+ };
+ 
+ DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
+ 	.init_machine	= sunxi_dt_init,
+ 	.init_time	= sunxi_timer_init,
+ 	.dt_compat	= sun6i_board_dt_compat,
+ 	.restart	= sun6i_restart,
+ MACHINE_END
+ 
+ static const char * const sun7i_board_dt_compat[] = {
+ 	"allwinner,sun7i-a20",
+ 	NULL,
+ };
+ 
+ DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")
+ 	.init_machine	= sunxi_dt_init,
+ 	.init_time	= sunxi_timer_init,
+ 	.dt_compat	= sun7i_board_dt_compat,
+ 	.restart	= sun4i_restart,
  MACHINE_END