projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mfd
/
kempld-core.c
diff --git
a/drivers/mfd/kempld-core.c
b/drivers/mfd/kempld-core.c
index d3e23278d299021f34bab4aacbb361d117f5a40b..07692604e119123a1f9b311b2611c5d0103daa78 100644
(file)
--- a/
drivers/mfd/kempld-core.c
+++ b/
drivers/mfd/kempld-core.c
@@
-322,9
+322,12
@@
static int kempld_detect_device(struct kempld_device_data *pld)
return -ENODEV;
}
return -ENODEV;
}
- /* Release hardware mutex if aquired */
- if (!(index_reg & KEMPLD_MUTEX_KEY))
+ /* Release hardware mutex if a
c
quired */
+ if (!(index_reg & KEMPLD_MUTEX_KEY))
{
iowrite8(KEMPLD_MUTEX_KEY, pld->io_index);
iowrite8(KEMPLD_MUTEX_KEY, pld->io_index);
+ /* PXT and COMe-cPC2 boards may require a second release */
+ iowrite8(KEMPLD_MUTEX_KEY, pld->io_index);
+ }
mutex_unlock(&pld->lock);
mutex_unlock(&pld->lock);
@@
-437,6
+440,14
@@
static struct dmi_system_id __initdata kempld_dmi_table[] = {
},
.driver_data = (void *)&kempld_platform_data_generic,
.callback = kempld_create_platform_device,
},
.driver_data = (void *)&kempld_platform_data_generic,
.callback = kempld_create_platform_device,
+ }, {
+ .ident = "CHL6",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+ DMI_MATCH(DMI_BOARD_NAME, "COMe-cHL6"),
+ },
+ .driver_data = (void *)&kempld_platform_data_generic,
+ .callback = kempld_create_platform_device,
}, {
.ident = "CHR2",
.matches = {
}, {
.ident = "CHR2",
.matches = {
@@
-509,6
+520,14
@@
static struct dmi_system_id __initdata kempld_dmi_table[] = {
},
.driver_data = (void *)&kempld_platform_data_generic,
.callback = kempld_create_platform_device,
},
.driver_data = (void *)&kempld_platform_data_generic,
.callback = kempld_create_platform_device,
+ }, {
+ .ident = "CVV6",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+ DMI_MATCH(DMI_BOARD_NAME, "COMe-cBT"),
+ },
+ .driver_data = (void *)&kempld_platform_data_generic,
+ .callback = kempld_create_platform_device,
}, {
.ident = "FRI2",
.matches = {
}, {
.ident = "FRI2",
.matches = {
@@
-532,6
+551,14
@@
static struct dmi_system_id __initdata kempld_dmi_table[] = {
},
.driver_data = (void *)&kempld_platform_data_generic,
.callback = kempld_create_platform_device,
},
.driver_data = (void *)&kempld_platform_data_generic,
.callback = kempld_create_platform_device,
+ }, {
+ .ident = "MVV1",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+ DMI_MATCH(DMI_BOARD_NAME, "COMe-mBT"),
+ },
+ .driver_data = (void *)&kempld_platform_data_generic,
+ .callback = kempld_create_platform_device,
}, {
.ident = "NTC1",
.matches = {
}, {
.ident = "NTC1",
.matches = {