Commit 7bfc397f authored by Olof Johansson's avatar Olof Johansson
Browse files

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

From Maxime Ripard:
Allwinner core changes for 3.14

This mostly adds the reset controller initialisation for the A31 and the SMP
operations for this SoC.

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

:
  ARM: sun6i: Add SMP support for the Allwinner A31
  dt-bindings: fix example of allwinner interrupt controller
  ARM: sunxi: Register the A31 reset IP in init_time
  ARM: sunxi: Select ARCH_HAS_RESET_CONTROLLER

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

Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ intc: interrupt-controller { 
	compatible = "allwinner,sun4i-ic";

	reg = <0x01c20400 0x400>;

	interrupt-controller;

	#interrupt-cells = <2>;

	#interrupt-cells = <1>;

};

arch/arm/mach-sunxi/Kconfig

+1 −0
Original line number Diff line number Diff line 
config ARCH_SUNXI

	bool "Allwinner A1X SOCs" if ARCH_MULTI_V7

	select ARCH_HAS_RESET_CONTROLLER

	select ARCH_REQUIRE_GPIOLIB

	select ARM_GIC

	select CLKSRC_MMIO

arch/arm/mach-sunxi/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_ARCH_SUNXI) += sunxi.o

obj-$(CONFIG_SMP) += platsmp.o headsmp.o

arch/arm/mach-sunxi/common.h

0 → 100644
+19 −0
Original line number 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/headsmp.S

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#include <linux/linkage.h>

#include <linux/init.h>



        .section ".text.head", "ax"



ENTRY(sun6i_secondary_startup)

	msr	cpsr_fsxc, #0xd3

	b	secondary_startup

ENDPROC(sun6i_secondary_startup)

CRA Git | Maintained and supported by SUSTech CRA and CCSE