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

Commit 71f777ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "A first set of batches of fixes for 3.13.  The diffstat is large
  mostly because we're adding a defconfig for a family that's been
  lacking it, and there's some missing clock information added for i.MX
  and OMAP.

  The at91 new code is around dealing with RTC/RTT reset at boot to fix
  possible hangs due to pending wakeup interrupts coming in during early
  boot"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
  ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume
  doc: devicetree: Add bindings documentation for omap-des driver
  ARM: dts: doc: Document missing compatible property for omap-sham driver
  ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
  ARM: at91: fix hanged boot due to early rtt-interrupt
  ARM: at91: fix hanged boot due to early rtc-interrupt
  video: exynos_mipi_dsim: Remove unused variable
  ARM: highbank: only select errata 764369 if SMP
  ARM: sti: only select errata 764369 if SMP
  ARM: tegra: init fuse before setting reset handler
  ARM: vt8500: add defconfig for v6/v7 chips
  ARM: integrator_cp: Set LCD{0,1} enable lines when turning on CLCD
  ARM: OMAP: devicetree: fix SPI node compatible property syntax items
  pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
  ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
  MAINTAINERS: drop discontinued mailing list
  ARM: dts: i.MX51: Fix OTG PHY clock
  ARM: imx: set up pllv3 POWER and BYPASS sequentially
  ARM: imx: pllv3 needs relock in .set_rate() call
  ...
parents dd3190ee 6886059f

Documentation/devicetree/bindings/crypto/omap-des.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
OMAP SoC DES crypto Module



Required properties:



- compatible : Should contain "ti,omap4-des"

- ti,hwmods: Name of the hwmod associated with the DES module

- reg : Offset and length of the register set for the module

- interrupts : the interrupt-specifier for the DES module

- clocks : A phandle to the functional clock node of the DES module

           corresponding to each entry in clock-names

- clock-names : Name of the functional clock, should be "fck"



Optional properties:

- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,

	Documentation/devicetree/bindings/dma/dma.txt

	Each entry corresponds to an entry in dma-names

- dma-names: DMA request names should include "tx" and "rx" if present



Example:

	/* DRA7xx SoC */

	des: des@480a5000 {

		compatible = "ti,omap4-des";

		ti,hwmods = "des";

		reg = <0x480a5000 0xa0>;

		interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;

		dmas = <&sdma 117>, <&sdma 116>;

		dma-names = "tx", "rx";

		clocks = <&l3_iclk_div>;

		clock-names = "fck";

	};

Documentation/devicetree/bindings/crypto/omap-sham.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Required properties: 
  SHAM versions:

  - "ti,omap2-sham" for OMAP2 & OMAP3.

  - "ti,omap4-sham" for OMAP4 and AM33XX.

  Note that these two versions are incompatible.

  - "ti,omap5-sham" for OMAP5, DRA7 and AM43XX.

- ti,hwmods: Name of the hwmod associated with the SHAM module

- reg : Offset and length of the register set for the module

- interrupts : the interrupt-specifier for the SHAM module.

Documentation/devicetree/bindings/spi/omap-spi.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ OMAP2+ McSPI device 


Required properties:

- compatible :

  - "ti,omap2-spi" for OMAP2 & OMAP3.

  - "ti,omap4-spi" for OMAP4+.

  - "ti,omap2-mcspi" for OMAP2 & OMAP3.

  - "ti,omap4-mcspi" for OMAP4+.

- ti,spi-num-cs : Number of chipselect supported  by the instance.

- ti,hwmods: Name of the hwmod associated to the McSPI

- ti,pindir-d0-out-d1-in: Select the D0 pin as output and D1 as

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,6 @@ S: Maintained 
ARM/NOMADIK ARCHITECTURE

M:	Alessandro Rubini <rubini@unipv.it>

M:	Linus Walleij <linus.walleij@linaro.org>

M:	STEricsson <STEricsson_nomadik_linux@list.st.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-nomadik/

arch/arm/boot/dts/imx51.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ 


			usbphy0: usbphy@0 {

				compatible = "usb-nop-xceiv";

				clocks = <&clks 124>;

				clocks = <&clks 75>;

				clock-names = "main_clk";

				status = "okay";

			};