summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-02-24 22:09:37 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-28 12:35:08 +0000
commit7c59bc55e476947c1ea8a019e97aa648de53f5a0 (patch)
treedcd9478da1454ee590320c49044129f1a0b54a60 /sound/soc
parentfb1a6453bc413841876eac2ed1d7fd9e74b118fc (diff)
downloadblackbird-op-linux-7c59bc55e476947c1ea8a019e97aa648de53f5a0.tar.gz
blackbird-op-linux-7c59bc55e476947c1ea8a019e97aa648de53f5a0.zip
ASoC: fsl: align mpc8610_hpcd with p1022_ds on getting codec node
Align mpc8610_hpcd with p1022_ds on getting codec node by just calling of_parse_phandle. The bonus point of doing that is we can save exporting get_node_by_phandle_name() when we consolidate the common bits between mpc8610_hpcd and p1022_ds into a module, which can be shared by more machine drivers added later. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/fsl/mpc8610_hpcd.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 15e06e9d362c..93256b39ccb6 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -336,12 +336,8 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
const char *sprop;
const u32 *iprop;
- /* We are only interested in SSIs with a codec phandle in them,
- * so let's make sure this SSI has one. The MPC8610 HPCD only
- * knows about the CS4270 codec, so reject anything else.
- */
- codec_np = get_node_by_phandle_name(np, "codec-handle",
- "cirrus,cs4270");
+ /* Find the codec node for this SSI. */
+ codec_np = of_parse_phandle(np, "codec-handle", 0);
if (!codec_np) {
dev_err(dev, "invalid codec node\n");
return -EINVAL;
OpenPOWER on IntegriCloud