[PATCH v2] pxa/hx4700: add platform device and I2C info for AK4641 codec

[PATCH v2] pxa/hx4700: add platform device and I2C info for AK4641 codec

[Axel Lin]

The audio on hx4700 needs this to properly work.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
---
v2: Avoid rename AK4641 power GPIOs.

 arch/arm/mach-pxa/hx4700.c |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index fb9b62d..208eef1 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -45,6 +45,7 @@
 #include <mach/hx4700.h>
 #include <mach/irda.h>
 
+#include <sound/ak4641.h>
 #include <video/platform_lcd.h>
 #include <video/w100fb.h>
 
@@ -765,6 +766,28 @@ static struct i2c_board_info __initdata pi2c_board_info[] = {
 };
 
 /*
+ * Asahi Kasei AK4641 on I2C
+ */
+
+static struct ak4641_platform_data ak4641_info = {
+	.gpio_power = GPIO27_HX4700_CODEC_ON,
+	.gpio_npdn  = GPIO109_HX4700_CODEC_nPDN,
+};
+
+static struct i2c_board_info i2c_board_info[] __initdata = {
+	{
+		I2C_BOARD_INFO("ak4641", 0x12),
+		.platform_data = &ak4641_info,
+	},
+};
+
+static struct platform_device audio = {
+	.name	= "hx4700-audio",
+	.id	= -1,
+};
+
+
+/*
  * PCMCIA
  */
 
@@ -790,6 +813,7 @@ static struct platform_device *devices[] __initdata = {
 	&gpio_vbus,
 	&power_supply,
 	&strataflash,
+	&audio,
 	&pcmcia,
 };
 
@@ -827,6 +851,7 @@ static void __init hx4700_init(void)
 	pxa_set_ficp_info(&ficp_info);
 	pxa27x_set_i2c_power_info(NULL);
 	pxa_set_i2c_info(NULL);
+	i2c_register_board_info(0, ARRAY_AND_SIZE(i2c_board_info));
 	i2c_register_board_info(1, ARRAY_AND_SIZE(pi2c_board_info));
 	pxa2xx_set_spi_info(2, &pxa_ssp2_master_info);
 	spi_register_board_info(ARRAY_AND_SIZE(tsc2046_board_info));
-- 
1.7.5.4

Re: [PATCH v2] pxa/hx4700: add platform device and I2C info for AK4641 codec

[Paul Parsons]

Works for me on linux-3.2-rc7.

Tested-by: Paul Parsons <lost.distance@yahoo.com>

--- On Fri, 30/12/11, Axel Lin <axel.lin@gmail.com> wrote:

> From: Axel Lin <axel.lin@gmail.com>
> Subject: [PATCH v2] pxa/hx4700: add platform device and I2C info for AK4641 codec
> To: linux-kernel@vger.kernel.org
> Cc: "Philipp Zabel" <philipp.zabel@gmail.com>, "Dmitry Artamonow" <mad_soft@inbox.ru>, "Mark Brown" <broonie@opensource.wolfsonmicro.com>, "Liam Girdwood" <lrg@ti.com>, "Haojian Zhuang" <haojian.zhuang@marvell.com>, "Eric Miao" <eric.y.miao@gmail.com>, linux-arm-kernel@lists.infradead.org
> Date: Friday, 30 December, 2011, 4:06
> The audio on hx4700 needs this to
> properly work.
> 
> Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
> Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> Acked-by: Marek Vasut <marek.vasut@gmail.com>
> ---
> v2: Avoid rename AK4641 power GPIOs.
> 
>  arch/arm/mach-pxa/hx4700.c |   25
> +++++++++++++++++++++++++
>  1 files changed, 25 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-pxa/hx4700.c
> b/arch/arm/mach-pxa/hx4700.c
> index fb9b62d..208eef1 100644
> --- a/arch/arm/mach-pxa/hx4700.c
> +++ b/arch/arm/mach-pxa/hx4700.c
> @@ -45,6 +45,7 @@
>  #include <mach/hx4700.h>
>  #include <mach/irda.h>
>  
> +#include <sound/ak4641.h>
>  #include <video/platform_lcd.h>
>  #include <video/w100fb.h>
>  
> @@ -765,6 +766,28 @@ static struct i2c_board_info
> __initdata pi2c_board_info[] = {
>  };
>  
>  /*
> + * Asahi Kasei AK4641 on I2C
> + */
> +
> +static struct ak4641_platform_data ak4641_info = {
> +    .gpio_power = GPIO27_HX4700_CODEC_ON,
> +    .gpio_npdn  =
> GPIO109_HX4700_CODEC_nPDN,
> +};
> +
> +static struct i2c_board_info i2c_board_info[] __initdata =
> {
> +    {
> +       
> I2C_BOARD_INFO("ak4641", 0x12),
> +        .platform_data =
> &ak4641_info,
> +    },
> +};
> +
> +static struct platform_device audio = {
> +    .name    =
> "hx4700-audio",
> +    .id    = -1,
> +};
> +
> +
> +/*
>   * PCMCIA
>   */
>  
> @@ -790,6 +813,7 @@ static struct platform_device
> *devices[] __initdata = {
>      &gpio_vbus,
>      &power_supply,
>      &strataflash,
> +    &audio,
>      &pcmcia,
>  };
>  
> @@ -827,6 +851,7 @@ static void __init hx4700_init(void)
>      pxa_set_ficp_info(&ficp_info);
>      pxa27x_set_i2c_power_info(NULL);
>      pxa_set_i2c_info(NULL);
> +    i2c_register_board_info(0,
> ARRAY_AND_SIZE(i2c_board_info));
>      i2c_register_board_info(1,
> ARRAY_AND_SIZE(pi2c_board_info));
>      pxa2xx_set_spi_info(2,
> &pxa_ssp2_master_info);
>     
> spi_register_board_info(ARRAY_AND_SIZE(tsc2046_board_info));
> -- 
> 1.7.5.4
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe
> linux-kernel" in
> the body of a message to majordomo@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 v2] pxa/hx4700: add platform device and I2C info for AK4641 codec

[Haojian Zhuang]

On Sat, Dec 31, 2011 at 9:35 PM, Paul Parsons <lost.distance@yahoo.com> wrote:
> Works for me on linux-3.2-rc7.
>
> Tested-by: Paul Parsons <lost.distance@yahoo.com>
>
Applied.

Re: [PATCH v2] pxa/hx4700: add platform device and I2C info for AK4641 codec

[Axel Lin]

2012/1/4 Haojian Zhuang <haojian.zhuang@gmail.com>:
> On Sat, Dec 31, 2011 at 9:35 PM, Paul Parsons <lost.distance@yahoo.com> wrote:
>> Works for me on linux-3.2-rc7.
>>
>> Tested-by: Paul Parsons <lost.distance@yahoo.com>
>>
> Applied.
Hi Haojian,
This patch is not (yet) upstream.
Not in Linus' tree. and not in linux-next tree.
Could you help to check it again.

Thanks,
Axel