Commit 58ac0000 authored by Eric Anholt's avatar Eric Anholt
Browse files

Merge tag 'bcm2835-dt-ethernet' into HEAD 

This merge brings over the DT ethernet nodes from 32-bit (used so that
we can get the MAC address for it) so that we can expose it on arm64
as well.
parents 9d56c22a 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>;

		};

	};

};