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

Commit 5b5bbc20 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

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

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

From Tony Lindgren:
Platform data changes for omaps for the display subsystem and
n900 secure mode changes. Note that the n900 secure mode changes
will still be needed for device tree based booting also.

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

: (508 commits)
  ARM: OMAP2+: display: Create omap_vout device inside omap_display_init
  ARM: OMAP2+: display: Create omapvrfb and omapfb devices inside omap_display_init
  ARM: OMAP2+: display: Create omapdrm device inside omap_display_init
  ARM: OMAP2+: drm: Don't build device for DMM
  RX-51: Add support for OMAP3 ROM Random Number Generator
  ARM: OMAP3: RX-51: ARM errata 430973 workaround
  ARM: OMAP3: Add secure function omap_smc3() which calling instruction smc #1
  +Linux 3.12-rc4

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 4fd03763 9e490f48

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: