Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e0a7969 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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

From Maxime Ripard:
Second round of core additions for the Allwinner SoCs

Fixes to select missing configuration options, and update of the maintainer
file.

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

:
  ARM: sunxi: select ARM_PSCI
  MAINTAINERS: Update Allwinner sunXi maintainer files
  ARM: sunxi: Select RESET_CONTROLLER
  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
  reset: Add Allwinner SoCs Reset Controller Driver

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents eb902177 75cac6ab

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>;

};

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -766,7 +766,12 @@ ARM/Allwinner A1X SoC support 
M:	Maxime Ripard <maxime.ripard@free-electrons.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-sunxi/

N:	sun[x4567]i



ARM/Allwinner SoC Clock Support

M:	Emilio López <emilio@elopez.com.ar>

S:	Maintained

F:	drivers/clk/sunxi/



ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES

M:	Andrew Victor <linux@maxim.org.za>

arch/arm/mach-sunxi/Kconfig

+3 −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 ARM_PSCI

	select CLKSRC_MMIO

	select CLKSRC_OF

	select COMMON_CLK
@@ -10,5 +12,6 @@ config ARCH_SUNXI 
	select HAVE_SMP

	select PINCTRL

	select PINCTRL_SUNXI

	select RESET_CONTROLLER

	select SPARSE_IRQ

	select SUN4I_TIMER

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_ */