Commit c98e140f authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'arm-soc/for-4.16/devicetree-fixes' of https://github.com/Broadcom/stblinux into fixes

Pull "Broadcom devicetree fixes for 4.16" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
4.16, please pull the following:

- Mathieu fixes leading 0x and 0's from bindings and Device Tree source
  files, he has done this treewide and most of his changes are already in
  4.16

- Stefan provides two changes to the BCM283x DTS files in order to fix
  DTC warnings

- Florian fixes the amount of RAM on the BCM958625HR reference board to
  properly limit to what is initialized by the bootloader

* tag 'arm-soc/for-4.16/devicetree-fixes' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm283x: Move arm-pmu out of soc node
  ARM: dts: bcm283x: Fix unit address of local_intc
  ARM: dts: NSP: Fix amount of RAM on BCM958625HR
  ARM: BCM: dts: Remove leading 0x and 0s from bindings notation
parents 20f4ed3a 2944866a
...@@ -55,7 +55,7 @@ gic: interrupt-controller@3ff00100 { ...@@ -55,7 +55,7 @@ gic: interrupt-controller@3ff00100 {
<0x3ff00100 0x100>; <0x3ff00100 0x100>;
}; };
smc@0x3404c000 { smc@3404c000 {
compatible = "brcm,bcm11351-smc", "brcm,kona-smc"; compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */ reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */
}; };
......
...@@ -55,7 +55,7 @@ gic: interrupt-controller@3ff00100 { ...@@ -55,7 +55,7 @@ gic: interrupt-controller@3ff00100 {
<0x3ff00100 0x100>; <0x3ff00100 0x100>;
}; };
smc@0x3404e000 { smc@3404e000 {
compatible = "brcm,bcm21664-smc", "brcm,kona-smc"; compatible = "brcm,bcm21664-smc", "brcm,kona-smc";
reg = <0x3404e000 0x400>; /* 1 KiB in SRAM */ reg = <0x3404e000 0x400>; /* 1 KiB in SRAM */
}; };
......
...@@ -18,10 +18,10 @@ cpu@0 { ...@@ -18,10 +18,10 @@ cpu@0 {
soc { soc {
ranges = <0x7e000000 0x20000000 0x02000000>; ranges = <0x7e000000 0x20000000 0x02000000>;
dma-ranges = <0x40000000 0x00000000 0x20000000>; dma-ranges = <0x40000000 0x00000000 0x20000000>;
};
arm-pmu { arm-pmu {
compatible = "arm,arm1176-pmu"; compatible = "arm,arm1176-pmu";
};
}; };
}; };
......
...@@ -9,19 +9,19 @@ soc { ...@@ -9,19 +9,19 @@ soc {
<0x40000000 0x40000000 0x00001000>; <0x40000000 0x40000000 0x00001000>;
dma-ranges = <0xc0000000 0x00000000 0x3f000000>; dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
local_intc: local_intc { local_intc: local_intc@40000000 {
compatible = "brcm,bcm2836-l1-intc"; compatible = "brcm,bcm2836-l1-intc";
reg = <0x40000000 0x100>; reg = <0x40000000 0x100>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupt-parent = <&local_intc>; interrupt-parent = <&local_intc>;
}; };
};
arm-pmu { arm-pmu {
compatible = "arm,cortex-a7-pmu"; compatible = "arm,cortex-a7-pmu";
interrupt-parent = <&local_intc>; interrupt-parent = <&local_intc>;
interrupts = <9 IRQ_TYPE_LEVEL_HIGH>; interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;
};
}; };
timer { timer {
......
...@@ -8,7 +8,7 @@ soc { ...@@ -8,7 +8,7 @@ soc {
<0x40000000 0x40000000 0x00001000>; <0x40000000 0x40000000 0x00001000>;
dma-ranges = <0xc0000000 0x00000000 0x3f000000>; dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
local_intc: local_intc { local_intc: local_intc@40000000 {
compatible = "brcm,bcm2836-l1-intc"; compatible = "brcm,bcm2836-l1-intc";
reg = <0x40000000 0x100>; reg = <0x40000000 0x100>;
interrupt-controller; interrupt-controller;
......
...@@ -465,7 +465,7 @@ thermal: thermal@7e212000 { ...@@ -465,7 +465,7 @@ thermal: thermal@7e212000 {
status = "disabled"; status = "disabled";
}; };
aux: aux@0x7e215000 { aux: aux@7e215000 {
compatible = "brcm,bcm2835-aux"; compatible = "brcm,bcm2835-aux";
#clock-cells = <1>; #clock-cells = <1>;
reg = <0x7e215000 0x8>; reg = <0x7e215000 0x8>;
......
...@@ -49,7 +49,7 @@ chosen { ...@@ -49,7 +49,7 @@ chosen {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x60000000 0x80000000>; reg = <0x60000000 0x20000000>;
}; };
gpio-restart { gpio-restart {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment