x86/intel-mid changes for v3.13
Subsystems (11)
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: aeeca404266c8ed2997905afc342ba9561f49ca7 x86, intel-mid: Do not re-introduce usage of obsolete __cpuinit
Update the 'intel mid' (mobile internet device) platform code as Intel is rolling out more SoC designs.
This gets rid of most of the 'MRST' platform code in the process, mostly by renaming and shuffling code around into their respective 'intel-mid' platform drivers.
out-of-topic modifications in x86-intel-mid-for-linus:
--------------------------------------------------------
drivers/gpu/drm/gma500/mdfld_dsi_output.h# 05454c2: intel_mid: Renamed *mrst* to *int drivers/gpu/drm/gma500/oaktrail_device.c# 05454c2: intel_mid: Renamed *mrst* to *int drivers/gpu/drm/gma500/oaktrail_lvds.c# 05454c2: intel_mid: Renamed *mrst* to *int drivers/platform/x86/intel_scu_ipc.c# 712b6aa: intel_mid: Renamed *mrst* to *int
# 05454c2: intel_mid: Renamed *mrst* to *int
drivers/rtc/rtc-mrst.c # 05454c2: intel_mid: Renamed *mrst* to *int
drivers/watchdog/intel_scu_watchdog.c# 712b6aa: intel_mid: Renamed *mrst* to *int
# 05454c2: intel_mid: Renamed *mrst* to *int include/linux/sfi.h # 40a96d5: intel_mid: Move platform device s
Thanks,
Ingo
------------------>
David Cohen (3):
intel-mid: sfi: Allow struct devs_id.get_platform_data to be NULL
x86: intel-mid: Add section for sfi device table
intel_mid: Move platform device setups to their own platform_<device>.* files
Fengguang Wu (1):
pci: intel_mid: Return true/false in function returning bool
Kuppuswamy Sathyanarayanan (8):
mrst: Fixed printk/pr_* related issues
mrst: Fixed indentation issues
intel_mid: Renamed *mrst* to *intel_mid*
intel_mid: Renamed *mrst* to *intel_mid*
intel_mid: Refactored sfi_parse_devs() function
intel_mid: Added custom device_handler support
intel_mid: Added custom handler for ipc devices
intel_mid: Moved SFI related code to sfi.c
Paul Gortmaker (1):
x86, intel-mid: Do not re-introduce usage of obsolete __cpuinit
Documentation/kernel-parameters.txt | 6 +-
arch/x86/include/asm/intel-mid.h | 113 +++
.../include/asm/{mrst-vrtc.h => intel_mid_vrtc.h} | 4 +-
arch/x86/include/asm/mrst.h | 81 --
arch/x86/include/asm/setup.h | 4 +-
arch/x86/include/uapi/asm/bootparam.h | 2 +-
arch/x86/kernel/apb_timer.c | 10 +-
arch/x86/kernel/early_printk.c | 2 +-
arch/x86/kernel/head32.c | 4 +-
arch/x86/kernel/rtc.c | 4 +-
arch/x86/kernel/vmlinux.lds.S | 9 +
arch/x86/pci/Makefile | 2 +-
arch/x86/pci/{mrst.c => intel_mid_pci.c} | 20 +-
arch/x86/platform/Makefile | 2 +-
arch/x86/platform/intel-mid/Makefile | 7 +
arch/x86/platform/intel-mid/device_libs/Makefile | 22 +
.../intel-mid/device_libs/platform_bma023.c | 20 +
.../intel-mid/device_libs/platform_emc1403.c | 41 +
.../intel-mid/device_libs/platform_gpio_keys.c | 83 ++
.../platform/intel-mid/device_libs/platform_ipc.c | 68 ++
.../platform/intel-mid/device_libs/platform_ipc.h | 17 +
.../intel-mid/device_libs/platform_lis331.c | 39 +
.../intel-mid/device_libs/platform_max3111.c | 35 +
.../intel-mid/device_libs/platform_max7315.c | 79 ++
.../intel-mid/device_libs/platform_mpu3050.c | 36 +
.../platform/intel-mid/device_libs/platform_msic.c | 87 ++
.../platform/intel-mid/device_libs/platform_msic.h | 19 +
.../intel-mid/device_libs/platform_msic_audio.c | 47 +
.../intel-mid/device_libs/platform_msic_battery.c | 37 +
.../intel-mid/device_libs/platform_msic_gpio.c | 48 +
.../intel-mid/device_libs/platform_msic_ocd.c | 49 +
.../device_libs/platform_msic_power_btn.c | 36 +
.../intel-mid/device_libs/platform_msic_thermal.c | 37 +
.../intel-mid/device_libs/platform_pmic_gpio.c | 54 +
.../intel-mid/device_libs/platform_tc35876x.c | 36 +
.../intel-mid/device_libs/platform_tca6416.c | 57 ++
.../early_printk_intel_mid.c} | 11 +-
arch/x86/platform/intel-mid/intel-mid.c | 213 ++++
.../{mrst/vrtc.c => intel-mid/intel_mid_vrtc.c} | 19 +-
arch/x86/platform/intel-mid/sfi.c | 488 +++++++++
arch/x86/platform/mrst/Makefile | 3 -
arch/x86/platform/mrst/mrst.c | 1052 --------------------
drivers/gpu/drm/gma500/mdfld_dsi_output.h | 2 +-
drivers/gpu/drm/gma500/oaktrail_device.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +-
drivers/platform/x86/intel_scu_ipc.c | 4 +-
drivers/rtc/rtc-mrst.c | 4 +-
drivers/watchdog/intel_scu_watchdog.c | 4 +-
include/linux/sfi.h | 3 +
49 files changed, 1834 insertions(+), 1190 deletions(-)
create mode 100644 arch/x86/include/asm/intel-mid.h
rename arch/x86/include/asm/{mrst-vrtc.h => intel_mid_vrtc.h} (81%)
delete mode 100644 arch/x86/include/asm/mrst.h
rename arch/x86/pci/{mrst.c => intel_mid_pci.c} (96%)
create mode 100644 arch/x86/platform/intel-mid/Makefile
create mode 100644 arch/x86/platform/intel-mid/device_libs/Makefile
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_bma023.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_emc1403.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.h
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_lis331.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_max3111.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_max7315.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.h
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_tc35876x.c
create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_tca6416.c
rename arch/x86/platform/{mrst/early_printk_mrst.c => intel-mid/early_printk_intel_mid.c} (97%)
create mode 100644 arch/x86/platform/intel-mid/intel-mid.c
rename arch/x86/platform/{mrst/vrtc.c => intel-mid/intel_mid_vrtc.c} (90%)
create mode 100644 arch/x86/platform/intel-mid/sfi.c
delete mode 100644 arch/x86/platform/mrst/Makefile
delete mode 100644 arch/x86/platform/mrst/mrst.cDocumentation/kernel-parameters.txt +3 -3
@@ -3471,11 +3471,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. default x2apic cluster mode on platforms supporting x2apic. - x86_mrst_timer= [X86-32,APBT] - Choose timer option for x86 Moorestown MID platform. + x86_intel_mid_timer= [X86-32,APBT] + Choose timer option for x86 Intel MID platform. Two valid options are apbt timer only and lapic timer plus one apbt timer for broadcast timer. - x86_mrst_timer=apbt_only | lapic_and_apbt + x86_intel_mid_timer=apbt_only | lapic_and_apbt xen_emul_unplug= [HW,X86,XEN] Unplug Xen emulated devices
arch/x86/include/asm/intel-mid.h new file +113 -0
113 lines not on this page · raw message
arch/x86/include/asm/intel_mid_vrtc.h renamed from arch/x86/include/asm/mrst-vrtc.h +2 -2
@@ -1,5 +1,5 @@ -#ifndef _MRST_VRTC_H -#define _MRST_VRTC_H +#ifndef _INTEL_MID_VRTC_H +#define _INTEL_MID_VRTC_Hextern unsigned char vrtc_cmos_read (unsigned char reg);extern void vrtc_cmos_write (unsigned char val,unsigned char reg);
arch/x86/include/asm/mrst.h deleted +0 -81
81 lines not on this page · raw message
arch/x86/include/asm/setup.h +2 -2
@@ -51,9 +51,9 @@ extern void i386_reserve_resources(void);extern void setup_default_timer_irq (void );#ifdef CONFIG_X86_INTEL_MID -extern void x86_mrst_early_setup (void ); +extern void x86_intel_mid_early_setup (void );#else -static inline void x86_mrst_early_setup (void ) { } +static inline void x86_intel_mid_early_setup (void ) { }#endif #ifdef CONFIG_X86_INTEL_CE
arch/x86/include/uapi/asm/bootparam.h +1 -1
@@ -158,7 +158,7 @@ enum {X86_SUBARCH_PC =0 ,X86_SUBARCH_LGUEST ,X86_SUBARCH_XEN , -X86_SUBARCH_MRST , +X86_SUBARCH_INTEL_MID ,X86_SUBARCH_CE4100 , X86_NR_SUBARCHS, };
arch/x86/kernel/apb_timer.c +5 -5
@@ -40,7 +40,7 @@#include <asm/fixmap.h> #include <asm/apb_timer.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include <asm/time.h> #define APBT_CLOCKEVENT_RATING 110
@@ -157,13 +157,13 @@ static int __init apbt_clockevent_register(void) adev->num =smp_processor_id (); adev->timer =dw_apb_clockevent_init (smp_processor_id (),"apbt0" , - mrst_timer_options ==MRST_TIMER_LAPIC_APBT ? + intel_mid_timer_options ==INTEL_MID_TIMER_LAPIC_APBT ?APBT_CLOCKEVENT_RATING -100 :APBT_CLOCKEVENT_RATING ,adev_virt_addr (adev),0 , apbt_freq);/* Firmware does EOI handling for us. */ adev->timer->eoi =NULL ; -if (mrst_timer_options ==MRST_TIMER_LAPIC_APBT ) { +if (intel_mid_timer_options ==INTEL_MID_TIMER_LAPIC_APBT ) { global_clock_event = &adev->timer->ced;printk (KERN_DEBUG "%s clockevent registered as global\n" , global_clock_event->name);
@@ -253,7 +253,7 @@ static int apbt_cpuhp_notify(struct notifier_block *n,static __init int apbt_late_init (void ) { -if (mrst_timer_options ==MRST_TIMER_LAPIC_APBT || +if (intel_mid_timer_options ==INTEL_MID_TIMER_LAPIC_APBT || !apb_timer_block_enabled)return 0 ;/* This notifier should be called after workqueue is ready */
@@ -340,7 +340,7 @@ void __init apbt_time_init(void) }#ifdef CONFIG_SMP /* kernel cmdline disable apb timer, so we will use lapic timers */ -if (mrst_timer_options ==MRST_TIMER_LAPIC_APBT ) { +if (intel_mid_timer_options ==INTEL_MID_TIMER_LAPIC_APBT ) {printk (KERN_INFO "apbt: disabled per cpu timer\n" );return ; }
arch/x86/kernel/early_printk.c +1 -1
@@ -14,7 +14,7 @@#include <xen/hvc-console.h> #include <asm/pci-direct.h> #include <asm/fixmap.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include <asm/pgtable.h> #include <linux/usb/ehci_def.h>
arch/x86/kernel/head32.c +2 -2
@@ -35,8 +35,8 @@ asmlinkage void __init i386_start_kernel(void)/* Call the subarch specific early setup function */ switch (boot_params.hdr.hardware_subarch) { -case X86_SUBARCH_MRST : -x86_mrst_early_setup (); +case X86_SUBARCH_INTEL_MID : +x86_intel_mid_early_setup ();break ;case X86_SUBARCH_CE4100 :x86_ce4100_early_setup ();
arch/x86/kernel/rtc.c +2 -2
@@ -12,7 +12,7 @@#include <asm/vsyscall.h> #include <asm/x86_init.h> #include <asm/time.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include <asm/rtc.h> #ifdef CONFIG_X86_32
@@ -189,7 +189,7 @@ static __init int add_rtc_cmos(void)return 0 ;/* Intel MID platforms don't have ioport rtc */ -if (mrst_identify_cpu ()) +if (intel_mid_identify_cpu ())return -ENODEV ;platform_device_register (&rtc_device);
arch/x86/kernel/vmlinux.lds.S +9 -0
@@ -199,6 +199,15 @@ SECTIONS __x86_cpu_dev_end = .; } +#ifdef CONFIG_X86_INTEL_MID + .x86_intel_mid_dev.init : AT(ADDR(.x86_intel_mid_dev.init) - \ + LOAD_OFFSET) { + __x86_intel_mid_dev_start = .; + *(.x86_intel_mid_dev.init) + __x86_intel_mid_dev_end = .; + } +#endif + /* * start address and size of operations which during runtime * can be patched with virtualization friendly instructions or
arch/x86/pci/Makefile +1 -1
@@ -18,7 +18,7 @@ obj-$(CONFIG_X86_VISWS) += visws.o obj-$(CONFIG_X86_NUMAQ) += numaq_32.o obj-$(CONFIG_X86_NUMACHIP) += numachip.o -obj-$(CONFIG_X86_INTEL_MID) += mrst.o +obj-$(CONFIG_X86_INTEL_MID) += intel_mid_pci.o obj-y += common.o early.o obj-y += bus_numa.o
arch/x86/pci/intel_mid_pci.c renamed from arch/x86/pci/mrst.c +10 -10
@@ -1,5 +1,5 @@/* -* Moorestown PCI support +* Intel MID PCI support * Copyright (c) 2008 Intel Corporation * Jesse Barnes <[email protected]> *
@@ -150,12 +150,12 @@ static bool type1_access_ok(unsigned int bus, unsigned int devfn, int reg)* shim. Therefore, use the header type in shim instead. */ if (reg >=0x100 || reg ==PCI_STATUS || reg ==PCI_HEADER_TYPE ) -return 0 ; +return false;if (bus ==0 && (devfn ==PCI_DEVFN (2 ,0 ) || devfn ==PCI_DEVFN (0 ,0 ) || devfn ==PCI_DEVFN (3 ,0 ))) -return 1 ; -return 0 ;/* Langwell on others */ +return true; +return false;/* Langwell on others */ } static int pci_read(struct pci_bus *bus, unsigned int devfn, int where,
@@ -205,7 +205,7 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where, where, size, value); } -static int mrst_pci_irq_enable (struct pci_dev *dev) +static int intel_mid_pci_irq_enable (struct pci_dev *dev) {u8 pin;struct io_apic_irq_attr irq_attr;
@@ -225,23 +225,23 @@ static int mrst_pci_irq_enable(struct pci_dev *dev)return 0 ; } -struct pci_ops pci_mrst_ops = { +struct pci_ops intel_mid_pci_ops = { .read = pci_read, .write = pci_write, };/** -* pci_mrst_init - installs pci_mrst_ops +* intel_mid_pci_init - installs intel_mid_pci_ops * * Moorestown has an interesting PCI implementation (see above). * Called when the early platform detection installs it. */ -int __init pci_mrst_init (void ) +int __init intel_mid_pci_init (void ) {pr_info ("Intel MID platform detected, using MID PCI ops\n" );pci_mmcfg_late_init (); - pcibios_enable_irq = mrst_pci_irq_enable; - pci_root_ops = pci_mrst_ops; + pcibios_enable_irq = intel_mid_pci_irq_enable; + pci_root_ops = intel_mid_pci_ops; pci_soc_mode =1 ;/* Continue with standard init */ return 1 ;
arch/x86/platform/Makefile +1 -1
@@ -4,7 +4,7 @@ obj-y += efi/ obj-y += geode/ obj-y += goldfish/ obj-y += iris/ -obj-y += mrst/ +obj-y += intel-mid/ obj-y += olpc/ obj-y += scx200/ obj-y += sfi/
arch/x86/platform/intel-mid/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o +obj-$(CONFIG_X86_INTEL_MID) += intel_mid_vrtc.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/ +endif
arch/x86/platform/intel-mid/device_libs/Makefile new file +22 -0
@@ -0,0 +1,22 @@ +# IPC Devices +obj-y += platform_ipc.o +obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic.o +obj-$(subst m,y,$(CONFIG_SND_MFLD_MACHINE)) += platform_msic_audio.o +obj-$(subst m,y,$(CONFIG_GPIO_MSIC)) += platform_msic_gpio.o +obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_ocd.o +obj-$(subst m,y,$(CONFIG_MFD_INTEL_MSIC)) += platform_msic_battery.o +obj-$(subst m,y,$(CONFIG_INTEL_MID_POWER_BUTTON)) += platform_msic_power_btn.o +obj-$(subst m,y,$(CONFIG_GPIO_INTEL_PMIC)) += platform_pmic_gpio.o +obj-$(subst m,y,$(CONFIG_INTEL_MFLD_THERMAL)) += platform_msic_thermal.o +# I2C Devices +obj-$(subst m,y,$(CONFIG_SENSORS_EMC1403)) += platform_emc1403.o +obj-$(subst m,y,$(CONFIG_SENSORS_LIS3LV02D)) += platform_lis331.o +obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_max7315.o +obj-$(subst m,y,$(CONFIG_INPUT_MPU3050)) += platform_mpu3050.o +obj-$(subst m,y,$(CONFIG_INPUT_BMA150)) += platform_bma023.o +obj-$(subst m,y,$(CONFIG_GPIO_PCA953X)) += platform_tca6416.o +obj-$(subst m,y,$(CONFIG_DRM_MEDFIELD)) += platform_tc35876x.o +# SPI Devices +obj-$(subst m,y,$(CONFIG_SERIAL_MRST_MAX3110)) += platform_max3111.o +# MISC Devices +obj-$(subst m,y,$(CONFIG_KEYBOARD_GPIO)) += platform_gpio_keys.o
arch/x86/platform/intel-mid/device_libs/platform_bma023.c new file +20 -0
@@ -0,0 +1,20 @@ +/* +* platform_bma023.c: bma023 platform data initilization file +* +* (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. +*/ + +#include <asm/intel-mid.h> + +static const struct devs_id bma023_dev_id__initconst = { + .name ="bma023" , + .type =SFI_DEV_TYPE_I2C , + .delay =1 , +}; + +sfi_device (bma023_dev_id);
arch/x86/platform/intel-mid/device_libs/platform_emc1403.c new file +41 -0
41 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c new file +83 -0
83 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_ipc.c new file +68 -0
68 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_ipc.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* platform_ipc.h: IPC platform library header file +* +* (C) Copyright 2013 Intel Corporation +* Author: Sathyanarayanan Kuppuswamy <[email protected]> +* +* 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. +*/ +#ifndef _PLATFORM_IPC_H_ +#define _PLATFORM_IPC_H_ + +extern void __init ipc_device_handler (struct sfi_device_table_entry *pentry, +struct devs_id *dev) __attribute__((weak)); +#endif
arch/x86/platform/intel-mid/device_libs/platform_lis331.c new file +39 -0
@@ -0,0 +1,39 @@ +/* +* platform_lis331.c: lis331 platform data initilization file +* +* (C) Copyright 2013 Intel Corporation +* Author: Sathyanarayanan Kuppuswamy <[email protected]> +* +* 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. +*/ + +#include <linux/i2c.h> +#include <linux/gpio.h> +#include <asm/intel-mid.h> + +static void __init *lis331dl_platform_data (void *info) +{ +static short intr2nd_pdata; +struct i2c_board_info *i2c_info = info; +int intr =get_gpio_by_name ("accel_int" ); +int intr2nd =get_gpio_by_name ("accel_2" ); + +if (intr ==-1 || intr2nd ==-1 ) +return NULL ; + + i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ; + intr2nd_pdata = intr2nd +INTEL_MID_IRQ_OFFSET ; + +return &intr2nd_pdata; +} + +static const struct devs_id lis331dl_dev_id__initconst = { + .name ="i2c_accel" , + .type =SFI_DEV_TYPE_I2C , + .get_platform_data = &lis331dl_platform_data, +}; + +sfi_device (lis331dl_dev_id);
arch/x86/platform/intel-mid/device_libs/platform_max3111.c new file +35 -0
@@ -0,0 +1,35 @@ +/* +* platform_max3111.c: max3111 platform data initilization file +* +* (C) Copyright 2013 Intel Corporation +* Author: Sathyanarayanan Kuppuswamy <[email protected]> +* +* 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. +*/ + +#include <linux/gpio.h> +#include <linux/spi/spi.h> +#include <asm/intel-mid.h> + +static void __init *max3111_platform_data (void *info) +{ +struct spi_board_info *spi_info = info; +int intr =get_gpio_by_name ("max3111_int" ); + + spi_info->mode =SPI_MODE_0 ; +if (intr ==-1 ) +return NULL ; + spi_info->irq = intr +INTEL_MID_IRQ_OFFSET ; +return NULL ; +} + +static const struct devs_id max3111_dev_id__initconst = { + .name ="spi_max3111" , + .type =SFI_DEV_TYPE_SPI , + .get_platform_data = &max3111_platform_data, +}; + +sfi_device (max3111_dev_id);
arch/x86/platform/intel-mid/device_libs/platform_max7315.c new file +79 -0
79 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* platform_mpu3050.c: mpu3050 platform data initilization file +* +* (C) Copyright 2013 Intel Corporation +* Author: Sathyanarayanan Kuppuswamy <[email protected]> +* +* 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. +*/ + +#include <linux/gpio.h> +#include <linux/i2c.h> +#include <asm/intel-mid.h> + +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 ) +return NULL ; + + i2c_info->irq = intr +INTEL_MID_IRQ_OFFSET ; +return NULL ; +} + +static const struct devs_id mpu3050_dev_id__initconst = { + .name ="mpu3050" , + .type =SFI_DEV_TYPE_I2C , + .delay =1 , + .get_platform_data = &mpu3050_platform_data, +}; + +sfi_device (mpu3050_dev_id);
arch/x86/platform/intel-mid/device_libs/platform_msic.c new file +87 -0
87 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_msic.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* platform_msic.h: MSIC platform data header file +* +* (C) Copyright 2013 Intel Corporation +* Author: Sathyanarayanan Kuppuswamy <[email protected]> +* +* 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. +*/ +#ifndef _PLATFORM_MSIC_H_ +#define _PLATFORM_MSIC_H_ + +extern struct intel_msic_platform_data msic_pdata; + +extern void *msic_generic_platform_data (void *info, +enum intel_msic_block block) __attribute__((weak)); +#endif
arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c new file +47 -0
47 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c new file +37 -0
@@ -0,0 +1,37 @@ +/* +* platform_msic_battery.c: MSIC battery platform data initilization file +* +* (C) Copyright 2013 Intel Corporation +* Author: Sathyanarayanan Kuppuswamy <[email protected]> +* +* 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. +*/ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/scatterlist.h> +#include <linux/init.h> +#include <linux/sfi.h> +#include <linux/mfd/intel_msic.h> +#include <asm/intel-mid.h> + +#include "platform_msic.h" +#include "platform_ipc.h" + +static void __init *msic_battery_platform_data (void *info) +{ +return msic_generic_platform_data (info,INTEL_MSIC_BLOCK_BATTERY ); +} + +static const struct devs_id msic_battery_dev_id__initconst = { + .name ="msic_battery" , + .type =SFI_DEV_TYPE_IPC , + .delay =1 , + .get_platform_data = &msic_battery_platform_data, + .device_handler = &ipc_device_handler, +}; + +sfi_device (msic_battery_dev_id);
arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c new file +48 -0
48 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c new file +49 -0
49 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* platform_msic_power_btn.c: MSIC power btn platform data initilization file +* +* (C) Copyright 2013 Intel Corporation +* Author: Sathyanarayanan Kuppuswamy <[email protected]> +* +* 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. +*/ +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/scatterlist.h> +#include <linux/sfi.h> +#include <linux/init.h> +#include <linux/mfd/intel_msic.h> +#include <asm/intel-mid.h> + +#include "platform_msic.h" +#include "platform_ipc.h" + +static void __init *msic_power_btn_platform_data (void *info) +{ +return msic_generic_platform_data (info,INTEL_MSIC_BLOCK_POWER_BTN ); +} + +static const struct devs_id msic_power_btn_dev_id__initconst = { + .name ="msic_power_btn" , + .type =SFI_DEV_TYPE_IPC , + .delay =1 , + .get_platform_data = &msic_power_btn_platform_data, + .device_handler = &ipc_device_handler, +}; + +sfi_device (msic_power_btn_dev_id);
arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c new file +37 -0
@@ -0,0 +1,37 @@ +/* +* platform_msic_thermal.c: msic_thermal platform data initilization file +* +* (C) Copyright 2013 Intel Corporation +* Author: Sathyanarayanan Kuppuswamy <[email protected]> +* +* 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. +*/ + +#include <linux/input.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/gpio.h> +#include <linux/platform_device.h> +#include <linux/mfd/intel_msic.h> +#include <asm/intel-mid.h> + +#include "platform_msic.h" +#include "platform_ipc.h" + +static void __init *msic_thermal_platform_data (void *info) +{ +return msic_generic_platform_data (info,INTEL_MSIC_BLOCK_THERMAL ); +} + +static const struct devs_id msic_thermal_dev_id__initconst = { + .name ="msic_thermal" , + .type =SFI_DEV_TYPE_IPC , + .delay =1 , + .get_platform_data = &msic_thermal_platform_data, + .device_handler = &ipc_device_handler, +}; + +sfi_device (msic_thermal_dev_id);
arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c new file +54 -0
54 lines not on this page · raw message
arch/x86/platform/intel-mid/device_libs/platform_tc35876x.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* platform_tc35876x.c: tc35876x platform data initilization file +* +* (C) Copyright 2013 Intel Corporation +* Author: Sathyanarayanan Kuppuswamy <[email protected]> +* +* 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. +*/ + +#include <linux/gpio.h> +#include <linux/i2c/tc35876x.h> +#include <asm/intel-mid.h> + +/*tc35876x DSI_LVDS bridge chip and panel platform data*/ +static void *tc35876x_platform_data (void *data) +{ +static struct tc35876x_platform_data pdata; + +/* gpio pins set to -1 will not be used by the driver */ + pdata.gpio_bridge_reset =get_gpio_by_name ("LCMB_RXEN" ); + pdata.gpio_panel_bl_en =get_gpio_by_name ("6S6P_BL_EN" ); + pdata.gpio_panel_vadd =get_gpio_by_name ("EN_VREG_LCD_V3P3" ); + +return &pdata; +} + +static const struct devs_id tc35876x_dev_id__initconst = { + .name ="i2c_disp_brig" , + .type =SFI_DEV_TYPE_I2C , + .get_platform_data = &tc35876x_platform_data, +}; + +sfi_device (tc35876x_dev_id);
arch/x86/platform/intel-mid/device_libs/platform_tca6416.c new file +57 -0
57 lines not on this page · raw message
arch/x86/platform/intel-mid/early_printk_intel_mid.c renamed from arch/x86/platform/mrst/early_printk_mrst.c +6 -5
@@ -1,5 +1,5 @@/* -* early_printk_mrst.c - early consoles for Intel MID platforms +* early_printk_intel_mid.c - early consoles for Intel MID platforms * * Copyright (c) 2008-2010, Intel Corporation *
@@ -27,7 +27,7 @@#include <asm/fixmap.h> #include <asm/pgtable.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #define MRST_SPI_TIMEOUT 0x200000#define MRST_REGBASE_SPI0 0xff128000
@@ -152,7 +152,7 @@ void mrst_early_console_init(void) spi0_cdiv = ((*pclk_spi0) &0xe00 ) >>9 ; freq =100000000 / (spi0_cdiv +1 ); -if (mrst_identify_cpu () ==MRST_CPU_CHIP_PENWELL ) +if (intel_mid_identify_cpu () ==INTEL_MID_CPU_CHIP_PENWELL ) mrst_spi_paddr =MRST_REGBASE_SPI1 ; pspi = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE,
@@ -213,13 +213,14 @@ static void early_mrst_spi_putc(char c) }if (!timeout) -pr_warning ("MRST earlycon: timed out\n" ); +pr_warn ("MRST earlycon: timed out\n" );else max3110_write_data (c); }/* Early SPI only uses polling mode */ -static void early_mrst_spi_write (struct console *con,const char *str,unsigned n) +static void early_mrst_spi_write (struct console *con,const char *str, +unsigned n) {int i;
arch/x86/platform/intel-mid/intel-mid.c new file +213 -0
213 lines not on this page · raw message
arch/x86/platform/intel-mid/intel_mid_vrtc.c renamed from arch/x86/platform/mrst/vrtc.c +9 -10
@@ -1,5 +1,5 @@/* -* vrtc.c: Driver for virtual RTC device on Intel MID platform +* intel_mid_vrtc.c: Driver for virtual RTC device on Intel MID platform * * (C) Copyright 2009 Intel Corporation *
@@ -23,8 +23,8 @@#include <linux/sfi.h> #include <linux/platform_device.h> -#include <asm/mrst.h> -#include <asm/mrst-vrtc.h> +#include <asm/intel-mid.h> +#include <asm/intel_mid_vrtc.h> #include <asm/time.h> #include <asm/fixmap.h>
@@ -79,7 +79,7 @@ void vrtc_get_time(struct timespec *now)/* vRTC YEAR reg contains the offset to 1972 */ year +=1972 ; -printk (KERN_INFO "vRTC: sec: %d min: %d hour: %d day: %d " +pr_info ("vRTC: sec: %d min: %d hour: %d day: %d " "mon: %d year: %d\n" , sec, min, hour, mday, mon, year); now->tv_sec =mktime (year, mon, mday, hour, min, sec);
@@ -109,15 +109,14 @@ int vrtc_set_mmss(const struct timespec *now)vrtc_cmos_write (tm.tm_sec,RTC_SECONDS );spin_unlock_irqrestore (&rtc_lock, flags); }else { -printk (KERN_ERR -"%s: Invalid vRTC value: write of %lx to vRTC failed\n" , +pr_err ("%s: Invalid vRTC value: write of %lx to vRTC failed\n" , __FUNCTION__, now->tv_sec); retval = -EINVAL ; }return retval; } -void __init mrst_rtc_init (void ) +void __init intel_mid_rtc_init (void ) {unsigned long vrtc_paddr;
@@ -155,10 +154,10 @@ static struct platform_device vrtc_device = { };/* Register the RTC device if appropriate */ -static int __init mrst_device_create (void ) +static int __init intel_mid_device_create (void ) {/* No Moorestown, no device */ -if (!mrst_identify_cpu ()) +if (!intel_mid_identify_cpu ())return -ENODEV ;/* No timer, no device */ if (!sfi_mrtc_num)
@@ -175,4 +174,4 @@ static int __init mrst_device_create(void)return platform_device_register (&vrtc_device); } -module_init (mrst_device_create); +module_init (intel_mid_device_create);
arch/x86/platform/intel-mid/sfi.c new file +488 -0
488 lines not on this page · raw message
arch/x86/platform/mrst/Makefile deleted +0 -3
@@ -1,3 +0,0 @@ -obj-$(CONFIG_X86_INTEL_MID) += mrst.o -obj-$(CONFIG_X86_INTEL_MID) += vrtc.o -obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_mrst.o
arch/x86/platform/mrst/mrst.c deleted +0 -1052
851 lines not on this page · raw message
drivers/gpu/drm/gma500/mdfld_dsi_output.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/gma500/oaktrail_device.c +1 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.