[PATCH 1/2] OMAP4: devices: Do not create dmic device if the dtb has been provided

[PATCH 1/2] OMAP4: devices: Do not create dmic device if the dtb has been provided

[nb6g3dENgvI]

From: Peter Ujfalusi <peter.ujfalusi@ti.com>

If dtb is provided the needed device will be created dynamically.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/mach-omap2/devices.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 98cab3a..df2f45a 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -702,12 +702,13 @@ static int __init omap2_init_devices(void)
 	 */
 	omap_init_audio();
 	omap_init_mcpdm();
-	omap_init_dmic();
 	omap_init_camera();
 	omap_init_mbox();
 	/* If dtb is there, the devices will be created dynamically */
-	if (!of_have_populated_dt())
+	if (!of_have_populated_dt()) {
+		omap_init_dmic();
 		omap_init_mcspi();
+	}
 	omap_init_pmu();
 	omap_hdq_init();
 	omap_init_sti();
-- 
1.7.8.6

[PATCH 2/2] OMAP4: devices: Do not create mcpdm device if the dtb has been provided

[nb6g3dENgvI]

From: Peter Ujfalusi <peter.ujfalusi@ti.com>

If dtb is provided the needed device will be created dynamically.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/mach-omap2/devices.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index df2f45a..b61c365 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -701,12 +701,12 @@ static int __init omap2_init_devices(void)
 	 * in alphabetical order so they're easier to sort through.
 	 */
 	omap_init_audio();
-	omap_init_mcpdm();
 	omap_init_camera();
 	omap_init_mbox();
 	/* If dtb is there, the devices will be created dynamically */
 	if (!of_have_populated_dt()) {
 		omap_init_dmic();
+		omap_init_mcpdm();
 		omap_init_mcspi();
 	}
 	omap_init_pmu();
-- 
1.7.8.6

Re: [PATCH 2/2] OMAP4: devices: Do not create mcpdm device if the dtb has been provided

[Tony Lindgren]

* nb6g3dENgvI <peter.ujfalusi@ti.com> [120502 05:26]:
> From: Peter Ujfalusi <peter.ujfalusi@ti.com>
> 
> If dtb is provided the needed device will be created dynamically.

Thanks applying both into dt branch.

Regards,

Tony

[PATCH 2/2] OMAP4: devices: Do not create mcpdm device if the dtb has been provided

[Tony Lindgren]

* nb6g3dENgvI <peter.ujfalusi@ti.com> [120502 05:26]:
> From: Peter Ujfalusi <peter.ujfalusi@ti.com>
> 
> If dtb is provided the needed device will be created dynamically.

Thanks applying both into dt branch.

Regards,

Tony