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

Commit fb35f1ce authored by Russell King's avatar Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents 8954bb0d cdb4acc0

arch/arm/include/asm/mach/udc_pxa2xx.h

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ struct pxa2xx_udc_mach_info { 
	 * here.  Note that sometimes the signals go through inverters...

	 */

	bool	gpio_vbus_inverted;

	u16	gpio_vbus;			/* high == vbus present */

	int	gpio_vbus;			/* high == vbus present */

	bool	gpio_pullup_inverted;

	u16	gpio_pullup;			/* high == pullup activated */

	int	gpio_pullup;			/* high == pullup activated */

};

arch/arm/mach-pxa/mioa701.c

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ static struct i2c_board_info __initdata mioa701_pi2c_devices[] = { 
};



/* Board I2C devices. */

static struct i2c_board_info __initdata mioa701_i2c_devices[] = {

static struct i2c_board_info mioa701_i2c_devices[] = {

	{

		I2C_BOARD_INFO("mt9m111", 0x5d),

	},

arch/arm/mach-pxa/z2.c

+10 −16
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@ 
 *

 *  Support for the Zipit Z2 Handheld device.

 *

 *  Author: 	Ken McGuire

 *  Created:	Jan 25, 2009

 *  Copyright (C) 2009-2010 Marek Vasut <marek.vasut@gmail.com>

 *

 *  Based on research and code by: Ken McGuire

 *  Based on mainstone.c as modified for the Zipit Z2.

 *

 *  This program is free software; you can redistribute it and/or modify
@@ -157,21 +158,14 @@ static struct mtd_partition z2_flash_parts[] = { 
	{

		.name	= "U-Boot Bootloader",

		.offset	= 0x0,

		.size	= 0x20000,

	},

	{

		.name	= "Linux Kernel",

		.offset	= 0x20000,

		.size	= 0x220000,

	},

	{

		.name	= "Filesystem",

		.offset	= 0x240000,

		.size	= 0x5b0000,

	},

	{

		.size	= 0x40000,

	}, {

		.name	= "U-Boot Environment",

		.offset	= 0x7f0000,

		.offset	= 0x40000,

		.size	= 0x60000,

	}, {

		.name	= "Flash",

		.offset	= 0x60000,

		.size	= MTDPART_SIZ_FULL,

	},

};

arch/arm/plat-pxa/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ 
# Makefile for code common across different PXA processor families

#



obj-y	:= dma.o pmu.o

obj-y	:= dma.o



obj-$(CONFIG_ARCH_PXA)		+= pmu.o

obj-$(CONFIG_GENERIC_GPIO)	+= gpio.o

obj-$(CONFIG_PXA3xx)		+= mfp.o

obj-$(CONFIG_ARCH_MMP)		+= mfp.o

drivers/power/z2_battery.c

+3 −9
Original line number Diff line number Diff line
@@ -9,19 +9,13 @@ 
 *

 */



#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/power_supply.h>

#include <linux/i2c.h>

#include <linux/spinlock.h>

#include <linux/interrupt.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <asm/irq.h>

#include <asm/mach/irq.h>

#include <linux/power_supply.h>

#include <linux/slab.h>

#include <linux/z2_battery.h>



#define	Z2_DEFAULT_NAME	"Z2"