Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[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 7d28c03a9e0bccf7352a61d7e5016727c936b8de..76fe994f2ba4075b70972df15d5fd3eed364b9b7 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -30,6 +30,11 @@
                        no-map;
                        reg = <0x98000000 0x04000000>; /* 64M */
                };
+
+               coldfire_memory: codefire_memory@9ef00000 {
+                       reg = <0x9ef00000 0x00100000>;
+                       no-map;
+               };
        };
 
        leds {
@@ -49,11 +54,15 @@
        };
 
        fsi: gpio-fsi {
-               compatible = "fsi-master-gpio", "fsi-master";
+               compatible = "aspeed,ast2500-cf-fsi-master", "fsi-master";
                #address-cells = <2>;
                #size-cells = <0>;
                no-gpio-delays;
 
+               memory-region = <&coldfire_memory>;
+               aspeed,sram = <&sram>;
+               aspeed,cvic = <&cvic>;
+
                clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
                data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>;
                mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>;
@@ -76,6 +85,11 @@
                        linux,code = <ASPEED_GPIO(Q, 7)>;
                };
        };
+
+       iio-hwmon-battery {
+               compatible = "iio-hwmon";
+               io-channels = <&adc 12>;
+       };
 };
 
 &fmc {
@@ -274,3 +288,11 @@
 &ibt {
        status = "okay";
 };
+
+&vhub {
+       status = "okay";
+};
+
+&adc {
+       status = "okay";
+};