riscv: dts: microchip: remove gpio hogs from beaglev-fire

sd-det-hog should be cd-gpios, but when the mmc-spi-slot was added, the
"cd-" prefix was omitted and the collision with the hog was not noticed.

vio-enable-hog is just a regulator that can be modelled as such.

Fixes: 1088d49b62648 ("riscv: dts: microchip: enable qspi adc/mmc-spi-slot on BeagleV Fire")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts
index 0e1b0b8d394b9026e1edcdb3be493e8670cc7ae9..6e9653827cfe25128dc53da602037ffc507aa8c9 100644 (file)
--- a/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts
+++ b/arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts
@@ -77,6 +77,15 @@
                regulator-max-microvolt = <1200000>;
        };
 
+       regulator-1v8-syzygy {
+               compatible = "regulator-fixed";
+               gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
+               regulator-name = "syzygy_1v8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+               enable-active-high;
+       };
 };
 
 &gpio0 {
@@ -118,20 +127,6 @@
                          "P8_PIN27", "P8_PIN28", "P8_PIN29", "P8_PIN30", "M2_W_DISABLE1",
                          "M2_W_DISABLE2", "VIO_ENABLE", "SD_DET";
        status = "okay";
-
-       vio-enable-hog {
-               gpio-hog;
-               gpios = <30 30>;
-               output-high;
-               line-name = "VIO_ENABLE";
-       };
-
-       sd-det-hog {
-               gpio-hog;
-               gpios = <31 31>;
-               input;
-               line-name = "SD_DET";
-       };
 };
 
 &i2c0 {
@@ -316,7 +311,7 @@
        mmc@1 {
                compatible = "mmc-spi-slot";
                reg = <1>;
-               gpios = <&gpio2 31 1>;
+               cd-gpios = <&gpio2 31 GPIO_ACTIVE_LOW>;
                voltage-ranges = <3300 3300>;
                spi-max-frequency = <5000000>;
                disable-wp;