From ab89142d257bfdb713e41b9cce02e695bfaa2955 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sep 01 2016 08:29:57 +0000 Subject: add missing patch for bcm2837 support (clearly looking at too many branches when I missed this :-/ ) --- diff --git a/bcm2837-initial-support.patch b/bcm2837-initial-support.patch index 99769dc..ba3902c 100644 --- a/bcm2837-initial-support.patch +++ b/bcm2837-initial-support.patch @@ -181,3 +181,152 @@ index 0000000..8216bbb -- 2.9.3 +From fc07a6d394f41a98f839507580082184ac684912 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Mon, 2 May 2016 09:06:51 +0200 +Subject: [PATCH 1/2] ARM: bcm2835: dt: Add the ethernet to the device trees + +The hub and the ethernet in its port 1 are hardwired on the board. + +Compared to the adapters that can be plugged into the USB ports, this +one has no serial EEPROM to store its MAC. Nevertheless, the Raspberry Pi +has the MAC address for this adapter in its ROM, accessible from its +firmware. + +U-Boot can read out the address and set the local-mac-address property of the +node with "ethernet" alias. Let's add the node so that U-Boot can do its +business. + +Model B rev2 and Model B+ entries were verified by me, the hierarchy and +pid/vid pair for the Version 2 was provided by Peter Chen. Original +Model B is a blind shot, though very likely correct. + +Signed-off-by: Lubomir Rintel +Acked-by: Stephen Warren +Signed-off-by: Eric Anholt +--- + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 + + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 + + arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm283x.dtsi | 2 ++ + 7 files changed, 44 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi + +diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +index 57d313b..d5fdb8e 100644 +--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +@@ -1,6 +1,7 @@ + /dts-v1/; + #include "bcm2835.dtsi" + #include "bcm2835-rpi.dtsi" ++#include "bcm283x-rpi-smsc9514.dtsi" + + / { + compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; +diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +index cf2774e..bfc4bd9 100644 +--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +@@ -1,6 +1,7 @@ + /dts-v1/; + #include "bcm2835.dtsi" + #include "bcm2835-rpi.dtsi" ++#include "bcm283x-rpi-smsc9512.dtsi" + + / { + compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835"; +diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts +index 8b15f9c..0371bb7 100644 +--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts ++++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts +@@ -1,6 +1,7 @@ + /dts-v1/; + #include "bcm2835.dtsi" + #include "bcm2835-rpi.dtsi" ++#include "bcm283x-rpi-smsc9512.dtsi" + + / { + compatible = "raspberrypi,model-b", "brcm,bcm2835"; +diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +index c4743f4..29e1cfe 100644 +--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts ++++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +@@ -1,6 +1,7 @@ + /dts-v1/; + #include "bcm2836.dtsi" + #include "bcm2835-rpi.dtsi" ++#include "bcm283x-rpi-smsc9514.dtsi" + + / { + compatible = "raspberrypi,2-model-b", "brcm,bcm2836"; +diff --git a/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi b/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi +new file mode 100644 +index 0000000..12c981e +--- /dev/null ++++ b/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi +@@ -0,0 +1,19 @@ ++/ { ++ aliases { ++ ethernet = ðernet; ++ }; ++}; ++ ++&usb { ++ usb1@1 { ++ compatible = "usb424,9512"; ++ reg = <1>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ ethernet: usbether@1 { ++ compatible = "usb424,ec00"; ++ reg = <1>; ++ }; ++ }; ++}; +diff --git a/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi b/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi +new file mode 100644 +index 0000000..3f0a56e +--- /dev/null ++++ b/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi +@@ -0,0 +1,19 @@ ++/ { ++ aliases { ++ ethernet = ðernet; ++ }; ++}; ++ ++&usb { ++ usb1@1 { ++ compatible = "usb424,9514"; ++ reg = <1>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ ethernet: usbether@1 { ++ compatible = "usb424,ec00"; ++ reg = <1>; ++ }; ++ }; ++}; +diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi +index 10b27b9..b982522 100644 +--- a/arch/arm/boot/dts/bcm283x.dtsi ++++ b/arch/arm/boot/dts/bcm283x.dtsi +@@ -287,6 +287,8 @@ + compatible = "brcm,bcm2835-usb"; + reg = <0x7e980000 0x10000>; + interrupts = <1 9>; ++ #address-cells = <1>; ++ #size-cells = <0>; + }; + + v3d: v3d@7ec00000 { +-- +2.9.3 +