diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-01-19 21:24:23 +0200 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2017-01-20 10:07:41 +0100 |
| commit | 910a26f6e952148a0c8815281737aaead640626c (patch) | |
| tree | 4f4fde5c17fc04f3bc61d3c4d2d278661c92a208 /arch/x86/platform/intel-mid/device_libs/Makefile | |
| parent | x86/ioapic: Return suitable error code in mp_map_gsi_to_irq() (diff) | |
| download | linux-dev-910a26f6e952148a0c8815281737aaead640626c.tar.xz linux-dev-910a26f6e952148a0c8815281737aaead640626c.zip | |
x86/platform/intel-mid: Allocate RTC interrupt for Merrifield
Legacy RTC requires interrupt line 8 to be dedicated for it. On
Intel MID platforms the legacy PIC is absent and in order to make RTC
work we need to allocate interrupt separately.
Current solution brought by commit de1c2540aa4f does it in a wrong place,
and since it's done unconditionally for all x86 devices, some of them,
e.g. PNP based, might get it wrong because they execute the MID specific
code due to x86_platform.legacy.rtc flag being set.
Move intel_mid_legacy_rtc_init() to its own module and call it before x86 RTC
CMOS initialization.
Fixes: de1c2540aa4f ("x86/platform/intel-mid: Enable RTC on Intel Merrifield")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: "Luis R . Rodriguez" <mcgrof@kernel.org>
Link: http://lkml.kernel.org/r/20170119192425.189899-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/platform/intel-mid/device_libs/Makefile')
| -rw-r--r-- | arch/x86/platform/intel-mid/device_libs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/platform/intel-mid/device_libs/Makefile b/arch/x86/platform/intel-mid/device_libs/Makefile index d4af7785844e..a7dbec4dce27 100644 --- a/arch/x86/platform/intel-mid/device_libs/Makefile +++ b/arch/x86/platform/intel-mid/device_libs/Makefile @@ -26,4 +26,5 @@ obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_pcal9555a.o obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o # MISC Devices obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o +obj-$(subst m,y,$(CONFIG_RTC_DRV_CMOS)) += platform_mrfld_rtc.o obj-$(subst m,y,$(CONFIG_INTEL_MID_WATCHDOG)) += platform_mrfld_wdt.o |