CC'ing the DT ML, please don't forget in future.
> From: Rongjun Ying <rongjun.ying@xxxxxxx>
>
> The audio modules inside the consist of an internal audio codec, internal
> audio port and i2s controller.
>
> These modules sharing same register range and size.
> sirf-audio.c provides common regmap mmio handling for all audio modules.
> The sound drivers operation are via regmap.
>
> Signed-off-by: Rongjun Ying <rongjun.ying@xxxxxxx>
> ---
> .../devicetree/bindings/mfd/sirf-audio.txt | 67 +++++++++++
DT documentation should be provided in a separate patch.
> drivers/mfd/Kconfig | 11 ++
> drivers/mfd/Makefile | 1 +
> drivers/mfd/sirf-audio.c | 119 ++++++++++++++++++++
> include/linux/mfd/sirf/audio.h | 17 +++
> 5 files changed, 215 insertions(+), 0 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/mfd/sirf-audio.txt
> create mode 100644 drivers/mfd/sirf-audio.c
> create mode 100644 include/linux/mfd/sirf/audio.h
>
> diff --git a/Documentation/devicetree/bindings/mfd/sirf-audio.txt b/Documentation/devicetree/bindings/mfd/sirf-audio.txt
> new file mode 100644
> index 0000000..cc6a39b
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/sirf-audio.txt
> @@ -0,0 +1,67 @@
> +SiRF SoC audio modules
> +
> +The audio modules inside the consist of an internal audio codec, internal
... inside the <what?>
> +audio port and i2s controller.
> +
> +Required properties:
> +- compatible: "sirf,prima2-audio" or "sirf,atlas6-audio"
> +- reg : the register address of the device.
Nit: s/the/The
> +- #address-cells: Must be 1
> +- #size-cells: Must be 1
> +
> +Nodes:
> +Internal audio codec:
> + - compatible : "sirf,atlas6-audio-codec" or "sirf,prima2-audio-codec"
> + - clocks: the clock of SiRF internal audio codec
Nit: s/the/The
Might be worth mentioning that clocks expects a phandle.
> +Internal audio port:
> +- compatible: "sirf,audio-port"
> +- dmas: List of DMA controller phandle and DMA request line ordered pairs.
s/phandle/phandles
> +- dma-names: Identifier string for each DMA request line in the dmas property.
> + These strings correspond 1:1 with the ordered pairs in dmas.
> +
> + One of the DMA channels will be responsible for transmission (should be
> + named "tx") and one for reception (should be named "rx").
> +
> +I2S controller:
> +- compatible: "sirf,prima2-i2s"
> +- dmas: List of DMA controller phandle and DMA request line ordered pairs.
s/phandle/phandles
> +- dma-names: Identifier string for each DMA request line in the dmas property.
> + These strings correspond 1:1 with the ordered pairs in dmas.
> +
> + One of the DMA channels will be responsible for transmission (should be
> + named "tx") and one for reception (should be named "rx").
No need to keep mentioning these same lines over and over - just point
to:
Documentation/devicetree/bindings/dma/dma.txt
> +- clocks: I2S controller clock source
> +- pinctrl-names: Must contain a "default" entry.
> +- pinctrl-NNN: One property must exist for each entry in pinctrl-names.
Again, rather than making up your own interpretation of the standard
pinctrl properties, just point to:
Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
Full stops and colons are not consistent throughout.
> +Example:
> +
> +sirfaudio: sirfaudio@b0040000 {
> + compatible = "sirf,atlas6-audio";
> + reg = <0xb0040000 0x10000>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + audiocodec: audiocodec@b0040000 {
> + compatible = "sirf,atlas6-audio-codec";
> + interrupts = <35>;
No flags?
> + clocks = <&clks 27>;
> + };
> +
> + audioport: audioport@b0040000 {
No need for the @b0040000 on child properties.
> + compatible = "sirf,audio-port";
> + dmas = <&dmac1 3>, <&dmac1 8>;
> + dma-names = "rx", "tx";
> + };
> +
> + i2s: i2s@b0040000 {
> + compatible = "sirf,prima2-i2s";
> + dmas = <&dmac1 6>, <&dmac1 12>;
> + dma-names = "rx", "tx";
> + clocks = <&clks 27>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2s_pins_a>;
> + };
> +};
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index b7c74a7..1c13019 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -546,6 +546,17 @@ config MFD_SI476X_CORE
> To compile this driver as a module, choose M here: the
> module will be called si476x-core.
>
> +config MFD_SIRF_AUDIO
> + tristate "SiRF Audio modules"
> + depends on ARCH_SIRF
depends on OF
> + select MFD_CORE
> + select REGMAP_MMIO
> + help
> + This is the driver for the SiRF audio modules, include I2S,
s/include/which consists of (or similar)
> + internal audio codec, internal audio port and AC97. These modules
> + share same register map region and size. So this MFD driver used
s/same/the same
s/register map region and size/address space
s/used/is used
> + to manage regmap.
s/regmap/the regmap OR via regmap
> +
> config MFD_SM501
> tristate "Silicon Motion SM501"
> ---help---
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 8a28dc9..9182170 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -164,3 +164,4 @@ obj-$(CONFIG_MFD_RETU) += retu-mfd.o
> obj-$(CONFIG_MFD_AS3711) += as3711.o
> obj-$(CONFIG_MFD_AS3722) += as3722.o
> obj-$(CONFIG_MFD_STW481X) += stw481x.o
> +obj-$(CONFIG_MFD_SIRF_AUDIO) += sirf-audio.o
> diff --git a/drivers/mfd/sirf-audio.c b/drivers/mfd/sirf-audio.c
> new file mode 100644
> index 0000000..078f0a2
> --- /dev/null
> +++ b/drivers/mfd/sirf-audio.c
> @@ -0,0 +1,119 @@
> +/*
> + * airf-audio.c
> + *
> + * Copyright (c) 2014 Cambridge Silicon Radio Limited, a CSR plc group company.
> + *
> + * Licensed under GPLv2 or later.
> + */
Please use a more standard header. There are plenty of good examples
in other drivers.
> +#include <linux/module.h>
> +#include <linux/moduleparam.h>
> +#include <linux/init.h>
> +#include <linux/err.h>
> +#include <linux/of.h>
> +#include <linux/mfd/core.h>
> +#include <linux/mfd/sirf/audio.h>
> +#include <linux/regmap.h>
> +
> +static const struct mfd_cell sirf_audio_atlas6_devs[] = {
> + {
> + .of_compatible = "sirf,prima2-i2s",
> + .name = "sirf-i2s",
> + }, {
> + .of_compatible = "sirf,atlas6-audio-codec",
> + .name = "sirf-audio-codec",
> + }, {
> + .of_compatible = "sirf,audio-port",
> + .name = "sirf-audio-port",
> + }
> +};
> +
> +static const struct mfd_cell sirf_audio_prima2_devs[] = {
> + {
> + .of_compatible = "sirf,prima2-i2s",
> + .name = "sirf-i2s",
> + }, {
> + .of_compatible = "sirf,prima2-audio-codec",
> + .name = "sirf-audio-codec",
> + }, {
> + .of_compatible = "sirf,audio-port",
> + .name = "sirf-audio-port",
> + }
> +};
> +
> +static const struct regmap_config sirf_audio_regmap_config = {
> + .reg_bits = 32,
> + .reg_stride = 4,
> + .val_bits = 32,
> + .cache_type = REGCACHE_NONE,
> +};
> +
> +static int sirf_audio_probe(struct platform_device *pdev)
> +{
> + struct resource *mem_res;
> + struct sirf_audio_dev *sirf_audio;
> + void __iomem *base;
> + struct mfd_cell *cell;
> + int cell_number;
> +
> + sirf_audio = devm_kzalloc(&pdev->dev, sizeof(struct sirf_audio_dev),
sizeof(*sirf_audio)
> + GFP_KERNEL);
> + if (sirf_audio == NULL)
if (!sirf_audio)
> + return -ENOMEM;
> +
> + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + base = devm_ioremap_resource(&pdev->dev, mem_res);
> + if (base == NULL)
if (!base)
> + return -ENOMEM;
> +
> + sirf_audio->regmap = devm_regmap_init_mmio(&pdev->dev, base,
> + &sirf_audio_regmap_config);
> + if (IS_ERR(sirf_audio->regmap))
> + return PTR_ERR(sirf_audio->regmap);
Use a local regmap variable here and assign it to sirf_audio->regmap
if successful.
> + platform_set_drvdata(pdev, sirf_audio);
> +
> + if (of_device_is_compatible(pdev->dev.of_node,
> + "sirf,prima2-audio")) {
> + cell = sirf_audio_prima2_devs;
> + cell_number = ARRAY_SIZE(sirf_audio_prima2_devs);
s/cell_number/n_devs
> + } else if (of_device_is_compatible(pdev->dev.of_node,
> + "sirf,atlas6-audio")) {
> + cell = sirf_audio_atlas6_devs;
> + cell_number = ARRAY_SIZE(sirf_audio_atlas6_devs);
s/cell_number/n_devs
> + } else
> + return -EINVAL;
I'm not sure there's any need for this. Why don't you just parse the
child nodes? Are you even sure you need an MFD at all? It appears
you're just using an MFD to share a regmap. Seems like over-kill to me.
> + return mfd_add_devices(&pdev->dev, -1, cell, cell_number,
> + NULL, 0, NULL);
> +}
> +
> +static int sirf_audio_remove(struct platform_device *pdev)
> +{
> + mfd_remove_devices(&pdev->dev);
> + return 0;
> +}
> +
> +static const struct of_device_id sirf_audio_of_match[] = {
> + { .compatible = "sirf,prima2-audio", },
> + { .compatible = "sirf,atlas6-audio", },
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, sirf_audio_of_match);
> +
> +static struct platform_driver sirf_audio_driver = {
> + .driver = {
> + .name = "sirf-audio",
> + .owner = THIS_MODULE,
> + .of_match_table = sirf_audio_of_match,
> + },
> + .probe = sirf_audio_probe,
> + .remove = sirf_audio_remove,
> +};
> +
> +module_platform_driver(sirf_audio_driver);
> +
> +MODULE_DESCRIPTION("SiRF Audio mfd driver");
s/mfd/MFD
> +MODULE_AUTHOR("RongJun Ying <Rongjun.Ying@xxxxxxx>");
> +MODULE_LICENSE("GPL v2");
> +
> diff --git a/include/linux/mfd/sirf/audio.h b/include/linux/mfd/sirf/audio.h
> new file mode 100644
> index 0000000..d8cfff9
> --- /dev/null
> +++ b/include/linux/mfd/sirf/audio.h
> @@ -0,0 +1,17 @@
> +/*
> + * audio.h
> + *
> + * Copyright (c) 2014 Cambridge Silicon Radio Limited, a CSR plc group company.
> + *
> + * Licensed under GPLv2 or later.
> + */
Use a standard header please.
> +
> +
Superfluous new lines.
> +#ifndef __LINUX_MFD_SIRF_AUDIO_H
> +#define __LINUX_MFD_SIRF_AUDIO_H
The LINUX_ is superfluous also.
> +struct sirf_audio_dev {
> + struct regmap *regmap;
> +};
Is this going to be utilised in the subordinate drivers?
> +#endif /* __LINUX_MFD_SIRF_AUDIO_H */
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
