Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a96d54 authored by David Cohen's avatar David Cohen Committed by H. Peter Anvin
Browse files

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.

Signed-off-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Link: http://lkml.kernel.org/r/1382049336-21316-13-git-send-email-david.a.cohen@linux.intel.com


Signed-off-by: default avatarDavid Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 66ac5013

arch/x86/include/asm/intel-mid.h

+16 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2,4 +2,6 @@ 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
 
ifdef CONFIG_X86_INTEL_MID

obj-$(CONFIG_SFI) += sfi.o device_libs/

endif

arch/x86/platform/intel-mid/device_libs/Makefile

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# 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

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * 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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * platform_emc1403.c: emc1403 platform data initilization file

 *

 * (C) Copyright 2013 Intel Corporation

 * Author: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>

 *

 * 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/init.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <asm/intel-mid.h>



static void __init *emc1403_platform_data(void *info)

{

	static short intr2nd_pdata;

	struct i2c_board_info *i2c_info = info;

	int intr = get_gpio_by_name("thermal_int");

	int intr2nd = get_gpio_by_name("thermal_alert");



	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 emc1403_dev_id __initconst = {

	.name = "emc1403",

	.type = SFI_DEV_TYPE_I2C,

	.delay = 1,

	.get_platform_data = &emc1403_platform_data,

};



sfi_device(emc1403_dev_id);