ARM: tegra: pinctrl: remove func_safe

This field isn't used anywhere, so remove it. Note that PIN() macros are
left unchanged for now, to avoid many diffs to them; later commits will
completely rewrite them just one time.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/arch/arm/cpu/tegra114-common/pinmux.c b/arch/arm/cpu/tegra114-common/pinmux.c
index 4983a05090a2dad037318a42ecec4c6014f54da6..7bf494c49a4d476a270bb5c71cc00b8cb5e30cc2 100644 (file)
--- a/arch/arm/cpu/tegra114-common/pinmux.c
+++ b/arch/arm/cpu/tegra114-common/pinmux.c
@@ -24,7 +24,6 @@
 struct tegra_pingroup_desc {
        const char *name;
        enum pmux_func funcs[4];
 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;
 };
        enum pmux_vddio vddio;
        enum pmux_pin_io io;
 };


@@ -62,7 +61,6 @@ struct tegra_pingroup_desc {
                        PMUX_FUNC_ ## f2,               \
                        PMUX_FUNC_ ## f3,               \
                },                                      \
                        PMUX_FUNC_ ## f2,               \
                        PMUX_FUNC_ ## f3,               \
                },                                      \

-               .func_safe = PMUX_FUNC_RSVD1,           \

                .io = PMUX_PIN_ ## iod,                 \
        }
 
                .io = PMUX_PIN_ ## iod,                 \
        }
 


@@ -396,10 +394,6 @@ void pinmux_set_func(enum pmux_pingrp pin, enum pmux_func func)
        assert(pmux_pingrp_isvalid(pin));
        assert(pmux_func_isvalid(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 {
        if (func & PMUX_FUNC_RSVD1) {
                mux = func & 0x3;
        } else {

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];
 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;
 };
        enum pmux_vddio vddio;
        enum pmux_pin_io io;
 };


@@ -53,7 +52,6 @@ struct tegra_pingroup_desc {
                        PMUX_FUNC_ ## f2,               \
                        PMUX_FUNC_ ## f3,               \
                },                                      \
                        PMUX_FUNC_ ## f2,               \
                        PMUX_FUNC_ ## f3,               \
                },                                      \

-               .func_safe = PMUX_FUNC_RSVD1,           \

                .io = PMUX_PIN_ ## iod,                 \
        }
 
                .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));
 
        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 {
        if (func & PMUX_FUNC_RSVD1) {
                mux = func & 0x3;
        } else {

diff --git a/arch/arm/cpu/tegra20-common/pinmux.c b/arch/arm/cpu/tegra20-common/pinmux.c
index a65e9915194e2d17fe1bf9684bb2161cd74529b7..1f04d9c7ff7d1ade2f645920a479230da9afd34d 100644 (file)
--- a/arch/arm/cpu/tegra20-common/pinmux.c
+++ b/arch/arm/cpu/tegra20-common/pinmux.c
@@ -259,7 +259,6 @@ enum pmux_pullid {
 struct tegra_pingroup_desc {
        const char *name;
        enum pmux_func funcs[4];
 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;
        enum pmux_vddio vddio;
        enum pmux_ctlid ctl_id;
        enum pmux_pullid pull_id;


@@ -294,7 +293,6 @@ struct tegra_pingroup_desc {
                        PMUX_FUNC_ ## f2,                       \
                        PMUX_FUNC_ ## f3,                       \
                },                                      \
                        PMUX_FUNC_ ## f2,                       \
                        PMUX_FUNC_ ## f3,                       \
                },                                      \

-               .func_safe = PMUX_FUNC_ ## f_safe,              \

                .ctl_id = mux,                          \
                .pull_id = pupd                         \
        }
                .ctl_id = mux,                          \
                .pull_id = pupd                         \
        }

diff --git a/arch/arm/cpu/tegra30-common/pinmux.c b/arch/arm/cpu/tegra30-common/pinmux.c
index eecf0580bc9011d74843c0f6cd5f83187c8cdc22..6fd424981c23795ef01892b19bfac907327f0ee4 100644 (file)
--- a/arch/arm/cpu/tegra30-common/pinmux.c
+++ b/arch/arm/cpu/tegra30-common/pinmux.c
@@ -24,7 +24,6 @@
 struct tegra_pingroup_desc {
        const char *name;
        enum pmux_func funcs[4];
 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;
 };
        enum pmux_vddio vddio;
        enum pmux_pin_io io;
 };


