Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e343d7a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes 

* 'fixes' of git://github.com/hzhuang1/linux:
  pxa/hx4700: add platform device and I2C info for AK4641 codec
  arch/arm/mach-pxa/: included linux/gpio.h twice
  arch/arm/mach-mmp/: some files include some headers twice
  ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
  ARM: pxa: fix including linux/gpio.h twice
  ARM: pxa: fix mixed declarations and code in sharpsl_pm
  ARM: pxa: fix wrong parsing gpio event on spitz
parents b01543df d87f6143

arch/arm/mach-mmp/aspenite.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/nand.h>

#include <linux/interrupt.h>

#include <linux/gpio.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

arch/arm/mach-mmp/pxa168.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <mach/dma.h>

#include <mach/devices.h>

#include <mach/mfp.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <mach/pxa168.h>

arch/arm/mach-mmp/tavorevb.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/smc91x.h>

#include <linux/gpio.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

arch/arm/mach-pxa/hx4700.c

+25 −0
Original line number Diff line number Diff line
@@ -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>
@@ -764,6 +765,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));

arch/arm/mach-pxa/pxa25x.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/suspend.h>

#include <linux/syscore_ops.h>

#include <linux/irq.h>

#include <linux/gpio.h>



#include <asm/mach/map.h>

#include <asm/suspend.h>