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

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

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

Pull ARM SoC platform changes from Olof Johansson:
 "This is the bulk of new SoC enablement and other platform changes for
  3.17:

   - Samsung S5PV210 has been converted to DT and multiplatform
   - Clock drivers and bindings for some of the lower-end i.MX 1/2
     platforms
   - Kirkwood, one of the popular Marvell platforms, is folded into the
     mvebu platform code, removing mach-kirkwood
   - Hwmod data for TI AM43xx and DRA7 platforms
   - More additions of Renesas shmobile platform support
   - Removal of plat-samsung contents that can be removed with S5PV210
     being multiplatform/DT-enabled and the other two old platforms
     being removed

  New platforms (most with only basic support right now):

   - Hisilicon X5HD2 settop box chipset is introduced
   - Mediatek MT6589 (mobile chipset) is introduced
   - Broadcom BCM7xxx settop box chipset is introduced

  + as usual a lot other pieces all over the platform code"

* tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (240 commits)
  ARM: hisi: remove smp from machine descriptor
  power: reset: move hisilicon reboot code
  ARM: dts: Add hix5hd2-dkb dts file.
  ARM: debug: Rename Hi3716 to HIX5HD2
  ARM: hisi: enable hix5hd2 SoC
  ARM: hisi: add ARCH_HISI
  MAINTAINERS: add entry for Broadcom ARM STB architecture
  ARM: brcmstb: select GISB arbiter and interrupt drivers
  ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs
  ARM: configs: enable SMP in bcm_defconfig
  ARM: add SMP support for Broadcom mobile SoCs
  Documentation: arm: misc updates to Marvell EBU SoC status
  Documentation: arm: add URLs to public datasheets for the Marvell Armada XP SoC
  ARM: mvebu: fix build without platforms selected
  ARM: mvebu: add cpuidle support for Armada 38x
  ARM: mvebu: add cpuidle support for Armada 370
  cpuidle: mvebu: add Armada 38x support
  cpuidle: mvebu: add Armada 370 support
  cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7
  ARM: mvebu: export the SCU address
  ...
parents 44c916d5 c2fff85e

Documentation/arm/Marvell/README

+13 −10
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ Kirkwood family 
                Functional Spec: http://www.marvell.com/embedded-processors/kirkwood/assets/FS_88F6180_9x_6281_OpenSource.pdf

  Homepage: http://www.marvell.com/embedded-processors/kirkwood/

  Core: Feroceon ARMv5 compatible

  Linux kernel mach directory: arch/arm/mach-kirkwood

  Linux kernel plat directory: arch/arm/plat-orion

  Linux kernel mach directory: arch/arm/mach-mvebu

  Linux kernel plat directory: none



Discovery family

----------------
@@ -84,6 +84,8 @@ EBU Armada family 
        88F6707

        88F6W11

    Product Brief:   http://www.marvell.com/embedded-processors/armada-300/assets/Marvell_ARMADA_370_SoC.pdf

    Hardware Spec:   http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA370-datasheet.pdf

    Functional Spec: http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA370-FunctionalSpec-datasheet.pdf



  Armada 375 Flavors:

	88F6720
@@ -100,8 +102,7 @@ EBU Armada family 
        MV78460

    NOTE: not to be confused with the non-SMP 78xx0 SoCs

    Product Brief: http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf



  No public datasheet available.

    Functional Spec: http://www.marvell.com/embedded-processors/armada-xp/assets/ARMADA-XP-Functional-SpecDatasheet.pdf



  Core: Sheeva ARMv7 compatible
@@ -135,7 +136,9 @@ Dove family (application processor) 
                Functional Spec : http://www.marvell.com/application-processors/armada-500/assets/Armada-510-Functional-Spec.pdf

  Homepage: http://www.marvell.com/application-processors/armada-500/

  Core: ARMv7 compatible

  Directory: arch/arm/mach-dove



  Directory: arch/arm/mach-mvebu (DT enabled platforms)

             arch/arm/mach-dove (non-DT enabled platforms)



PXA 2xx/3xx/93x/95x family

--------------------------
@@ -253,10 +256,10 @@ Berlin family (Digital Entertainment) 
Long-term plans

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



 * Unify the mach-dove/, mach-mv78xx0/, mach-orion5x/ and

   mach-kirkwood/ into the mach-mvebu/ to support all SoCs from the

   Marvell EBU (Engineering Business Unit) in a single mach-<foo>

   directory. The plat-orion/ would therefore disappear.

 * Unify the mach-dove/, mach-mv78xx0/, mach-orion5x/ into the

   mach-mvebu/ to support all SoCs from the Marvell EBU (Engineering

   Business Unit) in a single mach-<foo> directory. The plat-orion/

   would therefore disappear.



 * Unify the mach-mmp/ and mach-pxa/ into the same mach-pxa

   directory. The plat-pxa/ would therefore disappear.

Documentation/devicetree/bindings/arm/arm-boards

+6 −0
Original line number Diff line number Diff line
@@ -86,3 +86,9 @@ Interrupt controllers: 
	compatible = "arm,versatile-sic";

	interrupt-controller;

	#interrupt-cells = <1>;



Required nodes:



- core-module: the root node to the Versatile platforms must have

  a core-module with regs and the compatible strings

  "arm,core-module-versatile", "syscon"

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

+11 −0
Original line number Diff line number Diff line
@@ -31,6 +31,17 @@ Example: 
		reboot-offset = <0x4>;

	};



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

Hisilicon CPU controller



Required properties:

- compatible : "hisilicon,cpuctrl"

- reg : Register address and size



The clock registers and power registers of secondary cores are defined

in CPU controller, especially in HIX5HD2 SoC.



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

PCTRL: Peripheral misc control register



Required Properties:

Documentation/devicetree/bindings/arm/mediatek.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Mediatek MT6589 Platforms Device Tree Bindings



Boards with a SoC of the Mediatek MT6589 shall have the following property:



Required root node property:



compatible: must contain "mediatek,mt6589"

Documentation/devicetree/bindings/clock/arm-integrator.txt

+2 −2
Original line number Diff line number Diff line 
Clock bindings for ARM Integrator Core Module clocks

Clock bindings for ARM Integrator and Versatile Core Module clocks



Auxilary Oscillator Clock
@@ -12,7 +12,7 @@ parent node. 




Required properties:

- compatible: must be "arm,integrator-cm-auxosc"

- compatible: must be "arm,integrator-cm-auxosc" or "arm,versatile-cm-auxosc"

- #clock-cells: must be <0>



Optional properties: