summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-29 21:08:48 +0000
committerArnd Bergmann <arnd@arndb.de>2012-02-29 21:08:48 +0000
commit590d829a7cf882cf1a9d6fb7bdb247dc6b0993cb (patch)
tree21a1d0e576aabad465a3c1eb706f9c46a291f5d9 /arch/arm/plat-omap
parente0e5ce59dc7b2685516219fdf44f01a8d53e0228 (diff)
parentffd76d8be36da09f8456c55569c008f5aa93095e (diff)
downloadop-kernel-dev-590d829a7cf882cf1a9d6fb7bdb247dc6b0993cb.zip
op-kernel-dev-590d829a7cf882cf1a9d6fb7bdb247dc6b0993cb.tar.gz
Merge branch 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
* 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: arm/dts: Add support for TI OMAP3 EVM board arm/dts: OMAP4: Update DTS file with new GIC bindings arm/dts: OMAP3: Add i2c controller nodes arm/dts: OMAP4: Add i2c controller nodes ARM: OMAP2+: Set Kconfig dependencies for PROC_DEVICETREE arm/dts: OMAP3&4: Remove the '0x' prefix for serial nodes ARM: OMAP1: kconfig: Enable IRQ_DOMAIN by default for OMAP1 platforms ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT ARM: OMAP2+: omap_device: Replace dev_warn by dev_dbg in omap_device_build_from_dt ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE ARM: OMAP2+: kconfig: Enable devicetree by default for OMAP2+ systems arm/dts: OMAP: Remove bootargs node from board files
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/Kconfig3
-rw-r--r--arch/arm/plat-omap/omap_device.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index aa59f42..f419a082 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -14,6 +14,7 @@ config ARCH_OMAP1
select CLKDEV_LOOKUP
select CLKSRC_MMIO
select GENERIC_IRQ_CHIP
+ select IRQ_DOMAIN
select HAVE_IDE
select NEED_MACH_MEMORY_H
help
@@ -24,6 +25,8 @@ config ARCH_OMAP2PLUS
select CLKDEV_LOOKUP
select GENERIC_IRQ_CHIP
select OMAP_DM_TIMER
+ select USE_OF
+ select PROC_DEVICETREE if PROC_FS
help
"Systems based on OMAP2, OMAP3 or OMAP4"
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index e8d9869..69fde03 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -348,7 +348,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
oh_cnt = of_property_count_strings(node, "ti,hwmods");
if (!oh_cnt || IS_ERR_VALUE(oh_cnt)) {
- dev_warn(&pdev->dev, "No 'hwmods' to build omap_device\n");
+ dev_dbg(&pdev->dev, "No 'hwmods' to build omap_device\n");
return -ENODEV;
}
OpenPOWER on IntegriCloud