ARM: tegra: pinctrl: remove func_safe

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

diff --git a/arch/arm/cpu/tegra124-common/pinmux.c b/arch/arm/cpu/tegra124-common/pinmux.c
index a4ab4eae408f95723db53583bb7ed00b60e0dcfd..b1ac59e5b3c93ca3ce1f73faee0a799cff7f6eca 100644 (file)
--- a/arch/arm/cpu/tegra124-common/pinmux.c
+++ b/arch/arm/cpu/tegra124-common/pinmux.c
@@ -15,7 +15,6 @@
 struct tegra_pingroup_desc {
        const char *name;
        enum pmux_func funcs[4];
-       enum pmux_func func_safe;
        enum pmux_vddio vddio;
        enum pmux_pin_io io;
 };
@@ -53,7 +52,6 @@ struct tegra_pingroup_desc {
                        PMUX_FUNC_ ## f2,               \
                        PMUX_FUNC_ ## f3,               \
                },                                      \
-               .func_safe = PMUX_FUNC_RSVD1,           \
                .io = PMUX_PIN_ ## iod,                 \
        }
 
@@ -387,10 +385,6 @@ void pinmux_set_func(enum pmux_pingrp pin, enum pmux_func func)
        assert(pmux_pingrp_isvalid(pin));
        assert(pmux_func_isvalid(func));
 
-       /* Handle special values */
-       if (func == PMUX_FUNC_SAFE)
-               func = tegra_soc_pingroups[pin].func_safe;
-
        if (func & PMUX_FUNC_RSVD1) {
                mux = func & 0x3;
        } else {