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

Commit 10993374 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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

parents a133e775 fc76132b

arch/arm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -486,8 +486,6 @@ config ARCH_PXA 
	select HAVE_CLK

	select COMMON_CLKDEV

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_CLK

	select COMMON_CLKDEV

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select TICK_ONESHOT
@@ -1173,12 +1171,6 @@ config CPU_FREQ_IMX 


	  If in doubt, say N.



config CPU_FREQ_PXA

	bool

	depends on CPU_FREQ && ARCH_PXA && PXA25x

	default y

	select CPU_FREQ_DEFAULT_GOV_USERSPACE



endif



source "drivers/cpuidle/Kconfig"

arch/arm/configs/viper_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m 
CONFIG_CPU_FREQ_GOV_USERSPACE=m

CONFIG_CPU_FREQ_GOV_ONDEMAND=m

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m

CONFIG_CPU_FREQ_PXA=y



#

# Floating point emulation

arch/arm/mach-pxa/corgi.c

+10 −0
Original line number Diff line number Diff line
@@ -427,12 +427,22 @@ static struct pxa2xx_spi_master corgi_spi_info = { 
	.num_chipselect	= 3,

};



static void corgi_wait_for_hsync(void)

{

	while (gpio_get_value(CORGI_GPIO_HSYNC))

		cpu_relax();



	while (!gpio_get_value(CORGI_GPIO_HSYNC))

		cpu_relax();

}



static struct ads7846_platform_data corgi_ads7846_info = {

	.model			= 7846,

	.vref_delay_usecs	= 100,

	.x_plate_ohms		= 419,

	.y_plate_ohms		= 486,

	.gpio_pendown		= CORGI_GPIO_TP_INT,

	.wait_for_sync		= corgi_wait_for_hsync,

};



static void corgi_ads7846_cs(u32 command)

arch/arm/mach-pxa/littleton.c

+9 −0
Original line number Diff line number Diff line
@@ -334,6 +334,11 @@ static struct led_info littleton_da9034_leds[] = { 
	},

};



static struct da9034_touch_pdata littleton_da9034_touch = {

	.x_inverted     = 1,

	.interval_ms    = 20,

};



static struct da903x_subdev_info littleton_da9034_subdevs[] = {

	{

		.name		= "da903x-led",
@@ -350,6 +355,10 @@ static struct da903x_subdev_info littleton_da9034_subdevs[] = { 
	}, {

		.name		= "da903x-backlight",

		.id		= DA9034_ID_WLED,

	}, {

		.name		= "da9034-touch",

		.id		= DA9034_ID_TOUCH,

		.platform_data	= &littleton_da9034_touch,

	},

};

arch/arm/mach-pxa/spitz.c

+10 −0
Original line number Diff line number Diff line
@@ -299,12 +299,22 @@ static struct pxa2xx_spi_master spitz_spi_info = { 
	.num_chipselect	= 3,

};



static void spitz_wait_for_hsync(void)

{

	while (gpio_get_value(SPITZ_GPIO_HSYNC))

		cpu_relax();



	while (!gpio_get_value(SPITZ_GPIO_HSYNC))

		cpu_relax();

}



static struct ads7846_platform_data spitz_ads7846_info = {

	.model			= 7846,

	.vref_delay_usecs	= 100,

	.x_plate_ohms		= 419,

	.y_plate_ohms		= 486,

	.gpio_pendown		= SPITZ_GPIO_TP_INT,

	.wait_for_sync		= spitz_wait_for_hsync,

};



static void spitz_ads7846_cs(u32 command)