Commit 2a2bf85f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM soc device tree updates from Olof Johansson:
 "Device tree conversion and enablement branch.  Mostly a bunch of new
  bindings and setup for various platforms, but the Via/Winchip VT8500
  platform is also converted over from being 100% legacy to now use
  device tree for probing.  More of that will come for 3.8."

Trivial conflicts due to removal of vt8500 files, and one documentation
file that was added with slightly different contents both here and in
the USb tree.

* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (212 commits)
  arm: vt8500: Fixup for missing gpio.h
  ARM: LPC32xx: LED fix in PHY3250 DTS file
  ARM: dt: mmp-dma: add binding file
  arm: vt8500: Update arch-vt8500 to devicetree support.
  arm: vt8500: gpio: Devicetree support for arch-vt8500
  arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices
  arm: vt8500: clk: Add Common Clock Framework support
  video: vt8500: Add devicetree support for vt8500-fb and wm8505-fb
  serial: vt8500: Add devicetree support for vt8500-serial
  rtc: vt8500: Add devicetree support for vt8500-rtc
  arm: vt8500: Add device tree files for VIA/Wondermedia SoC's
  ARM: tegra: Add Avionic Design Tamonten Evaluation Carrier support
  ARM: tegra: Add Avionic Design Medcom-Wide support
  ARM: tegra: Add Avionic Design Plutux support
  ARM: tegra: Add Avionic Design Tamonten support
  ARM: tegra: dts: Add pwm label
  ARM: ux500: Fix SSP register address format
  ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT
  ARM: ux500: Remove redundant #gpio-cell properties from Snowball DT
  ARM: ux500: Add all encompassing sound node to the HREF Device Tree
  ...
parents 11801e9d 99261fba

Documentation/devicetree/bindings/arm/mrvl/tauros2.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Marvell Tauros2 Cache



Required properties:

- compatible : Should be "marvell,tauros2-cache".

- marvell,tauros2-cache-features : Specify the features supported for the

  tauros2 cache.

  The features including

    CACHE_TAUROS2_PREFETCH_ON       (1 << 0)

    CACHE_TAUROS2_LINEFILL_BURST8   (1 << 1)

  The definition can be found at

  arch/arm/include/asm/hardware/cache-tauros2.h



Example:

	L2: l2-cache {

		compatible = "marvell,tauros2-cache";

		marvell,tauros2-cache-features = <0x3>;

	};

Documentation/devicetree/bindings/arm/msm/timer.txt

0 → 100644
+38 −0
Original line number Diff line number Diff line 
* MSM Timer



Properties:



- compatible : Should at least contain "qcom,msm-timer". More specific

  properties such as "qcom,msm-gpt" and "qcom,msm-dgt" specify a general

  purpose timer and a debug timer respectively.



- interrupts : Interrupt indicating a match event.



- reg : Specifies the base address of the timer registers. The second region

  specifies an optional register used to configure the clock divider.



- clock-frequency : The frequency of the timer in Hz.



Optional:



- cpu-offset : per-cpu offset used when the timer is accessed without the

  CPU remapping facilities. The offset is cpu-offset * cpu-nr.



Example:



       timer@200a004 {

               compatible = "qcom,msm-gpt", "qcom,msm-timer";

               interrupts = <1 2 0x301>;

               reg = <0x0200a004 0x10>;

               clock-frequency = <32768>;

               cpu-offset = <0x40000>;

       };



       timer@200a024 {

               compatible = "qcom,msm-dgt", "qcom,msm-timer";

               interrupts = <1 3 0x301>;

               reg = <0x0200a024 0x10>,

                     <0x0200a034 0x4>;

               clock-frequency = <6750000>;

               cpu-offset = <0x40000>;

       };

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

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ Boards: 
- OMAP3 BeagleBoard : Low cost community board

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



- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

  compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"



- OMAP4 SDP : Software Developement Board

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

Documentation/devicetree/bindings/arm/vt8500.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
VIA/Wondermedia VT8500 Platforms Device Tree Bindings

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



Boards with the VIA VT8500 SoC shall have the following properties:

Required root node property:

compatible = "via,vt8500";



Boards with the Wondermedia WM8505 SoC shall have the following properties:

Required root node property:

compatible = "wm,wm8505";



Boards with the Wondermedia WM8650 SoC shall have the following properties:

Required root node property:

compatible = "wm,wm8650";

Documentation/devicetree/bindings/arm/vt8500/via,vt8500-intc.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
VIA/Wondermedia VT8500 Interrupt Controller

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



Required properties:

- compatible : "via,vt8500-intc"

- reg : Should contain 1 register ranges(address and length)

- #interrupt-cells : should be <1>



Example:



	intc: interrupt-controller@d8140000 {

		compatible = "via,vt8500-intc";

		interrupt-controller;

		reg = <0xd8140000 0x10000>;

		#interrupt-cells = <1>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE