summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-01-02 10:23:48 -0800
committerOlof Johansson <olof@lixom.net>2014-01-02 10:23:48 -0800
commit63df151aa1037e4f4e71ec009a3b233ee2cc1dea (patch)
treea886c62b097a88b3ff3fc2a394177a861b373c1a /arch/arm/mach-msm
parentdd7d395883adce2e623e4ef0af7598e6987685d9 (diff)
parent17d0900c95622c0bb672bbd7115ae228cfc3cd21 (diff)
downloadop-kernel-dev-63df151aa1037e4f4e71ec009a3b233ee2cc1dea.zip
op-kernel-dev-63df151aa1037e4f4e71ec009a3b233ee2cc1dea.tar.gz
Merge branch 'qcom/soc' into next/soc
* qcom/soc: ARM: msm: Simplify ARCH_MSM_DT config ARM: msm: Add support for MSM8974 SoC ARM: msm: trout: fix uninit var warning Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/Kconfig15
-rw-r--r--arch/arm/mach-msm/board-trout.c12
2 files changed, 19 insertions, 8 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 2586c28..702553b 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -44,6 +44,7 @@ endchoice
config ARCH_MSM8X60
bool "MSM8X60"
+ select ARCH_MSM_DT
select ARM_GIC
select CPU_V7
select GPIO_MSM_V2
@@ -52,15 +53,25 @@ config ARCH_MSM8X60
config ARCH_MSM8960
bool "MSM8960"
+ select ARCH_MSM_DT
select ARM_GIC
select CPU_V7
select HAVE_SMP
select GPIO_MSM_V2
select MSM_SCM if SMP
+config ARCH_MSM8974
+ bool "MSM8974"
+ select ARCH_MSM_DT
+ select ARM_GIC
+ select CPU_V7
+ select HAVE_ARM_ARCH_TIMER
+ select HAVE_SMP
+ select MSM_SCM if SMP
+ select USE_OF
+
config ARCH_MSM_DT
- def_bool y
- depends on (ARCH_MSM8X60 || ARCH_MSM8960)
+ bool
select SPARSE_IRQ
select USE_OF
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index ccf6621..015d544 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*
*/
+#define pr_fmt(fmt) "%s: " fmt, __func__
#include <linux/kernel.h>
#include <linux/init.h>
@@ -68,12 +69,11 @@ static void __init trout_init(void)
platform_add_devices(devices, ARRAY_SIZE(devices));
-#ifdef CONFIG_MMC
- rc = trout_init_mmc(system_rev);
- if (rc)
- printk(KERN_CRIT "%s: MMC init failure (%d)\n", __func__, rc);
-#endif
-
+ if (IS_ENABLED(CONFIG_MMC)) {
+ rc = trout_init_mmc(system_rev);
+ if (rc)
+ pr_crit("MMC init failure (%d)\n", rc);
+ }
}
static struct map_desc trout_io_desc[] __initdata = {
OpenPOWER on IntegriCloud