interrupt-controller;
        };
 
-       sdio1: sdio@3f180000 {
+       sdio1: mmc@3f180000 {
                compatible = "brcm,kona-sdhci";
                reg = <0x3f180000 0x10000>;
                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
                status = "disabled";
        };
 
-       sdio2: sdio@3f190000 {
+       sdio2: mmc@3f190000 {
                compatible = "brcm,kona-sdhci";
                reg = <0x3f190000 0x10000>;
                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                status = "disabled";
        };
 
-       sdio3: sdio@3f1a0000 {
+       sdio3: mmc@3f1a0000 {
                compatible = "brcm,kona-sdhci";
                reg = <0x3f1a0000 0x10000>;
                interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
                status = "disabled";
        };
 
-       sdio4: sdio@3f1b0000 {
+       sdio4: mmc@3f1b0000 {
                compatible = "brcm,kona-sdhci";
                reg = <0x3f1b0000 0x10000>;
                interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
 
                status = "okay";
        };
 
-       sdio1: sdio@3f180000 {
+       sdio1: mmc@3f180000 {
                max-frequency = <48000000>;
                status = "okay";
        };
 
-       sdio2: sdio@3f190000 {
+       sdio2: mmc@3f190000 {
                non-removable;
                max-frequency = <48000000>;
                status = "okay";
        };
 
-       sdio4: sdio@3f1b0000 {
+       sdio4: mmc@3f1b0000 {
                max-frequency = <48000000>;
                cd-gpios = <&gpio 91 GPIO_ACTIVE_LOW>;
                status = "okay";
 
                interrupt-controller;
        };
 
-       sdio1: sdio@3f180000 {
+       sdio1: mmc@3f180000 {
                compatible = "brcm,kona-sdhci";
                reg = <0x3f180000 0x801c>;
                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
                status = "disabled";
        };
 
-       sdio2: sdio@3f190000 {
+       sdio2: mmc@3f190000 {
                compatible = "brcm,kona-sdhci";
                reg = <0x3f190000 0x801c>;
                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                status = "disabled";
        };
 
-       sdio3: sdio@3f1a0000 {
+       sdio3: mmc@3f1a0000 {
                compatible = "brcm,kona-sdhci";
                reg = <0x3f1a0000 0x801c>;
                interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
                status = "disabled";
        };
 
-       sdio4: sdio@3f1b0000 {
+       sdio4: mmc@3f1b0000 {
                compatible = "brcm,kona-sdhci";
                reg = <0x3f1b0000 0x801c>;
                interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
 
                        status = "disabled";
                };
 
-               sdio1: sdio@e80000 {
+               sdio1: mmc@e80000 {
                        compatible = "brcm,kona-sdhci";
                        reg = <0x00e80000 0x801c>;
                        interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
 
-               sdio2: sdio@e90000 {
+               sdio2: mmc@e90000 {
                        compatible = "brcm,kona-sdhci";
                        reg = <0x00e90000 0x801c>;
                        interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
 
-               sdio3: sdio@ea0000 {
+               sdio3: mmc@ea0000 {
                        compatible = "brcm,kona-sdhci";
                        reg = <0x00ea0000 0x801c>;
                        interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };
 
-               sdio4: sdio@eb0000 {
+               sdio4: mmc@eb0000 {
                        compatible = "brcm,kona-sdhci";
                        reg = <0x00eb0000 0x801c>;
                        interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
 
                };
        };
 
-       sdio2: sdio@3f190000 {
+       sdio2: mmc@3f190000 {
                non-removable;
                max-frequency = <48000000>;
                vmmc-supply = <&camldo1_reg>;
                status = "okay";
        };
 
-       sdio4: sdio@3f1b0000 {
+       sdio4: mmc@3f1b0000 {
                max-frequency = <48000000>;
                cd-gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
                vmmc-supply = <&sdldo_reg>;