Commit 8d6d5e12 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-core-for-3.19' of... 

Merge tag 'sunxi-core-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc

Pull "Allwinner Core Additions for 3.19" from Maxime Ripard:

This has mostly been about introducing A80 support

* tag 'sunxi-core-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

:
  ARM: sunxi: make sun6i SMP ops static
  ARM: sunxi: Select ARCH_HAS_RESET_CONTROLLER and RESET_CONTROLLER for sun9i
  Documentation: sunxi: Add A80 datasheet link
  devicetree: bindings: Document supported Allwinner sunxi SoCs
  ARM: sunxi: Introduce Allwinner A80 support
  devicetree: bindings: Add vendor prefix for Merrii Technology Co., Ltd.
  ARM: sunxi: Add debug uart used by sun9i (Allwinner A80)
  Documentation: sunxi: Update Allwinner SoC documentation (A31/A31s/A23)

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f2f456e7 02c24f7d

Documentation/arm/sunxi/README

+13 −3
Original line number Diff line number Diff line
@@ -37,16 +37,26 @@ SunXi family 
          http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf



      - Allwinner A23

        + Not Supported

        + Datasheet

          http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf

        + User Manual

          http://dl.linux-sunxi.org/A23/A23%20User%20Manual%20V1.0%2020130830.pdf



    * Quad ARM Cortex-A7 based SoCs

      - Allwinner A31 (sun6i)

        + Datasheet

          http://dl.linux-sunxi.org/A31/A31%20Datasheet%20-%20v1.00%20(2012-12-24).pdf

          http://dl.linux-sunxi.org/A31/A3x_release_document/A31/IC/A31%20datasheet%20V1.3%2020131106.pdf

        + User Manual

          http://dl.linux-sunxi.org/A31/A3x_release_document/A31/IC/A31%20user%20manual%20V1.1%2020130630.pdf



      - Allwinner A31s (sun6i)

        + Not Supported

        + Datasheet

          http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20datasheet%20V1.3%2020131106.pdf

        + User Manual

          http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf



    * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs

      - Allwinner A80

        + Not Supported
 
 No newline at end of file
 
        + Datasheet

	  http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf

Documentation/devicetree/bindings/arm/sunxi.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Allwinner sunXi Platforms Device Tree Bindings



Each device tree must specify which Allwinner SoC it uses,

using one of the following compatible strings:



  allwinner,sun4i-a10

  allwinner,sun5i-a10s

  allwinner,sun5i-a13

  allwinner,sun6i-a31

  allwinner,sun7i-a20

  allwinner,sun8i-a23

  allwinner,sun9i-a80

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ lltc Linear Technology Corporation 
marvell	Marvell Technology Group Ltd.

maxim	Maxim Integrated Products

mediatek	MediaTek Inc.

merrii	Merrii Technology Co., Ltd.

micrel	Micrel Inc.

microchip	Microchip Technology Inc.

mitsubishi	Mitsubishi Electric Corporation

arch/arm/Kconfig.debug

+10 −0
Original line number Diff line number Diff line
@@ -750,6 +750,14 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA based platforms.



	config DEBUG_SUN9I_UART0

		bool "Kernel low-level debugging messages via sun9i UART0"

		depends on MACH_SUN9I

		select DEBUG_UART_8250

		help

		  Say Y here if you want kernel low-level debugging support

		  on Allwinner A80 based platforms on the UART0.



	config DEBUG_SUNXI_UART0

		bool "Kernel low-level debugging messages via sunXi UART0"

		depends on ARCH_SUNXI
@@ -1142,6 +1150,7 @@ config DEBUG_UART_PHYS 
	default 0x02530c00 if DEBUG_KEYSTONE_UART0

	default 0x02531000 if DEBUG_KEYSTONE_UART1

	default 0x03010fe0 if ARCH_RPC

	default 0x07000000 if DEBUG_SUN9I_UART0

	default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \

				DEBUG_VEXPRESS_UART0_CA9

	default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
@@ -1231,6 +1240,7 @@ config DEBUG_UART_VIRT 
	default 0xf2100000 if DEBUG_PXA_UART1

	default 0xf4090000 if ARCH_LPC32XX

	default 0xf4200000 if ARCH_GEMINI

	default 0xf7000000 if DEBUG_SUN9I_UART0

	default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \

				DEBUG_S3C2410_UART0)

	default 0xf7004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \

arch/arm/mach-sunxi/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -42,4 +42,11 @@ config MACH_SUN8I 
	select MFD_SUN6I_PRCM

	select RESET_CONTROLLER



config MACH_SUN9I

	bool "Allwinner (sun9i) SoCs support"

	default ARCH_SUNXI

	select ARCH_HAS_RESET_CONTROLLER

	select ARM_GIC

	select RESET_CONTROLLER



endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE