Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / uniphier-pinctrl.dtsi

diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi
index 9dd9d49ad7f2d4fd038008cfedb51a5b740b9c3d..1fee5ffbfb9c9e463a500d88c5965e5267e5c83e 100644 (file)
--- a/arch/arm/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/dts/uniphier-pinctrl.dtsi
@@ -56,11 +56,6 @@
                function = "emmc";
        };
 
-       pinctrl_emmc_1v8: emmc-1v8 {
-               groups = "emmc", "emmc_dat8";
-               function = "emmc";
-       };
-
        pinctrl_ether_mii: ether-mii {
                groups = "ether_mii";
                function = "ether_mii";
@@ -126,7 +121,7 @@
                function = "sd";
        };
 
-       pinctrl_sd_1v8: sd-1v8 {
+       pinctrl_sd_uhs: sd-uhs {
                groups = "sd";
                function = "sd";
        };
@@ -136,9 +131,24 @@
                function = "sd1";
        };
 
-       pinctrl_sd1_1v8: sd1-1v8 {
-               groups = "sd1";
-               function = "sd1";
+       pinctrl_spi0: spi0 {
+               groups = "spi0";
+               function = "spi0";
+       };
+
+       pinctrl_spi1: spi1 {
+               groups = "spi1";
+               function = "spi1";
+       };
+
+       pinctrl_spi2: spi2 {
+               groups = "spi2";
+               function = "spi2";
+       };
+
+       pinctrl_spi3: spi3 {
+               groups = "spi3";
+               function = "spi3";
        };
 
        pinctrl_system_bus: system-bus {