aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brunner <mibru@gmx.de>2016-06-19 04:48:20 -0400
committerLee Jones <lee.jones@linaro.org>2016-06-29 05:16:36 -0400
commit1db3ba2830bc2cd174f1b60da156d77214bed681 (patch)
tree264fd3f8ed3af29fdb103f4aa683e1befd5e3415
parent7e28abda8c1f08e8926ed1b9fbfb6efdfc88c19b (diff)
mfd: Add support for COMe-cSL6 and COMe-mAL10 to Kontron PLD driver
This is an unmodified resend of the patch already been sent on February 17 as it seems to have fallen through the net. This patch adds the DMI system ID of the Kontron COMe-cSL6 and COME-mAL10 boards 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> Acked-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/Kconfig2
-rw-r--r--drivers/mfd/kempld-core.c16
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 48ed14ae9651..2d1fb6420592 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -491,6 +491,8 @@ config MFD_KEMPLD
491 * COMe-cDC2 (microETXexpress-DC) 491 * COMe-cDC2 (microETXexpress-DC)
492 * COMe-cHL6 492 * COMe-cHL6
493 * COMe-cPC2 (microETXexpress-PC) 493 * COMe-cPC2 (microETXexpress-PC)
494 * COMe-cSL6
495 * COMe-mAL10
494 * COMe-mBT10 496 * COMe-mBT10
495 * COMe-mCT10 497 * COMe-mCT10
496 * COMe-mTT10 (nanoETXexpress-TT) 498 * COMe-mTT10 (nanoETXexpress-TT)
diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index 05b924542ee2..da5722d7c540 100644
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -624,6 +624,14 @@ static struct dmi_system_id kempld_dmi_table[] __initdata = {
624 .driver_data = (void *)&kempld_platform_data_generic, 624 .driver_data = (void *)&kempld_platform_data_generic,
625 .callback = kempld_create_platform_device, 625 .callback = kempld_create_platform_device,
626 }, { 626 }, {
627 .ident = "CSL6",
628 .matches = {
629 DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
630 DMI_MATCH(DMI_BOARD_NAME, "COMe-cSL6"),
631 },
632 .driver_data = (void *)&kempld_platform_data_generic,
633 .callback = kempld_create_platform_device,
634 }, {
627 .ident = "CVV6", 635 .ident = "CVV6",
628 .matches = { 636 .matches = {
629 DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"), 637 DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
@@ -647,6 +655,14 @@ static struct dmi_system_id kempld_dmi_table[] __initdata = {
647 .driver_data = (void *)&kempld_platform_data_generic, 655 .driver_data = (void *)&kempld_platform_data_generic,
648 .callback = kempld_create_platform_device, 656 .callback = kempld_create_platform_device,
649 }, { 657 }, {
658 .ident = "MAL1",
659 .matches = {
660 DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),
661 DMI_MATCH(DMI_BOARD_NAME, "COMe-mAL10"),
662 },
663 .driver_data = (void *)&kempld_platform_data_generic,
664 .callback = kempld_create_platform_device,
665 }, {
650 .ident = "MBR1", 666 .ident = "MBR1",
651 .matches = { 667 .matches = {
652 DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"), 668 DMI_MATCH(DMI_BOARD_VENDOR, "Kontron"),