diff options
author | Tom Rini <trini@konsulko.com> | 2015-09-24 12:28:10 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-09-24 12:28:10 -0400 |
commit | 1a9c229bf754c89f42b085451ad506693f326427 (patch) | |
tree | 288106d7498591ac889fa972d0c24fc5c9b811f9 /arch/arm/cpu | |
parent | d0f30211e9823694c1c2c79f471dbe9d498a40fd (diff) | |
parent | f697c2acca9ff02c9b0cf480a4a726ed9626a53a (diff) | |
download | u-boot-imx-1a9c229bf754c89f42b085451ad506693f326427.zip u-boot-imx-1a9c229bf754c89f42b085451ad506693f326427.tar.gz u-boot-imx-1a9c229bf754c89f42b085451ad506693f326427.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r-- | arch/arm/cpu/armv7/mx7/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/mx7/soc.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig index 892ffae..ea19e5c 100644 --- a/arch/arm/cpu/armv7/mx7/Kconfig +++ b/arch/arm/cpu/armv7/mx7/Kconfig @@ -13,7 +13,6 @@ choice config TARGET_MX7DSABRESD bool "mx7dsabresd" - select CPU_V7 select DM select DM_THERMAL diff --git a/arch/arm/cpu/armv7/mx7/soc.c b/arch/arm/cpu/armv7/mx7/soc.c index 8d50149..2ed05ea 100644 --- a/arch/arm/cpu/armv7/mx7/soc.c +++ b/arch/arm/cpu/armv7/mx7/soc.c @@ -15,8 +15,6 @@ #include <dm.h> #include <imx_thermal.h> -struct src *src_reg = (struct src *)SRC_BASE_ADDR; - #if defined(CONFIG_IMX_THERMAL) static const struct imx_thermal_plat imx7_thermal_plat = { .regs = (void *)ANATOP_BASE_ADDR, @@ -81,7 +79,7 @@ u32 get_cpu_temp_grade(int *minc, int *maxc) val &= 0x3; if (minc && maxc) { - if ( val == TEMP_AUTOMOTIVE) { + if (val == TEMP_AUTOMOTIVE) { *minc = -40; *maxc = 125; } else if (val == TEMP_INDUSTRIAL) { |