[U-Boot] [PATCH 01/11] ARM: tegra: pinctrl: remove func_safe

Stephen Warren
2014-03-13T17:41:57Z

From: Stephen Warren <swarren@nvidia.com>

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>
---
arch/arm/cpu/tegra114-common/pinmux.c | 6 ------
arch/arm/cpu/tegra124-common/pinmux.c | 6 ------
arch/arm/cpu/tegra20-common/pinmux.c | 2 --
arch/arm/cpu/tegra30-common/pinmux.c | 6 ------
arch/arm/include/asm/arch-tegra114/pinmux.h | 1 -
arch/arm/include/asm/arch-tegra124/pinmux.h | 1 -
arch/arm/include/asm/arch-tegra20/pinmux.h | 1 -
arch/arm/include/asm/arch-tegra30/pinmux.h | 1 -
8 files changed, 24 deletions(-)

diff --git a/arch/arm/cpu/tegra114-common/pinmux.c b/arch/arm/cpu/tegra114-common/pinmux.c
index 4983a05090a2..7bf494c49a4d 100644
--- 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];
- enum pmux_func func_safe;
enum pmux_vddio vddio;
enum pmux_pin_io io;
};
@@ -62,7 +61,6 @@ struct tegra_pingroup_desc {
PMUX_FUNC_ ## f2, \
PMUX_FUNC_ ## f3, \
}, \
- .func_safe = PMUX_FUNC_RSVD1, \
.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));

- /* Handle special values */
- if (func == PMUX_FUNC_SAFE)
- func = tegra_soc_pingroups[pin].func_safe;
-
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 a4ab4eae408f..b1ac59e5b3c9 100644
--- 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 {
diff --git a/arch/arm/cpu/tegra20-common/pinmux.c b/arch/arm/cpu/tegra20-common/pinmux.c
index a65e9915194e..1f04d9c7ff7d 100644
--- 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];
- enum pmux_func func_safe;
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, \
}, \
- .func_safe = PMUX_FUNC_ ## f_safe, \
.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 eecf0580bc90..6fd424981c23 100644
--- 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];
- enum pmux_func func_safe;
enum pmux_vddio vddio;
enum pmux_pin_io io;
};
@@ -61,7 +60,6 @@ struct tegra_pingroup_desc {
PMUX_FUNC_ ## f2, \
PMUX_FUNC_ ## f3, \
}, \
- .func_safe = PMUX_FUNC_RSVD1, \
.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));

- /* Handle special values */
- if (func == PMUX_FUNC_SAFE)
- func = tegra_soc_pingroups[pin].func_safe;
-
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 9c22c08b6e30..edf1a89ce111 100644
--- 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_SAFE,
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 9662e2b8aa53..f51f44a54a24 100644
--- 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_SAFE,
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 05925df861da..3374d9c40f12 100644
--- 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_SAFE,

/* 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 a9e1b462c4a1..ff2511e8774f 100644
--- 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_SAFE,

PMUX_FUNC_MAX,

--
1.8.1.5