Skip to content

L
linux
Commit 6af75ecd authored by Linus Walleij's avatar Linus Walleij Committed by Samuel Ortiz
Browse files
Options

mfd: Update ab8500 subdevice list 

This synchronize the subdevice entries for the AB8500 MFD driver
with the latest development of subdrivers for things like battery
charging and temperature monitoring.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 5cef8df5
Show whitespace changes
Inline Side-by-side
Showing with 166 additions and 49 deletions
drivers/mfd/ab8500-core.c
View file @ 6af75ecd
...@@ -417,19 +417,46 @@ static struct resource __devinitdata ab8500_poweronkey_db_resources[] = { ...@@ -417,19 +417,46 @@ static struct resource __devinitdata ab8500_poweronkey_db_resources[] = {
}, },
}; };
static struct resource __devinitdata ab8500_bm_resources[] = { static struct resource __devinitdata ab8500_av_acc_detect_resources[] = {
{ {
.name = "MAIN_EXT_CH_NOT_OK", .name = "ACC_DETECT_1DB_F",
.start = AB8500_INT_MAIN_EXT_CH_NOT_OK, .start = AB8500_INT_ACC_DETECT_1DB_F,
.end = AB8500_INT_MAIN_EXT_CH_NOT_OK, .end = AB8500_INT_ACC_DETECT_1DB_F,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "BATT_OVV", .name = "ACC_DETECT_1DB_R",
.start = AB8500_INT_BATT_OVV, .start = AB8500_INT_ACC_DETECT_1DB_R,
.end = AB8500_INT_BATT_OVV, .end = AB8500_INT_ACC_DETECT_1DB_R,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{
.name = "ACC_DETECT_21DB_F",
.start = AB8500_INT_ACC_DETECT_21DB_F,
.end = AB8500_INT_ACC_DETECT_21DB_F,
.flags = IORESOURCE_IRQ,
},
{
.name = "ACC_DETECT_21DB_R",
.start = AB8500_INT_ACC_DETECT_21DB_R,
.end = AB8500_INT_ACC_DETECT_21DB_R,
.flags = IORESOURCE_IRQ,
},
{
.name = "ACC_DETECT_22DB_F",
.start = AB8500_INT_ACC_DETECT_22DB_F,
.end = AB8500_INT_ACC_DETECT_22DB_F,
.flags = IORESOURCE_IRQ,
},
{
.name = "ACC_DETECT_22DB_R",
.start = AB8500_INT_ACC_DETECT_22DB_R,
.end = AB8500_INT_ACC_DETECT_22DB_R,
.flags = IORESOURCE_IRQ,
},
};
static struct resource __devinitdata ab8500_charger_resources[] = {
{ {
.name = "MAIN_CH_UNPLUG_DET", .name = "MAIN_CH_UNPLUG_DET",
.start = AB8500_INT_MAIN_CH_UNPLUG_DET, .start = AB8500_INT_MAIN_CH_UNPLUG_DET,
...@@ -442,12 +469,6 @@ static struct resource __devinitdata ab8500_bm_resources[] = { ...@@ -442,12 +469,6 @@ static struct resource __devinitdata ab8500_bm_resources[] = {
.end = AB8500_INT_MAIN_CH_PLUG_DET, .end = AB8500_INT_MAIN_CH_PLUG_DET,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{
.name = "VBUS_DET_F",
.start = AB8500_INT_VBUS_DET_F,
.end = AB8500_INT_VBUS_DET_F,
.flags = IORESOURCE_IRQ,
},
{ {
.name = "VBUS_DET_R", .name = "VBUS_DET_R",
.start = AB8500_INT_VBUS_DET_R, .start = AB8500_INT_VBUS_DET_R,
...@@ -455,15 +476,21 @@ static struct resource __devinitdata ab8500_bm_resources[] = { ...@@ -455,15 +476,21 @@ static struct resource __devinitdata ab8500_bm_resources[] = {
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "BAT_CTRL_INDB", .name = "VBUS_DET_F",
.start = AB8500_INT_BAT_CTRL_INDB, .start = AB8500_INT_VBUS_DET_F,
.end = AB8500_INT_BAT_CTRL_INDB, .end = AB8500_INT_VBUS_DET_F,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "CH_WD_EXP", .name = "USB_LINK_STATUS",
.start = AB8500_INT_CH_WD_EXP, .start = AB8500_INT_USB_LINK_STATUS,
.end = AB8500_INT_CH_WD_EXP, .end = AB8500_INT_USB_LINK_STATUS,
.flags = IORESOURCE_IRQ,
},
{
.name = "USB_CHARGE_DET_DONE",
.start = AB8500_INT_USB_CHG_DET_DONE,
.end = AB8500_INT_USB_CHG_DET_DONE,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -473,21 +500,60 @@ static struct resource __devinitdata ab8500_bm_resources[] = { ...@@ -473,21 +500,60 @@ static struct resource __devinitdata ab8500_bm_resources[] = {
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "NCONV_ACCU", .name = "USB_CH_TH_PROT_R",
.start = AB8500_INT_CCN_CONV_ACC, .start = AB8500_INT_USB_CH_TH_PROT_R,
.end = AB8500_INT_CCN_CONV_ACC, .end = AB8500_INT_USB_CH_TH_PROT_R,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "LOW_BAT_F", .name = "USB_CH_TH_PROT_F",
.start = AB8500_INT_LOW_BAT_F, .start = AB8500_INT_USB_CH_TH_PROT_F,
.end = AB8500_INT_LOW_BAT_F, .end = AB8500_INT_USB_CH_TH_PROT_F,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "LOW_BAT_R", .name = "MAIN_EXT_CH_NOT_OK",
.start = AB8500_INT_LOW_BAT_R, .start = AB8500_INT_MAIN_EXT_CH_NOT_OK,
.end = AB8500_INT_LOW_BAT_R, .end = AB8500_INT_MAIN_EXT_CH_NOT_OK,
.flags = IORESOURCE_IRQ,
},
{
.name = "MAIN_CH_TH_PROT_R",
.start = AB8500_INT_MAIN_CH_TH_PROT_R,
.end = AB8500_INT_MAIN_CH_TH_PROT_R,
.flags = IORESOURCE_IRQ,
},
{
.name = "MAIN_CH_TH_PROT_F",
.start = AB8500_INT_MAIN_CH_TH_PROT_F,
.end = AB8500_INT_MAIN_CH_TH_PROT_F,
.flags = IORESOURCE_IRQ,
},
{
.name = "USB_CHARGER_NOT_OKR",
.start = AB8500_INT_USB_CHARGER_NOT_OK,
.end = AB8500_INT_USB_CHARGER_NOT_OK,
.flags = IORESOURCE_IRQ,
},
{
.name = "USB_CHARGER_NOT_OKF",
.start = AB8500_INT_USB_CHARGER_NOT_OKF,
.end = AB8500_INT_USB_CHARGER_NOT_OKF,
.flags = IORESOURCE_IRQ,
},
{
.name = "CH_WD_EXP",
.start = AB8500_INT_CH_WD_EXP,
.end = AB8500_INT_CH_WD_EXP,
.flags = IORESOURCE_IRQ,
},
};
static struct resource __devinitdata ab8500_btemp_resources[] = {
{
.name = "BAT_CTRL_INDB",
.start = AB8500_INT_BAT_CTRL_INDB,
.end = AB8500_INT_BAT_CTRL_INDB,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
...@@ -503,37 +569,54 @@ static struct resource __devinitdata ab8500_bm_resources[] = { ...@@ -503,37 +569,54 @@ static struct resource __devinitdata ab8500_bm_resources[] = {
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "USB_CHARGER_NOT_OKR", .name = "BTEMP_LOW_MEDIUM",
.start = AB8500_INT_USB_CHARGER_NOT_OK, .start = AB8500_INT_BTEMP_LOW_MEDIUM,
.end = AB8500_INT_USB_CHARGER_NOT_OK, .end = AB8500_INT_BTEMP_LOW_MEDIUM,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "USB_CHARGE_DET_DONE", .name = "BTEMP_MEDIUM_HIGH",
.start = AB8500_INT_USB_CHG_DET_DONE, .start = AB8500_INT_BTEMP_MEDIUM_HIGH,
.end = AB8500_INT_USB_CHG_DET_DONE, .end = AB8500_INT_BTEMP_MEDIUM_HIGH,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
};
static struct resource __devinitdata ab8500_fg_resources[] = {
{ {
.name = "USB_CH_TH_PROT_R", .name = "NCONV_ACCU",
.start = AB8500_INT_USB_CH_TH_PROT_R, .start = AB8500_INT_CCN_CONV_ACC,
.end = AB8500_INT_USB_CH_TH_PROT_R, .end = AB8500_INT_CCN_CONV_ACC,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "MAIN_CH_TH_PROT_R", .name = "BATT_OVV",
.start = AB8500_INT_MAIN_CH_TH_PROT_R, .start = AB8500_INT_BATT_OVV,
.end = AB8500_INT_MAIN_CH_TH_PROT_R, .end = AB8500_INT_BATT_OVV,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{ {
.name = "USB_CHARGER_NOT_OKF", .name = "LOW_BAT_F",
.start = AB8500_INT_USB_CHARGER_NOT_OKF, .start = AB8500_INT_LOW_BAT_F,
.end = AB8500_INT_USB_CHARGER_NOT_OKF, .end = AB8500_INT_LOW_BAT_F,
.flags = IORESOURCE_IRQ,
},
{
.name = "LOW_BAT_R",
.start = AB8500_INT_LOW_BAT_R,
.end = AB8500_INT_LOW_BAT_R,
.flags = IORESOURCE_IRQ,
},
{
.name = "CC_INT_CALIB",
.start = AB8500_INT_CC_INT_CALIB,
.end = AB8500_INT_CC_INT_CALIB,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
}; };
static struct resource __devinitdata ab8500_chargalg_resources[] = {};
static struct resource __devinitdata ab8500_debug_resources[] = { static struct resource __devinitdata ab8500_debug_resources[] = {
{ {
.name = "IRQ_FIRST", .name = "IRQ_FIRST",
...@@ -580,6 +663,18 @@ static struct resource __devinitdata ab8500_usb_resources[] = { ...@@ -580,6 +663,18 @@ static struct resource __devinitdata ab8500_usb_resources[] = {
.end = AB8500_INT_USB_LINK_STATUS, .end = AB8500_INT_USB_LINK_STATUS,
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
{
.name = "USB_ADP_PROBE_PLUG",
.start = AB8500_INT_ADP_PROBE_PLUG,
.end = AB8500_INT_ADP_PROBE_PLUG,
.flags = IORESOURCE_IRQ,
},
{
.name = "USB_ADP_PROBE_UNPLUG",
.start = AB8500_INT_ADP_PROBE_UNPLUG,
.end = AB8500_INT_ADP_PROBE_UNPLUG,
.flags = IORESOURCE_IRQ,
},
}; };
static struct resource __devinitdata ab8500_temp_resources[] = { static struct resource __devinitdata ab8500_temp_resources[] = {
...@@ -621,11 +716,33 @@ static struct mfd_cell __devinitdata ab8500_devs[] = { ...@@ -621,11 +716,33 @@ static struct mfd_cell __devinitdata ab8500_devs[] = {
.resources = ab8500_rtc_resources, .resources = ab8500_rtc_resources,
}, },
{ {
.name = "ab8500-bm", .name = "ab8500-charger",
.num_resources = ARRAY_SIZE(ab8500_bm_resources), .num_resources = ARRAY_SIZE(ab8500_charger_resources),
.resources = ab8500_bm_resources, .resources = ab8500_charger_resources,
},
{
.name = "ab8500-btemp",
.num_resources = ARRAY_SIZE(ab8500_btemp_resources),
.resources = ab8500_btemp_resources,
},
{
.name = "ab8500-fg",
.num_resources = ARRAY_SIZE(ab8500_fg_resources),
.resources = ab8500_fg_resources,
},
{
.name = "ab8500-chargalg",
.num_resources = ARRAY_SIZE(ab8500_chargalg_resources),
.resources = ab8500_chargalg_resources,
},
{
.name = "ab8500-acc-det",
.num_resources = ARRAY_SIZE(ab8500_av_acc_detect_resources),
.resources = ab8500_av_acc_detect_resources,
},
{
.name = "ab8500-codec",
}, },
{ .name = "ab8500-codec", },
{ {
.name = "ab8500-usb", .name = "ab8500-usb",
.num_resources = ARRAY_SIZE(ab8500_usb_resources), .num_resources = ARRAY_SIZE(ab8500_usb_resources),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7