ARM: tegra: use MASK_BITS_* macros everywhere

Not all code that set or interpreted "mux_bits" was using the named
macros, but rather some was simply using hard-coded integer constants.
This makes it hard to determine which pieces of code are affected by
changes to those constants.

Replace the integer constants with the equivalent macro definitions so
that everything is nicely tied together.

Note that I'm not convinced all the code was using the correct integer
constants, and hence I'm not convinced that all the code is now using
the desired macros. However, this change is a purely mechanical
replacement and should have no functional change. Fixing any bugs will
come later, separately.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/arch/arm/cpu/tegra-common/clock.c b/arch/arm/cpu/tegra-common/clock.c
index d9f2c767d5d15ea794bdad080a9eca1f7a978470..96b705f2f6a4b750df404fcc790867481622122d 100644 (file)
--- a/arch/arm/cpu/tegra-common/clock.c
+++ b/arch/arm/cpu/tegra-common/clock.c
@@ -304,7 +304,7 @@ static int adjust_periph_pll(enum periph_id periph_id, int source,
        /* work out the source clock and set it */
        if (source < 0)
                return -1;
-       if (mux_bits == 4) {
+       if (mux_bits == MASK_BITS_31_28) {
                clrsetbits_le32(reg, OUT_CLK_SOURCE_31_28_MASK,
                                source << OUT_CLK_SOURCE_31_28_SHIFT);
        } else {

diff --git a/arch/arm/cpu/tegra20-common/clock.c b/arch/arm/cpu/tegra20-common/clock.c
index 34124f9bbac3a3c1e855ea86288e8c5ecfc6dfd2..0c4f5fb288a05d47d5ba97cfaae13d17b9f96668 100644 (file)
--- a/arch/arm/cpu/tegra20-common/clock.c
+++ b/arch/arm/cpu/tegra20-common/clock.c
@@ -412,9 +412,9 @@ int get_periph_clock_source(enum periph_id periph_id,
         * with its 16-bit divisor
         */
        if (type == CLOCK_TYPE_PCXTS)
-               *mux_bits = 4;
+               *mux_bits = MASK_BITS_31_28;
        else
-               *mux_bits = 2;
+               *mux_bits = MASK_BITS_31_30;
        if (type == CLOCK_TYPE_PCMT16)
                *divider_bits = 16;
        else