Commit 3c258017 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge "Allwinner Core additions for 3.16, take 2" from Maxime Ripard:

  - Convert the A31 SMP operations to the CPU_METHOD_OF_DECLARE mechanism
  - Remove the reset code from the machine definition, that removes pretty much
    all the code left in mach-sunxi

* tag 'sunxi-core-for-3.16-2' of https://github.com/mripard/linux

:
  ARM: sunxi: Remove init_machine callback
  ARM: sunxi: Remove reset code from the platform
  ARM: sun6i: Retire the smp field in A31 machine
  Documentation: dt: bindings: Document Allwinner A31 enable method
  ARM: sun6i: Use CPU_METHOD_OF_DECLARE
  Documentation: dt: bindings: Document ARM PSCI enable method

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8ad0bbd8 5e669ec5

Documentation/devicetree/bindings/arm/cpus.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -182,6 +182,8 @@ nodes to be present and contain the properties described below. 
			     "psci"

			     "psci"

			# On ARM 32-bit systems this property is optional and

			# On ARM 32-bit systems this property is optional and

			  can be one of:

			  can be one of:

			    "arm,psci"

			    "allwinner,sun6i-a31"

			    "qcom,gcc-msm8660"

			    "qcom,gcc-msm8660"

			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "qcom,kpss-acc-v2"

arch/arm/mach-sunxi/common.h

deleted100644 → 0
+0 −19
Original line number Original line Diff line number Diff line 
/*

 * Core functions for Allwinner SoCs

 *

 * Copyright (C) 2013 Maxime Ripard

 *

 * Maxime Ripard <maxime.ripard@free-electrons.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#ifndef __ARCH_SUNXI_COMMON_H_

#define __ARCH_SUNXI_COMMON_H_



void sun6i_secondary_startup(void);

extern struct smp_operations sun6i_smp_ops;



#endif /* __ARCH_SUNXI_COMMON_H_ */

arch/arm/mach-sunxi/platsmp.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/smp.h>

#include <linux/smp.h>





#include "common.h"



#define CPUCFG_CPU_PWR_CLAMP_STATUS_REG(cpu)	((cpu) * 0x40 + 0x64)

#define CPUCFG_CPU_PWR_CLAMP_STATUS_REG(cpu)	((cpu) * 0x40 + 0x64)

#define CPUCFG_CPU_RST_CTRL_REG(cpu)		(((cpu) + 1) * 0x40)

#define CPUCFG_CPU_RST_CTRL_REG(cpu)		(((cpu) + 1) * 0x40)

#define CPUCFG_CPU_CTRL_REG(cpu)		(((cpu) + 1) * 0x40 + 0x04)

#define CPUCFG_CPU_CTRL_REG(cpu)		(((cpu) + 1) * 0x40 + 0x04)
@@ -122,3 +120,4 @@ struct smp_operations sun6i_smp_ops __initdata = { 
	.smp_prepare_cpus	= sun6i_smp_prepare_cpus,

	.smp_prepare_cpus	= sun6i_smp_prepare_cpus,

	.smp_boot_secondary	= sun6i_smp_boot_secondary,

	.smp_boot_secondary	= sun6i_smp_boot_secondary,

};

};

CPU_METHOD_OF_DECLARE(sun6i_smp, "allwinner,sun6i-a31", &sun6i_smp_ops);

arch/arm/mach-sunxi/sunxi.c

+0 −110
Original line number Original line Diff line number Diff line
@@ -12,111 +12,8 @@ 




#include <linux/clk-provider.h>

#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/clocksource.h>

#include <linux/delay.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/io.h>

#include <linux/reboot.h>





#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/system_misc.h>



#include "common.h"



#define SUN4I_WATCHDOG_CTRL_REG		0x00

#define SUN4I_WATCHDOG_CTRL_RESTART		BIT(0)

#define SUN4I_WATCHDOG_MODE_REG		0x04

#define SUN4I_WATCHDOG_MODE_ENABLE		BIT(0)

#define SUN4I_WATCHDOG_MODE_RESET_ENABLE	BIT(1)



#define SUN6I_WATCHDOG1_IRQ_REG		0x00

#define SUN6I_WATCHDOG1_CTRL_REG	0x10

#define SUN6I_WATCHDOG1_CTRL_RESTART		BIT(0)

#define SUN6I_WATCHDOG1_CONFIG_REG	0x14

#define SUN6I_WATCHDOG1_CONFIG_RESTART		BIT(0)

#define SUN6I_WATCHDOG1_CONFIG_IRQ		BIT(1)

