* [tip:x86/platform] x86/mrst: Add msic_thermal platform support
@ 2012-01-26 21:42 tip-bot for Mika Westerberg
0 siblings, 0 replies; only message in thread
From: tip-bot for Mika Westerberg @ 2012-01-26 21:42 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, alan, hpa, mingo, kirill.shutemov, mika.westerberg,
tglx, mingo
Commit-ID: ecfdb0ac15ba983ba4ff11709fdf8f178c0b8b87
Gitweb: http://git.kernel.org/tip/ecfdb0ac15ba983ba4ff11709fdf8f178c0b8b87
Author: Mika Westerberg <mika.westerberg@linux.intel.com>
AuthorDate: Thu, 26 Jan 2012 17:36:08 +0000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 26 Jan 2012 21:23:56 +0100
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>
---
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 6743587..721e652 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)
return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_OCD);
}
+static void *msic_thermal_platform_data(void *info)
+{
+ return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_THERMAL);
+}
+
static const struct devs_id __initconst device_ids[] = {
{"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data},
{"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data},
@@ -689,6 +694,7 @@ static const struct devs_id __initconst device_ids[] = {
{"msic_audio", SFI_DEV_TYPE_IPC, 1, &msic_audio_platform_data},
{"msic_power_btn", SFI_DEV_TYPE_IPC, 1, &msic_power_btn_platform_data},
{"msic_ocd", SFI_DEV_TYPE_IPC, 1, &msic_ocd_platform_data},
+ {"msic_thermal", SFI_DEV_TYPE_IPC, 1, &msic_thermal_platform_data},
{},
};
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-01-26 21:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-26 21:42 [tip:x86/platform] x86/mrst: Add msic_thermal platform support tip-bot for Mika Westerberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).