Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161541Ab3FUO2l (ORCPT ); Fri, 21 Jun 2013 10:28:41 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:38688 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161512Ab3FUO2j (ORCPT ); Fri, 21 Jun 2013 10:28:39 -0400 Message-ID: <51C4630B.8020306@ti.com> Date: Fri, 21 Jun 2013 10:28:27 -0400 From: Eduardo Valentin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: amit daniel kachhap CC: Eduardo Valentin , , Zhang Rui , , , Kukjin Kim , Subject: Re: [PATCH V6 18/30] thermal: exynos: Add support to handle many instances of TMU References: <1371451599-31035-1-git-send-email-amit.daniel@samsung.com> <1371451599-31035-19-git-send-email-amit.daniel@samsung.com> <51C23E78.1010202@ti.com> In-Reply-To: X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="----enig2KFQIFJHMNMQVISLFBHLL" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 22370 Lines: 617 ------enig2KFQIFJHMNMQVISLFBHLL Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 21-06-2013 08:46, amit daniel kachhap wrote: > Hi Eduardo, >=20 > On Thu, Jun 20, 2013 at 4:57 AM, Eduardo Valentin > wrote: >> On 17-06-2013 02:46, Amit Daniel Kachhap wrote: >>> This patch adds support to handle multiple instances of the TMU contr= ollers. >>> This is done by removing the static structure to register with the co= re thermal >>> and creating it dynamically for each instance of the TMU controller. = The >>> interrupt is made shared type to handle shared interrupts. Also >>> the identifier of the TMU controller is extracted from device tree al= ias. >>> >>> Acked-by: Kukjin Kim >>> Acked-by: Jonghwa Lee >>> Signed-off-by: Amit Daniel Kachhap >>> --- >>> drivers/thermal/samsung/exynos_thermal_common.h | 1 + >>> drivers/thermal/samsung/exynos_tmu.c | 147 +++++++++++++= +++------- >>> drivers/thermal/samsung/exynos_tmu.h | 13 ++ >>> drivers/thermal/samsung/exynos_tmu_data.c | 145 ++++++++++++-= --------- >>> drivers/thermal/samsung/exynos_tmu_data.h | 4 +- >>> 5 files changed, 197 insertions(+), 113 deletions(-) >>> >>> diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/driver= s/thermal/samsung/exynos_thermal_common.h >>> index dd0077e..0c189d6 100644 >>> --- a/drivers/thermal/samsung/exynos_thermal_common.h >>> +++ b/drivers/thermal/samsung/exynos_thermal_common.h >>> @@ -84,6 +84,7 @@ struct thermal_sensor_conf { >>> struct thermal_cooling_conf cooling_data; >>> void *driver_data; >>> void *pzone_data; >>> + struct device *dev; >>> }; >>> >>> /*Functions used exynos based thermal sensor driver*/ >>> diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/s= amsung/exynos_tmu.c >>> index 4356118..1880c4e 100644 >>> --- a/drivers/thermal/samsung/exynos_tmu.c >>> +++ b/drivers/thermal/samsung/exynos_tmu.c >>> @@ -26,15 +26,32 @@ >>> #include >>> #include >>> #include >>> +#include >>> +#include >>> #include >>> >>> #include "exynos_thermal_common.h" >>> #include "exynos_tmu.h" >>> #include "exynos_tmu_data.h" >>> >>> +/** >>> + * struct exynos_tmu_data : A structure to hold the private data of = the TMU >>> + driver >>> + * @id: identifier of the one instance of the TMU controller. >>> + * @pdata: pointer to the tmu platform/configuration data >>> + * @base: base address of the single instance of the TMU controller.= >>> + * @irq: irq number of the TMU controller. >>> + * @soc: id of the SOC type. >>> + * @irq_work: pointer to the irq work structure. >>> + * @lock: lock to implement synchronization. >>> + * @clk: pointer to the clock structure. >>> + * @temp_error1: fused value of the first point trim. >>> + * @temp_error2: fused value of the second point trim. >>> + * @reg_conf: pointer to structure to register with core thermal. >>> + */ >>> struct exynos_tmu_data { >>> + int id; >>> struct exynos_tmu_platform_data *pdata; >>> - struct resource *mem; >>> void __iomem *base; >>> int irq; >>> enum soc_type soc; >>> @@ -42,6 +59,7 @@ struct exynos_tmu_data { >>> struct mutex lock; >>> struct clk *clk; >>> u8 temp_error1, temp_error2; >>> + struct thermal_sensor_conf *reg_conf; >>> }; >>> >>> /* >>> @@ -345,12 +363,6 @@ static int exynos_tmu_set_emulation(void *drv_da= ta, unsigned long temp) >>> { return -EINVAL; } >>> #endif/*CONFIG_THERMAL_EMULATION*/ >>> >>> -static struct thermal_sensor_conf exynos_sensor_conf =3D { >>> - .name =3D "exynos-therm", >>> - .read_temperature =3D (int (*)(void *))exynos_tmu_read, >>> - .write_emul_temp =3D exynos_tmu_set_emulation, >>> -}; >>> - >>> static void exynos_tmu_work(struct work_struct *work) >>> { >>> struct exynos_tmu_data *data =3D container_of(work, >>> @@ -359,7 +371,7 @@ static void exynos_tmu_work(struct work_struct *w= ork) >>> const struct exynos_tmu_registers *reg =3D pdata->registers; >>> unsigned int val_irq; >>> >>> - exynos_report_trigger(&exynos_sensor_conf); >>> + exynos_report_trigger(data->reg_conf); >>> mutex_lock(&data->lock); >>> clk_enable(data->clk); >>> >>> @@ -404,33 +416,73 @@ MODULE_DEVICE_TABLE(of, exynos_tmu_match); >>> #endif >>> >>> static inline struct exynos_tmu_platform_data *exynos_get_driver_da= ta( >>> - struct platform_device *pdev) >>> + struct platform_device *pdev, int id) >>> { >>> + struct exynos_tmu_init_data *data_table; >>> + struct exynos_tmu_platform_data *tmu_data; >>> #ifdef CONFIG_OF >>> if (pdev->dev.of_node) { >>> const struct of_device_id *match; >>> match =3D of_match_node(exynos_tmu_match, pdev->dev.of_= node); >>> if (!match) >>> return NULL; >>> - return (struct exynos_tmu_platform_data *) match->data;= >>> + data_table =3D (struct exynos_tmu_init_data *) match->d= ata; >>> + if (!data_table || id >=3D data_table->tmu_count) >>> + return NULL; >>> + tmu_data =3D data_table->tmu_data; >>> + return (struct exynos_tmu_platform_data *) (tmu_data + = id); >>> } >>> #endif >>> return NULL; >>> } >>> >>> -static int exynos_tmu_probe(struct platform_device *pdev) >>> +static int exynos_map_dt_data(struct platform_device *pdev) >>> { >>> - struct exynos_tmu_data *data; >>> - struct exynos_tmu_platform_data *pdata =3D pdev->dev.platform_d= ata; >>> - int ret, i; >>> + struct exynos_tmu_data *data =3D platform_get_drvdata(pdev); >>> + struct exynos_tmu_platform_data *pdata; >>> + struct resource res; >>> >>> - if (!pdata) >>> - pdata =3D exynos_get_driver_data(pdev); >>> + if (!data) >>> + return -ENODEV; >>> + >>> + data->id =3D of_alias_get_id(pdev->dev.of_node, "tmuctrl"); >>> + if (data->id < 0) >>> + data->id =3D 0; >>> >>> + data->irq =3D irq_of_parse_and_map(pdev->dev.of_node, 0); >>> + if (data->irq <=3D 0) { >>> + dev_err(&pdev->dev, "failed to get IRQ\n"); >>> + return -ENODEV; >>> + } >>> + >>> + if (of_address_to_resource(pdev->dev.of_node, 0, &res)) { >>> + dev_err(&pdev->dev, "failed to get Resource 0\n"); >>> + return -ENODEV; >>> + } >>> + >>> + data->base =3D devm_ioremap(&pdev->dev, res.start, resource_siz= e(&res)); >>> + if (!data->base) { >>> + dev_err(&pdev->dev, "Failed to ioremap memory\n"); >>> + return -EADDRNOTAVAIL; >>> + } >>> + >>> + pdata =3D exynos_get_driver_data(pdev, data->id); >>> if (!pdata) { >>> dev_err(&pdev->dev, "No platform init data supplied.\n"= ); >>> return -ENODEV; >>> } >>> + data->pdata =3D pdata; >>> + >>> + return 0; >>> +} >>> + >>> +static int exynos_tmu_probe(struct platform_device *pdev) >>> +{ >>> + struct exynos_tmu_data *data; >>> + struct exynos_tmu_platform_data *pdata; >>> + struct thermal_sensor_conf *sensor_conf; >>> + int ret, i; >>> + >>> data =3D devm_kzalloc(&pdev->dev, sizeof(struct exynos_tmu_data= ), >>> GFP_KERNEL); >>> if (!data) { >>> @@ -438,21 +490,18 @@ static int exynos_tmu_probe(struct platform_dev= ice *pdev) >>> return -ENOMEM; >>> } >>> >>> - data->irq =3D platform_get_irq(pdev, 0); >>> - if (data->irq < 0) { >>> - dev_err(&pdev->dev, "Failed to get platform irq\n"); >>> - return data->irq; >>> - } >>> + platform_set_drvdata(pdev, data); >>> + mutex_init(&data->lock); >>> >>> - INIT_WORK(&data->irq_work, exynos_tmu_work); >>> + ret =3D exynos_map_dt_data(pdev); >>> + if (ret) >>> + return ret; >>> >>> - data->mem =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); >>> - data->base =3D devm_ioremap_resource(&pdev->dev, data->mem); >>> - if (IS_ERR(data->base)) >>> - return PTR_ERR(data->base); >>> + pdata =3D data->pdata; >>> >>> + INIT_WORK(&data->irq_work, exynos_tmu_work); >>> ret =3D devm_request_irq(&pdev->dev, data->irq, exynos_tmu_irq,= >>> - IRQF_TRIGGER_RISING, "exynos-tmu", data); >>> + IRQF_TRIGGER_RISING | IRQF_SHARED, dev_name(&pdev->dev)= , data); >> >> Lets think about this poing: You request the IRQ before data->reg_con= f >> is allocated (below). Does it mean, from this point you can get called= >> to the IRQ handler even if reg_conf is not set? What happens then? I s= ee >> your irqhandler/worker use it. >=20 > Good catch. Will put a check in the IRQ handler. Consider also moving the IRQ request to a point where your driver is capable of serving IRQs already. >=20 > Thanks, > Amit Daniel >> >>> if (ret) { >>> dev_err(&pdev->dev, "Failed to request irq: %d\n", data= ->irq); >>> return ret; >>> @@ -477,10 +526,6 @@ static int exynos_tmu_probe(struct platform_devi= ce *pdev) >>> goto err_clk; >>> } >>> >>> - data->pdata =3D pdata; >>> - platform_set_drvdata(pdev, data); >>> - mutex_init(&data->lock); >>> - >>> ret =3D exynos_tmu_initialize(pdev); >>> if (ret) { >>> dev_err(&pdev->dev, "Failed to initialize TMU\n"); >>> @@ -489,31 +534,43 @@ static int exynos_tmu_probe(struct platform_dev= ice *pdev) >>> >>> exynos_tmu_control(pdev, true); >>> >>> - /* Register the sensor with thermal management interface */ >>> - (&exynos_sensor_conf)->driver_data =3D data; >>> - exynos_sensor_conf.trip_data.trip_count =3D pdata->trigger_enab= le[0] + >>> + /* Allocate a structure to register with the exynos core therma= l */ >>> + sensor_conf =3D devm_kzalloc(&pdev->dev, >>> + sizeof(struct thermal_sensor_conf), GFP= _KERNEL); >>> + if (!sensor_conf) { >>> + dev_err(&pdev->dev, "Failed to allocate registration st= ruct\n"); >>> + ret =3D -ENOMEM; >>> + goto err_clk; >>> + } >>> + data->reg_conf =3D sensor_conf; >>> + sprintf(sensor_conf->name, "therm_zone%d", data->id); >>> + sensor_conf->read_temperature =3D (int (*)(void *))exynos_tmu_r= ead; >>> + sensor_conf->write_emul_temp =3D >>> + (int (*)(void *, unsigned long))exynos_tmu_set_emulatio= n; >>> + sensor_conf->driver_data =3D data; >>> + sensor_conf->trip_data.trip_count =3D pdata->trigger_enable[0] = + >>> pdata->trigger_enable[1] + pdata->trigger_enabl= e[2]+ >>> pdata->trigger_enable[3]; >>> >>> - for (i =3D 0; i < exynos_sensor_conf.trip_data.trip_count; i++)= { >>> - exynos_sensor_conf.trip_data.trip_val[i] =3D >>> + for (i =3D 0; i < sensor_conf->trip_data.trip_count; i++) { >>> + sensor_conf->trip_data.trip_val[i] =3D >>> pdata->threshold + pdata->trigger_levels[i]; >>> - exynos_sensor_conf.trip_data.trip_type[i] =3D >>> + sensor_conf->trip_data.trip_type[i] =3D >>> pdata->trigger_type[i]; >>> } >>> >>> - exynos_sensor_conf.trip_data.trigger_falling =3D pdata->thresho= ld_falling; >>> + sensor_conf->trip_data.trigger_falling =3D pdata->threshold_fal= ling; >>> >>> - exynos_sensor_conf.cooling_data.freq_clip_count =3D >>> - pdata->freq_tab_count; >>> + sensor_conf->cooling_data.freq_clip_count =3D pdata->freq_tab_c= ount; >>> for (i =3D 0; i < pdata->freq_tab_count; i++) { >>> - exynos_sensor_conf.cooling_data.freq_data[i].freq_clip_= max =3D >>> + sensor_conf->cooling_data.freq_data[i].freq_clip_max =3D= >>> pdata->freq_tab[i].freq_clip_ma= x; >>> - exynos_sensor_conf.cooling_data.freq_data[i].temp_level= =3D >>> + sensor_conf->cooling_data.freq_data[i].temp_level =3D >>> pdata->freq_tab[i].temp_level; >>> } >>> - >>> - ret =3D exynos_register_thermal(&exynos_sensor_conf); >>> + sensor_conf->dev =3D &pdev->dev; >>> + /* Register the sensor with thermal management interface */ >>> + ret =3D exynos_register_thermal(sensor_conf); >>> if (ret) { >>> dev_err(&pdev->dev, "Failed to register thermal interfa= ce\n"); >>> goto err_clk; >>> @@ -531,7 +588,7 @@ static int exynos_tmu_remove(struct platform_devi= ce *pdev) >>> >>> exynos_tmu_control(pdev, false); >>> >>> - exynos_unregister_thermal(&exynos_sensor_conf); >>> + exynos_unregister_thermal(data->reg_conf); >>> >>> clk_unprepare(data->clk); >>> >>> diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/s= amsung/exynos_tmu.h >>> index 619a34c..b614407 100644 >>> --- a/drivers/thermal/samsung/exynos_tmu.h >>> +++ b/drivers/thermal/samsung/exynos_tmu.h >>> @@ -248,4 +248,17 @@ struct exynos_tmu_platform_data { >>> unsigned int freq_tab_count; >>> const struct exynos_tmu_registers *registers; >>> }; >>> + >>> +/** >>> + * struct exynos_tmu_init_data >>> + * @tmu_count: number of TMU instances. >>> + * @tmu_data: platform data of all TMU instances. >>> + * This structure is required to store data for multi-instance exyno= s tmu >>> + * driver. >>> + */ >>> +struct exynos_tmu_init_data { >>> + int tmu_count; >>> + struct exynos_tmu_platform_data tmu_data[]; >>> +}; >>> + >>> #endif /* _EXYNOS_TMU_H */ >>> diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/ther= mal/samsung/exynos_tmu_data.c >>> index 7fcf183..06ecfb0 100644 >>> --- a/drivers/thermal/samsung/exynos_tmu_data.c >>> +++ b/drivers/thermal/samsung/exynos_tmu_data.c >>> @@ -48,38 +48,44 @@ static const struct exynos_tmu_registers exynos42= 10_tmu_registers =3D { >>> .tmu_intstat =3D EXYNOS_TMU_REG_INTSTAT, >>> .tmu_intclear =3D EXYNOS_TMU_REG_INTCLEAR, >>> }; >>> -struct exynos_tmu_platform_data const exynos4210_default_tmu_data =3D= { >>> - .threshold =3D 80, >>> - .trigger_levels[0] =3D 5, >>> - .trigger_levels[1] =3D 20, >>> - .trigger_levels[2] =3D 30, >>> - .trigger_enable[0] =3D 1, >>> - .trigger_enable[1] =3D 1, >>> - .trigger_enable[2] =3D 1, >>> - .trigger_enable[3] =3D 0, >>> - .trigger_type[0] =3D THROTTLE_ACTIVE, >>> - .trigger_type[1] =3D THROTTLE_ACTIVE, >>> - .trigger_type[2] =3D SW_TRIP, >>> - .max_trigger_level =3D 4, >>> - .gain =3D 15, >>> - .reference_voltage =3D 7, >>> - .cal_type =3D TYPE_ONE_POINT_TRIMMING, >>> - .min_efuse_value =3D 40, >>> - .max_efuse_value =3D 100, >>> - .first_point_trim =3D 25, >>> - .second_point_trim =3D 85, >>> - .default_temp_offset =3D 50, >>> - .freq_tab[0] =3D { >>> - .freq_clip_max =3D 800 * 1000, >>> - .temp_level =3D 85, >>> - }, >>> - .freq_tab[1] =3D { >>> - .freq_clip_max =3D 200 * 1000, >>> - .temp_level =3D 100, >>> + >>> +struct exynos_tmu_init_data const exynos4210_default_tmu_data =3D { >>> + .tmu_data =3D { >>> + { >>> + .threshold =3D 80, >>> + .trigger_levels[0] =3D 5, >>> + .trigger_levels[1] =3D 20, >>> + .trigger_levels[2] =3D 30, >>> + .trigger_enable[0] =3D 1, >>> + .trigger_enable[1] =3D 1, >>> + .trigger_enable[2] =3D 1, >>> + .trigger_enable[3] =3D 0, >>> + .trigger_type[0] =3D THROTTLE_ACTIVE, >>> + .trigger_type[1] =3D THROTTLE_ACTIVE, >>> + .trigger_type[2] =3D SW_TRIP, >>> + .max_trigger_level =3D 4, >>> + .gain =3D 15, >>> + .reference_voltage =3D 7, >>> + .cal_type =3D TYPE_ONE_POINT_TRIMMING, >>> + .min_efuse_value =3D 40, >>> + .max_efuse_value =3D 100, >>> + .first_point_trim =3D 25, >>> + .second_point_trim =3D 85, >>> + .default_temp_offset =3D 50, >>> + .freq_tab[0] =3D { >>> + .freq_clip_max =3D 800 * 1000, >>> + .temp_level =3D 85, >>> + }, >>> + .freq_tab[1] =3D { >>> + .freq_clip_max =3D 200 * 1000, >>> + .temp_level =3D 100, >>> + }, >>> + .freq_tab_count =3D 2, >>> + .type =3D SOC_ARCH_EXYNOS4210, >>> + .registers =3D &exynos4210_tmu_registers, >>> + }, >>> }, >>> - .freq_tab_count =3D 2, >>> - .type =3D SOC_ARCH_EXYNOS4210, >>> - .registers =3D &exynos4210_tmu_registers, >>> + .tmu_count =3D 1, >>> }; >>> #endif >>> >>> @@ -120,41 +126,48 @@ static const struct exynos_tmu_registers exynos= 5250_tmu_registers =3D { >>> .emul_time_shift =3D EXYNOS_EMUL_TIME_SHIFT, >>> .emul_time_mask =3D EXYNOS_EMUL_TIME_MASK, >>> }; >>> -struct exynos_tmu_platform_data const exynos5250_default_tmu_data =3D= { >>> - .threshold_falling =3D 10, >>> - .trigger_levels[0] =3D 85, >>> - .trigger_levels[1] =3D 103, >>> - .trigger_levels[2] =3D 110, >>> - .trigger_levels[3] =3D 120, >>> - .trigger_enable[0] =3D 1, >>> - .trigger_enable[1] =3D 1, >>> - .trigger_enable[2] =3D 1, >>> - .trigger_enable[3] =3D 0, >>> - .trigger_type[0] =3D THROTTLE_ACTIVE, >>> - .trigger_type[1] =3D THROTTLE_ACTIVE, >>> - .trigger_type[2] =3D SW_TRIP, >>> - .trigger_type[3] =3D HW_TRIP, >>> - .max_trigger_level =3D 4, >>> - .gain =3D 8, >>> - .reference_voltage =3D 16, >>> - .noise_cancel_mode =3D 4, >>> - .cal_type =3D TYPE_ONE_POINT_TRIMMING, >>> - .efuse_value =3D 55, >>> - .min_efuse_value =3D 40, >>> - .max_efuse_value =3D 100, >>> - .first_point_trim =3D 25, >>> - .second_point_trim =3D 85, >>> - .default_temp_offset =3D 50, >>> - .freq_tab[0] =3D { >>> - .freq_clip_max =3D 800 * 1000, >>> - .temp_level =3D 85, >>> - }, >>> - .freq_tab[1] =3D { >>> - .freq_clip_max =3D 200 * 1000, >>> - .temp_level =3D 103, >>> - }, >>> - .freq_tab_count =3D 2, >>> - .type =3D SOC_ARCH_EXYNOS, >>> + >>> +#define EXYNOS5250_TMU_DATA \ >>> + .threshold_falling =3D 10, \ >>> + .trigger_levels[0] =3D 85, \ >>> + .trigger_levels[1] =3D 103, \ >>> + .trigger_levels[2] =3D 110, \ >>> + .trigger_levels[3] =3D 120, \ >>> + .trigger_enable[0] =3D 1, \ >>> + .trigger_enable[1] =3D 1, \ >>> + .trigger_enable[2] =3D 1, \ >>> + .trigger_enable[3] =3D 0, \ >>> + .trigger_type[0] =3D THROTTLE_ACTIVE, \ >>> + .trigger_type[1] =3D THROTTLE_ACTIVE, \ >>> + .trigger_type[2] =3D SW_TRIP, \ >>> + .trigger_type[3] =3D HW_TRIP, \ >>> + .max_trigger_level =3D 4, \ >>> + .gain =3D 8, \ >>> + .reference_voltage =3D 16, \ >>> + .noise_cancel_mode =3D 4, \ >>> + .cal_type =3D TYPE_ONE_POINT_TRIMMING, \ >>> + .efuse_value =3D 55, \ >>> + .min_efuse_value =3D 40, \ >>> + .max_efuse_value =3D 100, \ >>> + .first_point_trim =3D 25, \ >>> + .second_point_trim =3D 85, \ >>> + .default_temp_offset =3D 50, \ >>> + .freq_tab[0] =3D { \ >>> + .freq_clip_max =3D 800 * 1000, \ >>> + .temp_level =3D 85, \ >>> + }, \ >>> + .freq_tab[1] =3D { \ >>> + .freq_clip_max =3D 200 * 1000, \ >>> + .temp_level =3D 103, \ >>> + }, \ >>> + .freq_tab_count =3D 2, \ >>> + .type =3D SOC_ARCH_EXYNOS, \ >>> .registers =3D &exynos5250_tmu_registers, >>> + >>> +struct exynos_tmu_init_data const exynos5250_default_tmu_data =3D { >>> + .tmu_data =3D { >>> + { EXYNOS5250_TMU_DATA }, >>> + }, >>> + .tmu_count =3D 1, >>> }; >>> #endif >>> diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/ther= mal/samsung/exynos_tmu_data.h >>> index 4acf070..139dbbb 100644 >>> --- a/drivers/thermal/samsung/exynos_tmu_data.h >>> +++ b/drivers/thermal/samsung/exynos_tmu_data.h >>> @@ -94,14 +94,14 @@ >>> #define EXYNOS_MAX_TRIGGER_PER_REG 4 >>> >>> #if defined(CONFIG_CPU_EXYNOS4210) >>> -extern struct exynos_tmu_platform_data const exynos4210_default_tmu_= data; >>> +extern struct exynos_tmu_init_data const exynos4210_default_tmu_data= ; >>> #define EXYNOS4210_TMU_DRV_DATA (&exynos4210_default_tmu_data) >>> #else >>> #define EXYNOS4210_TMU_DRV_DATA (NULL) >>> #endif >>> >>> #if (defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412= )) >>> -extern struct exynos_tmu_platform_data const exynos5250_default_tmu_= data; >>> +extern struct exynos_tmu_init_data const exynos5250_default_tmu_data= ; >>> #define EXYNOS5250_TMU_DRV_DATA (&exynos5250_default_tmu_data) >>> #else >>> #define EXYNOS5250_TMU_DRV_DATA (NULL) >>> >> >> >> -- >> You have got to be excited about what you are doing. (L. Lamport) >> >> Eduardo Valentin >> >=20 >=20 --=20 You have got to be excited about what you are doing. (L. Lamport) Eduardo Valentin ------enig2KFQIFJHMNMQVISLFBHLL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iF4EAREIAAYFAlHEYwsACgkQCXcVR3XQvP2QjwD+KCLuU9oJgEIKuSGztQRPlulX /OWcEU4OEyRCo6VpeXgBAJo4vD3wJXF+TgnCH5ktrIeRZF9auOeD1yhpw+zBI2qJ =T35W -----END PGP SIGNATURE----- ------enig2KFQIFJHMNMQVISLFBHLL-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/