Merge tag 'soc-dt-late-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-block.git] / arch / arm / boot / dts / aspeed / aspeed-bmc-facebook-yosemite4.dts

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
index 64075cc41d927574344817ccd6b1f16274cc7a17..98477792aa005a6c62d7bbb7daf0c31280bcc7e0 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
@@ -88,7 +88,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_rmii3_default>;
        use-ncsi;
-       mlx,multi-host;
+       mellanox,multi-host;
 };
 
 &mac3 {
@@ -96,7 +96,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_rmii4_default>;
        use-ncsi;
-       mlx,multi-host;
+       mellanox,multi-host;
 };
 
 &fmc {
@@ -369,7 +369,14 @@
 
 &i2c13 {
        status = "okay";
-       bus-frequency = <400000>;
+       bus-frequency = <100000>;
+       multi-master;
+
+       ipmb@10 {
+               compatible = "ipmb-dev";
+               reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
+               i2c-protocol;
+       };
 };
 
 &i2c14 {
@@ -596,7 +603,6 @@
 };
 
 &adc0 {
-       ref_voltage = <2500>;
        status = "okay";
        pinctrl-0 = <&pinctrl_adc0_default &pinctrl_adc1_default
                        &pinctrl_adc2_default &pinctrl_adc3_default
@@ -605,7 +611,6 @@
 };
 
 &adc1 {
-       ref_voltage = <2500>;
        status = "okay";
        pinctrl-0 = <&pinctrl_adc8_default &pinctrl_adc9_default>;
 };