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

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

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

Pull arm-soc driver specific updates from Olof Johansson:
 "These changes are specific to some driver that may be used by multiple
  boards or socs.  The most significant change in here is the move of
  the samsung iommu code from a platform specific in-kernel interface to
  the generic iommu subsystem."

Fix up trivial conflicts in arch/arm/mach-exynos/Kconfig

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
  mmc: dt: Consolidate DT bindings
  iommu/exynos: Add iommu driver for EXYNOS Platforms
  ARM: davinci: optimize the DMA ISR
  ARM: davinci: implement DEBUG_LL port choice
  ARM: tegra: Add SMMU enabler in AHB
  ARM: tegra: Add Tegra AHB driver
  Input: pxa27x_keypad add choice to set direct_key_mask
  Input: pxa27x_keypad direct key may be low active
  Input: pxa27x_keypad bug fix for direct_key_mask
  Input: pxa27x_keypad keep clock on as wakeup source
  ARM: dt: tegra: pinmux changes for USB ULPI
  ARM: tegra: add USB ULPI PHY reset GPIO to device tree
  ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
  ARM: tegra: change pll_p_out4's rate to 24MHz
  ARM: tegra: fix pclk rate
  ARM: tegra: reparent sclk to pll_c_out1
  ARM: tegra: Add pllc clock init table
  ARM: dt: tegra cardhu: basic audio support
  ARM: dt: tegra30.dtsi: Add audio-related nodes
  ARM: tegra: add AUXDATA required for audio
  ...
parents 0877aa39 046fae44

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt

0 → 100644
+11 −0
Original line number Diff line number Diff line 
NVIDIA Tegra AHB



Required properties:

- compatible : "nvidia,tegra20-ahb" or "nvidia,tegra30-ahb"

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



Example:

	ahb: ahb@6000c004 {

		compatible = "nvidia,tegra20-ahb";

		reg = <0x6000c004 0x10c>; /* AHB Arbitration + Gizmo Controller */

	};

Documentation/devicetree/bindings/mmc/fsl-esdhc.txt

+4 −2
Original line number Diff line number Diff line
@@ -11,9 +11,11 @@ Required properties: 
  - interrupt-parent : interrupt source phandle.

  - clock-frequency : specifies eSDHC base clock frequency.

  - sdhci,wp-inverted : (optional) specifies that eSDHC controller

    reports inverted write-protect state;

    reports inverted write-protect state; New devices should use

    the generic "wp-inverted" property.

  - sdhci,1-bit-only : (optional) specifies that a controller can

    only handle 1-bit data transfers.

    only handle 1-bit data transfers. New devices should use the

    generic "bus-width = <1>" property.

  - sdhci,auto-cmd12: (optional) specifies that a controller can

    only handle auto CMD12.

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Required properties: 
- interrupts : Should contain eSDHC interrupt



Optional properties:

- fsl,card-wired : Indicate the card is wired to host permanently

- non-removable : Indicate the card is wired to host permanently

- fsl,cd-internal : Indicate to use controller internal card detection

- fsl,wp-internal : Indicate to use controller internal write protection

- cd-gpios : Specify GPIOs for card detection

Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ Required properties: 


Optional properties:

- gpios : may specify GPIOs in this order: Card-Detect GPIO,

  Write-Protect GPIO.

  Write-Protect GPIO. Note that this does not follow the

  binding from mmc.txt, for historic reasons.

- interrupts : the interrupt of a card detect interrupt.

- interrupt-parent : the phandle for the interrupt controller that

  services interrupts for this device.

Documentation/devicetree/bindings/mmc/mmc.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
These properties are common to multiple MMC host controllers. Any host

that requires the respective functionality should implement them using

these definitions.



Required properties:

- bus-width: Number of data lines, can be <1>, <4>, or <8>



Optional properties:

- cd-gpios : Specify GPIOs for card detection, see gpio binding

- wp-gpios : Specify GPIOs for write protection, see gpio binding

- cd-inverted: when present, polarity on the wp gpio line is inverted

- wp-inverted: when present, polarity on the wp gpio line is inverted

- non-removable: non-removable slot (like eMMC)

- max-frequency: maximum operating clock frequency



Example:



sdhci@ab000000 {

	compatible = "sdhci";

	reg = <0xab000000 0x200>;

	interrupts = <23>;

	bus-width = <4>;

	cd-gpios = <&gpio 69 0>;

	cd-inverted;

	wp-gpios = <&gpio 70 0>;

	max-frequency = <50000000>;

}