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

Commit 187f81b3 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-rmk' of... 

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
parents 1d89b30c d78ff0a5

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -653,6 +653,8 @@ M: laforge@openezx.org 
L:	openezx-devel@lists.openezx.org (subscribers-only)

W:	http://www.openezx.org/

S:	Maintained

T:	topgit git://git.openezx.org/openezx.git

F:	arch/arm/mach-pxa/ezx.c



ARM/FARADAY FA526 PORT

P:	Paulius Zaleckas
@@ -774,6 +776,13 @@ P: Philipp Zabel 
M:	philipp.zabel@gmail.com

S:	Maintained



ARM/MIOA701 MACHINE SUPPORT

P:	Robert Jarzmik

M:	robert.jarzmik@free.fr

L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)

F:	arch/arm/mach-pxa/mioa701.c

S:	Maintained



ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT

P:	Michael Petchkovsky

M:	mkpetch@internode.on.net
@@ -792,6 +801,12 @@ M: marek.vasut@gmail.com 
W:	http://hackndev.com

S:	Maintained



ARM/PALM TREO 680 SUPPORT

P:	Tomas Cech

M:	sleep_walker@suse.cz

W:	http://hackndev.com

S:	Maintained



ARM/PALMZ72 SUPPORT

P:	Sergey Lapin

M:	slapin@ossfans.org

arch/arm/mach-pxa/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -401,6 +401,16 @@ config MACH_PALMZ72 
	  Say Y here if you intend to run this kernel on Palm Zire 72

	  handheld computer.



config MACH_TREO680

	bool "Palm Treo 680"

	default y

	depends on ARCH_PXA_PALM

	select PXA27x

	select IWMMXT

	help

	  Say Y here if you intend to run this kernel on Palm Treo 680

	  smartphone.



config MACH_PALMLD

	bool "Palm LifeDrive"

	default y

arch/arm/mach-pxa/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ obj-$(CONFIG_MACH_PALMT5) += palmt5.o 
obj-$(CONFIG_MACH_PALMTX)	+= palmtx.o

obj-$(CONFIG_MACH_PALMLD)	+= palmld.o

obj-$(CONFIG_MACH_PALMZ72)	+= palmz72.o

obj-$(CONFIG_MACH_TREO680)	+= treo680.o

obj-$(CONFIG_ARCH_VIPER)	+= viper.o



ifeq ($(CONFIG_MACH_ZYLONITE),y)

arch/arm/mach-pxa/corgi.c

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

#include <linux/gpio.h>

#include <linux/backlight.h>

#include <linux/i2c.h>

#include <linux/io.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>
@@ -600,6 +601,10 @@ static struct platform_device *devices[] __initdata = { 
	&sharpsl_rom_device,

};



static struct i2c_board_info __initdata corgi_i2c_devices[] = {

	{ I2C_BOARD_INFO("wm8731", 0x1b) },

};



static void corgi_poweroff(void)

{

	if (!machine_is_corgi())
@@ -634,6 +639,7 @@ static void __init corgi_init(void) 
	pxa_set_mci_info(&corgi_mci_platform_data);

	pxa_set_ficp_info(&corgi_ficp_platform_data);

	pxa_set_i2c_info(NULL);

	i2c_register_board_info(0, ARRAY_AND_SIZE(corgi_i2c_devices));



	platform_scoop_config = &corgi_pcmcia_config;

arch/arm/mach-pxa/em-x270.c

+58 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/apm-emulation.h>

#include <linux/i2c.h>

#include <linux/i2c/pca953x.h>

#include <linux/regulator/userspace-consumer.h>



#include <media/soc_camera.h>
@@ -735,6 +736,7 @@ static struct pxa2xx_spi_chip em_x270_libertas_chip = { 
	.rx_threshold	= 1,

	.tx_threshold	= 1,

	.timeout	= 1000,

	.gpio_cs	= 14,

};



static unsigned long em_x270_libertas_pin_config[] = {
@@ -803,7 +805,6 @@ static int em_x270_libertas_teardown(struct spi_device *spi) 


struct libertas_spi_platform_data em_x270_libertas_pdata = {

	.use_dummy_writes	= 1,

	.gpio_cs		= 14,

	.setup			= em_x270_libertas_setup,

	.teardown		= em_x270_libertas_teardown,

};
@@ -838,10 +839,14 @@ static void __init em_x270_init_spi(void) 
static inline void em_x270_init_spi(void) {}

#endif



#if defined(CONFIG_SND_PXA2XX_AC97) || defined(CONFIG_SND_PXA2XX_AC97_MODULE)

#if defined(CONFIG_SND_PXA2XX_LIB_AC97)

static pxa2xx_audio_ops_t em_x270_ac97_info = {

	.reset_gpio = 113,

};



static void __init em_x270_init_ac97(void)

{

	pxa_set_ac97_info(NULL);

	pxa_set_ac97_info(&em_x270_ac97_info);

}

#else

static inline void em_x270_init_ac97(void) {}
@@ -1038,6 +1043,52 @@ static void __init em_x270_init_camera(void) 
static inline void em_x270_init_camera(void) {}

#endif



static struct regulator_bulk_data em_x270_gps_consumer_supply = {

	.supply		= "vcc gps",

};



static struct regulator_userspace_consumer_data em_x270_gps_consumer_data = {

	.name		= "vcc gps",

	.num_supplies	= 1,

	.supplies	= &em_x270_gps_consumer_supply,

};



static struct platform_device em_x270_gps_userspace_consumer = {

	.name		= "reg-userspace-consumer",

	.id		= 0,

	.dev		= {

		.platform_data = &em_x270_gps_consumer_data,

	},

};



static struct regulator_bulk_data em_x270_gprs_consumer_supply = {

	.supply		= "vcc gprs",

};



static struct regulator_userspace_consumer_data em_x270_gprs_consumer_data = {

	.name		= "vcc gprs",

	.num_supplies	= 1,

	.supplies	= &em_x270_gprs_consumer_supply

};



static struct platform_device em_x270_gprs_userspace_consumer = {

	.name		= "reg-userspace-consumer",

	.id		= 1,

	.dev		= {

		.platform_data = &em_x270_gprs_consumer_data,

	}

};



static struct platform_device *em_x270_userspace_consumers[] = {

	&em_x270_gps_userspace_consumer,

	&em_x270_gprs_userspace_consumer,

};



static void __init em_x270_userspace_consumers_init(void)

{

	platform_add_devices(ARRAY_AND_SIZE(em_x270_userspace_consumers));

}



/* DA9030 related initializations */

#define REGULATOR_CONSUMER(_name, _dev, _supply)			       \

	static struct regulator_consumer_supply _name##_consumers[] = {	\
@@ -1047,11 +1098,11 @@ static inline void em_x270_init_camera(void) {} 
		},							\

	}



REGULATOR_CONSUMER(ldo3, NULL, "vcc gps");

REGULATOR_CONSUMER(ldo3, &em_x270_gps_userspace_consumer.dev, "vcc gps");

REGULATOR_CONSUMER(ldo5, NULL, "vcc cam");

REGULATOR_CONSUMER(ldo10, &pxa_device_mci.dev, "vcc sdio");

REGULATOR_CONSUMER(ldo12, NULL, "vcc usb");

REGULATOR_CONSUMER(ldo19, NULL, "vcc gprs");

REGULATOR_CONSUMER(ldo19, &em_x270_gprs_userspace_consumer.dev, "vcc gprs");



#define REGULATOR_INIT(_ldo, _min_uV, _max_uV, _ops_mask)		\

	static struct regulator_init_data _ldo##_data = {		\
@@ -1062,6 +1113,7 @@ REGULATOR_CONSUMER(ldo19, NULL, "vcc gprs"); 
				.enabled = 0,				\

			},						\

			.valid_ops_mask = _ops_mask,			\

			.apply_uV = 1,					\

		},							\

		.num_consumer_supplies = ARRAY_SIZE(_ldo##_consumers),	\

		.consumer_supplies = _ldo##_consumers,			\
@@ -1240,6 +1292,7 @@ static void __init em_x270_init(void) 
	em_x270_init_spi();

	em_x270_init_i2c();

	em_x270_init_camera();

	em_x270_userspace_consumers_init();

}



MACHINE_START(EM_X270, "Compulab EM-X270")