diff options
author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2012-01-26 12:36:08 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-01-26 15:23:56 -0500 |
commit | ecfdb0ac15ba983ba4ff11709fdf8f178c0b8b87 (patch) | |
tree | 471ab03943eedb8879bf2717adf31022f4a8005e /arch | |
parent | 15a713df4145ad2540f8d84c3f4de930806f6151 (diff) |
x86/mrst: Add msic_thermal platform support
This will let the MSIC driver to create platform device for the
thermal driver.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: jacob.jun.pan@linux.intel.com
Link: http://lkml.kernel.org/n/tip-rh1jaft9tjpzfql76gd56h1q@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/platform/mrst/mrst.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c index 6743587575a6..721e65285dce 100644 --- a/arch/x86/platform/mrst/mrst.c +++ b/arch/x86/platform/mrst/mrst.c | |||
@@ -670,6 +670,11 @@ static void *msic_ocd_platform_data(void *info) | |||
670 | return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_OCD); | 670 | return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_OCD); |
671 | } | 671 | } |
672 | 672 | ||
673 | static void *msic_thermal_platform_data(void *info) | ||
674 | { | ||
675 | return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_THERMAL); | ||
676 | } | ||
677 | |||
673 | static const struct devs_id __initconst device_ids[] = { | 678 | static const struct devs_id __initconst device_ids[] = { |
674 | {"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data}, | 679 | {"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data}, |
675 | {"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data}, | 680 | {"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data}, |
@@ -689,6 +694,7 @@ static const struct devs_id __initconst device_ids[] = { | |||
689 | {"msic_audio", SFI_DEV_TYPE_IPC, 1, &msic_audio_platform_data}, | 694 | {"msic_audio", SFI_DEV_TYPE_IPC, 1, &msic_audio_platform_data}, |
690 | {"msic_power_btn", SFI_DEV_TYPE_IPC, 1, &msic_power_btn_platform_data}, | 695 | {"msic_power_btn", SFI_DEV_TYPE_IPC, 1, &msic_power_btn_platform_data}, |
691 | {"msic_ocd", SFI_DEV_TYPE_IPC, 1, &msic_ocd_platform_data}, | 696 | {"msic_ocd", SFI_DEV_TYPE_IPC, 1, &msic_ocd_platform_data}, |
697 | {"msic_thermal", SFI_DEV_TYPE_IPC, 1, &msic_thermal_platform_data}, | ||
692 | 698 | ||
693 | {}, | 699 | {}, |
694 | }; | 700 | }; |