Commit 48a5765e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards 

* 'board-specific' of git://github.com/hzhuang1/linux:
  ARM: pxa: hx4700: Add Synaptics NavPoint touchpad
  ARM: pxa: Use REGULATOR_SUPPLY macro
parents 0e6ce5f1 b2596c68

arch/arm/mach-pxa/balloon3.c

+1 −3
Original line number Diff line number Diff line
@@ -732,9 +732,7 @@ static inline void balloon3_nand_init(void) {} 
#if defined(CONFIG_REGULATOR_MAX1586) || \

    defined(CONFIG_REGULATOR_MAX1586_MODULE)

static struct regulator_consumer_supply balloon3_max1587a_consumers[] = {

	{

		.supply	= "vcc_core",

	}

	REGULATOR_SUPPLY("vcc_core", NULL),

};



static struct regulator_init_data balloon3_max1587a_v3_info = {

arch/arm/mach-pxa/cm-x300.c

+1 −3
Original line number Diff line number Diff line
@@ -713,9 +713,7 @@ struct da9030_battery_info cm_x300_battery_info = { 
};



static struct regulator_consumer_supply buck2_consumers[] = {

	{

		.supply = "vcc_core",

	},

	REGULATOR_SUPPLY("vcc_core", NULL),

};



static struct regulator_init_data buck2_data = {

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

+1 −4
Original line number Diff line number Diff line
@@ -1085,10 +1085,7 @@ static void __init em_x270_userspace_consumers_init(void) 
/* DA9030 related initializations */

#define REGULATOR_CONSUMER(_name, _dev_name, _supply)		        \

	static struct regulator_consumer_supply _name##_consumers[] = {	\

		{							\

			.dev_name = _dev_name,				\

			.supply = _supply,				\

		},							\

		REGULATOR_SUPPLY(_supply, _dev_name),			\

	}



REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");

arch/arm/mach-pxa/hx4700.c

+27 −10
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/gpio.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/input/navpoint.h>

#include <linux/lcd.h>

#include <linux/mfd/htc-egpio.h>

#include <linux/mfd/asic3.h>
@@ -117,7 +118,7 @@ static unsigned long hx4700_pin_config[] __initdata = { 
	GPIO113_I2S_SYSCLK,



	/* SSP 1 (NavPoint) */

	GPIO23_SSP1_SCLK,

	GPIO23_SSP1_SCLK_IN,

	GPIO24_SSP1_SFRM,

	GPIO25_SSP1_TXD,

	GPIO26_SSP1_RXD,
@@ -133,6 +134,9 @@ static unsigned long hx4700_pin_config[] __initdata = { 
	GPIO13_GPIO,	/* W3220_IRQ */

	GPIO14_GPIO,	/* nWLAN_IRQ */



	/* HX4700 specific output GPIOs */

	GPIO102_GPIO | MFP_LPM_DRIVE_LOW,	/* SYNAPTICS_POWER_ON */



	GPIO10_GPIO,	/* GSM_IRQ */

	GPIO13_GPIO,	/* CPLD_IRQ */

	GPIO107_GPIO,	/* DS1WM_IRQ */
@@ -186,6 +190,23 @@ static struct platform_device gpio_keys = { 
	.id   = -1,

};



/*

 * Synaptics NavPoint connected to SSP1

 */



static struct navpoint_platform_data navpoint_platform_data = {

	.port	= 1,

	.gpio	= GPIO102_HX4700_SYNAPTICS_POWER_ON,

};



static struct platform_device navpoint = {

	.name	= "navpoint",

	.id	= -1,

	.dev = {

		.platform_data = &navpoint_platform_data,

	},

};



/*

 * ASIC3

 */
@@ -685,12 +706,8 @@ static struct platform_device power_supply = { 
 */



static struct regulator_consumer_supply bq24022_consumers[] = {

	{

		.supply = "vbus_draw",

	},

	{

		.supply = "ac_draw",

	},

	REGULATOR_SUPPLY("vbus_draw", NULL),

	REGULATOR_SUPPLY("ac_draw", NULL),

};



static struct regulator_init_data bq24022_init_data = {
@@ -769,9 +786,8 @@ static struct platform_device strataflash = { 
 * Maxim MAX1587A on PI2C

 */



static struct regulator_consumer_supply max1587a_consumer = {

	.supply = "vcc_core",

};

static struct regulator_consumer_supply max1587a_consumer =

	REGULATOR_SUPPLY("vcc_core", NULL);



static struct regulator_init_data max1587a_v3_info = {

	.constraints = {
@@ -833,6 +849,7 @@ static struct platform_device audio = { 
static struct platform_device *devices[] __initdata = {

	&asic3,

	&gpio_keys,

	&navpoint,

	&backlight,

	&w3220,

	&hx4700_lcd,

arch/arm/mach-pxa/include/mach/mfp-pxa27x.h

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ 
#define GPIO113_I2S_SYSCLK	MFP_CFG_OUT(GPIO113, AF1, DRIVE_LOW)



/* SSP 1 */

#define GPIO23_SSP1_SCLK_IN	MFP_CFG_IN(GPIO23, AF2)

#define GPIO23_SSP1_SCLK	MFP_CFG_OUT(GPIO23, AF2, DRIVE_LOW)

#define GPIO29_SSP1_SCLK	MFP_CFG_IN(GPIO29, AF3)

#define GPIO27_SSP1_SYSCLK	MFP_CFG_OUT(GPIO27, AF1, DRIVE_LOW)