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

Commit 4232db2e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-fixes' of... 

Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes

ARM: dts: Amlogic fixes for v5.2-rc
- fix GPU interrupts and operating voltage

* tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  ARM: dts: meson8b: fix the operating voltage of the Mali GPU
  ARM: dts: meson8b: drop undocumented property from the Mali GPU node
  ARM: dts: meson8: fix GPU interrupts and drop an undocumented property

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2f7da158 26d65140

arch/arm/boot/dts/meson8.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -248,8 +248,8 @@ 
				     <GIC_SPI 167 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
@@ -264,7 +264,6 @@ 
			clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>;

			clock-names = "bus", "core";

			operating-points-v2 = <&gpu_opp_table>;

			switch-delay = <0xffff>;

		};

	};

}; /* end of / */

arch/arm/boot/dts/meson8b.dtsi

+5 −6
Original line number Diff line number Diff line
@@ -163,23 +163,23 @@ 


		opp-255000000 {

			opp-hz = /bits/ 64 <255000000>;

			opp-microvolt = <1150000>;

			opp-microvolt = <1100000>;

		};

		opp-364300000 {

			opp-hz = /bits/ 64 <364300000>;

			opp-microvolt = <1150000>;

			opp-microvolt = <1100000>;

		};

		opp-425000000 {

			opp-hz = /bits/ 64 <425000000>;

			opp-microvolt = <1150000>;

			opp-microvolt = <1100000>;

		};

		opp-510000000 {

			opp-hz = /bits/ 64 <510000000>;

			opp-microvolt = <1150000>;

			opp-microvolt = <1100000>;

		};

		opp-637500000 {

			opp-hz = /bits/ 64 <637500000>;

			opp-microvolt = <1150000>;

			opp-microvolt = <1100000>;

			turbo-mode;

		};

	};
@@ -229,7 +229,6 @@ 
			clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>;

			clock-names = "bus", "core";

			operating-points-v2 = <&gpu_opp_table>;

			switch-delay = <0xffff>;

		};

	};

}; /* end of / */