Re: [PATCH 1/2] mfd: mc13xxx: Do not use platform data with devicetree

[Alexander Shiyan]

Fri, 9 May 2014 12:30:30 +0100 ÐÑ Lee Jones <lee.jones@xxxxxxxxxx>:
> > This patch removes platform data usage for codec and touchscreen
> > when driver is used with devicetree.
> > This fixes possible "null pointer dereference" error if DTS uses
> > "fsl,mc13xxx-uses-codec" or "fsl,mc13xxx-uses-touch" options.
> > 
> > Signed-off-by: Alexander Shiyan <shc_work@xxxxxxx>
> > ---
> >  drivers/mfd/mc13xxx-core.c | 18 ++++++++++--------
> >  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> Applied, thanks.

This patch has been written as a way to separate MFD and ASoC changes of
the patch: (ASoC: mc13783: Add devicetree support)
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=780aaeff96819ca58e0cad830bfbe6eee9aef82c

So, it should produce conflict.

---