Commit 03fa6267 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'armsoc-soc' into test-merge 

ARM: SoC: platform support for v4.2

Our SoC branch usually contains expanded support for new SoCs and
other core platform code. Some highlights from this round:

- sunxi: SMP support for A23 SoC
- socpga: big-endian support
- pxa: conversion to common clock framework
- bcm: SMP support for BCM63138
- imx: support new I.MX7D SoC
- zte: basic support for ZX296702 SoC

 Conflicts:
	arch/arm/mach-socfpga/core.h

Trivial remove/remove conflict with our cleanup branch.
Resolution: remove both sides

# gpg: Signature made Wed Jun 24 21:32:12 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
# gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
# gpg:                 aka "Kevin Hilman <khilman@kernel.org>"

# Conflicts:
#	arch/arm/mach-socfpga/core.h
parents 8d2977bf 2879e43f

Documentation/arm/stm32/overview.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
			STM32 ARM Linux Overview

			========================



Introduction

------------



  The STMicroelectronics family of Cortex-M based MCUs are supported by the

  'STM32' platform of ARM Linux. Currently only the STM32F429 is supported.





Configuration

-------------



  A generic configuration is provided for STM32 family, and can be used as the

  default by

	make stm32_defconfig



Layout

------



  All the files for multiple machine families are located in the platform code

  contained in arch/arm/mach-stm32



  There is a generic board board-dt.c in the mach folder which support

  Flattened Device Tree, which means, it works with any compatible board with

  Device Trees.





Document Author

---------------



  Maxime Coquelin <mcoquelin.stm32@gmail.com>

Documentation/arm/stm32/stm32f429-overview.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
			STM32F429 Overview

			==================



  Introduction

  ------------

	The STM32F429 is a Cortex-M4 MCU aimed at various applications.

	It features:

	- ARM Cortex-M4 up to 180MHz with FPU

	- 2MB internal Flash Memory

	- External memory support through FMC controller (PSRAM, SDRAM, NOR, NAND)

	- I2C, SPI, SAI, CAN, USB OTG, Ethernet controllers

	- LCD controller & Camera interface

	- Cryptographic processor



  Resources

  ---------

	Datasheet and reference manual are publicly available on ST website:

	- http://www.st.com/web/en/catalog/mmc/FM141/SC1169/SS1577/LN1806?ecmp=stm32f429-439_pron_pr-ces2014_nov2013



  Document Author

  ---------------

	Maxime Coquelin <mcoquelin.stm32@gmail.com>

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ nodes to be present and contain the properties described below. 
			# On ARM 32-bit systems this property is optional and

			  can be one of:

			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,psci"

			    "brcm,brahma-b15"

			    "marvell,armada-375-smp"

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

+4 −3
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ Optional Properties: 
	domains.

- clock-names: The following clocks can be specified:

	- oscclk: Oscillator clock.

	- pclkN, clkN: Pairs of parent of input clock and input clock to the

		devices in this power domain. Maximum of 4 pairs (N = 0 to 3)

		are supported currently.

	- clkN: Input clocks to the devices in this power domain. These clocks

		will be reparented to oscclk before swithing power domain off.

		Their original parent will be brought back after turning on

		the domain. Maximum of 4 clocks (N = 0 to 3) are supported.

	- asbN: Clocks required by asynchronous bridges (ASB) present in

		the power domain. These clock should be enabled during power

		domain on/off operations.

Documentation/devicetree/bindings/arm/fsl.txt

+3 −0
Original line number Diff line number Diff line
@@ -81,12 +81,15 @@ Freescale Vybrid Platform Device Tree Bindings 
For the Vybrid SoC familiy all variants with DDR controller are supported,

which is the VF5xx and VF6xx series. Out of historical reasons, in most

places the kernel uses vf610 to refer to the whole familiy.

The compatible string "fsl,vf610m4" is used for the secondary Cortex-M4

core support.



Required root node compatible property (one of them):

    - compatible = "fsl,vf500";

    - compatible = "fsl,vf510";

    - compatible = "fsl,vf600";

    - compatible = "fsl,vf610";

    - compatible = "fsl,vf610m4";



Freescale LS1021A Platform Device Tree Bindings

------------------------------------------------

CRA Git | Maintained and supported by SUSTech CRA and CCSE