summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brunner <mibru@gmx.de>2015-01-27 11:05:49 +0100
committerLee Jones <lee.jones@linaro.org>2015-03-03 16:41:14 +0000
commitfb358e438d5456c29657698cf9f768ee55d6cba2 (patch)
tree4c3dd3b3bda45ac26ad72d968a404fa75470091f
parentd638787411a7d5df6dd2965b253efaa7b534e15e (diff)
downloadop-kernel-dev-fb358e438d5456c29657698cf9f768ee55d6cba2.zip
op-kernel-dev-fb358e438d5456c29657698cf9f768ee55d6cba2.tar.gz
mfd: Add support for COMe-cBL6 to Kontron PLD driver
This patch adds the DMI system ID of the Kontron COMe-cBL6 board to the Kontron PLD driver. The list of supported products in the module description is also updated. Signed-off-by: Michael Brunner <michael.brunner@kontron.com> Acked-by: Christian Rauch <christian.rauch@kontron.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/Kconfig1
-rw-r--r--drivers/mfd/kempld-core.c11
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 9b5e605..b5fb03c 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -364,6 +364,7 @@ config MFD_KEMPLD
* COMe-bIP#
* COMe-bPC2 (ETXexpress-PC)
* COMe-bSC# (ETXexpress-SC T#)
+ * COMe-cBL6
* COMe-cBT6
* COMe-cCT6
* COMe-cDC2 (microETXexpress-DC)
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index f38ec42..61a1f9b 100644
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -508,8 +508,15 @@ static struct dmi_system_id kempld_dmi_table[] __initdata = {
},
.driver_data = (void *)&kempld_platform_data_generic,
.callback = kempld_create_platform_device,
- },
- {
+ }, {
+ .ident = "CBL6",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
+ DMI_MATCH(DMI_BOARD_NAME, "COMe-cBL6"),
+ },
+ .driver_data = (void *)&kempld_platform_data_generic,
+ .callback = kempld_create_platform_device,
+ }, {
.ident = "CCR2",
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
OpenPOWER on IntegriCloud