Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1447629
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Maxime Ripard <maxime.ripard@free-electrons.com> |
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 5/5] mfd: sunxi-gpadc-mfd: probe sunxi-gpadc-ts driver |
| Date | Thu, 21 Jul 2016 08:10:01 +0200 |
| Message-ID | <rXflf-3Ad-3@gated-at.bofh.it> (permalink) |
| References | <rWVcR-7sY-3@gated-at.bofh.it> <rWVcS-7sY-37@gated-at.bofh.it> |
| X-Original-To | Quentin Schulz <quentin.schulz@free-electrons.com> |
| MIME-Version | 1.0 |
| Content-Type | multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="VS++wcV0S1rZb1Fb" |
| Content-Disposition | inline |
| User-Agent | Mutt/1.5.24 (2015-08-30) |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 205 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, wens@csie.org, dmitry.torokhov@gmail.com, lee.jones@linaro.org, antoine.tenart@free-electrons.com, thomas.petazzoni@free-electrons.com, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org |
| X-Original-Date | Thu, 21 Jul 2016 08:08:12 +0200 |
| X-Original-Message-ID | <20160721060812.GA5993@lukather> |
| X-Original-References | <1469003351-15263-1-git-send-email-quentin.schulz@free-electrons.com> <1469003351-15263-6-git-send-email-quentin.schulz@free-electrons.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1447629 |
Show key headers only | View raw
[Multipart message — attachments visible in raw view] - view raw
Hi Quentin,
On Wed, Jul 20, 2016 at 10:29:11AM +0200, Quentin Schulz wrote:
> This probes the touchscreen driver for Allwinner SoCs (A10, A13 and A31)
> when the property "allwinner,ts-attached" is set in the GPADC (rtp) node of
> the DT.
>
> Some comestic modifications done to shorten and increase readability of the
> code.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
> ---
> drivers/mfd/sunxi-gpadc-mfd.c | 115 ++++++++++++++++++++++++++++--------------
> 1 file changed, 77 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/mfd/sunxi-gpadc-mfd.c b/drivers/mfd/sunxi-gpadc-mfd.c
> index 05a000b..9b9ed0b 100644
> --- a/drivers/mfd/sunxi-gpadc-mfd.c
> +++ b/drivers/mfd/sunxi-gpadc-mfd.c
> @@ -21,6 +21,11 @@
> #define SUNXI_IRQ_TEMP_DATA 1
> #define SUNXI_IRQ_TP_UP 2
>
> +#define SUNXI_GPADC_MFD_CELL(_name, _resources, _num_resources) { \
> + .name = _name, \
> + .resources = _resources, \
> + .num_resources = _num_resources \
> +}
>
> static struct resource adc_resources[] = {
> {
> @@ -64,33 +69,45 @@ static const struct regmap_irq_chip sunxi_gpadc_mfd_regmap_irq_chip = {
> };
>
> static struct mfd_cell sun4i_gpadc_mfd_cells[] = {
> - {
> - .name = "sun4i-a10-gpadc-iio",
> - .resources = adc_resources,
> - .num_resources = ARRAY_SIZE(adc_resources),
> - }, {
> - .name = "iio_hwmon",
> - }
> + SUNXI_GPADC_MFD_CELL("sun4i-a10-gpadc-iio", adc_resources,
> + ARRAY_SIZE(adc_resources)),
> + SUNXI_GPADC_MFD_CELL("iio_hwmon", NULL, 0),
> };
>
> static struct mfd_cell sun5i_gpadc_mfd_cells[] = {
> - {
> - .name = "sun5i-a13-gpadc-iio",
> - .resources = adc_resources,
> - .num_resources = ARRAY_SIZE(adc_resources),
> - }, {
> - .name = "iio_hwmon",
> - },
> + SUNXI_GPADC_MFD_CELL("sun5i-a13-gpadc-iio", adc_resources,
> + ARRAY_SIZE(adc_resources)),
> + SUNXI_GPADC_MFD_CELL("iio_hwmon", NULL, 0),
> };
>
> static struct mfd_cell sun6i_gpadc_mfd_cells[] = {
> - {
> - .name = "sun6i-a31-gpadc-iio",
> - .resources = adc_resources,
> - .num_resources = ARRAY_SIZE(adc_resources),
> - }, {
> - .name = "iio_hwmon",
> - },
> + SUNXI_GPADC_MFD_CELL("sun6i-a31-gpadc-iio", adc_resources,
> + ARRAY_SIZE(adc_resources)),
> + SUNXI_GPADC_MFD_CELL("iio_hwmon", NULL, 0),
> +};
This should be part of a separate patch.
> +
> +static struct mfd_cell sun4i_gpadc_mfd_cells_ts[] = {
> + SUNXI_GPADC_MFD_CELL("sun6i-a31-gpadc-iio", adc_resources,
> + ARRAY_SIZE(adc_resources)),
> + SUNXI_GPADC_MFD_CELL("iio_hwmon", NULL, 0),
> + SUNXI_GPADC_MFD_CELL("sunxi-gpadc-ts", ts_resources,
> + ARRAY_SIZE(ts_resources)),
> +};
> +
> +static struct mfd_cell sun5i_gpadc_mfd_cells_ts[] = {
> + SUNXI_GPADC_MFD_CELL("sun5i-a13-gpadc-iio", adc_resources,
> + ARRAY_SIZE(adc_resources)),
> + SUNXI_GPADC_MFD_CELL("iio_hwmon", NULL, 0),
> + SUNXI_GPADC_MFD_CELL("sunxi-gpadc-ts", ts_resources,
> + ARRAY_SIZE(ts_resources)),
> +};
> +
> +static struct mfd_cell sun6i_gpadc_mfd_cells_ts[] = {
> + SUNXI_GPADC_MFD_CELL("sun6i-a31-gpadc-iio", adc_resources,
> + ARRAY_SIZE(adc_resources)),
> + SUNXI_GPADC_MFD_CELL("iio_hwmon", NULL, 0),
> + SUNXI_GPADC_MFD_CELL("sunxi-gpadc-ts", ts_resources,
> + ARRAY_SIZE(ts_resources)),
> };
>
> static const struct regmap_config sunxi_gpadc_mfd_regmap_config = {
> @@ -142,23 +159,45 @@ static int sunxi_gpadc_mfd_probe(struct platform_device *pdev)
> }
>
> if (of_device_is_compatible(pdev->dev.of_node,
> - "allwinner,sun4i-a10-ts"))
> - ret = mfd_add_devices(sunxi_gpadc_mfd_dev->dev, 0,
> - sun4i_gpadc_mfd_cells,
> - ARRAY_SIZE(sun4i_gpadc_mfd_cells), NULL,
> - 0, NULL);
> - else if (of_device_is_compatible(pdev->dev.of_node,
> - "allwinner,sun5i-a13-ts"))
> - ret = mfd_add_devices(sunxi_gpadc_mfd_dev->dev, 0,
> - sun5i_gpadc_mfd_cells,
> - ARRAY_SIZE(sun5i_gpadc_mfd_cells), NULL,
> - 0, NULL);
> - else if (of_device_is_compatible(pdev->dev.of_node,
> - "allwinner,sun6i-a31-ts"))
> - ret = mfd_add_devices(sunxi_gpadc_mfd_dev->dev, 0,
> - sun6i_gpadc_mfd_cells,
> - ARRAY_SIZE(sun6i_gpadc_mfd_cells), NULL,
> - 0, NULL);
> + "allwinner,sun4i-a10-ts")) {
> + if (of_property_read_bool(pdev->dev.of_node,
> + "allwinner,ts-attached"))
> + ret = mfd_add_devices(sunxi_gpadc_mfd_dev->dev, 0,
> + sun4i_gpadc_mfd_cells_ts,
> + ARRAY_SIZE(sun4i_gpadc_mfd_cells_ts),
> + NULL, 0, NULL);
> + else
> + ret = mfd_add_devices(sunxi_gpadc_mfd_dev->dev, 0,
> + sun4i_gpadc_mfd_cells,
> + ARRAY_SIZE(sun4i_gpadc_mfd_cells),
> + NULL, 0, NULL);
> + } else if (of_device_is_compatible(pdev->dev.of_node,
> + "allwinner,sun5i-a13-ts")) {
> + if (of_property_read_bool(pdev->dev.of_node,
> + "allwinner,ts-attached"))
> + ret = mfd_add_devices(sunxi_gpadc_mfd_dev->dev, 0,
> + sun5i_gpadc_mfd_cells_ts,
> + ARRAY_SIZE(sun5i_gpadc_mfd_cells_ts),
> + NULL, 0, NULL);
> + else
> + ret = mfd_add_devices(sunxi_gpadc_mfd_dev->dev, 0,
> + sun5i_gpadc_mfd_cells,
> + ARRAY_SIZE(sun5i_gpadc_mfd_cells),
> + NULL, 0, NULL);
> + } else if (of_device_is_compatible(pdev->dev.of_node,
> + "allwinner,sun6i-a31-ts")) {
> + if (of_property_read_bool(pdev->dev.of_node,
> + "allwinner,ts-attached"))
> + ret = mfd_add_devices(sunxi_gpadc_mfd_dev->dev, 0,
> + sun6i_gpadc_mfd_cells_ts,
> + ARRAY_SIZE(sun6i_gpadc_mfd_cells_ts),
> + NULL, 0, NULL);
> + else
> + ret = mfd_add_devices(sunxi_gpadc_mfd_dev->dev, 0,
> + sun6i_gpadc_mfd_cells,
> + ARRAY_SIZE(sun6i_gpadc_mfd_cells),
> + NULL, 0, NULL);
> + }
Please don't use any of_device_is_compatible.
Thanks,
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/5] add resistive touchscreen support for new Allwinner SoCs' GPADC's driver Quentin Schulz <quentin.schulz@free-electrons.com> - 2016-07-20 10:40 +0200
[PATCH 5/5] mfd: sunxi-gpadc-mfd: probe sunxi-gpadc-ts driver Quentin Schulz <quentin.schulz@free-electrons.com> - 2016-07-20 10:40 +0200
Re: [PATCH 5/5] mfd: sunxi-gpadc-mfd: probe sunxi-gpadc-ts driver Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-07-21 08:10 +0200
Re: [PATCH 5/5] mfd: sunxi-gpadc-mfd: probe sunxi-gpadc-ts driver Jonathan Cameron <jic23@kernel.org> - 2016-07-24 13:30 +0200
Re: [PATCH 5/5] mfd: sunxi-gpadc-mfd: probe sunxi-gpadc-ts driver Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-07-25 12:00 +0200
Re: [PATCH 5/5] mfd: sunxi-gpadc-mfd: probe sunxi-gpadc-ts driver Jonathan Cameron <jic23@jic23.retrosnub.co.uk> - 2016-07-25 12:10 +0200
Re: [PATCH 5/5] mfd: sunxi-gpadc-mfd: probe sunxi-gpadc-ts driver Lee Jones <lee.jones@linaro.org> - 2016-07-25 12:30 +0200
[PATCH 3/5] iio: adc: sunxi-gpadc-iio: enable iio_buffers Quentin Schulz <quentin.schulz@free-electrons.com> - 2016-07-20 10:40 +0200
Re: [PATCH 3/5] iio: adc: sunxi-gpadc-iio: enable iio_buffers Jonathan Cameron <jic23@kernel.org> - 2016-07-24 13:10 +0200
csiph-web