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

Commit 196d97ab 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-4.4.183 (94fd4280) into msm-4.4"

parents fad4d2e8 9a1c2880

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 182

SUBLEVEL = 183

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/exynos5420-arndale-octa.dts

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
				regulator-name = "PVDD_APIO_1V8";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

			};



			ldo3_reg: LDO3 {
@@ -135,6 +136,7 @@ 
				regulator-name = "PVDD_ABB_1V8";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

			};



			ldo9_reg: LDO9 {

arch/arm/boot/dts/imx6qdl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ 
				compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";

				reg = <0x020ec000 0x4000>;

				interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6QDL_CLK_SDMA>,

				clocks = <&clks IMX6QDL_CLK_IPG>,

					 <&clks IMX6QDL_CLK_SDMA>;

				clock-names = "ipg", "ahb";

				#dma-cells = <3>;

arch/arm/boot/dts/imx6sl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ 
				reg = <0x020ec000 0x4000>;

				interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6SL_CLK_SDMA>,

					 <&clks IMX6SL_CLK_SDMA>;

					 <&clks IMX6SL_CLK_AHB>;

				clock-names = "ipg", "ahb";

				#dma-cells = <3>;

				/* imx6sl reuses imx6q sdma firmware */

arch/arm/boot/dts/imx6sx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ 
				compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";

				reg = <0x020ec000 0x4000>;

				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6SX_CLK_SDMA>,

				clocks = <&clks IMX6SX_CLK_IPG>,

					 <&clks IMX6SX_CLK_SDMA>;

				clock-names = "ipg", "ahb";

				#dma-cells = <3>;