Commit 3316dee2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 's3c24xx-dma' of... 

Merge tag 's3c24xx-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

From Kukjin Kim, this branch adds device-tree support to the DMA controller
on the older Samsung SoCs. It also adds support for one of the missing SoCs
in the family (2410).

The driver has been Ack:ed by Vinod Koul, but is merged through here due
to dependencies with platform code.

* tag 's3c24xx-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: S3C24XX: add dma pdata for s3c2410, s3c2440 and s3c2442
  dmaengine: s3c24xx-dma: add support for the s3c2410 type of controller
  ARM: S3C24XX: Fix possible dma selection warning
  ARM: SAMSUNG: set s3c24xx_dma_filter for s3c64xx-spi0 device
  ARM: S3C24XX: add platform-devices for new dma driver for s3c2412 and s3c2443
  dmaengine: add driver for Samsung s3c24xx SoCs
  ARM: S3C24XX: number the dma clocks
  + Linux 3.12-rc3

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f2c4e82e 1fecf895

CREDITS

+1 −2
Original line number Diff line number Diff line
@@ -2808,8 +2808,7 @@ S: Ottawa, Ontario 
S: Canada K2P 0X8



N: Mikael Pettersson

E: mikpe@it.uu.se

W: http://user.it.uu.se/~mikpe/linux/

E: mikpelinux@gmail.com

D: Miscellaneous fixes



N: Reed H. Petty

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

+5 −5
Original line number Diff line number Diff line 
* Samsung Exynos specific extensions to the Synopsis Designware Mobile

* Samsung Exynos specific extensions to the Synopsys Designware Mobile

  Storage Host Controller



The Synopsis designware mobile storage host controller is used to interface

The Synopsys designware mobile storage host controller is used to interface

a SoC with storage medium such as eMMC or SD/MMC cards. This file documents

differences between the core Synopsis dw mshc controller properties described

by synopsis-dw-mshc.txt and the properties used by the Samsung Exynos specific

extensions to the Synopsis Designware Mobile Storage Host Controller.

differences between the core Synopsys dw mshc controller properties described

by synopsys-dw-mshc.txt and the properties used by the Samsung Exynos specific

extensions to the Synopsys Designware Mobile Storage Host Controller.



Required Properties:

Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt

+5 −5
Original line number Diff line number Diff line 
* Rockchip specific extensions to the Synopsis Designware Mobile

* Rockchip specific extensions to the Synopsys Designware Mobile

  Storage Host Controller



The Synopsis designware mobile storage host controller is used to interface

The Synopsys designware mobile storage host controller is used to interface

a SoC with storage medium such as eMMC or SD/MMC cards. This file documents

differences between the core Synopsis dw mshc controller properties described

by synopsis-dw-mshc.txt and the properties used by the Rockchip specific

extensions to the Synopsis Designware Mobile Storage Host Controller.

differences between the core Synopsys dw mshc controller properties described

by synopsys-dw-mshc.txt and the properties used by the Rockchip specific

extensions to the Synopsys Designware Mobile Storage Host Controller.



Required Properties:

Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt→Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

+4 −4
Original line number Diff line number Diff line 
* Synopsis Designware Mobile Storage Host Controller

* Synopsys Designware Mobile Storage Host Controller



The Synopsis designware mobile storage host controller is used to interface

The Synopsys designware mobile storage host controller is used to interface

a SoC with storage medium such as eMMC or SD/MMC cards. This file documents

differences between the core mmc properties described by mmc.txt and the

properties used by the Synopsis Designware Mobile Storage Host Controller.

properties used by the Synopsys Designware Mobile Storage Host Controller.



Required Properties:



* compatible: should be

	- snps,dw-mshc: for controllers compliant with synopsis dw-mshc.

	- snps,dw-mshc: for controllers compliant with synopsys dw-mshc.

* #address-cells: should be 1.

* #size-cells: should be 0.

Documentation/devicetree/bindings/pci/designware-pcie.txt

+1 −1
Original line number Diff line number Diff line 
* Synopsis Designware PCIe interface

* Synopsys Designware PCIe interface



Required properties:

- compatible: should contain "snps,dw-pcie" to identify the

CRA Git | Maintained and supported by SUSTech CRA and CCSE