thermal: exynos: remove test_mux pdata field
Replace pdata->test_mux check in get_con_reg() by explicitly checking for SoC type. Also since the used pdata->test_mux value is always identical use it directly and remove pdata->test_mux completely. There should be no functional changes caused by this patch. Cc: Amit Daniel Kachhap <amit.daniel@samsung.com> Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Eduardo Valentin <edubezval@gmail.com> Cc: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Tested-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
parent
17be30cb7f
commit
7575983c57
|
@ -193,8 +193,9 @@ static u32 get_con_reg(struct exynos_tmu_data *data, u32 con)
|
||||||
{
|
{
|
||||||
struct exynos_tmu_platform_data *pdata = data->pdata;
|
struct exynos_tmu_platform_data *pdata = data->pdata;
|
||||||
|
|
||||||
if (pdata->test_mux)
|
if (data->soc == SOC_ARCH_EXYNOS4412 ||
|
||||||
con |= (pdata->test_mux << EXYNOS4412_MUX_ADDR_SHIFT);
|
data->soc == SOC_ARCH_EXYNOS3250)
|
||||||
|
con |= (EXYNOS4412_MUX_ADDR_VALUE << EXYNOS4412_MUX_ADDR_SHIFT);
|
||||||
|
|
||||||
con &= ~(EXYNOS_TMU_REF_VOLTAGE_MASK << EXYNOS_TMU_REF_VOLTAGE_SHIFT);
|
con &= ~(EXYNOS_TMU_REF_VOLTAGE_MASK << EXYNOS_TMU_REF_VOLTAGE_SHIFT);
|
||||||
con |= pdata->reference_voltage << EXYNOS_TMU_REF_VOLTAGE_SHIFT;
|
con |= pdata->reference_voltage << EXYNOS_TMU_REF_VOLTAGE_SHIFT;
|
||||||
|
|
|
@ -89,7 +89,6 @@ enum soc_type {
|
||||||
* @first_point_trim: temp value of the first point trimming
|
* @first_point_trim: temp value of the first point trimming
|
||||||
* @second_point_trim: temp value of the second point trimming
|
* @second_point_trim: temp value of the second point trimming
|
||||||
* @default_temp_offset: default temperature offset in case of no trimming
|
* @default_temp_offset: default temperature offset in case of no trimming
|
||||||
* @test_mux; information if SoC supports test MUX
|
|
||||||
* @cal_type: calibration type for temperature
|
* @cal_type: calibration type for temperature
|
||||||
* @freq_clip_table: Table representing frequency reduction percentage.
|
* @freq_clip_table: Table representing frequency reduction percentage.
|
||||||
* @freq_tab_count: Count of the above table as frequency reduction may
|
* @freq_tab_count: Count of the above table as frequency reduction may
|
||||||
|
@ -115,7 +114,6 @@ struct exynos_tmu_platform_data {
|
||||||
u8 first_point_trim;
|
u8 first_point_trim;
|
||||||
u8 second_point_trim;
|
u8 second_point_trim;
|
||||||
u8 default_temp_offset;
|
u8 default_temp_offset;
|
||||||
u8 test_mux;
|
|
||||||
|
|
||||||
enum calibration_type cal_type;
|
enum calibration_type cal_type;
|
||||||
enum soc_type type;
|
enum soc_type type;
|
||||||
|
|
|
@ -109,7 +109,6 @@ struct exynos_tmu_init_data const exynos3250_default_tmu_data = {
|
||||||
{
|
{
|
||||||
EXYNOS3250_TMU_DATA,
|
EXYNOS3250_TMU_DATA,
|
||||||
.type = SOC_ARCH_EXYNOS3250,
|
.type = SOC_ARCH_EXYNOS3250,
|
||||||
.test_mux = EXYNOS4412_MUX_ADDR_VALUE,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
.tmu_count = 1,
|
.tmu_count = 1,
|
||||||
|
@ -160,7 +159,6 @@ struct exynos_tmu_init_data const exynos4412_default_tmu_data = {
|
||||||
{
|
{
|
||||||
EXYNOS4412_TMU_DATA,
|
EXYNOS4412_TMU_DATA,
|
||||||
.type = SOC_ARCH_EXYNOS4412,
|
.type = SOC_ARCH_EXYNOS4412,
|
||||||
.test_mux = EXYNOS4412_MUX_ADDR_VALUE,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
.tmu_count = 1,
|
.tmu_count = 1,
|
||||||
|
|
Loading…
Reference in New Issue