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

Commit 426ee9e3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v3.12-rc5' into perf/core 



Merge Linux v3.12-rc5, to pick up the latest fixes.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents b7af41a1 61e6cfa8

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/tmio_mmc.txt

+10 −7
Original line number Diff line number Diff line
@@ -9,12 +9,15 @@ compulsory and any optional properties, common to all SD/MMC drivers, as 
described in mmc.txt, can be used. Additionally the following tmio_mmc-specific

optional bindings can be used.



Required properties:

- compatible:	"renesas,sdhi-shmobile" - a generic sh-mobile SDHI unit

		"renesas,sdhi-sh7372" - SDHI IP on SH7372 SoC

		"renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC

		"renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC

		"renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC

		"renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC

		"renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC

		"renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC



Optional properties:

- toshiba,mmc-wrprotect-disable: write-protect detection is unavailable
 


When used with Renesas SDHI hardware, the following compatibility strings

configure various model-specific properties:



"renesas,sh7372-sdhi":	(default) compatible with SH7372

"renesas,r8a7740-sdhi":	compatible with R8A7740: certain MMC/SD commands have to

			wait for the interface to become idle.

Documentation/devicetree/bindings/net/fsl-tsec-phy.txt

+17 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ General Properties: 


Clock Properties:



  - fsl,cksel        Timer reference clock source.

  - fsl,tclk-period  Timer reference clock period in nanoseconds.

  - fsl,tmr-prsc     Prescaler, divides the output clock.

  - fsl,tmr-add      Frequency compensation value.
@@ -97,7 +98,7 @@ Clock Properties: 
  clock. You must choose these carefully for the clock to work right.

  Here is how to figure good values:



  TimerOsc     = system clock               MHz

  TimerOsc     = selected reference clock   MHz

  tclk_period  = desired clock period       nanoseconds

  NominalFreq  = 1000 / tclk_period         MHz

  FreqDivRatio = TimerOsc / NominalFreq     (must be greater that 1.0)
@@ -114,6 +115,20 @@ Clock Properties: 
  Pulse Per Second (PPS) signal, since this will be offered to the PPS

  subsystem to synchronize the Linux clock.



  Reference clock source is determined by the value, which is holded

  in CKSEL bits in TMR_CTRL register. "fsl,cksel" property keeps the

  value, which will be directly written in those bits, that is why,

  according to reference manual, the next clock sources can be used:



  <0> - external high precision timer reference clock (TSEC_TMR_CLK

        input is used for this purpose);

  <1> - eTSEC system clock;

  <2> - eTSEC1 transmit clock;

  <3> - RTC clock input.



  When this attribute is not used, eTSEC system clock will serve as

  IEEE 1588 timer reference clock.



Example:



	ptp_clock@24E00 {
@@ -121,6 +136,7 @@ Example: 
		reg = <0x24E00 0xB0>;

		interrupts = <12 0x8 13 0x8>;

		interrupt-parent = < &ipic >;

		fsl,cksel       = <1>;

		fsl,tclk-period = <10>;

		fsl,tmr-prsc    = <100>;

		fsl,tmr-add     = <0x999999A4>;