On 17-06-2013 02:46, Amit Daniel Kachhap wrote:
> This patch migrates the TMU register definition/bitfields to data file. This
> is needed to support SoC's which use the same TMU controller but register
> validity, offsets or bitfield may slightly vary across SOC's.
>
> Acked-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx>
> Acked-by: Jonghwa Lee <jonghwa3.lee@xxxxxxxxxxx>
> Signed-off-by: Amit Daniel Kachhap <amit.daniel@xxxxxxxxxxx>
Acked-by: Eduardo Valentin <eduardo.valentin@xxxxxx>
> ---
> drivers/thermal/samsung/exynos_tmu.c | 172 +++++++++-------------------
> drivers/thermal/samsung/exynos_tmu.h | 133 ++++++++++++++++++++++
> drivers/thermal/samsung/exynos_tmu_data.c | 59 ++++++++++
> drivers/thermal/samsung/exynos_tmu_data.h | 68 +++++++++++
> 4 files changed, 315 insertions(+), 117 deletions(-)
>
> diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
> index 401ec98..6fd776f 100644
> --- a/drivers/thermal/samsung/exynos_tmu.c
> +++ b/drivers/thermal/samsung/exynos_tmu.c
> @@ -32,76 +32,6 @@
> #include "exynos_tmu.h"
> #include "exynos_tmu_data.h"
>
> -/* Exynos generic registers */
> -#define EXYNOS_TMU_REG_TRIMINFO 0x0
> -#define EXYNOS_TMU_REG_CONTROL 0x20
> -#define EXYNOS_TMU_REG_STATUS 0x28
> -#define EXYNOS_TMU_REG_CURRENT_TEMP 0x40
> -#define EXYNOS_TMU_REG_INTEN 0x70
> -#define EXYNOS_TMU_REG_INTSTAT 0x74
> -#define EXYNOS_TMU_REG_INTCLEAR 0x78
> -
> -#define EXYNOS_TMU_TRIM_TEMP_MASK 0xff
> -#define EXYNOS_TMU_GAIN_SHIFT 8
> -#define EXYNOS_TMU_GAIN_MASK 0xf
> -#define EXYNOS_TMU_REF_VOLTAGE_SHIFT 24
> -#define EXYNOS_TMU_REF_VOLTAGE_MASK 0x1f
> -#define EXYNOS_TMU_BUF_SLOPE_SEL_MASK 0xf
> -#define EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT 8
> -#define EXYNOS_TMU_CORE_EN_SHIFT 0
> -
> -/* Exynos4210 specific registers */
> -#define EXYNOS4210_TMU_REG_THRESHOLD_TEMP 0x44
> -#define EXYNOS4210_TMU_REG_TRIG_LEVEL0 0x50
> -#define EXYNOS4210_TMU_REG_TRIG_LEVEL1 0x54
> -#define EXYNOS4210_TMU_REG_TRIG_LEVEL2 0x58
> -#define EXYNOS4210_TMU_REG_TRIG_LEVEL3 0x5C
> -#define EXYNOS4210_TMU_REG_PAST_TEMP0 0x60
> -#define EXYNOS4210_TMU_REG_PAST_TEMP1 0x64
> -#define EXYNOS4210_TMU_REG_PAST_TEMP2 0x68
> -#define EXYNOS4210_TMU_REG_PAST_TEMP3 0x6C
> -
> -#define EXYNOS4210_TMU_TRIG_LEVEL0_MASK 0x1
> -#define EXYNOS4210_TMU_TRIG_LEVEL1_MASK 0x10
> -#define EXYNOS4210_TMU_TRIG_LEVEL2_MASK 0x100
> -#define EXYNOS4210_TMU_TRIG_LEVEL3_MASK 0x1000
> -#define EXYNOS4210_TMU_TRIG_LEVEL_MASK 0x1111
> -#define EXYNOS4210_TMU_INTCLEAR_VAL 0x1111
> -
> -/* Exynos5250 and Exynos4412 specific registers */
> -#define EXYNOS_TMU_TRIMINFO_CON 0x14
> -#define EXYNOS_THD_TEMP_RISE 0x50
> -#define EXYNOS_THD_TEMP_FALL 0x54
> -#define EXYNOS_EMUL_CON 0x80
> -
> -#define EXYNOS_TRIMINFO_RELOAD 0x1
> -#define EXYNOS_TRIMINFO_SHIFT 0x0
> -#define EXYNOS_TMU_RISE_INT_MASK 0x111
> -#define EXYNOS_TMU_RISE_INT_SHIFT 0
> -#define EXYNOS_TMU_FALL_INT_MASK 0x111
> -#define EXYNOS_TMU_FALL_INT_SHIFT 12
> -#define EXYNOS_TMU_CLEAR_RISE_INT 0x111
> -#define EXYNOS_TMU_CLEAR_FALL_INT (0x111 << 12)
> -#define EXYNOS_TMU_TRIP_MODE_SHIFT 13
> -#define EXYNOS_TMU_TRIP_MODE_MASK 0x7
> -
> -#define EXYNOS_TMU_INTEN_RISE0_SHIFT 0
> -#define EXYNOS_TMU_INTEN_RISE1_SHIFT 4
> -#define EXYNOS_TMU_INTEN_RISE2_SHIFT 8
> -#define EXYNOS_TMU_INTEN_RISE3_SHIFT 12
> -#define EXYNOS_TMU_INTEN_FALL0_SHIFT 16
> -#define EXYNOS_TMU_INTEN_FALL1_SHIFT 20
> -#define EXYNOS_TMU_INTEN_FALL2_SHIFT 24
> -
> -#ifdef CONFIG_THERMAL_EMULATION
> -#define EXYNOS_EMUL_TIME 0x57F0
> -#define EXYNOS_EMUL_TIME_MASK 0xffff
> -#define EXYNOS_EMUL_TIME_SHIFT 16
> -#define EXYNOS_EMUL_DATA_SHIFT 8
> -#define EXYNOS_EMUL_DATA_MASK 0xFF
> -#define EXYNOS_EMUL_ENABLE 0x1
> -#endif /* CONFIG_THERMAL_EMULATION */
> -
> struct exynos_tmu_data {
> struct exynos_tmu_platform_data *pdata;
> struct resource *mem;
> @@ -186,6 +116,7 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
> {
> struct exynos_tmu_data *data = platform_get_drvdata(pdev);
> struct exynos_tmu_platform_data *pdata = data->pdata;
> + const struct exynos_tmu_registers *reg = pdata->registers;
> unsigned int status, trim_info;
> unsigned int rising_threshold = 0, falling_threshold = 0;
> int ret = 0, threshold_code, i, trigger_levs = 0;
> @@ -193,20 +124,20 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
> mutex_lock(&data->lock);
> clk_enable(data->clk);
>
> - status = readb(data->base + EXYNOS_TMU_REG_STATUS);
> + status = readb(data->base + reg->tmu_status);
> if (!status) {
> ret = -EBUSY;
> goto out;
> }
>
> - if (data->soc == SOC_ARCH_EXYNOS) {
> - __raw_writel(EXYNOS_TRIMINFO_RELOAD,
> - data->base + EXYNOS_TMU_TRIMINFO_CON);
> - }
> + if (data->soc == SOC_ARCH_EXYNOS)
> + __raw_writel(1, data->base + reg->triminfo_ctrl);
> +
> /* Save trimming info in order to perform calibration */
> - trim_info = readl(data->base + EXYNOS_TMU_REG_TRIMINFO);
> - data->temp_error1 = trim_info & EXYNOS_TMU_TRIM_TEMP_MASK;
> - data->temp_error2 = ((trim_info >> 8) & EXYNOS_TMU_TRIM_TEMP_MASK);
> + trim_info = readl(data->base + reg->triminfo_data);
> + data->temp_error1 = trim_info & EXYNOS_TMU_TEMP_MASK;
> + data->temp_error2 = ((trim_info >> reg->triminfo_85_shift) &
> + EXYNOS_TMU_TEMP_MASK);
>
> if ((pdata->min_efuse_value > data->temp_error1) ||
> (data->temp_error1 > pdata->max_efuse_value) ||
> @@ -226,13 +157,12 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
> goto out;
> }
> writeb(threshold_code,
> - data->base + EXYNOS4210_TMU_REG_THRESHOLD_TEMP);
> + data->base + reg->threshold_temp);
> for (i = 0; i < trigger_levs; i++)
> - writeb(pdata->trigger_levels[i],
> - data->base + EXYNOS4210_TMU_REG_TRIG_LEVEL0 + i * 4);
> + writeb(pdata->trigger_levels[i], data->base +
> + reg->threshold_th0 + i * sizeof(reg->threshold_th0));
>
> - writel(EXYNOS4210_TMU_INTCLEAR_VAL,
> - data->base + EXYNOS_TMU_REG_INTCLEAR);
> + writel(reg->inten_rise_mask, data->base + reg->tmu_intclear);
> } else if (data->soc == SOC_ARCH_EXYNOS) {
> /* Write temperature code for rising and falling threshold */
> for (i = 0; i < trigger_levs; i++) {
> @@ -254,12 +184,13 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
> }
>
> writel(rising_threshold,
> - data->base + EXYNOS_THD_TEMP_RISE);
> + data->base + reg->threshold_th0);
> writel(falling_threshold,
> - data->base + EXYNOS_THD_TEMP_FALL);
> + data->base + reg->threshold_th1);
>
> - writel(EXYNOS_TMU_CLEAR_RISE_INT | EXYNOS_TMU_CLEAR_FALL_INT,
> - data->base + EXYNOS_TMU_REG_INTCLEAR);
> + writel((reg->inten_rise_mask << reg->inten_rise_shift) |
> + (reg->inten_fall_mask << reg->inten_fall_shift),
> + data->base + reg->tmu_intclear);
> }
> out:
> clk_disable(data->clk);
> @@ -272,46 +203,46 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
> {
> struct exynos_tmu_data *data = platform_get_drvdata(pdev);
> struct exynos_tmu_platform_data *pdata = data->pdata;
> + const struct exynos_tmu_registers *reg = pdata->registers;
> unsigned int con, interrupt_en;
>
> mutex_lock(&data->lock);
> clk_enable(data->clk);
>
> - con = readl(data->base + EXYNOS_TMU_REG_CONTROL);
> + con = readl(data->base + reg->tmu_ctrl);
>
> if (pdata->reference_voltage) {
> - con &= ~(EXYNOS_TMU_REF_VOLTAGE_MASK <<
> - EXYNOS_TMU_REF_VOLTAGE_SHIFT);
> - con |= pdata->reference_voltage << EXYNOS_TMU_REF_VOLTAGE_SHIFT;
> + con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift);
> + con |= pdata->reference_voltage << reg->buf_vref_sel_shift;
> }
>
> if (pdata->gain) {
> - con &= ~(EXYNOS_TMU_GAIN_MASK << EXYNOS_TMU_GAIN_SHIFT);
> - con |= (pdata->gain << EXYNOS_TMU_GAIN_SHIFT);
> + con &= ~(reg->buf_slope_sel_mask << reg->buf_slope_sel_shift);
> + con |= (pdata->gain << reg->buf_slope_sel_shift);
> }
>
> if (pdata->noise_cancel_mode) {
> - con &= ~(EXYNOS_TMU_TRIP_MODE_MASK <<
> - EXYNOS_TMU_TRIP_MODE_SHIFT);
> - con |= (pdata->noise_cancel_mode << EXYNOS_TMU_TRIP_MODE_SHIFT);
> + con &= ~(reg->therm_trip_mode_mask <<
> + reg->therm_trip_mode_shift);
> + con |= (pdata->noise_cancel_mode << reg->therm_trip_mode_shift);
> }
>
> if (on) {
> - con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT);
> + con |= (1 << reg->core_en_shift);
> interrupt_en =
> - pdata->trigger_enable[3] << EXYNOS_TMU_INTEN_RISE3_SHIFT |
> - pdata->trigger_enable[2] << EXYNOS_TMU_INTEN_RISE2_SHIFT |
> - pdata->trigger_enable[1] << EXYNOS_TMU_INTEN_RISE1_SHIFT |
> - pdata->trigger_enable[0] << EXYNOS_TMU_INTEN_RISE0_SHIFT;
> + pdata->trigger_enable[3] << reg->inten_rise3_shift |
> + pdata->trigger_enable[2] << reg->inten_rise2_shift |
> + pdata->trigger_enable[1] << reg->inten_rise1_shift |
> + pdata->trigger_enable[0] << reg->inten_rise0_shift;
> if (pdata->threshold_falling)
> interrupt_en |=
> - interrupt_en << EXYNOS_TMU_INTEN_FALL0_SHIFT;
> + interrupt_en << reg->inten_fall0_shift;
> } else {
> - con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT);
> + con &= ~(1 << reg->core_en_shift);
> interrupt_en = 0; /* Disable all interrupts */
> }
> - writel(interrupt_en, data->base + EXYNOS_TMU_REG_INTEN);
> - writel(con, data->base + EXYNOS_TMU_REG_CONTROL);
> + writel(interrupt_en, data->base + reg->tmu_inten);
> + writel(con, data->base + reg->tmu_ctrl);
>
> clk_disable(data->clk);
> mutex_unlock(&data->lock);
> @@ -319,13 +250,15 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
>
> static int exynos_tmu_read(struct exynos_tmu_data *data)
> {
> + struct exynos_tmu_platform_data *pdata = data->pdata;
> + const struct exynos_tmu_registers *reg = pdata->registers;
> u8 temp_code;
> int temp;
>
> mutex_lock(&data->lock);
> clk_enable(data->clk);
>
> - temp_code = readb(data->base + EXYNOS_TMU_REG_CURRENT_TEMP);
> + temp_code = readb(data->base + reg->tmu_cur_temp);
> temp = code_to_temp(data, temp_code);
>
> clk_disable(data->clk);
> @@ -338,7 +271,9 @@ static int exynos_tmu_read(struct exynos_tmu_data *data)
> static int exynos_tmu_set_emulation(void *drv_data, unsigned long temp)
> {
> struct exynos_tmu_data *data = drv_data;
> - unsigned int reg;
> + struct exynos_tmu_platform_data *pdata = data->pdata;
> + const struct exynos_tmu_registers *reg = pdata->registers;
> + unsigned int val;
> int ret = -EINVAL;
>
> if (data->soc == SOC_ARCH_EXYNOS4210)
> @@ -350,19 +285,19 @@ static int exynos_tmu_set_emulation(void *drv_data, unsigned long temp)
> mutex_lock(&data->lock);
> clk_enable(data->clk);
>
> - reg = readl(data->base + EXYNOS_EMUL_CON);
> + val = readl(data->base + reg->emul_con);
>
> if (temp) {
> temp /= MCELSIUS;
>
> - reg = (EXYNOS_EMUL_TIME << EXYNOS_EMUL_TIME_SHIFT) |
> + val = (EXYNOS_EMUL_TIME << reg->emul_time_shift) |
> (temp_to_code(data, temp)
> - << EXYNOS_EMUL_DATA_SHIFT) | EXYNOS_EMUL_ENABLE;
> + << reg->emul_temp_shift) | EXYNOS_EMUL_ENABLE;
> } else {
> - reg &= ~EXYNOS_EMUL_ENABLE;
> + val &= ~EXYNOS_EMUL_ENABLE;
> }
>
> - writel(reg, data->base + EXYNOS_EMUL_CON);
> + writel(val, data->base + reg->emul_con);
>
> clk_disable(data->clk);
> mutex_unlock(&data->lock);
> @@ -379,17 +314,20 @@ static void exynos_tmu_work(struct work_struct *work)
> {
> struct exynos_tmu_data *data = container_of(work,
> struct exynos_tmu_data, irq_work);
> + struct exynos_tmu_platform_data *pdata = data->pdata;
> + const struct exynos_tmu_registers *reg = pdata->registers;
>
> exynos_report_trigger();
> mutex_lock(&data->lock);
> clk_enable(data->clk);
> +
> if (data->soc == SOC_ARCH_EXYNOS)
> - writel(EXYNOS_TMU_CLEAR_RISE_INT |
> - EXYNOS_TMU_CLEAR_FALL_INT,
> - data->base + EXYNOS_TMU_REG_INTCLEAR);
> + writel((reg->inten_rise_mask << reg->inten_rise_shift) |
> + (reg->inten_fall_mask << reg->inten_fall_shift),
> + data->base + reg->tmu_intclear);
> else
> - writel(EXYNOS4210_TMU_INTCLEAR_VAL,
> - data->base + EXYNOS_TMU_REG_INTCLEAR);
> + writel(reg->inten_rise_mask, data->base + reg->tmu_intclear);
> +
> clk_disable(data->clk);
> mutex_unlock(&data->lock);
>
> diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
> index 45c697d..619a34c 100644
> --- a/drivers/thermal/samsung/exynos_tmu.h
> +++ b/drivers/thermal/samsung/exynos_tmu.h
> @@ -41,6 +41,136 @@ enum soc_type {
> };
>
> /**
> + * struct exynos_tmu_register - register descriptors to access registers and
> + * bitfields. The register validity, offsets and bitfield values may vary
> + * slightly across different exynos SOC's.
> + * @triminfo_data: register containing 2 pont trimming data
> + * @triminfo_25_shift: shift bit of the 25 C trim value in triminfo_data reg.
> + * @triminfo_85_shift: shift bit of the 85 C trim value in triminfo_data reg.
> + * @triminfo_ctrl: trim info controller register.
> + * @triminfo_reload_shift: shift of triminfo reload enable bit in triminfo_ctrl
> + reg.
> + * @tmu_ctrl: TMU main controller register.
> + * @buf_vref_sel_shift: shift bits of reference voltage in tmu_ctrl register.
> + * @buf_vref_sel_mask: mask bits of reference voltage in tmu_ctrl register.
> + * @therm_trip_mode_shift: shift bits of tripping mode in tmu_ctrl register.
> + * @therm_trip_mode_mask: mask bits of tripping mode in tmu_ctrl register.
> + * @therm_trip_en_shift: shift bits of tripping enable in tmu_ctrl register.
> + * @buf_slope_sel_shift: shift bits of amplifier gain value in tmu_ctrl
> + register.
> + * @buf_slope_sel_mask: mask bits of amplifier gain value in tmu_ctrl register.
> + * @therm_trip_tq_en_shift: shift bits of thermal trip enable by TQ pin in
> + tmu_ctrl register.
> + * @core_en_shift: shift bits of TMU core enable bit in tmu_ctrl register.
> + * @tmu_status: register drescribing the TMU status.
> + * @tmu_cur_temp: register containing the current temperature of the TMU.
> + * @tmu_cur_temp_shift: shift bits of current temp value in tmu_cur_temp
> + register.
> + * @threshold_temp: register containing the base threshold level.
> + * @threshold_th0: Register containing first set of rising levels.
> + * @threshold_th0_l0_shift: shift bits of level0 threshold temperature.
> + * @threshold_th0_l1_shift: shift bits of level1 threshold temperature.
> + * @threshold_th0_l2_shift: shift bits of level2 threshold temperature.
> + * @threshold_th0_l3_shift: shift bits of level3 threshold temperature.
> + * @threshold_th1: Register containing second set of rising levels.
> + * @threshold_th1_l0_shift: shift bits of level0 threshold temperature.
> + * @threshold_th1_l1_shift: shift bits of level1 threshold temperature.
> + * @threshold_th1_l2_shift: shift bits of level2 threshold temperature.
> + * @threshold_th1_l3_shift: shift bits of level3 threshold temperature.
> + * @threshold_th2: Register containing third set of rising levels.
> + * @threshold_th2_l0_shift: shift bits of level0 threshold temperature.
> + * @threshold_th3: Register containing fourth set of rising levels.
> + * @threshold_th3_l0_shift: shift bits of level0 threshold temperature.
> + * @tmu_inten: register containing the different threshold interrupt
> + enable bits.
> + * @inten_rise_shift: shift bits of all rising interrupt bits.
> + * @inten_rise_mask: mask bits of all rising interrupt bits.
> + * @inten_fall_shift: shift bits of all rising interrupt bits.
> + * @inten_fall_mask: mask bits of all rising interrupt bits.
> + * @inten_rise0_shift: shift bits of rising 0 interrupt bits.
> + * @inten_rise1_shift: shift bits of rising 1 interrupt bits.
> + * @inten_rise2_shift: shift bits of rising 2 interrupt bits.
> + * @inten_rise3_shift: shift bits of rising 3 interrupt bits.
> + * @inten_fall0_shift: shift bits of falling 0 interrupt bits.
> + * @inten_fall1_shift: shift bits of falling 1 interrupt bits.
> + * @inten_fall2_shift: shift bits of falling 2 interrupt bits.
> + * @inten_fall3_shift: shift bits of falling 3 interrupt bits.
> + * @tmu_intstat: Register containing the interrupt status values.
> + * @tmu_intclear: Register for clearing the raised interrupt status.
> + * @emul_con: TMU emulation controller register.
> + * @emul_temp_shift: shift bits of emulation temperature.
> + * @emul_time_shift: shift bits of emulation time.
> + * @emul_time_mask: mask bits of emulation time.
> + */
> +struct exynos_tmu_registers {
> + u32 triminfo_data;
> + u32 triminfo_25_shift;
> + u32 triminfo_85_shift;
> +
> + u32 triminfo_ctrl;
> + u32 triminfo_reload_shift;
> +
> + u32 tmu_ctrl;
> + u32 buf_vref_sel_shift;
> + u32 buf_vref_sel_mask;
> + u32 therm_trip_mode_shift;
> + u32 therm_trip_mode_mask;
> + u32 therm_trip_en_shift;
> + u32 buf_slope_sel_shift;
> + u32 buf_slope_sel_mask;
> + u32 therm_trip_tq_en_shift;
> + u32 core_en_shift;
> +
> + u32 tmu_status;
> +
> + u32 tmu_cur_temp;
> + u32 tmu_cur_temp_shift;
> +
> + u32 threshold_temp;
> +
> + u32 threshold_th0;
> + u32 threshold_th0_l0_shift;
> + u32 threshold_th0_l1_shift;
> + u32 threshold_th0_l2_shift;
> + u32 threshold_th0_l3_shift;
> +
> + u32 threshold_th1;
> + u32 threshold_th1_l0_shift;
> + u32 threshold_th1_l1_shift;
> + u32 threshold_th1_l2_shift;
> + u32 threshold_th1_l3_shift;
> +
> + u32 threshold_th2;
> + u32 threshold_th2_l0_shift;
> +
> + u32 threshold_th3;
> + u32 threshold_th3_l0_shift;
> +
> + u32 tmu_inten;
> + u32 inten_rise_shift;
> + u32 inten_rise_mask;
> + u32 inten_fall_shift;
> + u32 inten_fall_mask;
> + u32 inten_rise0_shift;
> + u32 inten_rise1_shift;
> + u32 inten_rise2_shift;
> + u32 inten_rise3_shift;
> + u32 inten_fall0_shift;
> + u32 inten_fall1_shift;
> + u32 inten_fall2_shift;
> + u32 inten_fall3_shift;
> +
> + u32 tmu_intstat;
> +
> + u32 tmu_intclear;
> +
> + u32 emul_con;
> + u32 emul_temp_shift;
> + u32 emul_time_shift;
> + u32 emul_time_mask;
> +};
> +
> +/**
> * struct exynos_tmu_platform_data
> * @threshold: basic temperature for generating interrupt
> * 25 <= threshold <= 125 [unit: degree Celsius]
> @@ -88,6 +218,8 @@ enum soc_type {
> * @freq_clip_table: Table representing frequency reduction percentage.
> * @freq_tab_count: Count of the above table as frequency reduction may
> * applicable to only some of the trigger levels.
> + * @registers: Pointer to structure containing all the TMU controller registers
> + * and bitfields shifts and masks.
> *
> * This structure is required for configuration of exynos_tmu driver.
> */
> @@ -114,5 +246,6 @@ struct exynos_tmu_platform_data {
> enum soc_type type;
> struct freq_clip_table freq_tab[4];
> unsigned int freq_tab_count;
> + const struct exynos_tmu_registers *registers;
> };
> #endif /* _EXYNOS_TMU_H */
> diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
> index a187043..589a519 100644
> --- a/drivers/thermal/samsung/exynos_tmu_data.c
> +++ b/drivers/thermal/samsung/exynos_tmu_data.c
> @@ -25,6 +25,28 @@
> #include "exynos_tmu_data.h"
>
> #if defined(CONFIG_CPU_EXYNOS4210)
> +static const struct exynos_tmu_registers exynos4210_tmu_registers = {
> + .triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
> + .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
> + .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
> + .tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
> + .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
> + .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
> + .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
> + .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
> + .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
> + .tmu_status = EXYNOS_TMU_REG_STATUS,
> + .tmu_cur_temp = EXYNOS_TMU_REG_CURRENT_TEMP,
> + .threshold_temp = EXYNOS4210_TMU_REG_THRESHOLD_TEMP,
> + .threshold_th0 = EXYNOS4210_TMU_REG_TRIG_LEVEL0,
> + .tmu_inten = EXYNOS_TMU_REG_INTEN,
> + .inten_rise_mask = EXYNOS4210_TMU_TRIG_LEVEL_MASK,
> + .inten_rise0_shift = EXYNOS_TMU_INTEN_RISE0_SHIFT,
> + .inten_rise1_shift = EXYNOS_TMU_INTEN_RISE1_SHIFT,
> + .inten_rise2_shift = EXYNOS_TMU_INTEN_RISE2_SHIFT,
> + .inten_rise3_shift = EXYNOS_TMU_INTEN_RISE3_SHIFT,
> + .tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
> +};
> struct exynos_tmu_platform_data const exynos4210_default_tmu_data = {
> .threshold = 80,
> .trigger_levels[0] = 5,
> @@ -56,10 +78,46 @@ struct exynos_tmu_platform_data const exynos4210_default_tmu_data = {
> },
> .freq_tab_count = 2,
> .type = SOC_ARCH_EXYNOS4210,
> + .registers = &exynos4210_tmu_registers,
> };
> #endif
>
> #if defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412)
> +static const struct exynos_tmu_registers exynos5250_tmu_registers = {
> + .triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
> + .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
> + .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
> + .triminfo_ctrl = EXYNOS_TMU_TRIMINFO_CON,
> + .triminfo_reload_shift = EXYNOS_TRIMINFO_RELOAD_SHIFT,
> + .tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
> + .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
> + .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
> + .therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
> + .therm_trip_mode_mask = EXYNOS_TMU_TRIP_MODE_MASK,
> + .therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
> + .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
> + .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
> + .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
> + .tmu_status = EXYNOS_TMU_REG_STATUS,
> + .tmu_cur_temp = EXYNOS_TMU_REG_CURRENT_TEMP,
> + .threshold_th0 = EXYNOS_THD_TEMP_RISE,
> + .threshold_th1 = EXYNOS_THD_TEMP_FALL,
> + .tmu_inten = EXYNOS_TMU_REG_INTEN,
> + .inten_rise_mask = EXYNOS_TMU_RISE_INT_MASK,
> + .inten_rise_shift = EXYNOS_TMU_RISE_INT_SHIFT,
> + .inten_fall_mask = EXYNOS_TMU_FALL_INT_MASK,
> + .inten_fall_shift = EXYNOS_TMU_FALL_INT_SHIFT,
> + .inten_rise0_shift = EXYNOS_TMU_INTEN_RISE0_SHIFT,
> + .inten_rise1_shift = EXYNOS_TMU_INTEN_RISE1_SHIFT,
> + .inten_rise2_shift = EXYNOS_TMU_INTEN_RISE2_SHIFT,
> + .inten_rise3_shift = EXYNOS_TMU_INTEN_RISE3_SHIFT,
> + .inten_fall0_shift = EXYNOS_TMU_INTEN_FALL0_SHIFT,
> + .tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
> + .emul_con = EXYNOS_EMUL_CON,
> + .emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
> + .emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
> + .emul_time_mask = EXYNOS_EMUL_TIME_MASK,
> +};
> struct exynos_tmu_platform_data const exynos5250_default_tmu_data = {
> .threshold_falling = 10,
> .trigger_levels[0] = 85,
> @@ -93,5 +151,6 @@ struct exynos_tmu_platform_data const exynos5250_default_tmu_data = {
> },
> .freq_tab_count = 2,
> .type = SOC_ARCH_EXYNOS,
> + .registers = &exynos5250_tmu_registers,
> };
> #endif
> diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/thermal/samsung/exynos_tmu_data.h
> index b7835fe..0e2244f 100644
> --- a/drivers/thermal/samsung/exynos_tmu_data.h
> +++ b/drivers/thermal/samsung/exynos_tmu_data.h
> @@ -23,6 +23,74 @@
> #ifndef _EXYNOS_TMU_DATA_H
> #define _EXYNOS_TMU_DATA_H
>
> +/* Exynos generic registers */
> +#define EXYNOS_TMU_REG_TRIMINFO 0x0
> +#define EXYNOS_TMU_REG_CONTROL 0x20
> +#define EXYNOS_TMU_REG_STATUS 0x28
> +#define EXYNOS_TMU_REG_CURRENT_TEMP 0x40
> +#define EXYNOS_TMU_REG_INTEN 0x70
> +#define EXYNOS_TMU_REG_INTSTAT 0x74
> +#define EXYNOS_TMU_REG_INTCLEAR 0x78
> +
> +#define EXYNOS_TMU_TEMP_MASK 0xff
> +#define EXYNOS_TMU_REF_VOLTAGE_SHIFT 24
> +#define EXYNOS_TMU_REF_VOLTAGE_MASK 0x1f
> +#define EXYNOS_TMU_BUF_SLOPE_SEL_MASK 0xf
> +#define EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT 8
> +#define EXYNOS_TMU_CORE_EN_SHIFT 0
> +
> +/* Exynos4210 specific registers */
> +#define EXYNOS4210_TMU_REG_THRESHOLD_TEMP 0x44
> +#define EXYNOS4210_TMU_REG_TRIG_LEVEL0 0x50
> +#define EXYNOS4210_TMU_REG_TRIG_LEVEL1 0x54
> +#define EXYNOS4210_TMU_REG_TRIG_LEVEL2 0x58
> +#define EXYNOS4210_TMU_REG_TRIG_LEVEL3 0x5C
> +#define EXYNOS4210_TMU_REG_PAST_TEMP0 0x60
> +#define EXYNOS4210_TMU_REG_PAST_TEMP1 0x64
> +#define EXYNOS4210_TMU_REG_PAST_TEMP2 0x68
> +#define EXYNOS4210_TMU_REG_PAST_TEMP3 0x6C
> +
> +#define EXYNOS4210_TMU_TRIG_LEVEL0_MASK 0x1
> +#define EXYNOS4210_TMU_TRIG_LEVEL1_MASK 0x10
> +#define EXYNOS4210_TMU_TRIG_LEVEL2_MASK 0x100
> +#define EXYNOS4210_TMU_TRIG_LEVEL3_MASK 0x1000
> +#define EXYNOS4210_TMU_TRIG_LEVEL_MASK 0x1111
> +#define EXYNOS4210_TMU_INTCLEAR_VAL 0x1111
> +
> +/* Exynos5250 and Exynos4412 specific registers */
> +#define EXYNOS_TMU_TRIMINFO_CON 0x14
> +#define EXYNOS_THD_TEMP_RISE 0x50
> +#define EXYNOS_THD_TEMP_FALL 0x54
> +#define EXYNOS_EMUL_CON 0x80
> +
> +#define EXYNOS_TRIMINFO_RELOAD_SHIFT 1
> +#define EXYNOS_TRIMINFO_25_SHIFT 0
> +#define EXYNOS_TRIMINFO_85_SHIFT 8
> +#define EXYNOS_TMU_RISE_INT_MASK 0x111
> +#define EXYNOS_TMU_RISE_INT_SHIFT 0
> +#define EXYNOS_TMU_FALL_INT_MASK 0x111
> +#define EXYNOS_TMU_FALL_INT_SHIFT 12
> +#define EXYNOS_TMU_CLEAR_RISE_INT 0x111
> +#define EXYNOS_TMU_CLEAR_FALL_INT (0x111 << 12)
> +#define EXYNOS_TMU_TRIP_MODE_SHIFT 13
> +#define EXYNOS_TMU_TRIP_MODE_MASK 0x7
> +#define EXYNOS_TMU_THERM_TRIP_EN_SHIFT 12
> +
> +#define EXYNOS_TMU_INTEN_RISE0_SHIFT 0
> +#define EXYNOS_TMU_INTEN_RISE1_SHIFT 4
> +#define EXYNOS_TMU_INTEN_RISE2_SHIFT 8
> +#define EXYNOS_TMU_INTEN_RISE3_SHIFT 12
> +#define EXYNOS_TMU_INTEN_FALL0_SHIFT 16
> +#define EXYNOS_TMU_INTEN_FALL1_SHIFT 20
> +#define EXYNOS_TMU_INTEN_FALL2_SHIFT 24
> +
> +#define EXYNOS_EMUL_TIME 0x57F0
> +#define EXYNOS_EMUL_TIME_MASK 0xffff
> +#define EXYNOS_EMUL_TIME_SHIFT 16
> +#define EXYNOS_EMUL_DATA_SHIFT 8
> +#define EXYNOS_EMUL_DATA_MASK 0xFF
> +#define EXYNOS_EMUL_ENABLE 0x1
> +
> #if defined(CONFIG_CPU_EXYNOS4210)
> extern struct exynos_tmu_platform_data const exynos4210_default_tmu_data;
> #define EXYNOS4210_TMU_DRV_DATA (&exynos4210_default_tmu_data)
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
Attachment:
signature.asc
Description: OpenPGP digital signature
