Commit f1ca2218 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'pinctrl-single-for-linus-for-v3.13-signed' into omap-for-v3.13/quirk 

Changes to pinctrl-single to allow handling the wake-up
interrupts that most omaps have in each pinctrl register.

As I need these merged also into the omap tree, it was
agreed that I set them up into a separate branch for
both pinctrl tree and linux-omap tree to merge as needed.
parents 68a531a1 dc7743aa

CREDITS

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

S: Canada K2P 0X8





N: Mikael Pettersson

N: Mikael Pettersson

E: mikpe@it.uu.se

E: mikpelinux@gmail.com

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

D: Miscellaneous fixes

D: Miscellaneous fixes





N: Reed H. Petty

N: Reed H. Petty

Documentation/block/00-INDEX

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

	- Generic Block Device Capability (/sys/block/<device>/capability)

cfq-iosched.txt

cfq-iosched.txt

	- CFQ IO scheduler tunables

	- CFQ IO scheduler tunables

cmdline-partition.txt

	- how to specify block device partitions on kernel command line

data-integrity.txt

data-integrity.txt

	- Block data integrity

	- Block data integrity

deadline-iosched.txt

deadline-iosched.txt

Documentation/block/cmdline-partition.txt

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

Embedded device command line partition parsing

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

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





Read block device partition table from command line.

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

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

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

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

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

by absolute address of data on the block device.

by absolute address of data on the block device.

Users can easily change the partition.

Users can easily change the partition.

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

+5 −5
Original line number Original line 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

  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

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

differences between the core Synopsys dw mshc controller properties described

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

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

extensions to the Synopsis Designware Mobile Storage Host Controller.

extensions to the Synopsys Designware Mobile Storage Host Controller.





Required Properties:

Required Properties:

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

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

* Rockchip specific extensions to the Synopsys Designware Mobile

  Storage Host Controller

  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

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

differences between the core Synopsys dw mshc controller properties described

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

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

extensions to the Synopsis Designware Mobile Storage Host Controller.

extensions to the Synopsys Designware Mobile Storage Host Controller.





Required Properties:

Required Properties:

CRA Git | Maintained and supported by SUSTech CRA and CCSE