ARM: dts: sun8i-h3: Rename sinovoip-bpi-m2-plus to bananapi-m2-plus

The Banana Pi series is a well known series of single board computers.
The manufacturer, Sinovoip, is less well known. Moreover, the board
markings do not mention Sinovoip, but only the Banana Pi logo, and
the BPI-M* model name.

Rename the dts file to use the more well known name. Also fix up
some of the model names and labels to match other Banana Pi boards.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 016611da6d5aa651c87723580e8396cd4eb892d6..3ccc653281be5f6a84eb5606a657ea1671539c67 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -763,11 +763,11 @@ dtb-$(CONFIG_MACH_SUN8I) += \
        sun8i-a33-sinlinx-sina33.dtb \
        sun8i-a83t-allwinner-h8homlet-v2.dtb \
        sun8i-a83t-cubietruck-plus.dtb \
+       sun8i-h3-bananapi-m2-plus.dtb \
        sun8i-h3-orangepi-2.dtb \
        sun8i-h3-orangepi-one.dtb \
        sun8i-h3-orangepi-pc.dtb \
        sun8i-h3-orangepi-plus.dtb \
-       sun8i-h3-sinovoip-bpi-m2-plus.dtb \
        sun8i-r16-parrot.dtb
 dtb-$(CONFIG_MACH_SUN9I) += \
        sun9i-a80-optimus.dtb \

diff --git a/arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
similarity index 97%
rename from arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts
rename to arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
index d21bc57ce14062aa2b42c232c0c92952a5674ed8..f3b1d5f6dbd248a5d58a7cfd9f09698a20cba524 100644 (file)
--- a/arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts
+++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts
@@ -49,8 +49,8 @@
 #include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
-       model = "Sinovoip BPI-M2+";
-       compatible = "sinovoip,bpi-m2+", "allwinner,sun8i-h3";
+       model = "Banana Pi BPI-M2-Plus";
+       compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3";
 
        aliases {
                serial0 = &uart0;
@@ -67,7 +67,7 @@
                pinctrl-0 = <&pwr_led_bpi_m2p>;
 
                pwr_led {
-                       label = "bpi-m2+:red:pwr";
+                       label = "bananapi-m2-plus:red:pwr";
                        gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */
                        default-state = "on";
                };