ARM: tegra: pinctrl: make pmux_func values consistent on Tegra20
authorStephen Warren <swarren@nvidia.com>
Fri, 21 Mar 2014 18:28:51 +0000 (12:28 -0600)
committerTom Warren <twarren@nvidia.com>
Thu, 17 Apr 2014 15:41:05 +0000 (08:41 -0700)
commit6ac1e542c6ff8413698e59d83ae11ab51f59e8c2
tree33f77b2e3ec47bbf5a6897392d483c246aa99767
parentdd45948dd748581dba5b666fe17601f32205cda2
ARM: tegra: pinctrl: make pmux_func values consistent on Tegra20

For consistency with other SoCs, modify Tegra20's enum pmux_func to:

* Remove PMUX_FUNC values that aren't real
* Use the same PMUX_FUNC_RSVD[1-4] values, and ensure (RSVD1 & 3)==0;
  this will be assumed by pinmux_set_func() in a future patch.

Unfortunately, PMUX_FUNC_RSVD is still used in the pin macros. Use a
private define inside the driver to prevent this from causing compilaton
errors. This will be cleaned up when the pin tables are re-written in a
later patch in this series.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>
arch/arm/cpu/tegra20-common/pinmux.c
arch/arm/include/asm/arch-tegra20/pinmux.h