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

Unverified Commit 9b31970c authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-dt-next-2016-07-03' into devicetree/next 



This pull request brings in the change to describe the ethernet in the
DT so that the firmware can tell us its MAC address.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents fd048c6b 6a937927

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";

arch/arm/boot/dts/bcm2836-rpi-2-b.dts

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

#include "bcm2836.dtsi"

#include "bcm2835-rpi.dtsi"

#include "bcm283x-rpi-smsc9514.dtsi"



/ {

	compatible = "raspberrypi,2-model-b", "brcm,bcm2836";

arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/ {

	aliases {

		ethernet = &ethernet;

	};

};



&usb {

	usb1@1 {

		compatible = "usb424,9512";

		reg = <1>;

		#address-cells = <1>;

		#size-cells = <0>;



		ethernet: usbether@1 {

			compatible = "usb424,ec00";

			reg = <1>;

		};

	};

};