Re: [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata
> > > 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 > > > --- > > > drivers/mfd/mc13xxx-core.c | 11 +++ > > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > This patch doesn't apply. What tree is it based on? > Please wait a bit before applying this one. I'd like to get Dmitry's > feedback on the input one first. It's okay, I didn't intend on actually applying it. I just wanted to see the full file changes. I usually apply it, then do a `git log -p -U1000` to get the full picture. However, I can't even do that yet, which suggests it's based on some non-upstream tree. -- Lee Jones Linaro ST-Ericsson 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 linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata
Hi Lee, On Tue, Aug 20, 2013 at 09:26:36AM +0100, Lee Jones wrote: > 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 > > --- > > drivers/mfd/mc13xxx-core.c | 11 +++ > > 1 file changed, 7 insertions(+), 4 deletions(-) > > This patch doesn't apply. What tree is it based on? Please wait a bit before applying this one. I'd like to get Dmitry's feedback on the input one first. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata
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
> ---
> 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",
> >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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata
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.grzesc...@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
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata
Hi Lee, On Tue, Aug 20, 2013 at 09:26:36AM +0100, Lee Jones wrote: 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.grzesc...@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? Please wait a bit before applying this one. I'd like to get Dmitry's feedback on the input one first. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] mfd: mc13xxx: make it possible to use the codec without pdata
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.grzesc...@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? Please wait a bit before applying this one. I'd like to get Dmitry's feedback on the input one first. It's okay, I didn't intend on actually applying it. I just wanted to see the full file changes. I usually apply it, then do a `git log -p -U1000` to get the full picture. However, I can't even do that yet, which suggests it's based on some non-upstream tree. -- Lee Jones Linaro ST-Ericsson 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 linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
