diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-09-14 09:57:12 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-09-14 09:57:12 +0800 |
| commit | 51cc6c2198dec98742a58890c33e34f669a4dc61 (patch) | |
| tree | 40c5ebd3b70f8c6eeb9eddf84bd55f580859e5d6 | |
| parent | f8a1d33da4d817f8beffebe357e5b089d97fe825 (diff) | |
| parent | 3dbe412085dee8e0c378af17fec523221392f565 (diff) | |
Merge commit '3dbe412085dee8e0c378af17fec523221392f565' into imx_3.0.35_android
| -rw-r--r-- | arch/arm/configs/imx6_defconfig | 4 | ||||
| -rwxr-xr-x | arch/arm/plat-mxc/cpufreq.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 2 | ||||
| -rw-r--r-- | drivers/mxc/thermal/thermal.c | 12 |
4 files changed, 12 insertions, 8 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index 495cdf7ea588..f9a4eacce42b 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -306,6 +306,7 @@ CONFIG_FORCE_MAX_ZONEORDER=14 CONFIG_SOC_IMX6Q=y CONFIG_MACH_MX6Q_ARM2=y # CONFIG_MACH_MX6SL_ARM2 is not set +# CONFIG_MACH_MX6SL_EVK is not set CONFIG_MACH_MX6Q_SABRELITE=y CONFIG_MACH_MX6Q_SABRESD=y CONFIG_MACH_MX6Q_SABREAUTO=y @@ -2275,6 +2276,7 @@ CONFIG_MXC_IPU_V3H=y # CONFIG_MXC_VPU=y # CONFIG_MXC_VPU_DEBUG is not set +# CONFIG_MX6_VPU_352M is not set # # MXC Asynchronous Sample Rate Converter support @@ -2669,7 +2671,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=255 CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=2048 CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y -# CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API is not set +CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y # CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set # CONFIG_BINARY_PRINTF is not set diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c index 7a06aaec02e7..e7278d9501a5 100755 --- a/arch/arm/plat-mxc/cpufreq.c +++ b/arch/arm/plat-mxc/cpufreq.c @@ -219,7 +219,7 @@ static int mxc_set_target(struct cpufreq_policy *policy, * So update it for all CPUs. */ - for_each_cpu(i, policy->cpus) + for_each_possible_cpu(i) per_cpu(cpu_data, i).loops_per_jiffy = cpufreq_scale(per_cpu(cpu_data, i).loops_per_jiffy, freqs.old, freqs.new); diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 4c2a62b75b5c..df9fca34915d 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -141,7 +141,7 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) break; if (!for_busy && !(temp & I2SR_IBB)) break; - if (signal_pending(current)) { + if (fatal_signal_pending(current)) { dev_dbg(&i2c_imx->adapter.dev, "<%s> I2C Interrupted\n", __func__); return -EINTR; diff --git a/drivers/mxc/thermal/thermal.c b/drivers/mxc/thermal/thermal.c index f0e961f6109d..0982a7b781bd 100644 --- a/drivers/mxc/thermal/thermal.c +++ b/drivers/mxc/thermal/thermal.c @@ -912,6 +912,13 @@ static int anatop_thermal_probe(struct platform_device *pdev) dev_err(&pdev->dev, "failed to remap anatop calibration data address!\n"); goto anatop_failed; } + + pll3_clk = clk_get(NULL, "pll3_main_clk"); + if (IS_ERR(pll3_clk)) { + retval = -ENOENT; + goto anatop_failed; + } + raw_n40c = DEFAULT_N40C; /* use calibration data to get ratio */ anatop_thermal_counting_ratio(__raw_readl(calibration_addr)); @@ -925,11 +932,6 @@ static int anatop_thermal_probe(struct platform_device *pdev) NULL); thermal_irq = res_irq->start; - pll3_clk = clk_get(NULL, "pll3_main_clk"); - if (IS_ERR(pll3_clk)) { - retval = -ENOENT; - goto anatop_failed; - } anatop_thermal_add(device); anatop_thermal_cpufreq_init(); |