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

Commit ae6e9ed0 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge tag 'v3.18.3' into msm-3.18 



This is the 3.18.3 stable release

Resolve a handful of trivial context conflicts with local
changes as part of the merge resolution.

Conflicts:
	arch/arm64/kernel/efi.c
	arch/arm64/kernel/setup.c
	arch/arm64/kernel/sleep.S
	drivers/mmc/host/sdhci.c

Change-Id: Iaba75d2ad713a8f909c206043921892fc789a788
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 1e0d48c2 219b188d

Documentation/devicetree/bindings/i2c/i2c-designware.txt

+2 −2
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ Optional properties : 
 - i2c-sda-hold-time-ns : should contain the SDA hold time in nanoseconds.

   This option is only supported in hardware blocks version 1.11a or newer.



 - i2c-scl-falling-time : should contain the SCL falling time in nanoseconds.

 - i2c-scl-falling-time-ns : should contain the SCL falling time in nanoseconds.

   This value which is by default 300ns is used to compute the tLOW period.



 - i2c-sda-falling-time : should contain the SDA falling time in nanoseconds.

 - i2c-sda-falling-time-ns : should contain the SDA falling time in nanoseconds.

   This value which is by default 300ns is used to compute the tHIGH period.



Example :

Documentation/ramoops.txt

+11 −2
Original line number Diff line number Diff line
@@ -14,11 +14,19 @@ survive after a restart. 


1. Ramoops concepts



Ramoops uses a predefined memory area to store the dump. The start and size of

the memory area are set using two variables:

Ramoops uses a predefined memory area to store the dump. The start and size

and type of the memory area are set using three variables:

  * "mem_address" for the start

  * "mem_size" for the size. The memory size will be rounded down to a

  power of two.

  * "mem_type" to specifiy if the memory type (default is pgprot_writecombine).



Typically the default value of mem_type=0 should be used as that sets the pstore

mapping to pgprot_writecombine. Setting mem_type=1 attempts to use

pgprot_noncached, which only works on some platforms. This is because pstore

depends on atomic operations. At least on ARM, pgprot_noncached causes the

memory to be mapped strongly ordered, and atomic operations on strongly ordered

memory are implementation defined, and won't work on many ARMs such as omaps.



The memory area is divided into "record_size" chunks (also rounded down to

power of two) and each oops/panic writes a "record_size" chunk of
@@ -55,6 +63,7 @@ Setting the ramoops parameters can be done in 2 different manners: 
static struct ramoops_platform_data ramoops_data = {

        .mem_size               = <...>,

        .mem_address            = <...>,

        .mem_type               = <...>,

        .record_size            = <...>,

        .dump_oops              = <...>,

        .ecc                    = <...>,

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 2

SUBLEVEL = 3

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/arm/boot/dts/am437x-sk-evm.dts

+7 −8
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
	};



	lcd0: display {

		compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";

		compatible = "newhaven,nhd-4.3-480272ef-atxl", "panel-dpi";

		label = "lcd";



		pinctrl-names = "default";
@@ -112,11 +112,11 @@ 
			clock-frequency = <9000000>;

			hactive = <480>;

			vactive = <272>;

			hfront-porch = <8>;

			hback-porch = <43>;

			hsync-len = <4>;

			vback-porch = <12>;

			vfront-porch = <4>;

			hfront-porch = <2>;

			hback-porch = <2>;

			hsync-len = <41>;

			vfront-porch = <2>;

			vback-porch = <2>;

			vsync-len = <10>;

			hsync-active = <0>;

			vsync-active = <0>;
@@ -320,8 +320,7 @@ 


	lcd_pins: lcd_pins {

		pinctrl-single,pins = <

			/* GPIO 5_8 to select LCD / HDMI */

			0x238 (PIN_OUTPUT_PULLUP | MUX_MODE7)

			0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpcm_ad7.gpio1_7 */

		>;

	};

};

arch/arm/boot/dts/dra7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ 
		};



		wdt2: wdt@4ae14000 {

			compatible = "ti,omap4-wdt";

			compatible = "ti,omap3-wdt";

			reg = <0x4ae14000 0x80>;

			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "wd_timer2";