Commit e9f6d135 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'sunxi/soc2' into next/soc 



From Maxime Ripard:

Here is a pull request to add the support for Allwinner A10 SoCs.

* sunxi/soc2:
  ARM: sunxi: Add sunxi restart function via onchip watchdog
  ARM: sunxi: Add sun4i and cubieboard support
  ARM: sunxi: Add earlyprintk support for UART0 (sun4i)
  ARM: sunxi: Restructure sunxi dts/dtsi files

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 41739b60 67bea88d

Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
Allwinner sunXi Watchdog timer



Required properties:



- compatible : should be "allwinner,sunxi-wdt"

- reg : Specifies base physical address and size of the registers.



Example:



wdt: watchdog@01c20c90 {

	compatible = "allwinner,sunxi-wdt";

	reg = <0x01c20c90 0x10>;

};

arch/arm/Kconfig.debug

+8 −1
Original line number Diff line number Diff line
@@ -345,6 +345,13 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on SOCFPGA based platforms.



	config DEBUG_SUNXI_UART0

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

		depends on ARCH_SUNXI

		help

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

		  on Allwinner A1X based platforms on the UART0.



	config DEBUG_SUNXI_UART1

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

		depends on ARCH_SUNXI
@@ -431,7 +438,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART

	default "debug/sunxi.S" if DEBUG_SUNXI_UART1

	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \

		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1

	default "mach/debug-macro.S"

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ 
	spear310-evb.dtb \

	spear320-evb.dtb

dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun5i-olinuxino.dtb

dtb-$(CONFIG_ARCH_SUNXI) += sun4i-cubieboard.dtb \

	sun5i-olinuxino.dtb

dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \

	tegra20-medcom-wide.dtb \

	tegra20-paz00.dtb \

arch/arm/boot/dts/sun4i-cubieboard.dts

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Stefan Roese

 * Stefan Roese <sr@denx.de>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/dts-v1/;

/include/ "sun4i.dtsi"



/ {

	model = "Cubietech Cubieboard";

	compatible = "cubietech,cubieboard", "allwinner,sun4i";



	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

	};



	chosen {

		bootargs = "earlyprintk console=ttyS0,115200";

	};



	soc {

		uart0: uart@01c28000 {

			status = "okay";

		};



		uart1: uart@01c28400 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/sun5i-olinuxino.dts

+5 −1
Original line number Diff line number Diff line
@@ -18,8 +18,12 @@ 
	model = "Olimex A13-Olinuxino";

	compatible = "olimex,a13-olinuxino", "allwinner,sun5i";



	chosen {

		bootargs = "earlyprintk console=ttyS0,115200";

	};



	soc {

		duart: uart@01c28400 {

		uart1: uart@01c28400 {

			status = "okay";

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE