x86/intel-mid changes for v3.14
Subsystems (3)
Linus,
Please pull the latest x86-intel-mid-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-intel-mid-for-linus
# HEAD: ee87c751d88f9b03fee7349556817fe80c113b32 x86, intel_mid: Replace memcpy with struct assignment
This tree improves Intel MID (Mobile Internet Device) platform support:
- Merrifield platform support (David Cohen)
- Clovertrail platform support (Kuppuswamy Sathyanarayanan)
- Various cleanups and fixes (David Cohen)
Thanks,
Ingo
------------------>
David Cohen (6):
x86, intel-mid: Move Medfield code out of intel-mid.c core file x86, intel-mid: Add Merrifield platform support
x86, intel-mid: Remove deprecated X86_MDFLD and X86_WANT_INTEL_MID configs x86, intel-mid: sfi_handle_*_dev() should check for pdata error code x86, intel-mid: Check get_gpio_by_name() error code on platform code x86, intel-mid: Return proper error code from get_gpio_by_name()
Fengguang Wu (1):
x86, intel_mid: Replace memcpy with struct assignment
Kuppuswamy Sathyanarayanan (1):
x86, intel-mid: Add Clovertrail platform support
arch/x86/Kconfig | 30 ++---- arch/x86/include/asm/intel-mid.h | 48 +++++++++- arch/x86/pci/intel_mid_pci.c | 6 +- arch/x86/platform/intel-mid/Makefile | 4 +- .../intel-mid/device_libs/platform_emc1403.c | 4 +- .../intel-mid/device_libs/platform_gpio_keys.c | 2 +- .../intel-mid/device_libs/platform_lis331.c | 4 +- .../intel-mid/device_libs/platform_max7315.c | 2 +- .../intel-mid/device_libs/platform_mpu3050.c | 2 +- .../intel-mid/device_libs/platform_pmic_gpio.c | 2 +- .../intel-mid/device_libs/platform_tca6416.c | 4 +- arch/x86/platform/intel-mid/intel-mid.c | 64 +++++++------ arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 19 ++++ arch/x86/platform/intel-mid/mfld.c | 75 +++++++++++++++ arch/x86/platform/intel-mid/mrfl.c | 103 +++++++++++++++++++++ arch/x86/platform/intel-mid/sfi.c | 46 +++++++-- 16 files changed, 340 insertions(+), 75 deletions(-) create mode 100644 arch/x86/platform/intel-mid/intel_mid_weak_decls.h create mode 100644 arch/x86/platform/intel-mid/mfld.c create mode 100644 arch/x86/platform/intel-mid/mrfl.c
arch/x86/Kconfig +7 -23
@@ -438,42 +438,26 @@ config X86_INTEL_CE This option compiles in support for the CE4100 SOC for settop boxes and media devices. -config X86_WANT_INTEL_MID +config X86_INTEL_MID bool "Intel MID platform support" depends on X86_32 depends on X86_EXTENDED_PLATFORM - ---help--- - Select to build a kernel capable of supporting Intel MID platform - systems which do not have the PCI legacy interfaces (Moorestown, - Medfield). If you are building for a PC class system say N here. - -if X86_WANT_INTEL_MID - -config X86_INTEL_MID - bool - -config X86_MDFLD - bool "Medfield MID platform" depends on PCI depends on PCI_GOANY depends on X86_IO_APIC - select X86_INTEL_MID select SFI + select I2C select DW_APB_TIMER select APB_TIMER - select I2C - select SPI select INTEL_SCU_IPC - select X86_PLATFORM_DEVICES select MFD_INTEL_MSIC ---help--- - Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin - Internet Device(MID) platform. - Unlike standard x86 PCs, Medfield does not have many legacy devices - nor standard legacy replacement devices/features. e.g. Medfield does - not contain i8259, i8254, HPET, legacy BIOS, most of the io ports. + Select to build a kernel capable of supporting Intel MID (Mobile + Internet Device) platform systems which do not have the PCI legacy + interfaces. If you are building for a PC class system say N here. -endif + Intel MID platforms are based on an Intel processor and chipset which + consume less power than most of the x86 derivatives. config X86_INTEL_LPSS bool "Intel Low Power Subsystem Support"
arch/x86/include/asm/intel-mid.h +46 -2
64 lines not on this page · raw message
arch/x86/pci/intel_mid_pci.c +5 -1
@@ -31,6 +31,7 @@#include <asm/pci_x86.h> #include <asm/hw_irq.h> #include <asm/io_apic.h> +#include <asm/intel-mid.h> #define PCIE_CAP_OFFSET 0x100
@@ -219,7 +220,10 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) irq_attr.ioapic =mp_find_ioapic (dev->irq); irq_attr.ioapic_pin = dev->irq; irq_attr.trigger =1 ;/* level */ - irq_attr.polarity =1 ;/* active low */ +if (intel_mid_identify_cpu () ==INTEL_MID_CPU_CHIP_TANGIER ) + irq_attr.polarity =0 ;/* active high */ +else + irq_attr.polarity =1 ;/* active low */ io_apic_set_pci_routing (&dev->dev, dev->irq, &irq_attr);return 0 ;
arch/x86/platform/intel-mid/Makefile +2 -2
@@ -1,6 +1,6 @@ -obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o -obj-$(CONFIG_X86_INTEL_MID) += intel_mid_vrtc.o +obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o mfld.o mrfl.o obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_intel_mid.o + # SFI specific code ifdef CONFIG_X86_INTEL_MID obj-$(CONFIG_SFI) += sfi.o device_libs/
arch/x86/platform/intel-mid/device_libs/platform_emc1403.c +3 -1
@@ -22,7 +22,9 @@ static void __init *emc1403_platform_data(void *info)int intr =get_gpio_by_name ("thermal_int" );int intr2nd =get_gpio_by_name ("thermal_alert" ); -if (intr ==-1 || intr2nd ==-1 ) +if (intr <0 ) +return NULL ; +if (intr2nd <0 )return NULL ; i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c +1 -1
@@ -66,7 +66,7 @@ static int __init pb_keys_init(void) gb[i].gpio =get_gpio_by_name (gb[i].desc);pr_debug ("info[%2d]: name = %s, gpio = %d\n" , i, gb[i].desc, gb[i].gpio); -if (gb[i].gpio ==-1 ) +if (gb[i].gpio <0 )continue ;if (i != good)
arch/x86/platform/intel-mid/device_libs/platform_lis331.c +3 -1
@@ -21,7 +21,9 @@ static void __init *lis331dl_platform_data(void *info)int intr =get_gpio_by_name ("accel_int" );int intr2nd =get_gpio_by_name ("accel_2" ); -if (intr ==-1 || intr2nd ==-1 ) +if (intr <0 ) +return NULL ; +if (intr2nd <0 )return NULL ; i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_max7315.c +1 -1
@@ -48,7 +48,7 @@ static void __init *max7315_platform_data(void *info) gpio_base =get_gpio_by_name (base_pin_name); intr =get_gpio_by_name (intr_pin_name); -if (gpio_base ==-1 ) +if (gpio_base <0 )return NULL ; max7315->gpio_base = gpio_base;if (intr !=-1 ) {
arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c +1 -1
@@ -19,7 +19,7 @@ static void *mpu3050_platform_data(void *info)struct i2c_board_info *i2c_info = info;int intr =get_gpio_by_name ("mpu3050_int" ); -if (intr ==-1 ) +if (intr <0 )return NULL ; i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c +1 -1
@@ -26,7 +26,7 @@ static void __init *pmic_gpio_platform_data(void *info)static struct intel_pmic_gpio_platform_data pmic_gpio_pdata;int gpio_base =get_gpio_by_name ("pmic_gpio_base" ); -if (gpio_base ==-1 ) +if (gpio_base <0 ) gpio_base =64 ; pmic_gpio_pdata.gpio_base = gpio_base; pmic_gpio_pdata.irq_base = gpio_base +INTEL_MID_IRQ_OFFSET ;
arch/x86/platform/intel-mid/device_libs/platform_tca6416.c +2 -2
@@ -34,10 +34,10 @@ static void *tca6416_platform_data(void *info) gpio_base =get_gpio_by_name (base_pin_name); intr =get_gpio_by_name (intr_pin_name); -if (gpio_base ==-1 ) +if (gpio_base <0 )return NULL ; tca6416.gpio_base = gpio_base; -if (intr !=-1 ) { +if (intr >=0 ) { i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ; tca6416.irq_base = gpio_base +INTEL_MID_IRQ_OFFSET ; }else {
arch/x86/platform/intel-mid/intel-mid.c +34 -30
97 lines not on this page · raw message
arch/x86/platform/intel-mid/intel_mid_weak_decls.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* intel_mid_weak_decls.h: Weak declarations of intel-mid.c +* +* (C) Copyright 2013 Intel Corporation +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; version 2 +* of the License. +*/ + + +/* __attribute__((weak)) makes these declarations overridable */ +/* For every CPU addition a new get_<cpuname>_ops interface needs +* to be added. +*/ +extern void *__cpuinit get_penwell_ops (void ) __attribute__((weak)); +extern void *__cpuinit get_cloverview_ops (void ) __attribute__((weak)); +extern void *__init get_tangier_ops (void ) __attribute__((weak));
arch/x86/platform/intel-mid/mfld.c new file +75 -0
75 lines not on this page · raw message
arch/x86/platform/intel-mid/mrfl.c new file +103 -0
103 lines not on this page · raw message
arch/x86/platform/intel-mid/sfi.c +37 -9
89 lines not on this page · raw message