BCM270X_DT: Rename Pi Zero W DT files

The downtream Pi Zero W dts file uses the digit 0, whereas upstream
chose to spell it out - "zero-w". The firmware has, for a long time,
looked for bcm2708-rpi-zero-w.dtb first before falling back to the
numerical version. Therefore it is better to follow upstream and
make the switch to "bcm2708-rpi-zero-w".

At the same time, remove some overrides that duplicate values
inherited from the shared .dtsi files.

Signed-off-by: Phil Elwell <phil@raspberrypi.org>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ffd515b..8ba7c56 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -4,7 +4,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 97%
rename from arch/arm/boot/dts/bcm2708-rpi-0-w.dts
rename to arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
index 23ff3e4..087f391 100644 (file)
--- a/arch/arm/boot/dts/bcm2708-rpi-0-w.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
@@ -132,15 +132,10 @@
 };
 
 &i2s {
-       #sound-dai-cells = <0>;
        pinctrl-names = "default";
        pinctrl-0 = <&i2s_pins>;
 };
 
-&random {
-       status = "okay";
-};
-
 &leds {
        act_led: act {
                label = "led0";