[PATCH 17/21] ASoC: Ux500: Enable ux500 PCM driver for Device Tree
Lee Jones
lee.jones at linaro.org
Thu Jul 26 06:28:50 EDT 2012
Here we pass platform registration from platform code over to Device
Tree, when DT is enabled.
Signed-off-by: Lee Jones <lee.jones at linaro.org>
---
arch/arm/mach-ux500/board-mop500-msp.c | 3 ---
sound/soc/ux500/ux500_pcm.c | 6 ++++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
index ce7fff9..890feb3 100644
--- a/arch/arm/mach-ux500/board-mop500-msp.c
+++ b/arch/arm/mach-ux500/board-mop500-msp.c
@@ -257,9 +257,6 @@ void mop500_of_msp_init(struct device *parent)
"could not get MSP1 idlestate\n");
}
}
-
- pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__);
- platform_device_register(&ux500_pcm);
}
void mop500_msp_init(struct device *parent)
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c
index 1a04e24..557da2d 100644
--- a/sound/soc/ux500/ux500_pcm.c
+++ b/sound/soc/ux500/ux500_pcm.c
@@ -304,10 +304,16 @@ static int __devinit ux500_pcm_drv_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id ux500_pcm_match[] = {
+ { .compatible = "stericsson,ux500-pcm", },
+ {},
+};
+
static struct platform_driver ux500_pcm_driver = {
.driver = {
.name = "ux500-pcm",
.owner = THIS_MODULE,
+ .of_match_table = ux500_pcm_match,
},
.probe = ux500_pcm_drv_probe,
--
1.7.9.5
More information about the linux-arm-kernel
mailing list