Commit c98e140f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

arch/arm/boot/dts/bcm11351.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
		      <0x3ff00100 0x100>;

	};



	smc@0x3404c000 {

	smc@3404c000 {

		compatible = "brcm,bcm11351-smc", "brcm,kona-smc";

		reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */

	};

arch/arm/boot/dts/bcm21664.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
		      <0x3ff00100 0x100>;

	};



	smc@0x3404e000 {

	smc@3404e000 {

		compatible = "brcm,bcm21664-smc", "brcm,kona-smc";

		reg = <0x3404e000 0x400>; /* 1 KiB in SRAM */

	};

arch/arm/boot/dts/bcm2835.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 
	soc {

		ranges = <0x7e000000 0x20000000 0x02000000>;

		dma-ranges = <0x40000000 0x00000000 0x20000000>;

	};



	arm-pmu {

		compatible = "arm,arm1176-pmu";

	};

};

};



&cpu_thermal {

	coefficients = <(-538)	407000>;

arch/arm/boot/dts/bcm2836.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -9,20 +9,20 @@ 
			 <0x40000000 0x40000000 0x00001000>;

		dma-ranges = <0xc0000000 0x00000000 0x3f000000>;



		local_intc: local_intc {

		local_intc: local_intc@40000000 {

			compatible = "brcm,bcm2836-l1-intc";

			reg = <0x40000000 0x100>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-parent = <&local_intc>;

		};

	};



	arm-pmu {

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

		interrupt-parent = <&local_intc>;

		interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;

	};

	};



	timer {

		compatible = "arm,armv7-timer";

arch/arm/boot/dts/bcm2837.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
			 <0x40000000 0x40000000 0x00001000>;

		dma-ranges = <0xc0000000 0x00000000 0x3f000000>;



		local_intc: local_intc {

		local_intc: local_intc@40000000 {

			compatible = "brcm,bcm2836-l1-intc";

			reg = <0x40000000 0x100>;

			interrupt-controller;

CRA Git | Maintained and supported by SUSTech CRA and CCSE