| Message ID | 20181206191142.14118-1-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | 5719ac19fc32d892434939c1756c2f9a8322e6ef |
| Headers | show |
| Series | ARM: dts: sunxi: Fix PMU compatible strings | expand |
On Thu, Dec 06, 2018 at 01:11:42PM -0600, Rob Herring wrote: > "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: Rob Herring <robh@kernel.org> > --- > arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- > arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi > index a960b8ef7822..9e7931d5e42a 100644 > --- a/arch/arm/boot/dts/sun6i-a31.dtsi > +++ b/arch/arm/boot/dts/sun6i-a31.dtsi > @@ -202,7 +202,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>, > diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi > index 3c571dc599c3..5e413a5d9f6d 100644 > --- a/arch/arm/boot/dts/sun7i-a20.dtsi > +++ b/arch/arm/boot/dts/sun7i-a20.dtsi > @@ -199,7 +199,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>; Acked-by: Will Deacon <will.deacon@arm.com> Will
On Thu, Dec 06, 2018 at 01:11:42PM -0600, Rob Herring wrote: > "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: Rob Herring <robh@kernel.org> Applied, thanks! Maxime -- Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index a960b8ef7822..9e7931d5e42a 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -202,7 +202,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>, diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 3c571dc599c3..5e413a5d9f6d 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -199,7 +199,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>; };
"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: Rob Herring <robh@kernel.org> --- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.19.1