#define SUN6I_WATCHDOG1_MODE_REG	0x18

#define SUN6I_WATCHDOG1_MODE_ENABLE		BIT(0)



static void __iomem *wdt_base;



static void sun4i_restart(enum reboot_mode mode, const char *cmd)

{

	if (!wdt_base)

		return;



	/* Enable timer and set reset bit in the watchdog */

	writel(SUN4I_WATCHDOG_MODE_ENABLE | SUN4I_WATCHDOG_MODE_RESET_ENABLE,

	       wdt_base + SUN4I_WATCHDOG_MODE_REG);



	/*

	 * Restart the watchdog. The default (and lowest) interval

	 * value for the watchdog is 0.5s.

	 */

	writel(SUN4I_WATCHDOG_CTRL_RESTART, wdt_base + SUN4I_WATCHDOG_CTRL_REG);



	while (1) {

		mdelay(5);

		writel(SUN4I_WATCHDOG_MODE_ENABLE | SUN4I_WATCHDOG_MODE_RESET_ENABLE,

		       wdt_base + SUN4I_WATCHDOG_MODE_REG);

	}

}



static void sun6i_restart(enum reboot_mode mode, const char *cmd)

{

	if (!wdt_base)

		return;



	/* Disable interrupts */

	writel(0, wdt_base + SUN6I_WATCHDOG1_IRQ_REG);



	/* We want to disable the IRQ and just reset the whole system */

	writel(SUN6I_WATCHDOG1_CONFIG_RESTART,

		wdt_base + SUN6I_WATCHDOG1_CONFIG_REG);



	/* Enable timer. The default and lowest interval value is 0.5s */

	writel(SUN6I_WATCHDOG1_MODE_ENABLE,

		wdt_base + SUN6I_WATCHDOG1_MODE_REG);



	/* Restart the watchdog. */

	writel(SUN6I_WATCHDOG1_CTRL_RESTART,

		wdt_base + SUN6I_WATCHDOG1_CTRL_REG);



	while (1) {

		mdelay(5);

		writel(SUN6I_WATCHDOG1_MODE_ENABLE,

			wdt_base + SUN6I_WATCHDOG1_MODE_REG);

	}

}



static struct of_device_id sunxi_restart_ids[] = {

	{ .compatible = "allwinner,sun4i-a10-wdt" },

	{ .compatible = "allwinner,sun6i-a31-wdt" },

	{ /*sentinel*/ }

};



static void sunxi_setup_restart(void)

{

	struct device_node *np;



	np = of_find_matching_node(NULL, sunxi_restart_ids);

	if (WARN(!np, "unable to setup watchdog restart"))

		return;



	wdt_base = of_iomap(np, 0);

	WARN(!wdt_base, "failed to map watchdog base address");

}



static void __init sunxi_dt_init(void)

{

	sunxi_setup_restart();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}





static const char * const sunxi_board_dt_compat[] = {

static const char * const sunxi_board_dt_compat[] = {

	"allwinner,sun4i-a10",

	"allwinner,sun4i-a10",
@@ -126,9 +23,7 @@ static const char * const sunxi_board_dt_compat[] = { 
};

};





DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")

DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")

	.init_machine	= sunxi_dt_init,

	.dt_compat	= sunxi_board_dt_compat,

	.dt_compat	= sunxi_board_dt_compat,

	.restart	= sun4i_restart,

MACHINE_END

MACHINE_END





static const char * const sun6i_board_dt_compat[] = {

static const char * const sun6i_board_dt_compat[] = {
@@ -145,11 +40,8 @@ static void __init sun6i_timer_init(void) 
}

}





DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")

DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")

	.init_machine	= sunxi_dt_init,

	.init_time	= sun6i_timer_init,

	.init_time	= sun6i_timer_init,

	.dt_compat	= sun6i_board_dt_compat,

	.dt_compat	= sun6i_board_dt_compat,

	.restart	= sun6i_restart,

	.smp		= smp_ops(sun6i_smp_ops),

MACHINE_END

MACHINE_END





static const char * const sun7i_board_dt_compat[] = {

static const char * const sun7i_board_dt_compat[] = {
@@ -158,7 +50,5 @@ static const char * const sun7i_board_dt_compat[] = { 
};

};





DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")

DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")

	.init_machine	= sunxi_dt_init,

	.dt_compat	= sun7i_board_dt_compat,

	.dt_compat	= sun7i_board_dt_compat,

	.restart	= sun4i_restart,

MACHINE_END
 
MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE