ARM: tegra: pinctrl: remove vddio

[karo-tx-uboot.git] / arch / arm / cpu / tegra20-common / pinmux.c

diff --git a/arch/arm/cpu/tegra20-common/pinmux.c b/arch/arm/cpu/tegra20-common/pinmux.c
index a65e9915194e2d17fe1bf9684bb2161cd74529b7..40301e13c29df3019da84e858aff5f645bb87046 100644 (file)
--- a/arch/arm/cpu/tegra20-common/pinmux.c
+++ b/arch/arm/cpu/tegra20-common/pinmux.c
@@ -259,8 +259,6 @@ enum pmux_pullid {
 struct tegra_pingroup_desc {
        const char *name;
        enum pmux_func funcs[4];
-       enum pmux_func func_safe;
-       enum pmux_vddio vddio;
        enum pmux_ctlid ctl_id;
        enum pmux_pullid pull_id;
 };
@@ -287,14 +285,12 @@ struct tegra_pingroup_desc {
 /* Convenient macro for defining pin group properties */
 #define PINALL(pg_name, vdd, f0, f1, f2, f3, f_safe, mux, pupd)                \
        {                                               \
-               .vddio = PMUX_VDDIO_ ## vdd,            \
                .funcs = {                              \
                        PMUX_FUNC_ ## f0,                       \
                        PMUX_FUNC_ ## f1,                       \
                        PMUX_FUNC_ ## f2,                       \
                        PMUX_FUNC_ ## f3,                       \
                },                                      \
-               .func_safe = PMUX_FUNC_ ## f_safe,              \
                .ctl_id = mux,                          \
                .pull_id = pupd                         \
        }