rework arch/x86/platform/[mrst => intel-mid]
Subsystems (11)
v10 cover rework arch/x86/platform/[mrst => intel-mid]
This patch set does initial rework from arch/x86/platform/mrst to arch/x86/platform/intel-mid.
These changes are necessary to update the obsolete Intel Atom Moorestown code to support the newer Atom processors of this family (called 'intel-mid').
Change from v9 to v10:
- Improved patch title of one coccinelle warning fix.
- Removed one non-functional patch fixing coccinelle warning.
- Squashed non-functional patch which fixed compilation warning on the deleted mrst.c file.
There is no function change in the end.
---
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 board related codes 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
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.cSignature · 1 line
1.8.4.rc3
PATCH v10 1/12 mrst: Fixed printk/pr_* related issues
From: Kuppuswamy Sathyanarayanan <[email protected]>
Fixed printk and pr_* related issues in mrst related files.
--- arch/x86/platform/mrst/early_printk_mrst.c | 2 +- arch/x86/platform/mrst/mrst.c | 2 +- arch/x86/platform/mrst/vrtc.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-)
arch/x86/platform/mrst/early_printk_mrst.c +1 -1
@@ -213,7 +213,7 @@ 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); }
arch/x86/platform/mrst/mrst.c +1 -1
@@ -328,7 +328,7 @@ static inline int __init setup_x86_mrst_timer(char *arg)else if (strcmp ("lapic_and_apbt" , arg) ==0 ) mrst_timer_options =MRST_TIMER_LAPIC_APBT ;else { -pr_warning ("X86 MRST timer option %s not recognised" +pr_warn ("X86 MRST timer option %s not recognised" " use x86_mrst_timer=apbt_only or lapic_and_apbt\n" , arg);return -EINVAL ;
arch/x86/platform/mrst/vrtc.c +2 -3
@@ -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,8 +109,7 @@ 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 ; }
Signature · 1 line
1.8.4.rc3
tip-bot for Kuppuswamy Sathyanarayanan
merge bot[tip:x86/intel-mid] mrst: Fixed printk/pr_* related issues
mrst: Fixed printk/pr_* related issues
Commit-ID: 001d4c7aea587ce0865c07ec45aa56ecbefd431a Gitweb: http://git.kernel.org/tip/001d4c7aea587ce0865c07ec45aa56ecbefd431a Author: Kuppuswamy Sathyanarayanan <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:25 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:33 -0700
mrst: Fixed printk/pr_* related issues
Fixed printk and pr_* related issues in mrst related files.
--- arch/x86/platform/mrst/early_printk_mrst.c | 2 +- arch/x86/platform/mrst/mrst.c | 2 +- arch/x86/platform/mrst/vrtc.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-)
arch/x86/platform/mrst/early_printk_mrst.c +1 -1
@@ -213,7 +213,7 @@ 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); }
arch/x86/platform/mrst/mrst.c +1 -1
@@ -328,7 +328,7 @@ static inline int __init setup_x86_mrst_timer(char *arg)else if (strcmp ("lapic_and_apbt" , arg) ==0 ) mrst_timer_options =MRST_TIMER_LAPIC_APBT ;else { -pr_warning ("X86 MRST timer option %s not recognised" +pr_warn ("X86 MRST timer option %s not recognised" " use x86_mrst_timer=apbt_only or lapic_and_apbt\n" , arg);return -EINVAL ;
arch/x86/platform/mrst/vrtc.c +2 -3
@@ -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,8 +109,7 @@ 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 ; }
PATCH v10 2/12 mrst: Fixed indentation issues
In reply to David CohenFrom: Kuppuswamy Sathyanarayanan <[email protected]>
Fixed indentation issues reported by checkpatch script in mrst related files.
--- arch/x86/platform/mrst/early_printk_mrst.c | 3 ++- arch/x86/platform/mrst/mrst.c | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-)
arch/x86/platform/mrst/early_printk_mrst.c +2 -1
@@ -219,7 +219,8 @@ static void early_mrst_spi_putc(char 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/mrst/mrst.c +13 -11
@@ -131,7 +131,7 @@ struct sfi_timer_table_entry *sfi_get_mtmr(int hint)int i;if (hint < sfi_mtimer_num) {if (!sfi_mtimer_usage[hint]) { -pr_debug ("hint taken for timer %d irq %d\n" ,\ +pr_debug ("hint taken for timer %d irq %d\n" , hint, sfi_mtimer_array[hint].irq); sfi_mtimer_usage[hint] =1 ;return &sfi_mtimer_array[hint];
@@ -679,14 +679,14 @@ static void *msic_thermal_platform_data(void *info)/* tc35876x DSI-LVDS bridge chip and panel platform data */ static void *tc35876x_platform_data (void *data) { -static struct tc35876x_platform_data pdata; +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" ); +/* 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; +return &pdata; }static const struct devs_id __initconst device_ids[] = {
@@ -729,7 +729,7 @@ static int i2c_next_dev;static void __init intel_scu_device_register (struct platform_device *pdev) { -if (ipc_next_dev ==MAX_IPCDEVS ) +if (ipc_next_dev ==MAX_IPCDEVS )pr_err ("too many SCU IPC devices" );else ipc_devs[ipc_next_dev++] = pdev;
@@ -872,7 +872,8 @@ static void __init sfi_handle_spi_dev(struct spi_board_info *spi_info)while (dev->name[0 ]) {if (dev->type ==SFI_DEV_TYPE_SPI && - !strncmp (dev->name, spi_info->modalias,SFI_NAME_LEN )) { + !strncmp (dev->name, spi_info->modalias, +SFI_NAME_LEN )) { pdata = dev->get_platform_data (spi_info);break ; }
@@ -904,7 +905,7 @@ static void __init sfi_handle_i2c_dev(int bus, struct i2c_board_info *i2c_info)intel_scu_i2c_device_register (bus, i2c_info); else i2c_register_board_info(bus, i2c_info, 1); - } +} static int __init sfi_parse_devs(struct sfi_table_header *table)
@@ -1034,7 +1035,8 @@ static int __init pb_keys_init(void) num =sizeof (gpio_button) /sizeof (struct gpio_keys_button );for (i =0 ; i < num; i++) { 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); +pr_debug ("info[%2d]: name = %s, gpio = %d\n" , i, gb[i].desc, + gb[i].gpio);if (gb[i].gpio ==-1 )continue ;
Signature · 1 line
1.8.4.rc3
tip-bot for Kuppuswamy Sathyanarayanan
merge bot[tip:x86/intel-mid] mrst: Fixed indentation issues
mrst: Fixed indentation issues
Commit-ID: d8059302b374b351731ba503bb6f5bc88962d983 Gitweb: http://git.kernel.org/tip/d8059302b374b351731ba503bb6f5bc88962d983 Author: Kuppuswamy Sathyanarayanan <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:26 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:35 -0700
mrst: Fixed indentation issues
Fixed indentation issues reported by checkpatch script in mrst related files.
--- arch/x86/platform/mrst/early_printk_mrst.c | 3 ++- arch/x86/platform/mrst/mrst.c | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-)
arch/x86/platform/mrst/early_printk_mrst.c +2 -1
@@ -219,7 +219,8 @@ static void early_mrst_spi_putc(char 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/mrst/mrst.c +13 -11
@@ -131,7 +131,7 @@ struct sfi_timer_table_entry *sfi_get_mtmr(int hint)int i;if (hint < sfi_mtimer_num) {if (!sfi_mtimer_usage[hint]) { -pr_debug ("hint taken for timer %d irq %d\n" ,\ +pr_debug ("hint taken for timer %d irq %d\n" , hint, sfi_mtimer_array[hint].irq); sfi_mtimer_usage[hint] =1 ;return &sfi_mtimer_array[hint];
@@ -679,14 +679,14 @@ static void *msic_thermal_platform_data(void *info)/* tc35876x DSI-LVDS bridge chip and panel platform data */ static void *tc35876x_platform_data (void *data) { -static struct tc35876x_platform_data pdata; +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" ); +/* 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; +return &pdata; }static const struct devs_id __initconst device_ids[] = {
@@ -729,7 +729,7 @@ static int i2c_next_dev;static void __init intel_scu_device_register (struct platform_device *pdev) { -if (ipc_next_dev ==MAX_IPCDEVS ) +if (ipc_next_dev ==MAX_IPCDEVS )pr_err ("too many SCU IPC devices" );else ipc_devs[ipc_next_dev++] = pdev;
@@ -872,7 +872,8 @@ static void __init sfi_handle_spi_dev(struct spi_board_info *spi_info)while (dev->name[0 ]) {if (dev->type ==SFI_DEV_TYPE_SPI && - !strncmp (dev->name, spi_info->modalias,SFI_NAME_LEN )) { + !strncmp (dev->name, spi_info->modalias, +SFI_NAME_LEN )) { pdata = dev->get_platform_data (spi_info);break ; }
@@ -904,7 +905,7 @@ static void __init sfi_handle_i2c_dev(int bus, struct i2c_board_info *i2c_info)intel_scu_i2c_device_register (bus, i2c_info); else i2c_register_board_info(bus, i2c_info, 1); - } +} static int __init sfi_parse_devs(struct sfi_table_header *table)
@@ -1034,7 +1035,8 @@ static int __init pb_keys_init(void) num =sizeof (gpio_button) /sizeof (struct gpio_keys_button );for (i =0 ; i < num; i++) { 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); +pr_debug ("info[%2d]: name = %s, gpio = %d\n" , i, gb[i].desc, + gb[i].gpio);if (gb[i].gpio ==-1 )continue ;
PATCH v10 3/12 intel_mid: Renamed *mrst* to *intel_mid*
In reply to David CohenFrom: Kuppuswamy Sathyanarayanan <[email protected]>
Following files contains code that is common to all intel mid soc's. So renamed them as below.
mrst/mrst.c -> intel-mid/intel-mid.cmrst/vrtc.c -> intel-mid/intel_mid_vrtc.cmrst/early_printk_mrst.c -> intel-mid/intel_mid_vrtc.cpci/mrst.c -> pci/intel_mid_pci.c
Also, renamed the corresponding header files and made changes to the driver files that included these header files.
To ensure that there are no functional changes, I have compared the objdump of renamed files before and after rename and found that the only difference is file name change.
---
arch/x86/include/asm/{mrst.h => intel-mid.h} | 8 ++++----
arch/x86/include/asm/{mrst-vrtc.h => intel_mid_vrtc.h} | 4 ++--
arch/x86/kernel/apb_timer.c | 2 +-
arch/x86/kernel/early_printk.c | 2 +-
arch/x86/kernel/rtc.c | 2 +-
arch/x86/pci/Makefile | 2 +-
arch/x86/pci/{mrst.c => intel_mid_pci.c} | 2 +-
arch/x86/platform/Makefile | 2 +-
arch/x86/platform/intel-mid/Makefile | 3 +++
.../early_printk_intel_mid.c} | 4 ++--
arch/x86/platform/{mrst/mrst.c => intel-mid/intel-mid.c} | 11 ++++++-----
arch/x86/platform/{mrst/vrtc.c => intel-mid/intel_mid_vrtc.c} | 6 +++---
arch/x86/platform/mrst/Makefile | 3 ---
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 | 2 +-
drivers/rtc/rtc-mrst.c | 4 ++--
drivers/watchdog/intel_scu_watchdog.c | 2 +-
19 files changed, 33 insertions(+), 32 deletions(-)
rename arch/x86/include/asm/{mrst.h => intel-mid.h} (93%)
rename arch/x86/include/asm/{mrst-vrtc.h => intel_mid_vrtc.h} (81%)
rename arch/x86/pci/{mrst.c => intel_mid_pci.c} (99%)
create mode 100644 arch/x86/platform/intel-mid/Makefile
rename arch/x86/platform/{mrst/early_printk_mrst.c => intel-mid/early_printk_intel_mid.c} (98%)
rename arch/x86/platform/{mrst/mrst.c => intel-mid/intel-mid.c} (99%)
rename arch/x86/platform/{mrst/vrtc.c => intel-mid/intel_mid_vrtc.c} (97%)
delete mode 100644 arch/x86/platform/mrst/Makefilearch/x86/include/asm/intel-mid.h renamed from arch/x86/include/asm/mrst.h +4 -4
@@ -1,5 +1,5 @@/* -* mrst.h: Intel Moorestown platform specific setup code +* intel-mid.h: Intel MID specific setup code * * (C) Copyright 2009 Intel Corporation *
@@ -8,8 +8,8 @@* as published by the Free Software Foundation; version 2 * of the License. */ -#ifndef _ASM_X86_MRST_H -#define _ASM_X86_MRST_H +#ifndef _ASM_X86_INTEL_MID_H +#define _ASM_X86_INTEL_MID_H#include <linux/sfi.h>
@@ -78,4 +78,4 @@ extern void intel_scu_devices_destroy(void);extern void mrst_rtc_init (void ); -#endif /* _ASM_X86_MRST_H */ +#endif /* _ASM_X86_INTEL_MID_H */
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/kernel/apb_timer.c +1 -1
@@ -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
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/rtc.c +1 -1
@@ -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
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 +1 -1
@@ -1,5 +1,5 @@/* -* Moorestown PCI support +* Intel MID PCI support * Copyright (c) 2008 Intel Corporation * Jesse Barnes <[email protected]> *
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 +3 -0
@@ -0,0 +1,3 @@ +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
arch/x86/platform/intel-mid/early_printk_intel_mid.c renamed from arch/x86/platform/mrst/early_printk_mrst.c +2 -2
@@ -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
arch/x86/platform/intel-mid/intel-mid.c renamed from arch/x86/platform/mrst/mrst.c +6 -5
@@ -1,8 +1,9 @@/* -* mrst.c: Intel Moorestown platform specific setup code +* intel-mid.c: Intel MID platform setup code * -* (C) Copyright 2008 Intel Corporation +* (C) Copyright 2008, 2012 Intel Corporation * Author: Jacob Pan ([email protected]) +* 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
@@ -36,8 +37,8 @@#include <asm/hw_irq.h> #include <asm/apic.h> #include <asm/io_apic.h> -#include <asm/mrst.h> -#include <asm/mrst-vrtc.h> +#include <asm/intel-mid.h> +#include <asm/intel_mid_vrtc.h> #include <asm/io.h> #include <asm/i8259.h> #include <asm/intel_scu_ipc.h>
@@ -219,7 +220,7 @@ static unsigned long __init mrst_calibrate_tsc(void) lapic_timer_frequency = fsb *1000 /HZ ;/* mark tsc clocksource as reliable */ set_cpu_cap (&boot_cpu_data,X86_FEATURE_TSC_RELIABLE ); - +if (fast_calibrate)return fast_calibrate;
arch/x86/platform/intel-mid/intel_mid_vrtc.c renamed from arch/x86/platform/mrst/vrtc.c +3 -3
@@ -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>
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
drivers/gpu/drm/gma500/mdfld_dsi_output.h +1 -1
@@ -39,7 +39,7 @@#include "psb_intel_reg.h" #include "mdfld_output.h" -#include <asm/mrst.h> +#include <asm/intel-mid.h> #define FLD_MASK (start, end) (((1 << ((start) - (end) + 1)) - 1) << (end))#define FLD_VAL (val, start, end) (((val) << (end)) & FLD_MASK(start, end))
drivers/gpu/drm/gma500/oaktrail_device.c +1 -1
@@ -26,7 +26,7 @@#include "psb_drv.h" #include "psb_reg.h" #include "psb_intel_reg.h" -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include <asm/intel_scu_ipc.h> #include "mid_bios.h" #include "intel_bios.h"
drivers/gpu/drm/gma500/oaktrail_lvds.c +1 -1
@@ -22,7 +22,7 @@#include <linux/i2c.h> #include <drm/drmP.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include "intel_bios.h" #include "psb_drv.h"
drivers/platform/x86/intel_scu_ipc.c +1 -1
@@ -25,7 +25,7 @@#include <linux/interrupt.h> #include <linux/sfi.h> #include <linux/module.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include <asm/intel_scu_ipc.h> /* IPC defines the following message types */
drivers/rtc/rtc-mrst.c +2 -2
@@ -38,8 +38,8 @@#include <asm-generic/rtc.h> #include <asm/intel_scu_ipc.h> -#include <asm/mrst.h> -#include <asm/mrst-vrtc.h> +#include <asm/intel-mid.h> +#include <asm/intel_mid_vrtc.h> struct mrst_rtc {struct rtc_device *rtc;
drivers/watchdog/intel_scu_watchdog.c +1 -1
@@ -48,7 +48,7 @@#include <linux/atomic.h> #include <asm/intel_scu_ipc.h> #include <asm/apb_timer.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include "intel_scu_watchdog.h"
Signature · 1 line
1.8.4.rc3
tip-bot for Kuppuswamy Sathyanarayanan
merge bot[tip:x86/intel-mid] intel_mid: Renamed *mrst* to *intel_mid*
intel_mid: Renamed *mrst* to *intel_mid*
Commit-ID: 05454c26eb3587b56abc5eb139797ac5afb6d77a Gitweb: http://git.kernel.org/tip/05454c26eb3587b56abc5eb139797ac5afb6d77a Author: Kuppuswamy Sathyanarayanan <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:27 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:36 -0700
intel_mid: Renamed *mrst* to *intel_mid*
Following files contains code that is common to all intel mid soc's. So renamed them as below.
mrst/mrst.c -> intel-mid/intel-mid.cmrst/vrtc.c -> intel-mid/intel_mid_vrtc.cmrst/early_printk_mrst.c -> intel-mid/intel_mid_vrtc.cpci/mrst.c -> pci/intel_mid_pci.c
Also, renamed the corresponding header files and made changes to the driver files that included these header files.
To ensure that there are no functional changes, I have compared the objdump of renamed files before and after rename and found that the only difference is file name change.
---
arch/x86/include/asm/{mrst.h => intel-mid.h} | 8 ++++----
arch/x86/include/asm/{mrst-vrtc.h => intel_mid_vrtc.h} | 4 ++--
arch/x86/kernel/apb_timer.c | 2 +-
arch/x86/kernel/early_printk.c | 2 +-
arch/x86/kernel/rtc.c | 2 +-
arch/x86/pci/Makefile | 2 +-
arch/x86/pci/{mrst.c => intel_mid_pci.c} | 2 +-
arch/x86/platform/Makefile | 2 +-
arch/x86/platform/intel-mid/Makefile | 3 +++
.../early_printk_intel_mid.c} | 4 ++--
arch/x86/platform/{mrst/mrst.c => intel-mid/intel-mid.c} | 11 ++++++-----
arch/x86/platform/{mrst/vrtc.c => intel-mid/intel_mid_vrtc.c} | 6 +++---
arch/x86/platform/mrst/Makefile | 3 ---
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 | 2 +-
drivers/rtc/rtc-mrst.c | 4 ++--
drivers/watchdog/intel_scu_watchdog.c | 2 +-
19 files changed, 33 insertions(+), 32 deletions(-)arch/x86/include/asm/intel-mid.h renamed from arch/x86/include/asm/mrst.h +4 -4
@@ -1,5 +1,5 @@/* -* mrst.h: Intel Moorestown platform specific setup code +* intel-mid.h: Intel MID specific setup code * * (C) Copyright 2009 Intel Corporation *
@@ -8,8 +8,8 @@* as published by the Free Software Foundation; version 2 * of the License. */ -#ifndef _ASM_X86_MRST_H -#define _ASM_X86_MRST_H +#ifndef _ASM_X86_INTEL_MID_H +#define _ASM_X86_INTEL_MID_H#include <linux/sfi.h>
@@ -78,4 +78,4 @@ extern void intel_scu_devices_destroy(void);extern void mrst_rtc_init (void ); -#endif /* _ASM_X86_MRST_H */ +#endif /* _ASM_X86_INTEL_MID_H */
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/kernel/apb_timer.c +1 -1
@@ -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
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/rtc.c +1 -1
@@ -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
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 +1 -1
@@ -1,5 +1,5 @@/* -* Moorestown PCI support +* Intel MID PCI support * Copyright (c) 2008 Intel Corporation * Jesse Barnes <[email protected]> *
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 +3 -0
@@ -0,0 +1,3 @@ +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
arch/x86/platform/intel-mid/early_printk_intel_mid.c renamed from arch/x86/platform/mrst/early_printk_mrst.c +2 -2
@@ -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
arch/x86/platform/intel-mid/intel-mid.c renamed from arch/x86/platform/mrst/mrst.c +6 -5
@@ -1,8 +1,9 @@/* -* mrst.c: Intel Moorestown platform specific setup code +* intel-mid.c: Intel MID platform setup code * -* (C) Copyright 2008 Intel Corporation +* (C) Copyright 2008, 2012 Intel Corporation * Author: Jacob Pan ([email protected]) +* 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
@@ -36,8 +37,8 @@#include <asm/hw_irq.h> #include <asm/apic.h> #include <asm/io_apic.h> -#include <asm/mrst.h> -#include <asm/mrst-vrtc.h> +#include <asm/intel-mid.h> +#include <asm/intel_mid_vrtc.h> #include <asm/io.h> #include <asm/i8259.h> #include <asm/intel_scu_ipc.h>
@@ -219,7 +220,7 @@ static unsigned long __init mrst_calibrate_tsc(void) lapic_timer_frequency = fsb *1000 /HZ ;/* mark tsc clocksource as reliable */ set_cpu_cap (&boot_cpu_data,X86_FEATURE_TSC_RELIABLE ); - +if (fast_calibrate)return fast_calibrate;
arch/x86/platform/intel-mid/intel_mid_vrtc.c renamed from arch/x86/platform/mrst/vrtc.c +3 -3
@@ -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>
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
drivers/gpu/drm/gma500/mdfld_dsi_output.h +1 -1
@@ -39,7 +39,7 @@#include "psb_intel_reg.h" #include "mdfld_output.h" -#include <asm/mrst.h> +#include <asm/intel-mid.h> #define FLD_MASK (start, end) (((1 << ((start) - (end) + 1)) - 1) << (end))#define FLD_VAL (val, start, end) (((val) << (end)) & FLD_MASK(start, end))
drivers/gpu/drm/gma500/oaktrail_device.c +1 -1
@@ -26,7 +26,7 @@#include "psb_drv.h" #include "psb_reg.h" #include "psb_intel_reg.h" -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include <asm/intel_scu_ipc.h> #include "mid_bios.h" #include "intel_bios.h"
drivers/gpu/drm/gma500/oaktrail_lvds.c +1 -1
@@ -22,7 +22,7 @@#include <linux/i2c.h> #include <drm/drmP.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include "intel_bios.h" #include "psb_drv.h"
drivers/platform/x86/intel_scu_ipc.c +1 -1
@@ -25,7 +25,7 @@#include <linux/interrupt.h> #include <linux/sfi.h> #include <linux/module.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include <asm/intel_scu_ipc.h> /* IPC defines the following message types */
drivers/rtc/rtc-mrst.c +2 -2
@@ -38,8 +38,8 @@#include <asm-generic/rtc.h> #include <asm/intel_scu_ipc.h> -#include <asm/mrst.h> -#include <asm/mrst-vrtc.h> +#include <asm/intel-mid.h> +#include <asm/intel_mid_vrtc.h> struct mrst_rtc {struct rtc_device *rtc;
drivers/watchdog/intel_scu_watchdog.c +1 -1
@@ -48,7 +48,7 @@#include <linux/atomic.h> #include <asm/intel_scu_ipc.h> #include <asm/apb_timer.h> -#include <asm/mrst.h> +#include <asm/intel-mid.h> #include "intel_scu_watchdog.h"
PATCH v10 4/12 pci: intel_mid: return true/false in function returning bool
In reply to David CohenFrom: Fengguang Wu <[email protected]>
Function 'type1_access_ok' should return bool value, not 0/1. This patch changes 'return 0/1' to 'return false/true'.
--- arch/x86/pci/intel_mid_pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/pci/intel_mid_pci.c +3 -3
@@ -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,
Signature · 1 line
1.8.4.rc3
tip-bot for Fengguang Wu
merge bot[tip:x86/intel-mid] pci: intel_mid: Return true/ false in function returning bool
pci: intel_mid: Return true/false in function returning bool
Commit-ID: 6c21b176a93ffaa8023555107167379ccdc6b71f Gitweb: http://git.kernel.org/tip/6c21b176a93ffaa8023555107167379ccdc6b71f Author: Fengguang Wu <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:28 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:45 -0700
pci: intel_mid: Return true/false in function returning bool
Function 'type1_access_ok' should return bool value, not 0/1. This patch changes 'return 0/1' to 'return false/true'.
--- arch/x86/pci/intel_mid_pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/pci/intel_mid_pci.c +3 -3
@@ -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,
PATCH v10 5/12 intel_mid: Renamed *mrst* to *intel_mid*
In reply to David CohenFrom: Kuppuswamy Sathyanarayanan <[email protected]>
mrst is used as common name to represent all intel_mid type soc's. But moorsetwon is just one of the intel_mid soc. So renamed them to use intel_mid.
This patch mainly renames the variables and related functions that uses *mrst* prefix with *intel_mid*.
To ensure that there are no functional changes, I have compared the objdump of related files before and after rename and found the only difference is symbol and name changes.
--- Documentation/kernel-parameters.txt | 6 +- arch/x86/include/asm/intel-mid.h | 26 ++--- arch/x86/include/asm/setup.h | 4 +- arch/x86/include/uapi/asm/bootparam.h | 2 +- arch/x86/kernel/apb_timer.c | 8 +- arch/x86/kernel/head32.c | 4 +- arch/x86/kernel/rtc.c | 2 +- arch/x86/pci/intel_mid_pci.c | 12 +-- .../platform/intel-mid/early_printk_intel_mid.c | 2 +- arch/x86/platform/intel-mid/intel-mid.c | 109 ++++++++++----------- arch/x86/platform/intel-mid/intel_mid_vrtc.c | 8 +- drivers/platform/x86/intel_scu_ipc.c | 2 +- drivers/watchdog/intel_scu_watchdog.c | 2 +- 13 files changed, 93 insertions(+), 94 deletions(-)
Documentation/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 +13 -13
@@ -13,7 +13,7 @@#include <linux/sfi.h> -extern int pci_mrst_init (void ); +extern int intel_mid_pci_init (void );extern int __init sfi_parse_mrtc (struct sfi_table_header *table);extern int sfi_mrtc_num;extern struct sfi_rtc_table_entry sfi_mrtc_array[];
@@ -25,33 +25,33 @@ extern struct sfi_rtc_table_entry sfi_mrtc_array[];* we treat Medfield/Penwell as a variant of Moorestown. Penwell can be * identified via MSRs. */ -enum mrst_cpu_type { +enum intel_mid_cpu_type {/* 1 was Moorestown */ -MRST_CPU_CHIP_PENWELL =2 , +INTEL_MID_CPU_CHIP_PENWELL =2 , }; -extern enum mrst_cpu_type __mrst_cpu_chip; +extern enum intel_mid_cpu_type __intel_mid_cpu_chip;#ifdef CONFIG_X86_INTEL_MID -static inline enum mrst_cpu_type mrst_identify_cpu (void ) +static inline enum intel_mid_cpu_type intel_mid_identify_cpu (void ) { -return __mrst_cpu_chip; +return __intel_mid_cpu_chip; }#else /* !CONFIG_X86_INTEL_MID */ -#define mrst_identify_cpu () (0) +#define intel_mid_identify_cpu () (0)#endif /* !CONFIG_X86_INTEL_MID */ -enum mrst_timer_options { -MRST_TIMER_DEFAULT , -MRST_TIMER_APBT_ONLY , -MRST_TIMER_LAPIC_APBT , +enum intel_mid_timer_options { +INTEL_MID_TIMER_DEFAULT , +INTEL_MID_TIMER_APBT_ONLY , +INTEL_MID_TIMER_LAPIC_APBT , }; -extern enum mrst_timer_options mrst_timer_options; +extern enum intel_mid_timer_options intel_mid_timer_options;/* * Penwell uses spread spectrum clock, so the freq number is not exactly
@@ -76,6 +76,6 @@ extern void intel_scu_devices_destroy(void);#define MRST_VRTC_MAP_SZ (1024)/*#define MRST_VRTC_PGOFFSET (0xc00) */ -extern void mrst_rtc_init (void ); +extern void intel_mid_rtc_init (void );#endif /* _ASM_X86_INTEL_MID_H */
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 +4 -4
@@ -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/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 +1 -1
@@ -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/pci/intel_mid_pci.c +6 -6
@@ -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/intel-mid/early_printk_intel_mid.c +1 -1
@@ -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,
arch/x86/platform/intel-mid/intel-mid.c +54 -55
311 lines not on this page · raw message
arch/x86/platform/intel-mid/intel_mid_vrtc.c +4 -4
@@ -116,7 +116,7 @@ int vrtc_set_mmss(const struct timespec *now)return retval; } -void __init mrst_rtc_init (void ) +void __init intel_mid_rtc_init (void ) {unsigned long vrtc_paddr;
@@ -154,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)
@@ -174,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);
drivers/platform/x86/intel_scu_ipc.c +1 -1
@@ -579,7 +579,7 @@ static struct pci_driver ipc_driver = {static int __init intel_scu_ipc_init (void ) { - platform =mrst_identify_cpu (); + platform =intel_mid_identify_cpu ();if (platform ==0 )return -ENODEV ;return pci_register_driver (&ipc_driver);
drivers/watchdog/intel_scu_watchdog.c +1 -1
@@ -445,7 +445,7 @@ static int __init intel_scu_watchdog_init(void)* * If it isn't an intel MID device then it doesn't have this watchdog */ -if (!mrst_identify_cpu ()) +if (!intel_mid_identify_cpu ())return -ENODEV ;/* Check boot parameters to verify that their initial values */
Signature · 1 line
1.8.4.rc3
tip-bot for Kuppuswamy Sathyanarayanan
merge bot[tip:x86/intel-mid] intel_mid: Renamed *mrst* to *intel_mid*
intel_mid: Renamed *mrst* to *intel_mid*
Commit-ID: 712b6aa8731a7e148298c58cea66a5209c659e3c Gitweb: http://git.kernel.org/tip/712b6aa8731a7e148298c58cea66a5209c659e3c Author: Kuppuswamy Sathyanarayanan <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:29 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:47 -0700
intel_mid: Renamed *mrst* to *intel_mid*
mrst is used as common name to represent all intel_mid type soc's. But moorsetwon is just one of the intel_mid soc. So renamed them to use intel_mid.
This patch mainly renames the variables and related functions that uses *mrst* prefix with *intel_mid*.
To ensure that there are no functional changes, I have compared the objdump of related files before and after rename and found the only difference is symbol and name changes.
--- Documentation/kernel-parameters.txt | 6 +- arch/x86/include/asm/intel-mid.h | 26 ++--- arch/x86/include/asm/setup.h | 4 +- arch/x86/include/uapi/asm/bootparam.h | 2 +- arch/x86/kernel/apb_timer.c | 8 +- arch/x86/kernel/head32.c | 4 +- arch/x86/kernel/rtc.c | 2 +- arch/x86/pci/intel_mid_pci.c | 12 +-- .../platform/intel-mid/early_printk_intel_mid.c | 2 +- arch/x86/platform/intel-mid/intel-mid.c | 109 ++++++++++----------- arch/x86/platform/intel-mid/intel_mid_vrtc.c | 8 +- drivers/platform/x86/intel_scu_ipc.c | 2 +- drivers/watchdog/intel_scu_watchdog.c | 2 +- 13 files changed, 93 insertions(+), 94 deletions(-)
Documentation/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 +13 -13
@@ -13,7 +13,7 @@#include <linux/sfi.h> -extern int pci_mrst_init (void ); +extern int intel_mid_pci_init (void );extern int __init sfi_parse_mrtc (struct sfi_table_header *table);extern int sfi_mrtc_num;extern struct sfi_rtc_table_entry sfi_mrtc_array[];
@@ -25,33 +25,33 @@ extern struct sfi_rtc_table_entry sfi_mrtc_array[];* we treat Medfield/Penwell as a variant of Moorestown. Penwell can be * identified via MSRs. */ -enum mrst_cpu_type { +enum intel_mid_cpu_type {/* 1 was Moorestown */ -MRST_CPU_CHIP_PENWELL =2 , +INTEL_MID_CPU_CHIP_PENWELL =2 , }; -extern enum mrst_cpu_type __mrst_cpu_chip; +extern enum intel_mid_cpu_type __intel_mid_cpu_chip;#ifdef CONFIG_X86_INTEL_MID -static inline enum mrst_cpu_type mrst_identify_cpu (void ) +static inline enum intel_mid_cpu_type intel_mid_identify_cpu (void ) { -return __mrst_cpu_chip; +return __intel_mid_cpu_chip; }#else /* !CONFIG_X86_INTEL_MID */ -#define mrst_identify_cpu () (0) +#define intel_mid_identify_cpu () (0)#endif /* !CONFIG_X86_INTEL_MID */ -enum mrst_timer_options { -MRST_TIMER_DEFAULT , -MRST_TIMER_APBT_ONLY , -MRST_TIMER_LAPIC_APBT , +enum intel_mid_timer_options { +INTEL_MID_TIMER_DEFAULT , +INTEL_MID_TIMER_APBT_ONLY , +INTEL_MID_TIMER_LAPIC_APBT , }; -extern enum mrst_timer_options mrst_timer_options; +extern enum intel_mid_timer_options intel_mid_timer_options;/* * Penwell uses spread spectrum clock, so the freq number is not exactly
@@ -76,6 +76,6 @@ extern void intel_scu_devices_destroy(void);#define MRST_VRTC_MAP_SZ (1024)/*#define MRST_VRTC_PGOFFSET (0xc00) */ -extern void mrst_rtc_init (void ); +extern void intel_mid_rtc_init (void );#endif /* _ASM_X86_INTEL_MID_H */
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 +4 -4
@@ -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/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 +1 -1
@@ -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/pci/intel_mid_pci.c +6 -6
@@ -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/intel-mid/early_printk_intel_mid.c +1 -1
@@ -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,
arch/x86/platform/intel-mid/intel-mid.c +54 -55
311 lines not on this page · raw message
arch/x86/platform/intel-mid/intel_mid_vrtc.c +4 -4
@@ -116,7 +116,7 @@ int vrtc_set_mmss(const struct timespec *now)return retval; } -void __init mrst_rtc_init (void ) +void __init intel_mid_rtc_init (void ) {unsigned long vrtc_paddr;
@@ -154,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)
@@ -174,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);
drivers/platform/x86/intel_scu_ipc.c +1 -1
@@ -579,7 +579,7 @@ static struct pci_driver ipc_driver = {static int __init intel_scu_ipc_init (void ) { - platform =mrst_identify_cpu (); + platform =intel_mid_identify_cpu ();if (platform ==0 )return -ENODEV ;return pci_register_driver (&ipc_driver);
drivers/watchdog/intel_scu_watchdog.c +1 -1
@@ -445,7 +445,7 @@ static int __init intel_scu_watchdog_init(void)* * If it isn't an intel MID device then it doesn't have this watchdog */ -if (!mrst_identify_cpu ()) +if (!intel_mid_identify_cpu ())return -ENODEV ;/* Check boot parameters to verify that their initial values */
PATCH v10 6/12 intel_mid: Refactored sfi_parse_devs() function
In reply to David CohenFrom: Kuppuswamy Sathyanarayanan <[email protected]>
SFI device_id[] table parsing code is duplicated in every SFI device handler. This patch removes this code duplication, by adding a seperate function get_device_id() to parse through the device table. Also this patch moves the SPI, I2C, IPC info code from sfi_parse_devs() to respective device handlers.
--- arch/x86/platform/intel-mid/intel-mid.c | 141 ++++++++++++++++---------------- 1 file changed, 71 insertions(+), 70 deletions(-)
arch/x86/platform/intel-mid/intel-mid.c +71 -70
@@ -831,20 +831,15 @@ static void __init install_irq_resource(struct platform_device *pdev, int irq)platform_device_add_resources (pdev, &res,1 ); } -static void __init sfi_handle_ipc_dev (struct sfi_device_table_entry *entry) +static void __init sfi_handle_ipc_dev (struct sfi_device_table_entry *pentry, +struct devs_id *dev) { -const struct devs_id *dev = device_ids;struct platform_device *pdev;void *pdata =NULL ; -while (dev->name[0 ]) { -if (dev->type ==SFI_DEV_TYPE_IPC && - !strncmp (dev->name, entry->name,SFI_NAME_LEN )) { - pdata = dev->get_platform_data (entry); -break ; - } - dev++; - } +pr_debug ("IPC bus, name = %16.16s, irq = 0x%2x\n" , + pentry->name, pentry->irq); + pdata = dev->get_platform_data (pentry);/* * On Medfield the platform device creation is handled by the MSIC
@@ -853,68 +848,94 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *entry)if (intel_mid_has_msic ())return ; - pdev =platform_device_alloc (entry->name,0 ); + pdev =platform_device_alloc (pentry->name,0 );if (pdev ==NULL ) {pr_err ("out of memory for SFI platform device '%s'.\n" , - entry->name); + pentry->name);return ; } -install_irq_resource (pdev, entry->irq); +install_irq_resource (pdev, pentry->irq); pdev->dev.platform_data = pdata;intel_scu_device_register (pdev); } -static void __init sfi_handle_spi_dev (struct spi_board_info *spi_info) +static void __init sfi_handle_spi_dev (struct sfi_device_table_entry *pentry, +struct devs_id *dev) { -const struct devs_id *dev = device_ids; +struct spi_board_info spi_info;void *pdata =NULL ; -while (dev->name[0 ]) { -if (dev->type ==SFI_DEV_TYPE_SPI && - !strncmp (dev->name, spi_info->modalias, -SFI_NAME_LEN )) { - pdata = dev->get_platform_data (spi_info); -break ; - } - dev++; - } - spi_info->platform_data = pdata; +memset (&spi_info,0 ,sizeof (spi_info)); +strncpy (spi_info.modalias, pentry->name,SFI_NAME_LEN ); + spi_info.irq = ((pentry->irq == (u8 )0xff ) ?0 : pentry->irq); + spi_info.bus_num = pentry->host_num; + spi_info.chip_select = pentry->addr; + spi_info.max_speed_hz = pentry->max_freq; +pr_debug ("SPI bus=%d, name=%16.16s, irq=0x%2x, max_freq=%d, cs=%d\n" , + spi_info.bus_num, + spi_info.modalias, + spi_info.irq, + spi_info.max_speed_hz, + spi_info.chip_select); + + pdata = dev->get_platform_data (&spi_info); + + spi_info.platform_data = pdata;if (dev->delay) -intel_scu_spi_device_register (spi_info); +intel_scu_spi_device_register (&spi_info);else -spi_register_board_info (spi_info,1 ); +spi_register_board_info (&spi_info,1 ); } -static void __init sfi_handle_i2c_dev (int bus,struct i2c_board_info *i2c_info) +static void __init sfi_handle_i2c_dev (struct sfi_device_table_entry *pentry, +struct devs_id *dev) { -const struct devs_id *dev = device_ids; +struct i2c_board_info i2c_info;void *pdata =NULL ; +memset (&i2c_info,0 ,sizeof (i2c_info)); +strncpy (i2c_info.type, pentry->name,SFI_NAME_LEN ); + i2c_info.irq = ((pentry->irq == (u8 )0xff ) ?0 : pentry->irq); + i2c_info.addr = pentry->addr; +pr_debug ("I2C bus = %d, name = %16.16s, irq = 0x%2x, addr = 0x%x\n" , + pentry->host_num, + i2c_info.type, + i2c_info.irq, + i2c_info.addr); + pdata = dev->get_platform_data (&i2c_info); + i2c_info.platform_data = pdata; + +if (dev->delay) +intel_scu_i2c_device_register (pentry->host_num, &i2c_info); +else +i2c_register_board_info (pentry->host_num, &i2c_info,1 ); +} + +static struct devs_id __init *get_device_id (u8 type,char *name) +{ +struct devs_id *dev = device_ids; + +if (device_ids ==NULL ) +return NULL ; +while (dev->name[0 ]) { -if (dev->type ==SFI_DEV_TYPE_I2C && - !strncmp (dev->name, i2c_info->type,SFI_NAME_LEN )) { - pdata = dev->get_platform_data (i2c_info); -break ; +if (dev->type == type && + !strncmp (dev->name, name,SFI_NAME_LEN )) { +return dev; } dev++; } - i2c_info->platform_data = pdata; -if (dev->delay) -intel_scu_i2c_device_register (bus, i2c_info); -else -i2c_register_board_info (bus, i2c_info,1 ); +return NULL ; } -static int __init sfi_parse_devs (struct sfi_table_header *table) {struct sfi_table_simple *sb;struct sfi_device_table_entry *pentry; -struct spi_board_info spi_info; -struct i2c_board_info i2c_info; -int num, i, bus; +struct devs_id *dev =NULL ; +int num, i;int ioapic;struct io_apic_irq_attr irq_attr;
@@ -939,40 +960,20 @@ static int __init sfi_parse_devs(struct sfi_table_header *table) }else irq =0 ;/* No irq */ + dev =get_device_id (pentry->type, pentry->name); + +if ((dev ==NULL ) || (dev->get_platform_data ==NULL )) +continue ; +switch (pentry->type) {case SFI_DEV_TYPE_IPC : -pr_debug ("info[%2d]: IPC bus, name = %16.16s, " -"irq = 0x%2x\n" , i, pentry->name, pentry->irq); -sfi_handle_ipc_dev (pentry); +sfi_handle_ipc_dev (pentry, dev);break ;case SFI_DEV_TYPE_SPI : -memset (&spi_info,0 ,sizeof (spi_info)); -strncpy (spi_info.modalias, pentry->name,SFI_NAME_LEN ); - spi_info.irq = irq; - spi_info.bus_num = pentry->host_num; - spi_info.chip_select = pentry->addr; - spi_info.max_speed_hz = pentry->max_freq; -pr_debug ("info[%2d]: SPI bus = %d, name = %16.16s, " -"irq = 0x%2x, max_freq = %d, cs = %d\n" , i, - spi_info.bus_num, - spi_info.modalias, - spi_info.irq, - spi_info.max_speed_hz, - spi_info.chip_select); -sfi_handle_spi_dev (&spi_info); +sfi_handle_spi_dev (pentry, dev);break ;case SFI_DEV_TYPE_I2C : -memset (&i2c_info,0 ,sizeof (i2c_info)); - bus = pentry->host_num; -strncpy (i2c_info.type, pentry->name,SFI_NAME_LEN ); - i2c_info.irq = irq; - i2c_info.addr = pentry->addr; -pr_debug ("info[%2d]: I2C bus = %d, name = %16.16s, " -"irq = 0x%2x, addr = 0x%x\n" , i, bus, - i2c_info.type, - i2c_info.irq, - i2c_info.addr); -sfi_handle_i2c_dev (bus, &i2c_info); +sfi_handle_i2c_dev (pentry, dev);break ;case SFI_DEV_TYPE_UART :case SFI_DEV_TYPE_HSI :
Signature · 1 line
1.8.4.rc3
tip-bot for Kuppuswamy Sathyanarayanan
merge bot[tip:x86/intel-mid] intel_mid: Refactored sfi_parse_devs() function
intel_mid: Refactored sfi_parse_devs() function
Commit-ID: 661b01076500e364c68dd9fdf0ef4216a75e8375 Gitweb: http://git.kernel.org/tip/661b01076500e364c68dd9fdf0ef4216a75e8375 Author: Kuppuswamy Sathyanarayanan <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:30 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:48 -0700
intel_mid: Refactored sfi_parse_devs() function
SFI device_id[] table parsing code is duplicated in every SFI device handler. This patch removes this code duplication, by adding a seperate function get_device_id() to parse through the device table. Also this patch moves the SPI, I2C, IPC info code from sfi_parse_devs() to respective device handlers.
--- arch/x86/platform/intel-mid/intel-mid.c | 141 ++++++++++++++++---------------- 1 file changed, 71 insertions(+), 70 deletions(-)
arch/x86/platform/intel-mid/intel-mid.c +71 -70
@@ -831,20 +831,15 @@ static void __init install_irq_resource(struct platform_device *pdev, int irq)platform_device_add_resources (pdev, &res,1 ); } -static void __init sfi_handle_ipc_dev (struct sfi_device_table_entry *entry) +static void __init sfi_handle_ipc_dev (struct sfi_device_table_entry *pentry, +struct devs_id *dev) { -const struct devs_id *dev = device_ids;struct platform_device *pdev;void *pdata =NULL ; -while (dev->name[0 ]) { -if (dev->type ==SFI_DEV_TYPE_IPC && - !strncmp (dev->name, entry->name,SFI_NAME_LEN )) { - pdata = dev->get_platform_data (entry); -break ; - } - dev++; - } +pr_debug ("IPC bus, name = %16.16s, irq = 0x%2x\n" , + pentry->name, pentry->irq); + pdata = dev->get_platform_data (pentry);/* * On Medfield the platform device creation is handled by the MSIC
@@ -853,68 +848,94 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *entry)if (intel_mid_has_msic ())return ; - pdev =platform_device_alloc (entry->name,0 ); + pdev =platform_device_alloc (pentry->name,0 );if (pdev ==NULL ) {pr_err ("out of memory for SFI platform device '%s'.\n" , - entry->name); + pentry->name);return ; } -install_irq_resource (pdev, entry->irq); +install_irq_resource (pdev, pentry->irq); pdev->dev.platform_data = pdata;intel_scu_device_register (pdev); } -static void __init sfi_handle_spi_dev (struct spi_board_info *spi_info) +static void __init sfi_handle_spi_dev (struct sfi_device_table_entry *pentry, +struct devs_id *dev) { -const struct devs_id *dev = device_ids; +struct spi_board_info spi_info;void *pdata =NULL ; -while (dev->name[0 ]) { -if (dev->type ==SFI_DEV_TYPE_SPI && - !strncmp (dev->name, spi_info->modalias, -SFI_NAME_LEN )) { - pdata = dev->get_platform_data (spi_info); -break ; - } - dev++; - } - spi_info->platform_data = pdata; +memset (&spi_info,0 ,sizeof (spi_info)); +strncpy (spi_info.modalias, pentry->name,SFI_NAME_LEN ); + spi_info.irq = ((pentry->irq == (u8 )0xff ) ?0 : pentry->irq); + spi_info.bus_num = pentry->host_num; + spi_info.chip_select = pentry->addr; + spi_info.max_speed_hz = pentry->max_freq; +pr_debug ("SPI bus=%d, name=%16.16s, irq=0x%2x, max_freq=%d, cs=%d\n" , + spi_info.bus_num, + spi_info.modalias, + spi_info.irq, + spi_info.max_speed_hz, + spi_info.chip_select); + + pdata = dev->get_platform_data (&spi_info); + + spi_info.platform_data = pdata;if (dev->delay) -intel_scu_spi_device_register (spi_info); +intel_scu_spi_device_register (&spi_info);else -spi_register_board_info (spi_info,1 ); +spi_register_board_info (&spi_info,1 ); } -static void __init sfi_handle_i2c_dev (int bus,struct i2c_board_info *i2c_info) +static void __init sfi_handle_i2c_dev (struct sfi_device_table_entry *pentry, +struct devs_id *dev) { -const struct devs_id *dev = device_ids; +struct i2c_board_info i2c_info;void *pdata =NULL ; +memset (&i2c_info,0 ,sizeof (i2c_info)); +strncpy (i2c_info.type, pentry->name,SFI_NAME_LEN ); + i2c_info.irq = ((pentry->irq == (u8 )0xff ) ?0 : pentry->irq); + i2c_info.addr = pentry->addr; +pr_debug ("I2C bus = %d, name = %16.16s, irq = 0x%2x, addr = 0x%x\n" , + pentry->host_num, + i2c_info.type, + i2c_info.irq, + i2c_info.addr); + pdata = dev->get_platform_data (&i2c_info); + i2c_info.platform_data = pdata; + +if (dev->delay) +intel_scu_i2c_device_register (pentry->host_num, &i2c_info); +else +i2c_register_board_info (pentry->host_num, &i2c_info,1 ); +} + +static struct devs_id __init *get_device_id (u8 type,char *name) +{ +struct devs_id *dev = device_ids; + +if (device_ids ==NULL ) +return NULL ; +while (dev->name[0 ]) { -if (dev->type ==SFI_DEV_TYPE_I2C && - !strncmp (dev->name, i2c_info->type,SFI_NAME_LEN )) { - pdata = dev->get_platform_data (i2c_info); -break ; +if (dev->type == type && + !strncmp (dev->name, name,SFI_NAME_LEN )) { +return dev; } dev++; } - i2c_info->platform_data = pdata; -if (dev->delay) -intel_scu_i2c_device_register (bus, i2c_info); -else -i2c_register_board_info (bus, i2c_info,1 ); +return NULL ; } -static int __init sfi_parse_devs (struct sfi_table_header *table) {struct sfi_table_simple *sb;struct sfi_device_table_entry *pentry; -struct spi_board_info spi_info; -struct i2c_board_info i2c_info; -int num, i, bus; +struct devs_id *dev =NULL ; +int num, i;int ioapic;struct io_apic_irq_attr irq_attr;
@@ -939,40 +960,20 @@ static int __init sfi_parse_devs(struct sfi_table_header *table) }else irq =0 ;/* No irq */ + dev =get_device_id (pentry->type, pentry->name); + +if ((dev ==NULL ) || (dev->get_platform_data ==NULL )) +continue ; +switch (pentry->type) {case SFI_DEV_TYPE_IPC : -pr_debug ("info[%2d]: IPC bus, name = %16.16s, " -"irq = 0x%2x\n" , i, pentry->name, pentry->irq); -sfi_handle_ipc_dev (pentry); +sfi_handle_ipc_dev (pentry, dev);break ;case SFI_DEV_TYPE_SPI : -memset (&spi_info,0 ,sizeof (spi_info)); -strncpy (spi_info.modalias, pentry->name,SFI_NAME_LEN ); - spi_info.irq = irq; - spi_info.bus_num = pentry->host_num; - spi_info.chip_select = pentry->addr; - spi_info.max_speed_hz = pentry->max_freq; -pr_debug ("info[%2d]: SPI bus = %d, name = %16.16s, " -"irq = 0x%2x, max_freq = %d, cs = %d\n" , i, - spi_info.bus_num, - spi_info.modalias, - spi_info.irq, - spi_info.max_speed_hz, - spi_info.chip_select); -sfi_handle_spi_dev (&spi_info); +sfi_handle_spi_dev (pentry, dev);break ;case SFI_DEV_TYPE_I2C : -memset (&i2c_info,0 ,sizeof (i2c_info)); - bus = pentry->host_num; -strncpy (i2c_info.type, pentry->name,SFI_NAME_LEN ); - i2c_info.irq = irq; - i2c_info.addr = pentry->addr; -pr_debug ("info[%2d]: I2C bus = %d, name = %16.16s, " -"irq = 0x%2x, addr = 0x%x\n" , i, bus, - i2c_info.type, - i2c_info.irq, - i2c_info.addr); -sfi_handle_i2c_dev (bus, &i2c_info); +sfi_handle_i2c_dev (pentry, dev);break ;case SFI_DEV_TYPE_UART :case SFI_DEV_TYPE_HSI :
PATCH v10 7/12 intel_mid: Added custom device_handler support
In reply to David CohenFrom: Kuppuswamy Sathyanarayanan <[email protected]>
This patch provides a means to add custom handler for SFI devices. If you set device_handler as NULL in device_id table standard SFI device handler will be used. If its not NULL custom handler will be called.
--- arch/x86/platform/intel-mid/intel-mid.c | 74 ++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 34 deletions(-)
arch/x86/platform/intel-mid/intel-mid.c +40 -34
@@ -396,6 +396,9 @@ struct devs_id {u8 type;u8 delay;void *(*get_platform_data)(void *info); +/* Custom handler for devices */ +void (*device_handler)(struct sfi_device_table_entry *pentry, +struct devs_id *dev); };/* the offset for the mapping of global gpio pin to irq */
@@ -690,28 +693,27 @@ static void *tc35876x_platform_data(void *data) }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}, - {"pmic_gpio" ,SFI_DEV_TYPE_IPC ,1 , &pmic_gpio_platform_data}, - {"spi_max3111" ,SFI_DEV_TYPE_SPI ,0 , &max3111_platform_data}, - {"i2c_max7315" ,SFI_DEV_TYPE_I2C ,1 , &max7315_platform_data}, - {"i2c_max7315_2" ,SFI_DEV_TYPE_I2C ,1 , &max7315_platform_data}, - {"tca6416" ,SFI_DEV_TYPE_I2C ,1 , &tca6416_platform_data}, - {"emc1403" ,SFI_DEV_TYPE_I2C ,1 , &emc1403_platform_data}, - {"i2c_accel" ,SFI_DEV_TYPE_I2C ,0 , &lis331dl_platform_data}, - {"pmic_audio" ,SFI_DEV_TYPE_IPC ,1 , &no_platform_data}, - {"mpu3050" ,SFI_DEV_TYPE_I2C ,1 , &mpu3050_platform_data}, - {"i2c_disp_brig" ,SFI_DEV_TYPE_I2C ,0 , &tc35876x_platform_data}, + {"bma023" ,SFI_DEV_TYPE_I2C ,1 , &no_platform_data,NULL }, + {"pmic_gpio" ,SFI_DEV_TYPE_SPI ,1 , &pmic_gpio_platform_data,NULL }, + {"pmic_gpio" ,SFI_DEV_TYPE_IPC ,1 , &pmic_gpio_platform_data,NULL }, + {"spi_max3111" ,SFI_DEV_TYPE_SPI ,0 , &max3111_platform_data,NULL }, + {"i2c_max7315" ,SFI_DEV_TYPE_I2C ,1 , &max7315_platform_data,NULL }, + {"i2c_max7315_2" ,SFI_DEV_TYPE_I2C ,1 , &max7315_platform_data,NULL }, + {"tca6416" ,SFI_DEV_TYPE_I2C ,1 , &tca6416_platform_data,NULL }, + {"emc1403" ,SFI_DEV_TYPE_I2C ,1 , &emc1403_platform_data,NULL }, + {"i2c_accel" ,SFI_DEV_TYPE_I2C ,0 , &lis331dl_platform_data,NULL }, + {"pmic_audio" ,SFI_DEV_TYPE_IPC ,1 , &no_platform_data,NULL }, + {"mpu3050" ,SFI_DEV_TYPE_I2C ,1 , &mpu3050_platform_data,NULL }, + {"i2c_disp_brig" ,SFI_DEV_TYPE_I2C ,0 , &tc35876x_platform_data,NULL },/* MSIC subdevices */ - {"msic_battery" ,SFI_DEV_TYPE_IPC ,1 , &msic_battery_platform_data}, - {"msic_gpio" ,SFI_DEV_TYPE_IPC ,1 , &msic_gpio_platform_data}, - {"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}, - - {}, + {"msic_battery" ,SFI_DEV_TYPE_IPC ,1 , &msic_battery_platform_data,NULL }, + {"msic_gpio" ,SFI_DEV_TYPE_IPC ,1 , &msic_gpio_platform_data,NULL }, + {"msic_audio" ,SFI_DEV_TYPE_IPC ,1 , &msic_audio_platform_data,NULL }, + {"msic_power_btn" ,SFI_DEV_TYPE_IPC ,1 , &msic_power_btn_platform_data,NULL }, + {"msic_ocd" ,SFI_DEV_TYPE_IPC ,1 , &msic_ocd_platform_data,NULL }, + {"msic_thermal" ,SFI_DEV_TYPE_IPC ,1 , &msic_thermal_platform_data,NULL }, + {0 } };#define MAX_IPCDEVS 24
@@ -965,20 +967,24 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)if ((dev ==NULL ) || (dev->get_platform_data ==NULL ))continue ; -switch (pentry->type) { -case SFI_DEV_TYPE_IPC : -sfi_handle_ipc_dev (pentry, dev); -break ; -case SFI_DEV_TYPE_SPI : -sfi_handle_spi_dev (pentry, dev); -break ; -case SFI_DEV_TYPE_I2C : -sfi_handle_i2c_dev (pentry, dev); -break ; -case SFI_DEV_TYPE_UART : -case SFI_DEV_TYPE_HSI : -default : - ; +if (dev->device_handler) { + dev->device_handler (pentry, dev); + }else { +switch (pentry->type) { +case SFI_DEV_TYPE_IPC : +sfi_handle_ipc_dev (pentry, dev); +break ; +case SFI_DEV_TYPE_SPI : +sfi_handle_spi_dev (pentry, dev); +break ; +case SFI_DEV_TYPE_I2C : +sfi_handle_i2c_dev (pentry, dev); +break ; +case SFI_DEV_TYPE_UART : +case SFI_DEV_TYPE_HSI : +default : +break ; + } } }return 0 ;
Signature · 1 line
1.8.4.rc3
tip-bot for Kuppuswamy Sathyanarayanan
merge bot[tip:x86/intel-mid] intel_mid: Added custom device_handler support
intel_mid: Added custom device_handler support
Commit-ID: 3fd79ae4275001f293dbd170479e89df6c433226 Gitweb: http://git.kernel.org/tip/3fd79ae4275001f293dbd170479e89df6c433226 Author: Kuppuswamy Sathyanarayanan <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:31 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:49 -0700
intel_mid: Added custom device_handler support
This patch provides a means to add custom handler for SFI devices. If you set device_handler as NULL in device_id table standard SFI device handler will be used. If its not NULL custom handler will be called.
--- arch/x86/platform/intel-mid/intel-mid.c | 74 ++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 34 deletions(-)
arch/x86/platform/intel-mid/intel-mid.c +40 -34
@@ -396,6 +396,9 @@ struct devs_id {u8 type;u8 delay;void *(*get_platform_data)(void *info); +/* Custom handler for devices */ +void (*device_handler)(struct sfi_device_table_entry *pentry, +struct devs_id *dev); };/* the offset for the mapping of global gpio pin to irq */
@@ -690,28 +693,27 @@ static void *tc35876x_platform_data(void *data) }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}, - {"pmic_gpio" ,SFI_DEV_TYPE_IPC ,1 , &pmic_gpio_platform_data}, - {"spi_max3111" ,SFI_DEV_TYPE_SPI ,0 , &max3111_platform_data}, - {"i2c_max7315" ,SFI_DEV_TYPE_I2C ,1 , &max7315_platform_data}, - {"i2c_max7315_2" ,SFI_DEV_TYPE_I2C ,1 , &max7315_platform_data}, - {"tca6416" ,SFI_DEV_TYPE_I2C ,1 , &tca6416_platform_data}, - {"emc1403" ,SFI_DEV_TYPE_I2C ,1 , &emc1403_platform_data}, - {"i2c_accel" ,SFI_DEV_TYPE_I2C ,0 , &lis331dl_platform_data}, - {"pmic_audio" ,SFI_DEV_TYPE_IPC ,1 , &no_platform_data}, - {"mpu3050" ,SFI_DEV_TYPE_I2C ,1 , &mpu3050_platform_data}, - {"i2c_disp_brig" ,SFI_DEV_TYPE_I2C ,0 , &tc35876x_platform_data}, + {"bma023" ,SFI_DEV_TYPE_I2C ,1 , &no_platform_data,NULL }, + {"pmic_gpio" ,SFI_DEV_TYPE_SPI ,1 , &pmic_gpio_platform_data,NULL }, + {"pmic_gpio" ,SFI_DEV_TYPE_IPC ,1 , &pmic_gpio_platform_data,NULL }, + {"spi_max3111" ,SFI_DEV_TYPE_SPI ,0 , &max3111_platform_data,NULL }, + {"i2c_max7315" ,SFI_DEV_TYPE_I2C ,1 , &max7315_platform_data,NULL }, + {"i2c_max7315_2" ,SFI_DEV_TYPE_I2C ,1 , &max7315_platform_data,NULL }, + {"tca6416" ,SFI_DEV_TYPE_I2C ,1 , &tca6416_platform_data,NULL }, + {"emc1403" ,SFI_DEV_TYPE_I2C ,1 , &emc1403_platform_data,NULL }, + {"i2c_accel" ,SFI_DEV_TYPE_I2C ,0 , &lis331dl_platform_data,NULL }, + {"pmic_audio" ,SFI_DEV_TYPE_IPC ,1 , &no_platform_data,NULL }, + {"mpu3050" ,SFI_DEV_TYPE_I2C ,1 , &mpu3050_platform_data,NULL }, + {"i2c_disp_brig" ,SFI_DEV_TYPE_I2C ,0 , &tc35876x_platform_data,NULL },/* MSIC subdevices */ - {"msic_battery" ,SFI_DEV_TYPE_IPC ,1 , &msic_battery_platform_data}, - {"msic_gpio" ,SFI_DEV_TYPE_IPC ,1 , &msic_gpio_platform_data}, - {"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}, - - {}, + {"msic_battery" ,SFI_DEV_TYPE_IPC ,1 , &msic_battery_platform_data,NULL }, + {"msic_gpio" ,SFI_DEV_TYPE_IPC ,1 , &msic_gpio_platform_data,NULL }, + {"msic_audio" ,SFI_DEV_TYPE_IPC ,1 , &msic_audio_platform_data,NULL }, + {"msic_power_btn" ,SFI_DEV_TYPE_IPC ,1 , &msic_power_btn_platform_data,NULL }, + {"msic_ocd" ,SFI_DEV_TYPE_IPC ,1 , &msic_ocd_platform_data,NULL }, + {"msic_thermal" ,SFI_DEV_TYPE_IPC ,1 , &msic_thermal_platform_data,NULL }, + {0 } };#define MAX_IPCDEVS 24
@@ -965,20 +967,24 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)if ((dev ==NULL ) || (dev->get_platform_data ==NULL ))continue ; -switch (pentry->type) { -case SFI_DEV_TYPE_IPC : -sfi_handle_ipc_dev (pentry, dev); -break ; -case SFI_DEV_TYPE_SPI : -sfi_handle_spi_dev (pentry, dev); -break ; -case SFI_DEV_TYPE_I2C : -sfi_handle_i2c_dev (pentry, dev); -break ; -case SFI_DEV_TYPE_UART : -case SFI_DEV_TYPE_HSI : -default : - ; +if (dev->device_handler) { + dev->device_handler (pentry, dev); + }else { +switch (pentry->type) { +case SFI_DEV_TYPE_IPC : +sfi_handle_ipc_dev (pentry, dev); +break ; +case SFI_DEV_TYPE_SPI : +sfi_handle_spi_dev (pentry, dev); +break ; +case SFI_DEV_TYPE_I2C : +sfi_handle_i2c_dev (pentry, dev); +break ; +case SFI_DEV_TYPE_UART : +case SFI_DEV_TYPE_HSI : +default : +break ; + } } }return 0 ;
PATCH v10 8/12 intel_mid: Added custom handler for ipc devices
In reply to David CohenFrom: Kuppuswamy Sathyanarayanan <[email protected]>
Added a custom handler for medfield based ipc devices and moved devs_id structure defintion to header file.
--- arch/x86/include/asm/intel-mid.h | 15 ++++++ arch/x86/platform/intel-mid/intel-mid.c | 82 ++++++++++++++++++++------------- 2 files changed, 66 insertions(+), 31 deletions(-)
arch/x86/include/asm/intel-mid.h +15 -0
@@ -19,6 +19,21 @@ extern int sfi_mrtc_num;extern struct sfi_rtc_table_entry sfi_mrtc_array[];/* +* Here defines the array of devices platform data that IAFW would export +* through SFI "DEVS" table, we use name and type to match the device and +* its platform data. +*/ +struct devs_id { +char name[SFI_NAME_LEN +1 ]; +u8 type; +u8 delay; +void *(*get_platform_data)(void *info); +/* Custom handler for devices */ +void (*device_handler)(struct sfi_device_table_entry *pentry, +struct devs_id *dev); +}; + +/* * Medfield is the follow-up of Moorestown, it combines two chip solution into * one. Other than that it also added always-on and constant tsc and lapic * timers. Medfield is the platform name, and the chip name is called Penwell
arch/x86/platform/intel-mid/intel-mid.c +51 -31
128 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
tip-bot for Kuppuswamy Sathyanarayanan
merge bot[tip:x86/intel-mid] intel_mid: Added custom handler for ipc devices
intel_mid: Added custom handler for ipc devices
Commit-ID: 49c72a0a8ad640fa6026962056eeaf85a4ce79fd Gitweb: http://git.kernel.org/tip/49c72a0a8ad640fa6026962056eeaf85a4ce79fd Author: Kuppuswamy Sathyanarayanan <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:32 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:50 -0700
intel_mid: Added custom handler for ipc devices
Added a custom handler for medfield based ipc devices and moved devs_id structure defintion to header file.
--- arch/x86/include/asm/intel-mid.h | 15 ++++++ arch/x86/platform/intel-mid/intel-mid.c | 82 ++++++++++++++++++++------------- 2 files changed, 66 insertions(+), 31 deletions(-)
arch/x86/include/asm/intel-mid.h +15 -0
@@ -19,6 +19,21 @@ extern int sfi_mrtc_num;extern struct sfi_rtc_table_entry sfi_mrtc_array[];/* +* Here defines the array of devices platform data that IAFW would export +* through SFI "DEVS" table, we use name and type to match the device and +* its platform data. +*/ +struct devs_id { +char name[SFI_NAME_LEN +1 ]; +u8 type; +u8 delay; +void *(*get_platform_data)(void *info); +/* Custom handler for devices */ +void (*device_handler)(struct sfi_device_table_entry *pentry, +struct devs_id *dev); +}; + +/* * Medfield is the follow-up of Moorestown, it combines two chip solution into * one. Other than that it also added always-on and constant tsc and lapic * timers. Medfield is the platform name, and the chip name is called Penwell
arch/x86/platform/intel-mid/intel-mid.c +51 -31
128 lines not on this page · raw message
PATCH v10 9/12 intel_mid: Moved SFI related code to sfi.c
In reply to David CohenFrom: Kuppuswamy Sathyanarayanan <[email protected]>
Moved SFI specific parsing/handling code to sfi.c. This will enable us to reuse our intel-mid code for platforms that supports firmware interfaces other than SFI (like ACPI).
--- arch/x86/include/asm/intel-mid.h | 1 + arch/x86/platform/intel-mid/Makefile | 2 + arch/x86/platform/intel-mid/intel-mid.c | 451 +---------------------------- arch/x86/platform/intel-mid/sfi.c | 485 ++++++++++++++++++++++++++++++++ 4 files changed, 489 insertions(+), 450 deletions(-) create mode 100644 arch/x86/platform/intel-mid/sfi.c
arch/x86/include/asm/intel-mid.h +1 -0
@@ -15,6 +15,7 @@extern int intel_mid_pci_init (void );extern int __init sfi_parse_mrtc (struct sfi_table_header *table); +extern int __init sfi_parse_mtmr (struct sfi_table_header *table);extern int sfi_mrtc_num;extern struct sfi_rtc_table_entry sfi_mrtc_array[];
arch/x86/platform/intel-mid/Makefile +2 -0
@@ -1,3 +1,5 @@ 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 +obj-$(CONFIG_SFI) += sfi.o
arch/x86/platform/intel-mid/intel-mid.c +1 -450
499 lines not on this page · raw message
arch/x86/platform/intel-mid/sfi.c new file +485 -0
485 lines not on this page · raw message
Signature · 1 line
1.8.4.rc3
tip-bot for Kuppuswamy Sathyanarayanan
merge bot[tip:x86/intel-mid] intel_mid: Moved SFI related code to sfi.c
intel_mid: Moved SFI related code to sfi.c
Commit-ID: aeedb370e7398fb5b39185b295d36f2da0653215 Gitweb: http://git.kernel.org/tip/aeedb370e7398fb5b39185b295d36f2da0653215 Author: Kuppuswamy Sathyanarayanan <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:33 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:51 -0700
intel_mid: Moved SFI related code to sfi.c
Moved SFI specific parsing/handling code to sfi.c. This will enable us to reuse our intel-mid code for platforms that supports firmware interfaces other than SFI (like ACPI).
--- arch/x86/include/asm/intel-mid.h | 1 + arch/x86/platform/intel-mid/Makefile | 2 + arch/x86/platform/intel-mid/intel-mid.c | 451 +---------------------------- arch/x86/platform/intel-mid/sfi.c | 485 ++++++++++++++++++++++++++++++++ 4 files changed, 489 insertions(+), 450 deletions(-)
arch/x86/include/asm/intel-mid.h +1 -0
@@ -15,6 +15,7 @@extern int intel_mid_pci_init (void );extern int __init sfi_parse_mrtc (struct sfi_table_header *table); +extern int __init sfi_parse_mtmr (struct sfi_table_header *table);extern int sfi_mrtc_num;extern struct sfi_rtc_table_entry sfi_mrtc_array[];
arch/x86/platform/intel-mid/Makefile +2 -0
@@ -1,3 +1,5 @@ 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 +obj-$(CONFIG_SFI) += sfi.o
arch/x86/platform/intel-mid/intel-mid.c +1 -450
499 lines not on this page · raw message
arch/x86/platform/intel-mid/sfi.c new file +485 -0
485 lines not on this page · raw message
PATCH v10 10/12 intel-mid: sfi: allow struct devs_id.get_platform_data to be NULL
In reply to David CohenIntel mid sfi code doesn't need struct devs_id.get_platform_data != NULL. If the callback is not set, just assume there is no platform_data.
--- arch/x86/platform/intel-mid/sfi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/platform/intel-mid/sfi.c +7 -4
@@ -70,6 +70,9 @@ struct blocking_notifier_head intel_scu_notifier =BLOCKING_NOTIFIER_INIT (intel_scu_notifier);EXPORT_SYMBOL_GPL (intel_scu_notifier); +#define intel_mid_sfi_get_pdata (dev, priv) \ + ((dev)->get_platform_data ? (dev)->get_platform_data(priv) : NULL) +/* parse all the mtimer info to a static mtimer array */ int __init sfi_parse_mtmr (struct sfi_table_header *table) {
@@ -334,7 +337,7 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,pr_debug ("IPC bus, name = %16.16s, irq = 0x%2x\n" , pentry->name, pentry->irq); - pdata = dev->get_platform_data (pentry); + pdata =intel_mid_sfi_get_pdata (dev, pentry); pdev =platform_device_alloc (pentry->name,0 );if (pdev ==NULL ) {
@@ -367,7 +370,7 @@ static void __init sfi_handle_spi_dev(struct sfi_device_table_entry *pentry, spi_info.max_speed_hz, spi_info.chip_select); - pdata = dev->get_platform_data (&spi_info); + pdata =intel_mid_sfi_get_pdata (dev, &spi_info); spi_info.platform_data = pdata;if (dev->delay)
@@ -391,7 +394,7 @@ static void __init sfi_handle_i2c_dev(struct sfi_device_table_entry *pentry, i2c_info.type, i2c_info.irq, i2c_info.addr); - pdata = dev->get_platform_data (&i2c_info); + pdata =intel_mid_sfi_get_pdata (dev, &i2c_info); i2c_info.platform_data = pdata;if (dev->delay)
@@ -450,7 +453,7 @@ static int __init sfi_parse_devs(struct sfi_table_header *table) dev =get_device_id (pentry->type, pentry->name); -if ((dev ==NULL ) || (dev->get_platform_data ==NULL )) +if (!dev)continue ;if (dev->device_handler) {
Signature · 1 line
1.8.4.rc3
tip-bot for David Cohen
merge bot[tip:x86/intel-mid] intel-mid: sfi: Allow struct devs_id.get_platform_data to be NULL
intel-mid: sfi: Allow struct devs_id.get_platform_data to be NULL
Commit-ID: 0e6fdb5f036338bc38bf660c65c931b3e92a31d7 Gitweb: http://git.kernel.org/tip/0e6fdb5f036338bc38bf660c65c931b3e92a31d7 Author: David Cohen <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:34 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:40:59 -0700
intel-mid: sfi: Allow struct devs_id.get_platform_data to be NULL
Intel mid sfi code doesn't need struct devs_id.get_platform_data != NULL. If the callback is not set, just assume there is no platform_data.
--- arch/x86/platform/intel-mid/sfi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/platform/intel-mid/sfi.c +7 -4
@@ -70,6 +70,9 @@ struct blocking_notifier_head intel_scu_notifier =BLOCKING_NOTIFIER_INIT (intel_scu_notifier);EXPORT_SYMBOL_GPL (intel_scu_notifier); +#define intel_mid_sfi_get_pdata (dev, priv) \ + ((dev)->get_platform_data ? (dev)->get_platform_data(priv) : NULL) +/* parse all the mtimer info to a static mtimer array */ int __init sfi_parse_mtmr (struct sfi_table_header *table) {
@@ -334,7 +337,7 @@ static void __init sfi_handle_ipc_dev(struct sfi_device_table_entry *pentry,pr_debug ("IPC bus, name = %16.16s, irq = 0x%2x\n" , pentry->name, pentry->irq); - pdata = dev->get_platform_data (pentry); + pdata =intel_mid_sfi_get_pdata (dev, pentry); pdev =platform_device_alloc (pentry->name,0 );if (pdev ==NULL ) {
@@ -367,7 +370,7 @@ static void __init sfi_handle_spi_dev(struct sfi_device_table_entry *pentry, spi_info.max_speed_hz, spi_info.chip_select); - pdata = dev->get_platform_data (&spi_info); + pdata =intel_mid_sfi_get_pdata (dev, &spi_info); spi_info.platform_data = pdata;if (dev->delay)
@@ -391,7 +394,7 @@ static void __init sfi_handle_i2c_dev(struct sfi_device_table_entry *pentry, i2c_info.type, i2c_info.irq, i2c_info.addr); - pdata = dev->get_platform_data (&i2c_info); + pdata =intel_mid_sfi_get_pdata (dev, &i2c_info); i2c_info.platform_data = pdata;if (dev->delay)
@@ -450,7 +453,7 @@ static int __init sfi_parse_devs(struct sfi_table_header *table) dev =get_device_id (pentry->type, pentry->name); -if ((dev ==NULL ) || (dev->get_platform_data ==NULL )) +if (!dev)continue ;if (dev->device_handler) {
PATCH v10 11/12 x86: intel-mid: add section for sfi device table
In reply to David CohenWhen Intel mid uses SFI table to enumerate devices, it requires an extra device table with further information about how to probe such devices.
This patch creates a section where the device table will stay if CONFIG_X86_INTEL_MID is selected.
--- arch/x86/kernel/vmlinux.lds.S | 9 +++++++++ 1 file changed, 9 insertions(+)
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
Signature · 1 line
1.8.4.rc3
tip-bot for David Cohen
merge bot[tip:x86/intel-mid] x86: intel-mid: Add section for sfi device table
x86: intel-mid: Add section for sfi device table
Commit-ID: 66ac50137049b3d3fab39e5ae245e1562aee5acd Gitweb: http://git.kernel.org/tip/66ac50137049b3d3fab39e5ae245e1562aee5acd Author: David Cohen <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:35 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:41:04 -0700
x86: intel-mid: Add section for sfi device table
When Intel mid uses SFI table to enumerate devices, it requires an extra device table with further information about how to probe such devices.
This patch creates a section where the device table will stay if CONFIG_X86_INTEL_MID is selected.
--- arch/x86/kernel/vmlinux.lds.S | 9 +++++++++ 1 file changed, 9 insertions(+)
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
PATCH v10 12/12 intel_mid: move board related codes to their own platform_<device>.* files
In reply to David CohenAs Intel rolling out more SoC's after Moorestown, we need to re-structure the code in a way that is backward compatible and easy to expand. This patch implements a flexible way to support multiple boards and devices.
This patch does not add any new functional support. It just refactors the existing code to increase the modularity and decrease the code duplication for supporting multiple soc's and boards.
Currently intel-mid.c has both board and soc related code in one file. This patch moves the board related code to new files and let linker script to create SFI devite table following this:
1. Move the SFI device specific code to arch/x86/platform/intel-mid/device-libs/platform_<device>.* A new device file is added for every supported device. This code will get conditionally compiled by using corresponding device driver CONFIG option.
2. Move the device_ids location to .x86_intel_mid_dev.init section by using new sfi_device() macro.
This patch was based on previous code from Sathyanarayanan Kuppuswamy.
--- arch/x86/include/asm/intel-mid.h | 16 + arch/x86/platform/intel-mid/Makefile | 8 +- 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 +++ arch/x86/platform/intel-mid/intel-mid.c | 419 --------------------- arch/x86/platform/intel-mid/sfi.c | 14 +- include/linux/sfi.h | 3 + 26 files changed, 978 insertions(+), 429 deletions(-) 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
arch/x86/include/asm/intel-mid.h +16 -0
@@ -12,8 +12,11 @@#define _ASM_X86_INTEL_MID_H#include <linux/sfi.h> +#include <linux/platform_device.h> extern int intel_mid_pci_init (void ); +extern int get_gpio_by_name (const char *name); +extern void intel_scu_device_register (struct platform_device *pdev);extern int __init sfi_parse_mrtc (struct sfi_table_header *table);extern int __init sfi_parse_mtmr (struct sfi_table_header *table);extern int sfi_mrtc_num;
@@ -34,6 +37,10 @@ struct devs_id { struct devs_id *dev); }; +#define sfi_device (i) \ + static const struct devs_id *const __intel_mid_sfi_##i##_dev __used \ + __attribute__((__section__(".x86_intel_mid_dev.init"))) = &i +/* * Medfield is the follow-up of Moorestown, it combines two chip solution into * one. Other than that it also added always-on and constant tsc and lapic
@@ -55,9 +62,15 @@ static inline enum intel_mid_cpu_type intel_mid_identify_cpu(void) return __intel_mid_cpu_chip; } +static inline bool intel_mid_has_msic (void ) +{ +return (intel_mid_identify_cpu () ==INTEL_MID_CPU_CHIP_PENWELL ); +} +#else /* !CONFIG_X86_INTEL_MID */ #define intel_mid_identify_cpu () (0) +#define intel_mid_has_msic () (0)#endif /* !CONFIG_X86_INTEL_MID */
@@ -94,4 +107,7 @@ extern void intel_scu_devices_destroy(void);extern void intel_mid_rtc_init (void ); +/* the offset for the mapping of global gpio pin to irq */ +#define INTEL_MID_IRQ_OFFSET 0x100 +#endif /* _ASM_X86_INTEL_MID_H */
arch/x86/platform/intel-mid/Makefile +5 -3
@@ -1,5 +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 +obj-$(CONFIG_X86_INTEL_MID) += intel_mid_vrtc.o +obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_intel_mid.o # SFI specific code -obj-$(CONFIG_SFI) += sfi.o +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/intel-mid.c +0 -419
429 lines not on this page · raw message
arch/x86/platform/intel-mid/sfi.c +7 -7
@@ -42,7 +42,6 @@#include <asm/intel_scu_ipc.h> #include <asm/apb_timer.h> #include <asm/reboot.h> -#include "intel_mid_weak_decls.h" #define SFI_SIG_OEM0 "OEM0"#define MAX_IPCDEVS 24
@@ -403,19 +402,20 @@ static void __init sfi_handle_i2c_dev(struct sfi_device_table_entry *pentry,i2c_register_board_info (pentry->host_num, &i2c_info,1 ); } +extern struct devs_id *const __x86_intel_mid_dev_start[], + *const __x86_intel_mid_dev_end[]; +static struct devs_id __init *get_device_id (u8 type,char *name) { -struct devs_id *dev = device_ids; - -if (device_ids ==NULL ) -return NULL ; +struct devs_id *const *dev_table; -while (dev->name[0 ]) { +for (dev_table = __x86_intel_mid_dev_start; + dev_table < __x86_intel_mid_dev_end; dev_table++) { +struct devs_id *dev = *dev_table;if (dev->type == type && !strncmp (dev->name, name,SFI_NAME_LEN )) {return dev; } - dev++; }return NULL ;
include/linux/sfi.h +3 -0
@@ -59,6 +59,9 @@#ifndef _LINUX_SFI_H#define _LINUX_SFI_H +#include <linux/init.h> +#include <linux/types.h> +/* Table signatures reserved by the SFI specification */ #define SFI_SIG_SYST "SYST"#define SFI_SIG_FREQ "FREQ"
Signature · 1 line
1.8.4.rc3
tip-bot for David Cohen
merge bot[tip:x86/intel-mid] intel_mid: Move platform device setups to their own platform_<device>.* files
intel_mid: Move platform device setups to their own platform_<device>.* files
Commit-ID: 40a96d54ee2232045783e657eb9224cd723dcb40 Gitweb: http://git.kernel.org/tip/40a96d54ee2232045783e657eb9224cd723dcb40 Author: David Cohen <[email protected]> AuthorDate: Thu, 17 Oct 2013 15:35:36 -0700 Committer: H. Peter Anvin <[email protected]> CommitDate: Thu, 17 Oct 2013 16:41:50 -0700
intel_mid: Move platform device setups to their own platform_<device>.* files
As Intel rolling out more SoC's after Moorestown, we need to re-structure the code in a way that is backward compatible and easy to expand. This patch implements a flexible way to support multiple boards and devices.
This patch does not add any new functional support. It just refactors the existing code to increase the modularity and decrease the code duplication for supporting multiple soc's and boards.
Currently intel-mid.c has both board and soc related code in one file. This patch moves the board related code to new files and let linker script to create SFI devite table following this:
1. Move the SFI device specific code to arch/x86/platform/intel-mid/device-libs/platform_<device>.* A new device file is added for every supported device. This code will get conditionally compiled by using corresponding device driver CONFIG option.
2. Move the device_ids location to .x86_intel_mid_dev.init section by using new sfi_device() macro.
This patch was based on previous code from Sathyanarayanan Kuppuswamy.
--- arch/x86/include/asm/intel-mid.h | 16 + arch/x86/platform/intel-mid/Makefile | 8 +- 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 +++ arch/x86/platform/intel-mid/intel-mid.c | 419 --------------------- arch/x86/platform/intel-mid/sfi.c | 14 +- include/linux/sfi.h | 3 + 26 files changed, 978 insertions(+), 429 deletions(-)
arch/x86/include/asm/intel-mid.h +16 -0
@@ -12,8 +12,11 @@#define _ASM_X86_INTEL_MID_H#include <linux/sfi.h> +#include <linux/platform_device.h> extern int intel_mid_pci_init (void ); +extern int get_gpio_by_name (const char *name); +extern void intel_scu_device_register (struct platform_device *pdev);extern int __init sfi_parse_mrtc (struct sfi_table_header *table);extern int __init sfi_parse_mtmr (struct sfi_table_header *table);extern int sfi_mrtc_num;
@@ -34,6 +37,10 @@ struct devs_id { struct devs_id *dev); }; +#define sfi_device (i) \ + static const struct devs_id *const __intel_mid_sfi_##i##_dev __used \ + __attribute__((__section__(".x86_intel_mid_dev.init"))) = &i +/* * Medfield is the follow-up of Moorestown, it combines two chip solution into * one. Other than that it also added always-on and constant tsc and lapic
@@ -55,9 +62,15 @@ static inline enum intel_mid_cpu_type intel_mid_identify_cpu(void) return __intel_mid_cpu_chip; } +static inline bool intel_mid_has_msic (void ) +{ +return (intel_mid_identify_cpu () ==INTEL_MID_CPU_CHIP_PENWELL ); +} +#else /* !CONFIG_X86_INTEL_MID */ #define intel_mid_identify_cpu () (0) +#define intel_mid_has_msic () (0)#endif /* !CONFIG_X86_INTEL_MID */
@@ -94,4 +107,7 @@ extern void intel_scu_devices_destroy(void);extern void intel_mid_rtc_init (void ); +/* the offset for the mapping of global gpio pin to irq */ +#define INTEL_MID_IRQ_OFFSET 0x100 +#endif /* _ASM_X86_INTEL_MID_H */
arch/x86/platform/intel-mid/Makefile +5 -3
@@ -1,5 +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 +obj-$(CONFIG_X86_INTEL_MID) += intel_mid_vrtc.o +obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_intel_mid.o # SFI specific code -obj-$(CONFIG_SFI) += sfi.o +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/intel-mid.c +0 -419
429 lines not on this page · raw message
arch/x86/platform/intel-mid/sfi.c +7 -7
@@ -42,7 +42,6 @@#include <asm/intel_scu_ipc.h> #include <asm/apb_timer.h> #include <asm/reboot.h> -#include "intel_mid_weak_decls.h" #define SFI_SIG_OEM0 "OEM0"#define MAX_IPCDEVS 24
@@ -403,19 +402,20 @@ static void __init sfi_handle_i2c_dev(struct sfi_device_table_entry *pentry,i2c_register_board_info (pentry->host_num, &i2c_info,1 ); } +extern struct devs_id *const __x86_intel_mid_dev_start[], + *const __x86_intel_mid_dev_end[]; +static struct devs_id __init *get_device_id (u8 type,char *name) { -struct devs_id *dev = device_ids; - -if (device_ids ==NULL ) -return NULL ; +struct devs_id *const *dev_table; -while (dev->name[0 ]) { +for (dev_table = __x86_intel_mid_dev_start; + dev_table < __x86_intel_mid_dev_end; dev_table++) { +struct devs_id *dev = *dev_table;if (dev->type == type && !strncmp (dev->name, name,SFI_NAME_LEN )) {return dev; } - dev++; }return NULL ;
include/linux/sfi.h +3 -0
@@ -59,6 +59,9 @@#ifndef _LINUX_SFI_H#define _LINUX_SFI_H +#include <linux/init.h> +#include <linux/types.h> +/* Table signatures reserved by the SFI specification */ #define SFI_SIG_SYST "SYST"#define SFI_SIG_FREQ "FREQ"
Quoted 9 lines · David Cohen
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 board related codes to their own platform_<device>.*
filesFengguang Wu (1):
pci:intel_mid: return true/false in function returning bool
Quoted 9 lines
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: Refactoredsfi_parse_devs()function
intel_mid: Added customdevice_handlersupport
intel_mid: Added custom handler for ipc devices
intel_mid: Moved SFI related code tosfi.c
Btw., when submitting a series _please_ harmonize the patch titles.
1)
Verbs should be present tense, i.e.:
-> intel_mid: Renamed *mrst* to *intel_mid* -> intel_mid: Renamed *mrst* to *intel_mid* +> intel_mid: Rename *mrst* to *intel_mid* +> intel_mid: Rename *mrst* to *intel_mid*
2)
Use consistent capitalization:
-> pci: intel_mid: return true/false in function returning bool
+> pci: intel_mid: Return true/false in function returning bool
3)
Use standard, consistent subsystem prefixes:
-> x86: intel-mid: add section for sfi device table
-> intel_mid: Renamed *mrst* to *intel_mid*
+> x86/intel-mid: Add section for sfi device table
+> x86/intel/mid: Rename *mrst* to *intel_mid*
etc.
Thanks,
Ingo
Hi Ingo,
Quoted 42 lines · Ingo Molnar
Quoted 9 lines · David Cohen
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 board related codes to their own platform_<device>.*
filesFengguang Wu (1):
pci:intel_mid: return true/false in function returning boolQuoted 9 lines
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: Refactoredsfi_parse_devs()function
intel_mid: Added customdevice_handlersupport
intel_mid: Added custom handler for ipc devices
intel_mid: Moved SFI related code tosfi.cBtw., when submitting a series _please_ harmonize the patch titles.
1)
Verbs should be present tense, i.e.:
-> intel_mid: Renamed *mrst* to *intel_mid* -> intel_mid: Renamed *mrst* to *intel_mid* +> intel_mid: Rename *mrst* to *intel_mid* +> intel_mid: Rename *mrst* to *intel_mid*2)
Use consistent capitalization:
-> pci:
intel_mid: return true/false in function returning bool
+> pci:intel_mid: Return true/false in function returning bool3)
Quoted 8 lines
Use standard, consistent subsystem prefixes:
-> x86: intel-mid: add section for sfi device table
->intel_mid: Renamed *mrst* to *intel_mid*
+> x86/intel-mid: Add section for sfi device table
+> x86/intel/mid: Rename *mrst* to *intel_mid*etc.
Thanks for the suggestion. I'll take care of it next time.
Br, David Cohen