diff options
| author | Stefan Wahren <stefan.wahren@i2se.com> | 2018-02-24 15:15:22 +0100 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2018-02-28 01:42:09 +0100 |
| commit | 2944866ac5b37e24ce1e646d2aaf472148e4a43e (patch) | |
| tree | b0feafdaac916acfdb134ad68f94043a7614a8b9 /arch | |
| parent | ARM: dts: bcm283x: Fix unit address of local_intc (diff) | |
| download | linux-2944866ac5b37e24ce1e646d2aaf472148e4a43e.tar.xz linux-2944866ac5b37e24ce1e646d2aaf472148e4a43e.zip | |
ARM: dts: bcm283x: Move arm-pmu out of soc node
The ARM PMU doesn't have a reg address, so fix the following DTC warning
(requires W=1):
Node /soc/arm-pmu missing or empty reg/ranges property
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/bcm2835.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2836.dtsi | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index 0e3d2a5ff208..a5c3824c8056 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -18,10 +18,10 @@ soc { ranges = <0x7e000000 0x20000000 0x02000000>; dma-ranges = <0x40000000 0x00000000 0x20000000>; + }; - arm-pmu { - compatible = "arm,arm1176-pmu"; - }; + arm-pmu { + compatible = "arm,arm1176-pmu"; }; }; diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi index e47f2e9ccbd0..c933e8413884 100644 --- a/arch/arm/boot/dts/bcm2836.dtsi +++ b/arch/arm/boot/dts/bcm2836.dtsi @@ -16,12 +16,12 @@ #interrupt-cells = <2>; interrupt-parent = <&local_intc>; }; + }; - arm-pmu { - compatible = "arm,cortex-a7-pmu"; - interrupt-parent = <&local_intc>; - interrupts = <9 IRQ_TYPE_LEVEL_HIGH>; - }; + arm-pmu { + compatible = "arm,cortex-a7-pmu"; + interrupt-parent = <&local_intc>; + interrupts = <9 IRQ_TYPE_LEVEL_HIGH>; }; timer { |