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

Commit 4a568706 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-3.18.120 (78291159) into msm-3.18"

parents 504a16b6 ee96153e

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 119

SUBLEVEL = 120

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/boot/dts/am3517.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ 
	};

};



/* Table Table 5-79 of the TRM shows 480ab000 is reserved */

&usb_otg_hs {

	status = "disabled";

};



&iva {

	status = "disabled";

};

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

+2 −0
Original line number Diff line number Diff line
@@ -415,6 +415,8 @@ 


		touchscreen-size-x = <480>;

		touchscreen-size-y = <272>;



		wakeup-source;

	};



	tlv320aic3106: tlv320aic3106@1b {

arch/arm/boot/dts/da850.dtsi

+1 −5
Original line number Diff line number Diff line
@@ -267,11 +267,7 @@ 
			compatible = "ti,dm6441-gpio";

			gpio-controller;

			reg = <0x226000 0x1000>;

			interrupts = <42 IRQ_TYPE_EDGE_BOTH

				43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH

				45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH

				47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH

				49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>;

			interrupts = <42 43 44 45 46 47 48 49 50>;

			ti,ngpio = <144>;

			ti,davinci-gpio-unbanked = <0>;

			status = "disabled";

arch/arm/configs/imx_v4_v5_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -146,9 +146,11 @@ CONFIG_USB_STORAGE=y 
CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_USB_CHIPIDEA_ULPI=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_GADGET=y

CONFIG_USB_ETH=m

CONFIG_USB_ULPI_BUS=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y