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

Commit 8e0beabe authored by Treehugger Robot's avatar Treehugger Robot
Browse files

Merge "Merge 4.19.302 into android-4.19-stable" into android-4.19-stable

parents 68334f2d cd086b65

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 301

SUBLEVEL = 302

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/imx6qdl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ 
				status = "disabled";

			};



			gpt: gpt@2098000 {

			gpt: timer@2098000 {

				compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";

				reg = <0x02098000 0x4000>;

				interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6sl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ 
				clock-names = "ipg", "per";

			};



			gpt: gpt@2098000 {

			gpt: timer@2098000 {

				compatible = "fsl,imx6sl-gpt";

				reg = <0x02098000 0x4000>;

				interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6sx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ 
				status = "disabled";

			};



			gpt: gpt@2098000 {

			gpt: timer@2098000 {

				compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";

				reg = <0x02098000 0x4000>;

				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6ul.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ 
				status = "disabled";

			};



			gpt1: gpt@2098000 {

			gpt1: timer@2098000 {

				compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";

				reg = <0x02098000 0x4000>;

				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
@@ -696,7 +696,7 @@ 
				reg = <0x020e4000 0x4000>;

			};



			gpt2: gpt@20e8000 {

			gpt2: timer@20e8000 {

				compatible = "fsl,imx6ul-gpt", "fsl,imx6sx-gpt";

				reg = <0x020e8000 0x4000>;

				interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;