[PATCH 1/2] ARM: dts: bcm283x: Fix unit address of local_intc

[Stefan Wahren]

This patch fixes the following DTC warning (requires W=1):
Node /soc/local_intc simple-bus unit address format error, expected "40000000"

Signed-off-by: Stefan Wahren <***@i2se.com>
---
arch/arm/boot/dts/bcm2836.dtsi | 2 +-
arch/arm/boot/dts/bcm2837.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi
index 1dfd764..e47f2e9 100644
--- a/arch/arm/boot/dts/bcm2836.dtsi
+++ b/arch/arm/boot/dts/bcm2836.dtsi
@@ -9,7 +9,7 @@
<0x40000000 0x40000000 0x00001000>;
dma-ranges = <0xc0000000 0x00000000 0x3f000000>;

- local_intc: local_intc {
+ local_intc: ***@40000000 {
compatible = "brcm,bcm2836-l1-intc";
reg = <0x40000000 0x100>;
interrupt-controller;
diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
index efa7d33..7704bb0 100644
--- a/arch/arm/boot/dts/bcm2837.dtsi
+++ b/arch/arm/boot/dts/bcm2837.dtsi
@@ -8,7 +8,7 @@
<0x40000000 0x40000000 0x00001000>;
dma-ranges = <0xc0000000 0x00000000 0x3f000000>;

- local_intc: local_intc {
+ local_intc: ***@40000000 {
compatible = "brcm,bcm2836-l1-intc";
reg = <0x40000000 0x100>;
interrupt-controller;

[Stefan Wahren]

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 <***@i2se.com>
---
arch/arm/boot/dts/bcm2835.dtsi | 6 +++---
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 0e3d2a5..a5c3824 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 e47f2e9..c933e84 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 {

[Eric Anholt]

Post by Stefan Wahren
The ARM PMU doesn't have a reg address, so fix the following DTC warning
Node /soc/arm-pmu missing or empty reg/ranges property

These seem good to me, I justed wanted to be sure: Does the PMU still
probe when the node is at this level of the hierarchy? If it does, then
these get my r-b.

[Stefan Wahren]

Post by Eric Anholt

Post by Stefan Wahren
The ARM PMU doesn't have a reg address, so fix the following DTC warning
Node /soc/arm-pmu missing or empty reg/ranges property

These seem good to me, I justed wanted to be sure: Does the PMU still
probe when the node is at this level of the hierarchy?

Yes, it does.

Post by Eric Anholt
If it does, then these get my r-b.

[Eric Anholt]

Post by Stefan Wahren

Post by Eric Anholt

Post by Stefan Wahren
The ARM PMU doesn't have a reg address, so fix the following DTC warning
Node /soc/arm-pmu missing or empty reg/ranges property

These seem good to me, I justed wanted to be sure: Does the PMU still
probe when the node is at this level of the hierarchy?

Yes, it does.

Great. It sounds like Florian will cherry-pick these directly for
fixes.

[Florian Fainelli]

This patch series fixes some DTC warnings, which are only visible with W=1.
ARM: dts: bcm283x: Fix unit address of local_intc
ARM: dts: bcm283x: Move arm-pmu out of soc node
arch/arm/boot/dts/bcm2835.dtsi | 6 +++---
arch/arm/boot/dts/bcm2836.dtsi | 12 ++++++------
arch/arm/boot/dts/bcm2837.dtsi | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)

Series applied to devicetree/fixes, thanks Stefan. Can you make sure you
copy bcm-kernel-feedback-***@broadcom.com for your future submissions?
That allows me to leverage the patchwork instance behind that list,
thank you!