ARM: dts: aspeed: minerva: Revise the name of DTS

The project Minerva which is the platform used by Meta has two boards: the
Chassis Management Module (Minerva) and the Motherboard (Harma), so change
the DTS name to minerva here for CMM use.

Signed-off-by: Yang Chen <yangchen.openbmc@gmail.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20231212075200.983536-2-yangchen.openbmc@gmail.com
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

diff --git a/arch/arm/boot/dts/aspeed/Makefile b/arch/arm/boot/dts/aspeed/Makefile
index 7231d8fa1004cc23245a946c5101da5853cd085e..560be4c3c8aea69175af31a9bef4f30dddeaffeb 100644 (file)
--- a/arch/arm/boot/dts/aspeed/Makefile
+++ b/arch/arm/boot/dts/aspeed/Makefile
@@ -22,7 +22,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-bmc-facebook-galaxy100.dtb \
        aspeed-bmc-facebook-greatlakes.dtb \
        aspeed-bmc-facebook-harma.dtb \
-       aspeed-bmc-facebook-minerva-cmc.dtb \
+       aspeed-bmc-facebook-minerva.dtb \
        aspeed-bmc-facebook-minipack.dtb \
        aspeed-bmc-facebook-tiogapass.dtb \
        aspeed-bmc-facebook-wedge40.dtb \

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts
deleted file mode 100644 (file)
index f04ef90..0000000
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts
+++ /dev/null
@@ -1,265 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-// Copyright (c) 2023 Facebook Inc.
-/dts-v1/;
-
-#include "aspeed-g6.dtsi"
-#include <dt-bindings/gpio/aspeed-gpio.h>
-#include <dt-bindings/i2c/i2c.h>
-
-/ {
-       model = "Facebook Minerva CMC";
-       compatible = "facebook,minerva-cmc", "aspeed,ast2600";
-
-       aliases {
-               serial5 = &uart5;
-       };
-
-       chosen {
-               stdout-path = "serial5:57600n8";
-       };
-
-       memory@80000000 {
-               device_type = "memory";
-               reg = <0x80000000 0x80000000>;
-       };
-
-       iio-hwmon {
-               compatible = "iio-hwmon";
-               io-channels = <&adc0 0>, <&adc0 1>, <&adc0 2>, <&adc0 3>,
-                       <&adc0 4>, <&adc0 5>, <&adc0 6>, <&adc0 7>,
-                       <&adc1 2>;
-       };
-};
-
-&uart6 {
-       status = "okay";
-};
-
-&wdt1 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_wdtrst1_default>;
-       aspeed,reset-type = "soc";
-       aspeed,external-signal;
-       aspeed,ext-push-pull;
-       aspeed,ext-active-high;
-       aspeed,ext-pulse-duration = <256>;
-};
-
-&mac3 {
-       status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_rmii4_default>;
-       use-ncsi;
-       mlx,multi-host;
-};
-
-&fmc {
-       status = "okay";
-       flash@0 {
-               status = "okay";
-               m25p,fast-read;
-               label = "bmc";
-               spi-max-frequency = <50000000>;
-#include "openbmc-flash-layout-128.dtsi"
-       };
-       flash@1 {
-               status = "okay";
-               m25p,fast-read;
-               label = "alt-bmc";
-               spi-max-frequency = <50000000>;
-       };
-};
-
-&rtc {
-       status = "okay";
-};
-
-&sgpiom1 {
-       status = "okay";
-       ngpios = <128>;
-       bus-frequency = <2000000>;
-};
-
-&i2c0 {
-       status = "okay";
-};
-
-&i2c1 {
-       status = "okay";
-
-       temperature-sensor@4b {
-               compatible = "ti,tmp75";
-               reg = <0x4B>;
-       };
-
-       eeprom@51 {
-               compatible = "atmel,24c128";
-               reg = <0x51>;
-       };
-};
-
-&i2c2 {
-       status = "okay";
-
-       i2c-mux@77 {
-               compatible = "nxp,pca9548";
-               reg = <0x77>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               i2c-mux-idle-disconnect;
-
-               i2c@0 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0>;
-
-                       eeprom@50 {
-                               compatible = "atmel,24c128";
-                               reg = <0x50>;
-                       };
-               };
-
-               i2c@1 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <1>;
-
-                       eeprom@50 {
-                               compatible = "atmel,24c128";
-                               reg = <0x50>;
-                       };
-               };
-
-               i2c@2 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <2>;
-
-                       eeprom@50 {
-                               compatible = "atmel,24c128";
-                               reg = <0x50>;
-                       };
-               };
-
-               i2c@3 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <3>;
-
-                       eeprom@50 {
-                               compatible = "atmel,24c128";
-                               reg = <0x50>;
-                       };
-               };
-
-               i2c@4 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <4>;
-
-                       eeprom@50 {
-                               compatible = "atmel,24c128";
-                               reg = <0x50>;
-                       };
-               };
-
-               i2c@5 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <5>;
-
-                       eeprom@50 {
-                               compatible = "atmel,24c128";
-                               reg = <0x50>;
-                       };
-               };
-       };
-};
-
-&i2c3 {
-       status = "okay";
-};
-
-&i2c4 {
-       status = "okay";
-};
-
-&i2c5 {
-       status = "okay";
-};
-
-&i2c6 {
-       status = "okay";
-};
-
-&i2c7 {
-       status = "okay";
-};
-
-&i2c8 {
-       status = "okay";
-};
-
-&i2c9 {
-       status = "okay";
-};
-
-&i2c10 {
-       status = "okay";
-};
-
-&i2c11 {
-       status = "okay";
-};
-
-&i2c12 {
-       status = "okay";
-};
-
-&i2c13 {
-       status = "okay";
-};
-
-&i2c14 {
-       status = "okay";
-       multi-master;
-
-       ipmb@10 {
-               compatible = "ipmb-dev";
-               reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
-               i2c-protocol;
-       };
-};
-
-&i2c15 {
-       status = "okay";
-
-       eeprom@50 {
-               compatible = "atmel,24c128";
-               reg = <0x50>;
-       };
-};
-
-&adc0 {
-       aspeed,int-vref-microvolt = <2500000>;
-       status = "okay";
-       pinctrl-0 = <&pinctrl_adc0_default &pinctrl_adc1_default
-               &pinctrl_adc2_default &pinctrl_adc3_default
-               &pinctrl_adc4_default &pinctrl_adc5_default
-               &pinctrl_adc6_default &pinctrl_adc7_default>;
-};
-
-&adc1 {
-       aspeed,int-vref-microvolt = <2500000>;
-       status = "okay";
-       pinctrl-0 = <&pinctrl_adc10_default>;
-};
-
-&ehci1 {
-       status = "okay";
-};
-
-&uhci {
-       status = "okay";
-};

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
new file mode 100644 (file)
index 0000000..c755fb3
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
@@ -0,0 +1,265 @@
+// SPDX-License-Identifier: GPL-2.0+
+// Copyright (c) 2023 Facebook Inc.
+/dts-v1/;
+
+#include "aspeed-g6.dtsi"
+#include <dt-bindings/gpio/aspeed-gpio.h>
+#include <dt-bindings/i2c/i2c.h>
+
+/ {
+       model = "Facebook Minerva CMM";
+       compatible = "facebook,minerva-cmc", "aspeed,ast2600";
+
+       aliases {
+               serial5 = &uart5;
+       };
+
+       chosen {
+               stdout-path = "serial5:57600n8";
+       };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
+
+       iio-hwmon {
+               compatible = "iio-hwmon";
+               io-channels = <&adc0 0>, <&adc0 1>, <&adc0 2>, <&adc0 3>,
+                       <&adc0 4>, <&adc0 5>, <&adc0 6>, <&adc0 7>,
+                       <&adc1 2>;
+       };
+};
+
+&uart6 {
+       status = "okay";
+};
+
+&wdt1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_wdtrst1_default>;
+       aspeed,reset-type = "soc";
+       aspeed,external-signal;
+       aspeed,ext-push-pull;
+       aspeed,ext-active-high;
+       aspeed,ext-pulse-duration = <256>;
+};
+
+&mac3 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_rmii4_default>;
+       use-ncsi;
+       mlx,multi-host;
+};
+
+&fmc {
+       status = "okay";
+       flash@0 {
+               status = "okay";
+               m25p,fast-read;
+               label = "bmc";
+               spi-max-frequency = <50000000>;
+#include "openbmc-flash-layout-128.dtsi"
+       };
+       flash@1 {
+               status = "okay";
+               m25p,fast-read;
+               label = "alt-bmc";
+               spi-max-frequency = <50000000>;
+       };
+};
+
+&rtc {
+       status = "okay";
+};
+
+&sgpiom1 {
+       status = "okay";
+       ngpios = <128>;
+       bus-frequency = <2000000>;
+};
+
+&i2c0 {
+       status = "okay";
+};
+
+&i2c1 {
+       status = "okay";
+
+       temperature-sensor@4b {
+               compatible = "ti,tmp75";
+               reg = <0x4B>;
+       };
+
+       eeprom@51 {
+               compatible = "atmel,24c128";
+               reg = <0x51>;
+       };
+};
+
+&i2c2 {
+       status = "okay";
+
+       i2c-mux@77 {
+               compatible = "nxp,pca9548";
+               reg = <0x77>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               i2c-mux-idle-disconnect;
+
+               i2c@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+
+                       eeprom@50 {
+                               compatible = "atmel,24c128";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+
+                       eeprom@50 {
+                               compatible = "atmel,24c128";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c@2 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <2>;
+
+                       eeprom@50 {
+                               compatible = "atmel,24c128";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c@3 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <3>;
+
+                       eeprom@50 {
+                               compatible = "atmel,24c128";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c@4 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <4>;
+
+                       eeprom@50 {
+                               compatible = "atmel,24c128";
+                               reg = <0x50>;
+                       };
+               };
+
+               i2c@5 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <5>;
+
+                       eeprom@50 {
+                               compatible = "atmel,24c128";
+                               reg = <0x50>;
+                       };
+               };
+       };
+};
+
+&i2c3 {
+       status = "okay";
+};
+
+&i2c4 {
+       status = "okay";
+};
+
+&i2c5 {
+       status = "okay";
+};
+
+&i2c6 {
+       status = "okay";
+};
+
+&i2c7 {
+       status = "okay";
+};
+
+&i2c8 {
+       status = "okay";
+};
+
+&i2c9 {
+       status = "okay";
+};
+
+&i2c10 {
+       status = "okay";
+};
+
+&i2c11 {
+       status = "okay";
+};
+
+&i2c12 {
+       status = "okay";
+};
+
+&i2c13 {
+       status = "okay";
+};
+
+&i2c14 {
+       status = "okay";
+       multi-master;
+
+       ipmb@10 {
+               compatible = "ipmb-dev";
+               reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+               i2c-protocol;
+       };
+};
+
+&i2c15 {
+       status = "okay";
+
+       eeprom@50 {
+               compatible = "atmel,24c128";
+               reg = <0x50>;
+       };
+};
+
+&adc0 {
+       aspeed,int-vref-microvolt = <2500000>;
+       status = "okay";
+       pinctrl-0 = <&pinctrl_adc0_default &pinctrl_adc1_default
+               &pinctrl_adc2_default &pinctrl_adc3_default
+               &pinctrl_adc4_default &pinctrl_adc5_default
+               &pinctrl_adc6_default &pinctrl_adc7_default>;
+};
+
+&adc1 {
+       aspeed,int-vref-microvolt = <2500000>;
+       status = "okay";
+       pinctrl-0 = <&pinctrl_adc10_default>;
+};
+
+&ehci1 {
+       status = "okay";
+};
+
+&uhci {
+       status = "okay";
+};