diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-01-15 12:48:43 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-01-15 12:48:43 +0200 |
| commit | 715a1284d89a740b197b3bad5eb20d36a397382f (patch) | |
| tree | 07ad2960ab66e56b3d1e151036262019a18e3df1 /arch/arm/mach-sa1100/collie.c | |
| parent | 181739822cf6f8f4e12b173913af2967a28906c0 (diff) | |
| parent | 06862d789ddde8a99c1e579e934ca17c15a84755 (diff) | |
| download | linux-715a1284d89a740b197b3bad5eb20d36a397382f.tar.gz linux-715a1284d89a740b197b3bad5eb20d36a397382f.tar.bz2 linux-715a1284d89a740b197b3bad5eb20d36a397382f.zip | |
Merge branch 'cpuidle-fix' into fixes
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index bd3a52fd09ce..d4e89a02c8c8 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -98,6 +98,26 @@ static struct mcp_plat_data collie_mcp_data = { .codec_pdata = &collie_ucb1x00_data, }; +/* Battery management GPIOs */ +static struct gpiod_lookup_table collie_battery_gpiod_table = { + /* the MCP codec mcp0 has the ucb1x00 as attached device */ + .dev_id = "ucb1x00", + .table = { + /* This is found on the main GPIO on the SA1100 */ + GPIO_LOOKUP("gpio", COLLIE_GPIO_CO, + "main battery full", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("gpio", COLLIE_GPIO_MAIN_BAT_LOW, + "main battery low", GPIO_ACTIVE_HIGH), + /* + * This is GPIO 0 on the Scoop expander, which is registered + * from common/scoop.c with this gpio chip label. + */ + GPIO_LOOKUP("sharp-scoop", 0, + "main charge on", GPIO_ACTIVE_HIGH), + { }, + }, +}; + static int collie_ir_startup(struct device *dev) { int rc = gpio_request(COLLIE_GPIO_IR_ON, "IrDA"); @@ -395,6 +415,7 @@ static void __init collie_init(void) platform_scoop_config = &collie_pcmcia_config; gpiod_add_lookup_table(&collie_power_gpiod_table); + gpiod_add_lookup_table(&collie_battery_gpiod_table); ret = platform_add_devices(devices, ARRAY_SIZE(devices)); if (ret) { |