Merge git://git.denx.de/u-boot-sh

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

diff --git a/arch/arm/dts/uniphier-pinctrl.dtsi b/arch/arm/dts/uniphier-pinctrl.dtsi
index b1691d0679e7dd259b56853509e4c1ad2c44fedd..f5c1552612596ea43a30275e73776629c55084ae 100644 (file)
--- a/arch/arm/dts/uniphier-pinctrl.dtsi
+++ b/arch/arm/dts/uniphier-pinctrl.dtsi
@@ -1,9 +1,10 @@
 /*
  * Device Tree Source for UniPhier SoCs default pinctrl settings
  *
- * Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2015-2017 Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+        X11
+ * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
 
 &pinctrl {
@@ -12,6 +13,11 @@
                function = "emmc";
        };
 
+       pinctrl_emmc_1v8: emmc_grp_1v8 {
+               groups = "emmc", "emmc_dat8";
+               function = "emmc";
+       };
+
        pinctrl_i2c0: i2c0_grp {
                groups = "i2c0";
                function = "i2c0";
@@ -32,16 +38,46 @@
                function = "i2c3";
        };
 
+       pinctrl_i2c4: i2c4_grp {
+               groups = "i2c4";
+               function = "i2c4";
+       };
+
+       pinctrl_nand: nand_grp {
+               groups = "nand";
+               function = "nand";
+       };
+
+       pinctrl_nand2cs: nand2cs_grp {
+               groups = "nand", "nand_cs1";
+               function = "nand";
+       };
+
        pinctrl_sd: sd_grp {
                groups = "sd";
                function = "sd";
        };
 
+       pinctrl_sd_1v8: sd_grp_1v8 {
+               groups = "sd";
+               function = "sd";
+       };
+
        pinctrl_sd1: sd1_grp {
                groups = "sd1";
                function = "sd1";
        };
 
+       pinctrl_sd1_1v8: sd1_grp_1v8 {
+               groups = "sd1";
+               function = "sd1";
+       };
+
+       pinctrl_system_bus: system_bus_grp {
+               groups = "system_bus", "system_bus_cs1";
+               function = "system_bus";
+       };
+
        pinctrl_uart0: uart0_grp {
                groups = "uart0";
                function = "uart0";