From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Francois Moine Subject: [PATCH v3] ARM: kirkwood: extend the kirkwood i2s driver for DT usage Date: Tue, 23 Jul 2013 10:46:15 +0200 Message-ID: <20130723104615.3696f1a9@armhf> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Rob Herring , Russell King , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, devicetree-discuss@vger.kernel.org List-Id: alsa-devel@alsa-project.org The kirkwood i2s driver is used without DT in the Kirkwood machine. This patch adds a DT compatible definition for use in other Marvell machines as the Armada 88AP510 (Dove). Signed-off-by: Jean-Francois Moine --- v3 - change compatible from kirkwood to mvebu (Andrew Lunn) v2 - this patch replaces the previous [PATCH 2/2] ARM: kirkwood: extend the kirkwood i2s driver for DT usage - 2 possible clocks (Sebastian Hesselbarth) - shorter io mapping (Andrew Lunn) - less #ifdef's --- Documentation/devicetree/bindings/sound/kirkwood-i2s.txt | 24 ++++++++= +++ sound/soc/kirkwood/kirkwood-i2s.c | 58 ++++++++= ++++++++++++------ 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/kirkwood-i2s.txt b= /Documentation/devicetree/bindings/sound/kirkwood-i2s.txt new file mode 100644 index 0000000..8f1e534 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/kirkwood-i2s.txt @@ -0,0 +1,24 @@ +* mvebu (Kirkwood, Dove, Armada 370) I2S controller + +Required properties: + +- compatible: "marvell,mvebu-i2s" + +- reg: physical base address of the controller and length of memory ma= pped + region. + +- interrupts: list of two irq numbers. + The first irq is used for data flow and the second one is used for e= rrors. + +- clocks: one or two phandles. + The first one is mandatory and defines the internal clock. + The second one is optional and defines an external clock. + +Example: + +i2s1: audio-controller@b4000 { + compatible =3D "marvell,mvebu-i2s"; + reg =3D <0xb4000 0x2210>; + interrupts =3D <21>, <22>; + clocks =3D <&gate_clk 13>; +}; diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kir= kwood-i2s.c index 4c9dad3..019e340 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -12,7 +12,6 @@ =20 #include #include -#include #include #include #include @@ -22,6 +21,8 @@ #include #include #include +#include + #include "kirkwood.h" =20 #define DRV_NAME "kirkwood-i2s" @@ -461,6 +462,7 @@ static int kirkwood_i2s_dev_probe(struct platform_d= evice *pdev) struct snd_soc_dai_driver *soc_dai =3D &kirkwood_i2s_dai; struct kirkwood_dma_data *priv; struct resource *mem; + struct device_node *np; int err; =20 priv =3D devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); @@ -481,24 +483,45 @@ static int kirkwood_i2s_dev_probe(struct platform= _device *pdev) return -ENXIO; } =20 - if (!data) { - dev_err(&pdev->dev, "no platform data ?!\n"); - return -EINVAL; + /* get the DT or static parameters */ + np =3D pdev->dev.of_node; + if (np) { + struct of_phandle_args clkspec; + + priv->burst =3D 128; /* might be 32 or 128 */ + priv->clk =3D of_clk_get(np, 0); /* internal clock */ + err =3D of_parse_phandle_with_args(np, + "clocks", "#clock-cells", 1, + &clkspec); + if (err) { + priv->extclk =3D ERR_PTR(-EINVAL); /* no external clock */ + } else { + priv->extclk =3D of_clk_get(np, 1); + if (IS_ERR(priv->extclk)) { + err =3D -EPROBE_DEFER; + goto fail; + } + } + } else { + if (!data) { + dev_err(&pdev->dev, "no platform data ?!\n"); + return -EINVAL; + } + priv->burst =3D data->burst; + priv->clk =3D clk_get(&pdev->dev, NULL); + priv->extclk =3D clk_get(&pdev->dev, "extclk"); } =20 - priv->burst =3D data->burst; - - priv->clk =3D devm_clk_get(&pdev->dev, NULL); if (IS_ERR(priv->clk)) { dev_err(&pdev->dev, "no clock\n"); - return PTR_ERR(priv->clk); + err =3D PTR_ERR(priv->clk); + goto fail; } =20 err =3D clk_prepare_enable(priv->clk); if (err < 0) - return err; + goto fail; =20 - priv->extclk =3D clk_get(&pdev->dev, "extclk"); if (!IS_ERR(priv->extclk)) { if (priv->extclk =3D=3D priv->clk) { clk_put(priv->extclk); @@ -515,7 +538,7 @@ static int kirkwood_i2s_dev_probe(struct platform_d= evice *pdev) priv->ctl_rec =3D KIRKWOOD_RECCTL_SIZE_24; =20 /* Select the burst size */ - if (data->burst =3D=3D 32) { + if (priv->burst =3D=3D 32) { priv->ctl_play |=3D KIRKWOOD_PLAYCTL_BURST_32; priv->ctl_rec |=3D KIRKWOOD_RECCTL_BURST_32; } else { @@ -528,12 +551,13 @@ static int kirkwood_i2s_dev_probe(struct platform= _device *pdev) if (!err) return 0; dev_err(&pdev->dev, "snd_soc_register_component failed\n"); - +fail: if (!IS_ERR(priv->extclk)) { clk_disable_unprepare(priv->extclk); clk_put(priv->extclk); } clk_disable_unprepare(priv->clk); + clk_put(priv->clk); =20 return err; } @@ -549,16 +573,26 @@ static int kirkwood_i2s_dev_remove(struct platfor= m_device *pdev) clk_put(priv->extclk); } clk_disable_unprepare(priv->clk); + clk_put(priv->clk); =20 return 0; } =20 +#ifdef CONFIG_OF +static struct of_device_id kirkwood_i2s_of_match[] =3D { + { .compatible =3D "marvell,mvebu-i2s" }, + { } +}; +MODULE_DEVICE_TABLE(of, kirkwood_i2s_of_match); +#endif + static struct platform_driver kirkwood_i2s_driver =3D { .probe =3D kirkwood_i2s_dev_probe, .remove =3D kirkwood_i2s_dev_remove, .driver =3D { .name =3D DRV_NAME, .owner =3D THIS_MODULE, + .of_match_table =3D of_match_ptr(kirkwood_i2s_of_match), }, }; =20 --=20 Ken ar c'henta=C3=B1 | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/