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
This commit is contained in:
commit
48a5765e51
|
@ -732,9 +732,7 @@ static inline void balloon3_nand_init(void) {}
|
||||||
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
||||||
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
||||||
static struct regulator_consumer_supply balloon3_max1587a_consumers[] = {
|
static struct regulator_consumer_supply balloon3_max1587a_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data balloon3_max1587a_v3_info = {
|
static struct regulator_init_data balloon3_max1587a_v3_info = {
|
||||||
|
|
|
@ -713,9 +713,7 @@ struct da9030_battery_info cm_x300_battery_info = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_consumer_supply buck2_consumers[] = {
|
static struct regulator_consumer_supply buck2_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data buck2_data = {
|
static struct regulator_init_data buck2_data = {
|
||||||
|
|
|
@ -1085,10 +1085,7 @@ static void __init em_x270_userspace_consumers_init(void)
|
||||||
/* DA9030 related initializations */
|
/* DA9030 related initializations */
|
||||||
#define REGULATOR_CONSUMER(_name, _dev_name, _supply) \
|
#define REGULATOR_CONSUMER(_name, _dev_name, _supply) \
|
||||||
static struct regulator_consumer_supply _name##_consumers[] = { \
|
static struct regulator_consumer_supply _name##_consumers[] = { \
|
||||||
{ \
|
REGULATOR_SUPPLY(_supply, _dev_name), \
|
||||||
.dev_name = _dev_name, \
|
|
||||||
.supply = _supply, \
|
|
||||||
}, \
|
|
||||||
}
|
}
|
||||||
|
|
||||||
REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");
|
REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
#include <linux/gpio_keys.h>
|
#include <linux/gpio_keys.h>
|
||||||
#include <linux/input.h>
|
#include <linux/input.h>
|
||||||
|
#include <linux/input/navpoint.h>
|
||||||
#include <linux/lcd.h>
|
#include <linux/lcd.h>
|
||||||
#include <linux/mfd/htc-egpio.h>
|
#include <linux/mfd/htc-egpio.h>
|
||||||
#include <linux/mfd/asic3.h>
|
#include <linux/mfd/asic3.h>
|
||||||
|
@ -117,7 +118,7 @@ static unsigned long hx4700_pin_config[] __initdata = {
|
||||||
GPIO113_I2S_SYSCLK,
|
GPIO113_I2S_SYSCLK,
|
||||||
|
|
||||||
/* SSP 1 (NavPoint) */
|
/* SSP 1 (NavPoint) */
|
||||||
GPIO23_SSP1_SCLK,
|
GPIO23_SSP1_SCLK_IN,
|
||||||
GPIO24_SSP1_SFRM,
|
GPIO24_SSP1_SFRM,
|
||||||
GPIO25_SSP1_TXD,
|
GPIO25_SSP1_TXD,
|
||||||
GPIO26_SSP1_RXD,
|
GPIO26_SSP1_RXD,
|
||||||
|
@ -133,6 +134,9 @@ static unsigned long hx4700_pin_config[] __initdata = {
|
||||||
GPIO13_GPIO, /* W3220_IRQ */
|
GPIO13_GPIO, /* W3220_IRQ */
|
||||||
GPIO14_GPIO, /* nWLAN_IRQ */
|
GPIO14_GPIO, /* nWLAN_IRQ */
|
||||||
|
|
||||||
|
/* HX4700 specific output GPIOs */
|
||||||
|
GPIO102_GPIO | MFP_LPM_DRIVE_LOW, /* SYNAPTICS_POWER_ON */
|
||||||
|
|
||||||
GPIO10_GPIO, /* GSM_IRQ */
|
GPIO10_GPIO, /* GSM_IRQ */
|
||||||
GPIO13_GPIO, /* CPLD_IRQ */
|
GPIO13_GPIO, /* CPLD_IRQ */
|
||||||
GPIO107_GPIO, /* DS1WM_IRQ */
|
GPIO107_GPIO, /* DS1WM_IRQ */
|
||||||
|
@ -186,6 +190,23 @@ static struct platform_device gpio_keys = {
|
||||||
.id = -1,
|
.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
|
* ASIC3
|
||||||
*/
|
*/
|
||||||
|
@ -685,12 +706,8 @@ static struct platform_device power_supply = {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static struct regulator_consumer_supply bq24022_consumers[] = {
|
static struct regulator_consumer_supply bq24022_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vbus_draw", NULL),
|
||||||
.supply = "vbus_draw",
|
REGULATOR_SUPPLY("ac_draw", NULL),
|
||||||
},
|
|
||||||
{
|
|
||||||
.supply = "ac_draw",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data bq24022_init_data = {
|
static struct regulator_init_data bq24022_init_data = {
|
||||||
|
@ -769,9 +786,8 @@ static struct platform_device strataflash = {
|
||||||
* Maxim MAX1587A on PI2C
|
* Maxim MAX1587A on PI2C
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static struct regulator_consumer_supply max1587a_consumer = {
|
static struct regulator_consumer_supply max1587a_consumer =
|
||||||
.supply = "vcc_core",
|
REGULATOR_SUPPLY("vcc_core", NULL);
|
||||||
};
|
|
||||||
|
|
||||||
static struct regulator_init_data max1587a_v3_info = {
|
static struct regulator_init_data max1587a_v3_info = {
|
||||||
.constraints = {
|
.constraints = {
|
||||||
|
@ -833,6 +849,7 @@ static struct platform_device audio = {
|
||||||
static struct platform_device *devices[] __initdata = {
|
static struct platform_device *devices[] __initdata = {
|
||||||
&asic3,
|
&asic3,
|
||||||
&gpio_keys,
|
&gpio_keys,
|
||||||
|
&navpoint,
|
||||||
&backlight,
|
&backlight,
|
||||||
&w3220,
|
&w3220,
|
||||||
&hx4700_lcd,
|
&hx4700_lcd,
|
||||||
|
|
|
@ -208,6 +208,7 @@
|
||||||
#define GPIO113_I2S_SYSCLK MFP_CFG_OUT(GPIO113, AF1, DRIVE_LOW)
|
#define GPIO113_I2S_SYSCLK MFP_CFG_OUT(GPIO113, AF1, DRIVE_LOW)
|
||||||
|
|
||||||
/* SSP 1 */
|
/* SSP 1 */
|
||||||
|
#define GPIO23_SSP1_SCLK_IN MFP_CFG_IN(GPIO23, AF2)
|
||||||
#define GPIO23_SSP1_SCLK MFP_CFG_OUT(GPIO23, AF2, DRIVE_LOW)
|
#define GPIO23_SSP1_SCLK MFP_CFG_OUT(GPIO23, AF2, DRIVE_LOW)
|
||||||
#define GPIO29_SSP1_SCLK MFP_CFG_IN(GPIO29, AF3)
|
#define GPIO29_SSP1_SCLK MFP_CFG_IN(GPIO29, AF3)
|
||||||
#define GPIO27_SSP1_SYSCLK MFP_CFG_OUT(GPIO27, AF1, DRIVE_LOW)
|
#define GPIO27_SSP1_SYSCLK MFP_CFG_OUT(GPIO27, AF1, DRIVE_LOW)
|
||||||
|
|
|
@ -579,12 +579,8 @@ static struct platform_device power_supply = {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static struct regulator_consumer_supply bq24022_consumers[] = {
|
static struct regulator_consumer_supply bq24022_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vbus_draw", NULL),
|
||||||
.supply = "vbus_draw",
|
REGULATOR_SUPPLY("ac_draw", NULL),
|
||||||
},
|
|
||||||
{
|
|
||||||
.supply = "ac_draw",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data bq24022_init_data = {
|
static struct regulator_init_data bq24022_init_data = {
|
||||||
|
|
|
@ -582,9 +582,7 @@ static struct wm97xx_pdata mioa701_wm97xx_pdata = {
|
||||||
* Voltage regulation
|
* Voltage regulation
|
||||||
*/
|
*/
|
||||||
static struct regulator_consumer_supply max1586_consumers[] = {
|
static struct regulator_consumer_supply max1586_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data max1586_v3_info = {
|
static struct regulator_init_data max1586_v3_info = {
|
||||||
|
|
|
@ -429,9 +429,7 @@ void __init palm27x_power_init(int ac, int usb)
|
||||||
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
||||||
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
||||||
static struct regulator_consumer_supply palm27x_max1587a_consumers[] = {
|
static struct regulator_consumer_supply palm27x_max1587a_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data palm27x_max1587a_v3_info = {
|
static struct regulator_init_data palm27x_max1587a_v3_info = {
|
||||||
|
|
|
@ -877,9 +877,7 @@ static struct i2c_board_info spitz_i2c_devs[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_consumer_supply isl6271a_consumers[] = {
|
static struct regulator_consumer_supply isl6271a_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data isl6271a_info[] = {
|
static struct regulator_init_data isl6271a_info[] = {
|
||||||
|
|
|
@ -151,10 +151,7 @@ static struct platform_device sht15 = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_consumer_supply stargate2_sensor_3_con[] = {
|
static struct regulator_consumer_supply stargate2_sensor_3_con[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc", "sht15"),
|
||||||
.dev_name = "sht15",
|
|
||||||
.supply = "vcc",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum stargate2_ldos{
|
enum stargate2_ldos{
|
||||||
|
|
|
@ -640,9 +640,7 @@ static inline void vpac270_ide_init(void) {}
|
||||||
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
||||||
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
||||||
static struct regulator_consumer_supply vpac270_max1587a_consumers[] = {
|
static struct regulator_consumer_supply vpac270_max1587a_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data vpac270_max1587a_v3_info = {
|
static struct regulator_init_data vpac270_max1587a_v3_info = {
|
||||||
|
|
|
@ -615,9 +615,7 @@ static inline void z2_spi_init(void) {}
|
||||||
#if defined(CONFIG_REGULATOR_TPS65023) || \
|
#if defined(CONFIG_REGULATOR_TPS65023) || \
|
||||||
defined(CONFIG_REGULATOR_TPS65023_MODULE)
|
defined(CONFIG_REGULATOR_TPS65023_MODULE)
|
||||||
static struct regulator_consumer_supply z2_tps65021_consumers[] = {
|
static struct regulator_consumer_supply z2_tps65021_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data z2_tps65021_info[] = {
|
static struct regulator_init_data z2_tps65021_info[] = {
|
||||||
|
|
Loading…
Reference in New Issue