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

Commit e60d4b91 authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman
Browse files

ARM: dts: sunxi: Fix PMU compatible strings 



[ Upstream commit 5719ac19fc32d892434939c1756c2f9a8322e6ef ]

"arm,cortex-a15-pmu" is not a valid fallback compatible string for an
Cortex-A7 PMU, so drop it.

Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6539e282

arch/arm/boot/dts/sun6i-a31.dtsi

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



	pmu {

		compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu";

		compatible = "arm,cortex-a7-pmu";

		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/sun7i-a20.dtsi

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



	pmu {

		compatible = "arm,cortex-a7-pmu", "arm,cortex-a15-pmu";

		compatible = "arm,cortex-a7-pmu";

		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;

	};