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

Commit 81a3c10c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc 

* 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc: (31 commits)
  ARM: OMAP: Warn if omap_ioremap is called before SoC detection
  ARM: OMAP: Move set_globals initialization to happen in init_early
  ARM: OMAP: Map SRAM later on with ioremap_exec()
  ARM: OMAP: Remove calls to SRAM allocations for framebuffer
  ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done
  ARM: OMAP1: Use generic map_io, init_early and init_irq
  arm/dts: OMAP3+: Add mpu, dsp and iva nodes
  arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
  ARM: OMAP2+: l3-noc: Add support for device-tree
  ARM: OMAP2+: board-generic: Add i2c static init
  ARM: OMAP2+: board-generic: Add DT support to generic board
  arm/dts: Add support for OMAP3 Beagle board
  arm/dts: Add initial device tree support for OMAP3 SoC
  arm/dts: Add support for OMAP4 SDP board
  arm/dts: Add support for OMAP4 PandaBoard
  arm/dts: Add initial device tree support for OMAP4 SoC
  ARM: OMAP: omap_device: Add a method to build an omap_device from a DT node
  ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration
  of: Add helpers to get one string in multiple strings property
  ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures
  ...

Fix up trivial header file conflicts in arch/arm/mach-omap2/board-generic.c
parents 6585dea1 df80442d

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

0 → 100644
+14 −0
Original line number Diff line number Diff line 
* TI - DSP (Digital Signal Processor)



TI DSP included in OMAP SoC



Required properties:

- compatible : Should be "ti,omap3-c64" for OMAP3 & 4

- ti,hwmods: "dsp"



Examples:



dsp {

    compatible = "ti,omap3-c64";

    ti,hwmods = "dsp";

};

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* TI - IVA (Imaging and Video Accelerator) subsystem



The IVA contain various audio, video or imaging HW accelerator

depending of the version.



Required properties:

- compatible : Should be:

  - "ti,ivahd" for OMAP4

  - "ti,iva2.2" for OMAP3

  - "ti,iva2.1" for OMAP2430

  - "ti,iva1" for OMAP2420

- ti,hwmods: "iva"



Examples:



iva {

    compatible = "ti,ivahd", "ti,iva";

    ti,hwmods = "iva";

};

Documentation/devicetree/bindings/arm/omap/l3-noc.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* TI - L3 Network On Chip (NoC)



This version is an implementation of the generic NoC IP

provided by Arteris.



Required properties:

- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family

               Should be "ti,omap4-l3-noc" for OMAP4 family

- ti,hwmods: "l3_main_1", ... One hwmod for each noc domain.



Examples:



ocp {

	compatible = "ti,omap4-l3-noc", "simple-bus";

	#address-cells = <1>;

	#size-cells = <1>;

	ranges;

	ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";

};

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

0 → 100644
+27 −0
Original line number Diff line number Diff line 
* TI - MPU (Main Processor Unit) subsystem



The MPU subsystem contain one or several ARM cores

depending of the version.

The MPU contain CPUs, GIC, L2 cache and a local PRCM.



Required properties:

- compatible : Should be "ti,omap3-mpu" for OMAP3

               Should be "ti,omap4-mpu" for OMAP4

- ti,hwmods: "mpu"



Examples:



- For an OMAP4 SMP system:



mpu {

    compatible = "ti,omap4-mpu";

    ti,hwmods = "mpu";

};





- For an OMAP3 monocore system:



mpu {

    compatible = "ti,omap3-mpu";

    ti,hwmods = "mpu";

};

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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
* Texas Instruments OMAP



OMAP is currently using a static file per SoC family to describe the

IPs present in the SoC.

On top of that an omap_device is created to extend the platform_device

capabilities and to allow binding with one or several hwmods.

The hwmods will contain all the information to build the device:

adresse range, irq lines, dma lines, interconnect, PRCM register,

clock domain, input clocks.

For the moment just point to the existing hwmod, the next step will be

to move data from hwmod to device-tree representation.





Required properties:

- compatible: Every devices present in OMAP SoC should be in the

  form: "ti,XXX"

- ti,hwmods: list of hwmod names (ascii strings), that comes from the OMAP

  HW documentation, attached to a device. Must contain at least

  one hwmod.



Optional properties:

- ti,no_idle_on_suspend: When present, it prevents the PM to idle the module

  during suspend.





Example:



spinlock@1 {

    compatible = "ti,omap4-spinlock";

    ti,hwmods = "spinlock";

};





Boards:



- OMAP3 BeagleBoard : Low cost community board

  compatible = "ti,omap3-beagle", "ti,omap3"



- OMAP4 SDP : Software Developement Board

  compatible = "ti,omap4-sdp", "ti,omap4430"



- OMAP4 PandaBoard : Low cost community board

  compatible = "ti,omap4-panda", "ti,omap4430"