Message ID | 1341341098-9510-1-git-send-email-fabio.estevam@freescale.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Sascha, On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam <fabio.estevam@freescale.com> wrote: > mx27pdk has a mc13783 audio codec. > > Add support for it. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Is this patch OK? Can it be applied? Regards, Fabio Estevam
Sascha, On 7/25/12, Fabio Estevam <festevam@gmail.com> wrote: > Hi Sascha, > > On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam > <fabio.estevam@freescale.com> wrote: >> mx27pdk has a mc13783 audio codec. >> >> Add support for it. >> >> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > > Is this patch OK? Can it be applied? Could this get into 3.6? Thanks, Fabio Estevam
On Tue, Jul 31, 2012 at 09:49:13AM -0300, Fabio Estevam wrote: > Sascha, > > On 7/25/12, Fabio Estevam <festevam@gmail.com> wrote: > > Hi Sascha, > > > > On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam > > <fabio.estevam@freescale.com> wrote: > >> mx27pdk has a mc13783 audio codec. > >> > >> Add support for it. > >> > >> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > > > > Is this patch OK? Can it be applied? > > Could this get into 3.6? Applied now. Sorry, missed this one. Sascha
On Fri, Aug 3, 2012 at 10:59 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Applied now. Sorry, missed this one.
Which git tree, please? I was not able to find it at
http://git.pengutronix.de/?p=imx/linux-2.6.git;a=summary
Regards,
Fabio Estevam
Hi, On 08/03/2012 03:59 PM, Sascha Hauer wrote: > On Tue, Jul 31, 2012 at 09:49:13AM -0300, Fabio Estevam wrote: >> Sascha, >> >> On 7/25/12, Fabio Estevam <festevam@gmail.com> wrote: >>> Hi Sascha, >>> >>> On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam >>> <fabio.estevam@freescale.com> wrote: >>>> mx27pdk has a mc13783 audio codec. >>>> >>>> Add support for it. >>>> >>>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> >>> >>> Is this patch OK? Can it be applied? >> >> Could this get into 3.6? > > Applied now. Sorry, missed this one. > > Sascha > Is this patch will be applied on linux-next tree ? Newer patch "[PATCH v2] ASoC: imx-ssi: Remove mono support" is already applied (I know that is not for the same branch) but not this one. Is there a problem with this patch ? Best regards, Gaëtan Carlier
On Mon, Aug 13, 2012 at 01:19:59PM +0200, Gaëtan Carlier wrote: > Hi, > On 08/03/2012 03:59 PM, Sascha Hauer wrote: > >On Tue, Jul 31, 2012 at 09:49:13AM -0300, Fabio Estevam wrote: > >>Sascha, > >> > >>On 7/25/12, Fabio Estevam <festevam@gmail.com> wrote: > >>>Hi Sascha, > >>> > >>>On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam > >>><fabio.estevam@freescale.com> wrote: > >>>>mx27pdk has a mc13783 audio codec. > >>>> > >>>>Add support for it. > >>>> > >>>>Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > >>> > >>>Is this patch OK? Can it be applied? > >> > >>Could this get into 3.6? > > > >Applied now. Sorry, missed this one. > > > >Sascha > > > Is this patch will be applied on linux-next tree ? This will be in linux-next once I send a pull request to Arnd. I do not have a branch in linux-next. Sascha
Hi, On 08/13/2012 08:58 PM, Sascha Hauer wrote: > On Mon, Aug 13, 2012 at 01:19:59PM +0200, Gaëtan Carlier wrote: >> Hi, >> On 08/03/2012 03:59 PM, Sascha Hauer wrote: >>> On Tue, Jul 31, 2012 at 09:49:13AM -0300, Fabio Estevam wrote: >>>> Sascha, >>>> >>>> On 7/25/12, Fabio Estevam <festevam@gmail.com> wrote: >>>>> Hi Sascha, >>>>> >>>>> On Tue, Jul 3, 2012 at 3:44 PM, Fabio Estevam >>>>> <fabio.estevam@freescale.com> wrote: >>>>>> mx27pdk has a mc13783 audio codec. >>>>>> >>>>>> Add support for it. >>>>>> >>>>>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> >>>>> >>>>> Is this patch OK? Can it be applied? >>>> >>>> Could this get into 3.6? >>> >>> Applied now. Sorry, missed this one. >>> >>> Sascha >>> >> Is this patch will be applied on linux-next tree ? > > This will be in linux-next once I send a pull request to Arnd. I do not > have a branch in linux-next. > > Sascha > Ok, thanks a lot. Gaëtan Carlier
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0da882a..deb9f37 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -300,6 +300,7 @@ config MACH_MX27_3DS select IMX_HAVE_PLATFORM_IMX_FB select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_KEYPAD + select IMX_HAVE_PLATFORM_IMX_SSI select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MX2_CAMERA select IMX_HAVE_PLATFORM_MXC_EHCI diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index c6d385c..3dc944e 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c @@ -160,6 +160,11 @@ static const int mx27pdk_pins[] __initconst = { PB21_PF_CSI_HSYNC, CSI_PWRDWN | GPIO_GPIO | GPIO_OUT, CSI_RESET | GPIO_GPIO | GPIO_OUT, + /* SSI4 */ + PC16_PF_SSI4_FS, + PC17_PF_SSI4_RXD, + PC18_PF_SSI4_TXD, + PC19_PF_SSI4_CLK, }; static struct gpio mx27_3ds_camera_gpios[] = { @@ -331,13 +336,24 @@ static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = { }; /* MC13783 */ +static struct mc13xxx_codec_platform_data mx27_3ds_codec = { + .dac_ssi_port = MC13783_SSI1_PORT, + .adc_ssi_port = MC13783_SSI1_PORT, +}; + static struct mc13xxx_platform_data mc13783_pdata = { .regulators = { .regulators = mx27_3ds_regulators, .num_regulators = ARRAY_SIZE(mx27_3ds_regulators), }, - .flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC, + .flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC | + MC13XXX_USE_CODEC, + .codec = &mx27_3ds_codec, +}; + +static struct imx_ssi_platform_data mx27_3ds_ssi_pdata = { + .flags = IMX_SSI_DMA | IMX_SSI_NET, }; /* SPI */ @@ -513,6 +529,9 @@ static void __init mx27pdk_init(void) } imx27_add_mx2_camera(&mx27_3ds_cam_pdata); + imx27_add_imx_ssi(0, &mx27_3ds_ssi_pdata); + + imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0); } static void __init mx27pdk_timer_init(void)
mx27pdk has a mc13783 audio codec. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/mach-mx27_3ds.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-)