Commit 7587b596 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'omap-for-v3.13/quirk-signed' of... 

Merge tag 'omap-for-v3.13/quirk-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:
Changes needed to prepare for making omap3 device tree only:

- Always build in board-generic, and add pdata quirks and auxdata
  support for it so we have all the pdata related quirks
  in the same place.

- Merge of the drivers/pinctrl changes that are needed for PM
  to continue working on omap3 and also needed for other omaps
  eventually. The three pinctrl related patches have been acked
  by Linus Walleij and are pulled into both the pinctrl tree
  and this branch.

- Few defconfig related changes for drivers needed.

* tag 'omap-for-v3.13/quirk-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (523 commits)
  ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies
  ARM: OMAP2+: Add WLAN modules and of_serial to omap2plus_defconfig
  ARM: OMAP2+: Run make savedefconfig on omap2plus_defconfig to shrink it
  ARM: OMAP2+: Add minimal 8250 support for GPMC
  ARM: OMAP2+: Use pdata quirks for wl12xx for omap3 evm and zoom3
  ARM: OMAP: Move DT wake-up event handling over to use pinctrl-single-omap
  ARM: OMAP2+: Add support for auxdata
  pinctrl: single: Add support for auxdata
  pinctrl: single: Add support for wake-up interrupts
  pinctrl: single: Prepare for supporting SoC specific features
  ARM: OMAP2+: igep0020: use display init from dss-common
  ARM: OMAP2+: pdata-quirks: add legacy display init for IGEPv2 board
  +Linux 3.12-rc4

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 6a9d10d5 8d715283

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/block/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ capability.txt 
	- Generic Block Device Capability (/sys/block/<device>/capability)

cfq-iosched.txt

	- CFQ IO scheduler tunables

cmdline-partition.txt

	- how to specify block device partitions on kernel command line

data-integrity.txt

	- Block data integrity

deadline-iosched.txt

Documentation/block/cmdline-partition.txt

+4 −4
Original line number Diff line number Diff line 
Embedded device command line partition

Embedded device command line partition parsing

=====================================================================



Read block device partition table from command line.

The partition used for fixed block device (eMMC) embedded device.

It is no MBR, save storage space. Bootloader can be easily accessed

Support for reading the block device partition table from the command line.

It is typically used for fixed block (eMMC) embedded devices.

It has no MBR, so saves storage space. Bootloader can be easily accessed

by absolute address of data on the block device.

Users can easily change the partition.

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:

CRA Git | Maintained and supported by SUSTech CRA and CCSE