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

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

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

Pull ARM SoC DT updates from Olof Johansson:
 "Device tree and bindings updates for 3.12.

  General additions of various on-chip and on-board peripherals on
  various platforms as support gets added.  Some of the bigger changes
  are:

   - Addition of (new) PCI-e support on Tegra.
   - More Tegra4 support, including PMC configuration for Dalmore.
   - Addition of a new board for Exynos4 (trats2) and more bindings for
     4x12 IP.
   - Addition of Allwinner A20 and A31 SoC and board files.
   - Move of the ST Ericsson device tree files to now use ste-* prefix.
   - More move of hardware description of shmobile platforms to DT.
   - Two new board dts files for Freescale MXs"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (177 commits)
  dts: Rename DW APB timer compatible strings
  dts: Deprecate ALTR as a vendor prefix
  of: add vendor prefix for Altera Corp.
  ARM: at91/dt: sam9x5ek: add sound configuration
  ARM: at91/dt: sam9x5ek: enable SSC
  ARM: at91/dt: sam9x5ek: add WM8731 codec
  ARM: at91/dt: sam9x5: add SSC DMA parameters
  ARM: at91/dt: add at91rm9200 PQFP package version
  ARM: at91: at91rm9200: set default mmc0 pinctrl-names
  ARM: at91: at91sam9n12: correct pin number of gpio-key
  ARM: at91: at91sam9n12: add qt1070 support
  ARM: at91: at91sam9n12: add pinctrl of TWI
  ARM: at91: Add PMU support for sama5d3
  ARM: at91: at91sam9260: add missing pinctrl-names on mmc
  ARM: tegra: configure power off for Dalmore
  ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
  ARM: dts: add sdio blocks to bcm28155-ap board
  ARM: dts: align sdio numbers to HW definition
  ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
  ARM: sun7i: Add Allwinner A20 DTSI
  ...
parents 8e73e367 56e9e0f3

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,4 +6,5 @@ bcm11351, bcm28145, bcm28155 SoCs) shall have the following properties: 




Required root node property:

Required root node property:





compatible = "bcm,bcm11351";
 
compatible = "brcm,bcm11351";

DEPRECATED: compatible = "bcm,bcm11351";

Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt→Documentation/devicetree/bindings/arm/bcm/kona-timer.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -4,14 +4,15 @@ This timer is used in the following Broadcom SoCs: 
 BCM11130, BCM11140, BCM11351, BCM28145, BCM28155

 BCM11130, BCM11140, BCM11351, BCM28145, BCM28155





Required properties:

Required properties:

- compatible : "bcm,kona-timer"

- compatible : "brcm,kona-timer"

- DEPRECATED: compatible : "bcm,kona-timer"

- reg : Register range for the timer

- reg : Register range for the timer

- interrupts : interrupt for the timer

- interrupts : interrupt for the timer

- clock-frequency: frequency that the clock operates

- clock-frequency: frequency that the clock operates





Example:

Example:

	timer@35006000 {

	timer@35006000 {

		compatible = "bcm,kona-timer";

		compatible = "brcm,kona-timer";

		reg = <0x35006000 0x1000>;

		reg = <0x35006000 0x1000>;

		interrupts = <0x0 7 0x4>;

		interrupts = <0x0 7 0x4>;

		clock-frequency = <32768>;

		clock-frequency = <32768>;

Documentation/devicetree/bindings/arm/bcm/kona-wdt.txt

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
Broadcom Kona Family Watchdog Timer

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



This watchdog timer is used in the following Broadcom SoCs:

  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155



Required properties:

  - compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

  - reg: memory address & range



Example:

	watchdog@35002f40 {

		compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

		reg = <0x35002f40 0x6c>;

	};

Documentation/devicetree/bindings/media/s5p-mfc.txt

+5 −5
Original line number Original line Diff line number Diff line
@@ -16,9 +16,9 @@ Required properties: 
	  mapped region.

	  mapped region.





  - interrupts : MFC interrupt number to the CPU.

  - interrupts : MFC interrupt number to the CPU.

  - clocks : from common clock binding: handle to mfc clocks.

  - clocks : from common clock binding: handle to mfc clock.

  - clock-names : from common clock binding: must contain "sclk_mfc" and "mfc",

  - clock-names : from common clock binding: must contain "mfc",

		  corresponding to entries in the clocks property.

		  corresponding to entry in the clocks property.





  - samsung,mfc-r : Base address of the first memory bank used by MFC

  - samsung,mfc-r : Base address of the first memory bank used by MFC

		    for DMA contiguous memory allocation and its size.

		    for DMA contiguous memory allocation and its size.
@@ -38,8 +38,8 @@ mfc: codec@13400000 { 
	reg = <0x13400000 0x10000>;

	reg = <0x13400000 0x10000>;

	interrupts = <0 94 0>;

	interrupts = <0 94 0>;

	samsung,power-domain = <&pd_mfc>;

	samsung,power-domain = <&pd_mfc>;

	clocks = <&clock 170>, <&clock 273>;

	clocks = <&clock 273>;

	clock-names = "sclk_mfc", "mfc";

	clock-names = "mfc";

};

};





Board specific DT entry:

Board specific DT entry:

Documentation/devicetree/bindings/misc/smc.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -4,11 +4,12 @@ This binding defines the location of the bounce buffer 
used for non-secure to secure communications.

used for non-secure to secure communications.





Required properties:

Required properties:

- compatible : "bcm,kona-smc"

- compatible : "brcm,kona-smc"

- DEPRECATED: compatible : "bcm,kona-smc"

- reg : Location and size of bounce buffer

- reg : Location and size of bounce buffer





Example:

Example:

	smc@0x3404c000 {

	smc@0x3404c000 {

		compatible = "bcm,bcm11351-smc", "bcm,kona-smc";

		compatible = "brcm,bcm11351-smc", "brcm,kona-smc";

		reg = <0x3404c000 0x400>; //1 KiB in SRAM

		reg = <0x3404c000 0x400>; //1 KiB in SRAM

	};
 
	};