linux-raspberrypi: Backport device tree rename to 4.14 kernel

Signed-off-by: Paul Barker <paul@betafive.co.uk>

2 files changed, 35 insertions, 0 deletions

diff --git a/recipes-kernel/linux/files/0002-Rename-Pi-Zero-W-device-tree.patch b/recipes-kernel/linux/files/0002-Rename-Pi-Zero-W-device-tree.patch
new file mode 100644
index 0000000..e0cc5ec
--- /dev/null
+++ b/recipes-kernel/linux/files/0002-Rename-Pi-Zero-W-device-tree.patch
@@ -0,0 +1,34 @@
+From 9f1b0a3a19d1fd4cc48aa6b7ebe88933278cc69a Mon Sep 17 00:00:00 2001
+From: Paul Barker <paul@betafive.co.uk>
+Date: Thu, 25 Jul 2019 21:14:36 +0100
+Subject: [PATCH] Rename Pi Zero W device tree
+
+Upstream-status: Backport (6f91b5dbfdb62a434571a73f2dc15181963e3bea,
+    file rename only)
+Signed-off-by: Paul Barker <paul@betafive.co.uk>
+---
+ arch/arm/boot/dts/Makefile                                      | 2 +-
+ .../boot/dts/{bcm2708-rpi-0-w.dts => bcm2708-rpi-zero-w.dts}    | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename arch/arm/boot/dts/{bcm2708-rpi-0-w.dts => bcm2708-rpi-zero-w.dts} (100%)
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 37982e8e3a30..b693bd37c472 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -5,7 +5,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
+        bcm2708-rpi-b.dtb \
+        bcm2708-rpi-b-plus.dtb \
+        bcm2708-rpi-cm.dtb \
+-       bcm2708-rpi-0-w.dtb \
++       bcm2708-rpi-zero-w.dtb \
+        bcm2709-rpi-2-b.dtb \
+        bcm2710-rpi-3-b.dtb \
+        bcm2710-rpi-3-b-plus.dtb \
+diff --git a/arch/arm/boot/dts/bcm2708-rpi-0-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
+similarity index 100%
+rename from arch/arm/boot/dts/bcm2708-rpi-0-w.dts
+rename to arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
+-- 
+2.22.0
+
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.14.bb b/recipes-kernel/linux/linux-raspberrypi_4.14.bb
index 6563918..838a551 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.14.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.14.bb
@@ -4,6 +4,7 @@ SRCREV = "6b5c4a2508403839af29ef44059d04acbe0ee204"
 SRC_URI = " \
     git://github.com/raspberrypi/linux.git;branch=rpi-4.14.y \
     file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \
+    file://0002-Rename-Pi-Zero-W-device-tree.patch \
     "
 
 require linux-raspberrypi.inc