@@ -61,7 +60,6 @@ struct tegra_pingroup_desc {
                        PMUX_FUNC_ ## f2,               \
                        PMUX_FUNC_ ## f3,               \
                },                                      \
                        PMUX_FUNC_ ## f2,               \
                        PMUX_FUNC_ ## f3,               \
                },                                      \

-               .func_safe = PMUX_FUNC_RSVD1,           \

                .io = PMUX_PIN_ ## iod,                 \
        }
 
                .io = PMUX_PIN_ ## iod,                 \
        }
 


@@ -381,10 +379,6 @@ void pinmux_set_func(enum pmux_pingrp pin, enum pmux_func func)
        assert(pmux_pingrp_isvalid(pin));
        assert(pmux_func_isvalid(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 {
        if (func & PMUX_FUNC_RSVD1) {
                mux = func & 0x3;
        } else {

diff --git a/arch/arm/include/asm/arch-tegra114/pinmux.h b/arch/arm/include/asm/arch-tegra114/pinmux.h
index 9c22c08b6e3013fd82e882eefacb8f288c222530..edf1a89ce1112027ed30602e80f412c783fd91e1 100644 (file)
--- a/arch/arm/include/asm/arch-tegra114/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra114/pinmux.h
@@ -367,7 +367,6 @@ enum pmux_func {
        PMUX_FUNC_RESET_OUT_N,
        /* End of Tegra114 MUX selectors */
 
        PMUX_FUNC_RESET_OUT_N,
        /* End of Tegra114 MUX selectors */
 

-       PMUX_FUNC_SAFE,

        PMUX_FUNC_MAX,
 
        PMUX_FUNC_INVALID = 0x4000,
        PMUX_FUNC_MAX,
 
        PMUX_FUNC_INVALID = 0x4000,

diff --git a/arch/arm/include/asm/arch-tegra124/pinmux.h b/arch/arm/include/asm/arch-tegra124/pinmux.h
index 9662e2b8aa5373b670c94d3aaf4e1696463b8287..f51f44a54a24315d1159c2647b84a5d4ba86aacc 100644 (file)
--- a/arch/arm/include/asm/arch-tegra124/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra124/pinmux.h
@@ -374,7 +374,6 @@ enum pmux_func {
        PMUX_FUNC_RESET_OUT_N,
        /* End of Tegra114 MUX selectors */
 
        PMUX_FUNC_RESET_OUT_N,
        /* End of Tegra114 MUX selectors */
 

-       PMUX_FUNC_SAFE,

        PMUX_FUNC_MAX,
 
        PMUX_FUNC_INVALID = 0x4000,
        PMUX_FUNC_MAX,
 
        PMUX_FUNC_INVALID = 0x4000,

diff --git a/arch/arm/include/asm/arch-tegra20/pinmux.h b/arch/arm/include/asm/arch-tegra20/pinmux.h
index 05925df861dacc9c5e0a84c68b5d2d352c768735..3374d9c40f129dcffa76a5411a02570042d34c94 100644 (file)
--- a/arch/arm/include/asm/arch-tegra20/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra20/pinmux.h
@@ -227,7 +227,6 @@ enum pmux_func {
        PMUX_FUNC_VI,
        PMUX_FUNC_VI_SENSOR_CLK,
        PMUX_FUNC_XIO,
        PMUX_FUNC_VI,
        PMUX_FUNC_VI_SENSOR_CLK,
        PMUX_FUNC_XIO,

-       PMUX_FUNC_SAFE,

 
        /* These don't have a name, but can be used in the table */
        PMUX_FUNC_RSVD1,
 
        /* These don't have a name, but can be used in the table */
        PMUX_FUNC_RSVD1,

diff --git a/arch/arm/include/asm/arch-tegra30/pinmux.h b/arch/arm/include/asm/arch-tegra30/pinmux.h
index a9e1b462c4a1b134eb2e375e197b47a408ea18f7..ff2511e8774f3bb0817e5935b2e7198b88a09b5d 100644 (file)
--- a/arch/arm/include/asm/arch-tegra30/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra30/pinmux.h
@@ -438,7 +438,6 @@ enum pmux_func {
        PMUX_FUNC_CPU_PWR_REQ,
        PMUX_FUNC_PWR_INT_N,
        PMUX_FUNC_CLK_32K_IN,
        PMUX_FUNC_CPU_PWR_REQ,
        PMUX_FUNC_PWR_INT_N,
        PMUX_FUNC_CLK_32K_IN,

-       PMUX_FUNC_SAFE,

 
        PMUX_FUNC_MAX,
 
 
        PMUX_FUNC_MAX,