Commit cf377ad7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC platform changes from Arnd Bergmann:
 "New and updated SoC support.  Among the things new for this release
  are:

   - at91: Added support for the new SAMA5D4 SoC, following the earlier
     SAMA5D3
   - bcm: Added support for BCM63XX family of DSL SoCs
   - hisi: Added support for HiP04 server-class SoC
   - meson: Initial support for the Amlogic Meson6 (aka 8726MX) platform
   - shmobile: added support for new r8a7794 (R-Car E2) automotive SoC

  Noteworthy changes to existing SoC support are:

   - imx: convert i.MX1 to device tree
   - omap: lots of power management work
   - omap: base support to enable moving to standard UART driver
   - shmobile: lots of progress for multiplatform support, still
     ongoing"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (171 commits)
  ARM: hisi: depend on ARCH_MULTI_V7
  CNS3xxx: Fix debug UART.
  ARM: at91: fix nommu build regression
  ARM: meson: add basic support for MesonX SoCs
  ARM: meson: debug: add debug UART for earlyprintk support
  irq: Export handle_fasteoi_irq
  ARM: mediatek: Add earlyprintk support for mt6589
  ARM: hisi: Fix platmcpm compilation when ARMv6 is selected
  ARM: debug: fix alphanumerical order on debug uarts
  ARM: at91: document Atmel SMART compatibles
  ARM: at91: add sama5d4 support to sama5_defconfig
  ARM: at91: dt: add device tree file for SAMA5D4ek board
  ARM: at91: dt: add device tree file for SAMA5D4 SoC
  ARM: at91: SAMA5D4 SoC detection code and low level routines
  ARM: at91: introduce basic SAMA5D4 support
  clk: at91: add a driver for the h32mx clock
  ARM: pxa3xx: provide specific platform_devices for all ssp ports
  ARM: pxa: ssp: provide platform_device_id for PXA3xx
  ARM: OMAP4+: Remove static iotable mappings for SRAM
  ARM: OMAP4+: Move SRAM data to DT
  ...
parents 212fe84a d8f0faa3

Documentation/devicetree/bindings/arm/atmel-at91.txt

+37 −0
Original line number Diff line number Diff line 
Atmel AT91 device tree bindings.

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



Boards with a SoC of the Atmel AT91 or SMART family shall have the following

properties:



Required root node properties:

compatible: must be one of:

 * "atmel,at91rm9200"



 * "atmel,at91sam9" for SoCs using an ARM926EJ-S core, shall be extended with

   the specific SoC family or compatible:

    o "atmel,at91sam9260"

    o "atmel,at91sam9261"

    o "atmel,at91sam9263"

    o "atmel,at91sam9x5" for the 5 series, shall be extended with the specific

      SoC compatible:

       - "atmel,at91sam9g15"

       - "atmel,at91sam9g25"

       - "atmel,at91sam9g35"

       - "atmel,at91sam9x25"

       - "atmel,at91sam9x35"

    o "atmel,at91sam9g20"

    o "atmel,at91sam9g45"

    o "atmel,at91sam9n12"

    o "atmel,at91sam9rl"

 * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific

   SoC family:

    o "atmel,sama5d3" shall be extended with the specific SoC compatible:

       - "atmel,sama5d31"

       - "atmel,sama5d33"

       - "atmel,sama5d34"

       - "atmel,sama5d35"

       - "atmel,sama5d36"

    o "atmel,sama5d4" shall be extended with the specific SoC compatible:

       - "atmel,sama5d41"

       - "atmel,sama5d42"

       - "atmel,sama5d43"

       - "atmel,sama5d44"



PIT Timer required properties:

- compatible: Should be "atmel,at91sam9260-pit"

- reg: Should contain registers location and length

Documentation/devicetree/bindings/arm/bcm/bcm63138.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
Broadcom BCM63138 DSL System-on-a-Chip device tree bindings

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



Boards compatible with the BCM63138 DSL System-on-a-Chip should have the

following properties:



Required root node property:



compatible: should be "brcm,bcm63138"

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

+23 −0
Original line number Diff line number Diff line
@@ -5,6 +5,11 @@ Hi4511 Board 
Required root node properties:

	- compatible = "hisilicon,hi3620-hi4511";



HiP04 D01 Board

Required root node properties:

	- compatible = "hisilicon,hip04-d01";





Hisilicon system controller



Required properties:
@@ -55,3 +60,21 @@ Example: 
		compatible = "hisilicon,pctrl";

		reg = <0xfca09000 0x1000>;

	};



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

Fabric:



Required Properties:

- compatible: "hisilicon,hip04-fabric";

- reg: Address and size of Fabric



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

Bootwrapper boot method (software protocol on SMP):



Required Properties:

- compatible: "hisilicon,hip04-bootwrapper";

- boot-method: Address and size of boot method.

  [0]: bootwrapper physical address

  [1]: bootwrapper size

  [2]: relocation physical address

  [3]: relocation size

Documentation/devicetree/bindings/arm/omap/mpu.txt

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ Required properties: 
	       Should be "ti,omap5-mpu" for OMAP5

- ti,hwmods: "mpu"



Optional properties:

- sram:	Phandle to the ocmcram node



Examples:



- For an OMAP5 SMP system:

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
NVIDIA Tegra Flow Controller



Required properties:

- compatible: Should be "nvidia,tegra<chip>-flowctrl"

- reg: Should contain one register range (address and length)



Example:



	flow-controller@60007000 {

		compatible = "nvidia,tegra20-flowctrl";

		reg = <0x60007000 0x1000>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE