summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-03-21 15:58:03 -0600
committerTom Warren <twarren@nvidia.com>2014-04-17 08:41:06 -0700
commitd381294aef4a5b6ddeda3685519330a5b73d884f (patch)
treefd371839179dd13fe44f9301ebd2ce491b2a9958 /arch/arm/cpu
parent8f9fd6caafb838bdb0d6a1c0a7e96997aec27b90 (diff)
downloadu-boot-imx-d381294aef4a5b6ddeda3685519330a5b73d884f.zip
u-boot-imx-d381294aef4a5b6ddeda3685519330a5b73d884f.tar.gz
u-boot-imx-d381294aef4a5b6ddeda3685519330a5b73d884f.tar.bz2
ARM: tegra: pack pinmux data tables tighter
Use smaller fields in the Tegra pinmux structures in order to pack the data tables into a smaller space. This saves around 1-3KB for the SPL and around 3-8KB for the main build of U-Boot, depending on the board, which SoC it uses, and how many pinmux table entries there are. In order to pack PMUX_FUNC_* into a smaller space, don't hard-code the values of PMUX_FUNC_RSVD* to values which require 16 bits to store them, but instead let their values be assigned automatically, so they end up fitting into 8 bits. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/tegra-common/pinmux-common.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/cpu/tegra-common/pinmux-common.c b/arch/arm/cpu/tegra-common/pinmux-common.c
index 32a46d5..d62618c 100644
--- a/arch/arm/cpu/tegra-common/pinmux-common.c
+++ b/arch/arm/cpu/tegra-common/pinmux-common.c
@@ -14,8 +14,7 @@
/* return 1 if a pmux_func is in range */
#define pmux_func_isvalid(func) \
- ((((func) >= 0) && ((func) < PMUX_FUNC_COUNT)) || \
- (((func) >= PMUX_FUNC_RSVD1) && ((func) <= PMUX_FUNC_RSVD4)))
+ (((func) >= 0) && ((func) < PMUX_FUNC_COUNT))
/* return 1 if a pin_pupd_is in range */
#define pmux_pin_pupd_isvalid(pupd) \
@@ -97,8 +96,8 @@ void pinmux_set_func(enum pmux_pingrp pin, enum pmux_func func)
assert(pmux_pingrp_isvalid(pin));
assert(pmux_func_isvalid(func));
- if (func & PMUX_FUNC_RSVD1) {
- mux = func & 3;
+ if (func >= PMUX_FUNC_RSVD1) {
+ mux = (func - PMUX_FUNC_RSVD1) & 3;
} else {
/* Search for the appropriate function */
for (i = 0; i < 4; i++) {