Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / aspeed-bmc-opp-romulus.dts

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
index 623b6ab4202123e2f917254a6d8ee9bd0f9651ad..51bc6a2e9dd57b8dc4f496b3e316f1e7a4472746 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -184,9 +184,9 @@
 &i2c12 {
        status = "okay";
 
-       max31785@52 {
-               compatible = "maxim,max31785";
-               reg = <0x52>;
+       w83773g@4c {
+               compatible = "nuvoton,w83773g";
+               reg = <0x4c>;
        };
 };
 
@@ -203,6 +203,12 @@
                output-low;
                line-name = "nic_func_mode1";
        };
+       seq_cont {
+               gpio-hog;
+               gpios = <ASPEED_GPIO(S, 7) GPIO_ACTIVE_HIGH>;
+               output-low;
+               line-name = "seq_cont";
+       };
 };
 
 &vuart {
@@ -257,3 +263,7 @@
                aspeed,fan-tach-ch = /bits/ 8 <0x0e>;
        };
 };
+
+&ibt {
+       status = "okay";
+};