Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 885a976e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.8/devicetree-part2' of http://github.com/Broadcom/stblinux into next/dt 

Merge "additional Broadcom ARM-based SoC Device Tree changes" from Florian Fainelli:

- Lubomir updates all BCM2835 (Raspberry Pi family) Device Tree source files with
  their proper information about the on-board USB Ethernet adapter so there is
  appropriate binding between this USB device and a device_node (useful for MAC
  address fetching and stuff)

- Raveendra adds the ADC controller Device Tree nodes to the Cygnus SoC device
  tree include files

- Rafal updates the BCM5301x Device Tree by separating how we specify the NAND
  chip-select information in a first change and then fixes the NAND controller
  ECC configuration for the D-Link DIR-885L

- Florian adds support for the BCM953012ER reference board, adds the HW random
  number generator DT node and adds proper memory node information to the
  BCM958625HR reference board

* tag 'arm-soc/for-4.8/devicetree-part2' of http://github.com/Broadcom/stblinux:
  ARM: dts: NSP: Specify RAM amount for BCM958625HR board
  ARM: BCM5301X: Fix NAND ECC parameters for D-Link DIR-885L
  ARM: BCM5301X: Specify NAND chip select and ECC in separated files
  ARM: dts: Cygnus: Add Broadcom iproc-static-adc DT node
  ARM: dts: BCM5301x: Add BCM953012ER board
  ARM: dts: BCM5301x: Add RNG Device Tree node
  ARM: bcm2835: dt: Add the ethernet to the device trees
parents dddaea6b 9a4865d4

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm47094-dlink-dir-885l.dtb \

	bcm94708.dtb \

	bcm94709.dtb \

	bcm953012er.dtb \

	bcm953012k.dtb

dtb-$(CONFIG_ARCH_BCM_63XX) += \

	bcm963138dvt.dtb

arch/arm/boot/dts/bcm-cygnus.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -366,5 +366,16 @@ 
			interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};



		adc: adc@180a6000 {

			compatible = "brcm,iproc-static-adc";

			#io-channel-cells = <1>;

			io-channel-ranges;

			adc-syscon = <&ts_adc_syscon>;

			clocks = <&asiu_clks BCM_CYGNUS_ASIU_ADC_CLK>;

			clock-names = "tsc_clk";

			interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/bcm2835-rpi-b-plus.dts

+1 −0
Original line number Diff line number Diff line 
/dts-v1/;

#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"

#include "bcm283x-rpi-smsc9514.dtsi"



/ {

	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";

arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts

+1 −0
Original line number Diff line number Diff line 
/dts-v1/;

#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"

#include "bcm283x-rpi-smsc9512.dtsi"



/ {

	compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";

arch/arm/boot/dts/bcm2835-rpi-b.dts

+1 −0
Original line number Diff line number Diff line 
/dts-v1/;

#include "bcm2835.dtsi"

#include "bcm2835-rpi.dtsi"

#include "bcm283x-rpi-smsc9512.dtsi"



/ {

	compatible = "raspberrypi,model-b", "brcm,bcm2835";