[U-Boot] [PATCH 1/6] ARM: tegra: deduplicate MASK_BITS_xxx clock mux enum

[Tom Warren]

Stephen,


On Wed, Jan 22, 2014 at 1:20 PM, Stephen Warren <swarren at wwwdotorg.org>wrote:

> From: Tom Warren <twarren.nvidia at gmail.com>
>
> The enum used to define the set of register bits used to represent a
> clock's input mux, MUX_BITS_*, is defined separately for each SoC at
> present. Move this definition to a common location to ease fixing up
> some issues with the definition, and the code that uses it.
>
> Signed-off-by: Tom Warren <twarren at nvidia.com>
> [swarren, extracted from a larger patch by Tom]
> Signed-off-by: Stephen Warren <swarren at nvidia.com>
> ---
>  arch/arm/cpu/tegra114-common/clock.c    | 6 ------
>  arch/arm/cpu/tegra30-common/clock.c     | 6 ------
>  arch/arm/include/asm/arch-tegra/clock.h | 6 ++++++
>  3 files changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/cpu/tegra114-common/clock.c
> b/arch/arm/cpu/tegra114-common/clock.c
> index 5c4305a418cc..47612e12d262 100644
> --- a/arch/arm/cpu/tegra114-common/clock.c
> +++ b/arch/arm/cpu/tegra114-common/clock.c
> @@ -61,12 +61,6 @@ enum {
>         CLOCK_MAX_MUX   = 8     /* number of source options for each clock
> */
>  };
>
> -enum {
> -       MASK_BITS_31_30 = 2,    /* num of bits used to specify clock
> source */
> -       MASK_BITS_31_29,
> -       MASK_BITS_29_28,
> -};
> -
>  /*
>   * Clock source mux for each clock type. This just converts our enum into
>   * a list of mux sources for use by the code.
> diff --git a/arch/arm/cpu/tegra30-common/clock.c
> b/arch/arm/cpu/tegra30-common/clock.c
> index 74bd22be1aeb..89c3529c885b 100644
> --- a/arch/arm/cpu/tegra30-common/clock.c
> +++ b/arch/arm/cpu/tegra30-common/clock.c
> @@ -60,12 +60,6 @@ enum {
>         CLOCK_MAX_MUX   = 8     /* number of source options for each clock
> */
>  };
>
> -enum {
> -       MASK_BITS_31_30 = 2,    /* num of bits used to specify clock
> source */
> -       MASK_BITS_31_29,
> -       MASK_BITS_29_28,
> -};
> -
>  /*
>   * Clock source mux for each clock type. This just converts our enum into
>   * a list of mux sources for use by the code.
> diff --git a/arch/arm/include/asm/arch-tegra/clock.h
> b/arch/arm/include/asm/arch-tegra/clock.h
> index e7d0fd45ee1d..052c0208b18a 100644
> --- a/arch/arm/include/asm/arch-tegra/clock.h
> +++ b/arch/arm/include/asm/arch-tegra/clock.h
> @@ -20,6 +20,12 @@ enum clock_osc_freq {
>         CLOCK_OSC_FREQ_COUNT,
>  };
>
> +enum {
> +       MASK_BITS_31_30 = 2,    /* num of bits used to specify clock
> source */
> +       MASK_BITS_31_29,
> +       MASK_BITS_29_28,
> +};
> +
>  #include <asm/arch/clock-tables.h>
>  /* PLL stabilization delay in usec */
>  #define CLOCK_PLL_STABLE_DELAY_US 300
> --
> 1.8.1.5
>
> Thanks for doing these patches - nice job. LGTM.

Applies cleanly to u-boot-tegra/next after applying Alban's 2 patches, your
other 3 patches, and then this series of 6. Building all now, I'll test
later.

Tom