[U-Boot] [PATCH v2 6/8] mvebu: Add rudimental MV78320 support

Stefan Roese
2015-12-22T08:32:20Z

On 22.12.2015 00:25, Phil Sutter wrote:
> Signed-off-by: Phil Sutter <phil@nwl.cc>

Please always add a small description into the commit text.
This is a common requirement, even for quite "simple"
patches.

Other than this look good, so:

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
> arch/arm/mach-mvebu/cpu.c | 16 +++++++++++-----
> arch/arm/mach-mvebu/include/mach/soc.h | 1 +
> arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 6 +++++-
> 3 files changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
> index fd12c22..941df7e 100644
> --- a/arch/arm/mach-mvebu/cpu.c
> +++ b/arch/arm/mach-mvebu/cpu.c
> @@ -70,13 +70,16 @@ int mvebu_soc_family(void)
> {
> u16 devid = (readl(MVEBU_REG_PCIE_DEVID) >> 16) & 0xffff;
>
> - if ((devid == SOC_MV78260_ID) || (devid == SOC_MV78460_ID))
> + switch (devid) {
> + case SOC_MV78230_ID:
> + case SOC_MV78260_ID:
> + case SOC_MV78460_ID:
> return MVEBU_SOC_AXP;
> -
> - if (devid == SOC_88F6810_ID || devid == SOC_88F6820_ID ||
> - devid == SOC_88F6828_ID)
> + case SOC_88F6810_ID:
> + case SOC_88F6820_ID:
> + case SOC_88F6828_ID:
> return MVEBU_SOC_A38X;
> -
> + }
> return MVEBU_SOC_UNKNOWN;
> }
>
> @@ -89,6 +92,9 @@ int print_cpuinfo(void)
> puts("SoC: ");
>
> switch (devid) {
> + case SOC_MV78230_ID:
> + puts("MV78230-");
> + break;
> case SOC_MV78260_ID:
> puts("MV78260-");
> break;
> diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
> index cfc28c3..94e6b96 100644
> --- a/arch/arm/mach-mvebu/include/mach/soc.h
> +++ b/arch/arm/mach-mvebu/include/mach/soc.h
> @@ -11,6 +11,7 @@
> #ifndef _MVEBU_SOC_H
> #define _MVEBU_SOC_H
>
> +#define SOC_MV78230_ID 0x7823
> #define SOC_MV78260_ID 0x7826
> #define SOC_MV78460_ID 0x7846
> #define SOC_88F6810_ID 0x6810
> diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
> index bfa7f13..0e2a905 100644
> --- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
> +++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c
> @@ -194,7 +194,9 @@ u16 ctrl_model_get(void)
> * SoC version can't be autodetected. So we need to rely on a define
> * from the config system here.
> */
> -#ifdef CONFIG_MV78260
> +#if defined(CONFIG_MV78230)
> + return MV_78230_DEV_ID;
> +#elif defined(CONFIG_MV78260)
> return MV_78260_DEV_ID;
> #else
> return MV_78460_DEV_ID;
> @@ -212,6 +214,8 @@ u32 get_line_cfg(u32 line_num, MV_BIN_SERDES_CFG *info)
> static int serdes_max_lines_get(void)
> {
> switch (ctrl_model_get()) {
> + case MV_78230_DEV_ID:
> + return 7;
> case MV_78260_DEV_ID:
> return 12;
> case MV_78460_DEV_ID:
>

--
Viele Gr??e,
Stefan

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de