From: Lee Jones <lee.jones@linaro.org>
To: Michael Grzeschik <m.grzeschik@pengutronix.de>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
linux-kernel@vger.kernel.org, kernel@pengutronix.de
Subject: Re: [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata
Date: Tue, 20 Aug 2013 09:26:36 +0100 [thread overview]
Message-ID: <20130820082636.GH23699@lee--X1> (raw)
In-Reply-To: <1376396148-29801-1-git-send-email-m.grzeschik@pengutronix.de>
On Tue, 13 Aug 2013, Michael Grzeschik wrote:
> In case of devicetree, we currently don't have a way to append pdata for
> the codec. This patch makes it possible to probe the codec without pdata
> for that case.
>
> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> ---
> drivers/mfd/mc13xxx-core.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
This patch doesn't apply. What tree is it based on?
> diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
> index 278601f..e1b89e6 100644
> --- a/drivers/mfd/mc13xxx-core.c
> +++ b/drivers/mfd/mc13xxx-core.c
> @@ -687,10 +687,6 @@ err_revision:
> if (mc13xxx->flags & MC13XXX_USE_ADC)
> mc13xxx_add_subdevice(mc13xxx, "%s-adc");
>
> - if (mc13xxx->flags & MC13XXX_USE_CODEC)
> - mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
> - pdata->codec, sizeof(*pdata->codec));
> -
> if (mc13xxx->flags & MC13XXX_USE_RTC)
> mc13xxx_add_subdevice(mc13xxx, "%s-rtc");
>
> @@ -705,6 +701,10 @@ err_revision:
> if (mc13xxx->flags & MC13XXX_USE_TOUCHSCREEN)
> mc13xxx_add_subdevice_pdata(mc13xxx, "%s-ts",
> &pdata->touch, sizeof(pdata->touch));
> +
> + if (mc13xxx->flags & MC13XXX_USE_CODEC)
> + mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
> + pdata->codec, sizeof(*pdata->codec));
> } else {
> mc13xxx_add_subdevice(mc13xxx, "%s-regulator");
> mc13xxx_add_subdevice(mc13xxx, "%s-led");
> @@ -712,6 +712,9 @@ err_revision:
>
> if (mc13xxx->flags & MC13XXX_USE_TOUCHSCREEN)
> mc13xxx_add_subdevice(mc13xxx, "%s-ts");
> +
> + if (mc13xxx->flags & MC13XXX_USE_CODEC)
> + mc13xxx_add_subdevice(mc13xxx, "%s-codec");
> }
>
> return 0;
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2013-08-20 8:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 12:15 [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata Michael Grzeschik
2013-08-20 8:26 ` Lee Jones [this message]
2013-08-20 8:36 ` Samuel Ortiz
2013-08-20 9:07 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130820082636.GH23699@lee--X1 \
--to=lee.jones@linaro.org \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=m.grzeschik@pengutronix.de \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox