Merge branch 'pinctrl-tegra-for-next-diet' into for-next

2 files changed, 67 insertions, 0 deletions

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 373652d76b90..32b420a90c3d 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -7,6 +7,8 @@ config ARCH_TEGRA_2x_SOC
         select CPU_V7
         select ARM_GIC
         select ARCH_REQUIRE_GPIOLIB
+        select PINCTRL
+        select PINCTRL_TEGRA20
         select USB_ARCH_HAS_EHCI if USB_SUPPORT
         select USB_ULPI if USB_SUPPORT
         select USB_ULPI_VIEWPORT if USB_SUPPORT
@@ -19,6 +21,8 @@ config ARCH_TEGRA_3x_SOC
         select CPU_V7
         select ARM_GIC
         select ARCH_REQUIRE_GPIOLIB
+        select PINCTRL
+        select PINCTRL_TEGRA30
         select USB_ARCH_HAS_EHCI if USB_SUPPORT
         select USB_ULPI if USB_SUPPORT
         select USB_ULPI_VIEWPORT if USB_SUPPORT
diff --git a/arch/arm/mach-tegra/include/mach/pinconf-tegra.h b/arch/arm/mach-tegra/include/mach/pinconf-tegra.h
new file mode 100644
index 000000000000..1f24d304921e
--- /dev/null
+++ b/arch/arm/mach-tegra/include/mach/pinconf-tegra.h
@@ -0,0 +1,63 @@
+/*
+ * pinctrl configuration definitions for the NVIDIA Tegra pinmux
+ *
+ * Copyright (c) 2011, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#ifndef __PINCONF_TEGRA_H__
+#define __PINCONF_TEGRA_H__
+
+enum tegra_pinconf_param {
+        /* argument: tegra_pinconf_pull */
+        TEGRA_PINCONF_PARAM_PULL,
+        /* argument: tegra_pinconf_tristate */
+        TEGRA_PINCONF_PARAM_TRISTATE,
+        /* argument: Boolean */
+        TEGRA_PINCONF_PARAM_ENABLE_INPUT,
+        /* argument: Boolean */
+        TEGRA_PINCONF_PARAM_OPEN_DRAIN,
+        /* argument: Boolean */
+        TEGRA_PINCONF_PARAM_LOCK,
+        /* argument: Boolean */
+        TEGRA_PINCONF_PARAM_IORESET,
+        /* argument: Boolean */
+        TEGRA_PINCONF_PARAM_HIGH_SPEED_MODE,
+        /* argument: Boolean */
+        TEGRA_PINCONF_PARAM_SCHMITT,
+        /* argument: Boolean */
+        TEGRA_PINCONF_PARAM_LOW_POWER_MODE,
+        /* argument: Integer, range is HW-dependant */
+        TEGRA_PINCONF_PARAM_DRIVE_DOWN_STRENGTH,
+        /* argument: Integer, range is HW-dependant */
+        TEGRA_PINCONF_PARAM_DRIVE_UP_STRENGTH,
+        /* argument: Integer, range is HW-dependant */
+        TEGRA_PINCONF_PARAM_SLEW_RATE_FALLING,
+        /* argument: Integer, range is HW-dependant */
+        TEGRA_PINCONF_PARAM_SLEW_RATE_RISING,
+};
+
+enum tegra_pinconf_pull {
+        TEGRA_PINCONFIG_PULL_NONE,
+        TEGRA_PINCONFIG_PULL_DOWN,
+        TEGRA_PINCONFIG_PULL_UP,
+};
+
+enum tegra_pinconf_tristate {
+        TEGRA_PINCONFIG_DRIVEN,
+        TEGRA_PINCONFIG_TRISTATE,
+};
+
+#define TEGRA_PINCONF_PACK(_param_, _arg_) ((_param_) << 16 | (_arg_))
+#define TEGRA_PINCONF_UNPACK_PARAM(_conf_) ((_conf_) >> 16)
+#define TEGRA_PINCONF_UNPACK_ARG(_conf_) ((_conf_) & 0xffff)
+
+#endif