leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: tegra: pinctrl: remove func_safe

Browse Source 
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>
This commit is contained in:
Stephen Warren 2014-03-21 12:28:49 -06:00 committed by Tom Warren
parent 1b82491ee6
commit 0d2c0d5788
8 changed files with 0 additions and 24 deletions
arch/arm
cpu
tegra114-common
pinmux.c
tegra124-common
pinmux.c
tegra20-common
pinmux.c
tegra30-common
pinmux.c
include/asm
arch-tegra114
pinmux.h
arch-tegra124
pinmux.h
arch-tegra20
pinmux.h
arch-tegra30
pinmux.h

6
arch/arm/cpu/tegra114-common/pinmux.c
View File

@ -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 {

6
arch/arm/cpu/tegra124-common/pinmux.c
View File

@ -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 {

2
arch/arm/cpu/tegra20-common/pinmux.c
View File

@ -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 \
}

6
arch/arm/cpu/tegra30-common/pinmux.c
View File

@ -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 {

1
arch/arm/include/asm/arch-tegra114/pinmux.h
View File

@ -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,

1
arch/arm/include/asm/arch-tegra124/pinmux.h
View File

@ -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,

1
arch/arm/include/asm/arch-tegra20/pinmux.h
View File

@ -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,

1
arch/arm/include/asm/arch-tegra30/pinmux.h
View File

@ -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,