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

Commit bfb2b88c authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Eduardo Valentin
Browse files

thermal: exynos: remove needless test_mux_addr_shift abstraction 



reg->test_mux_addr_shift is used only if pdata->test_mux is
non-zero.  pdata->test_mux is defined only on Exynos3250 and
Exynos4412 (other SoC types don't even have pdata->test_mux
entry assigned in their struct exynos_tmu_registers instances)
so the abstraction is not needed and can be removed.

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: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Tested-by: default avatarLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 32f95205

drivers/thermal/samsung/exynos_tmu.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on) 
	con = readl(data->base + reg->tmu_ctrl);



	if (pdata->test_mux)

		con |= (pdata->test_mux << reg->test_mux_addr_shift);

		con |= (pdata->test_mux << EXYNOS4412_MUX_ADDR_SHIFT);



	con &= ~(EXYNOS_TMU_REF_VOLTAGE_MASK << EXYNOS_TMU_REF_VOLTAGE_SHIFT);

	con |= pdata->reference_voltage << EXYNOS_TMU_REF_VOLTAGE_SHIFT;

drivers/thermal/samsung/exynos_tmu.h

+0 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ enum soc_type { 
 * bitfields. The register validity, offsets and bitfield values may vary

 * slightly across different exynos SOC's.

 * @tmu_ctrl: TMU main controller register.

 * @test_mux_addr_shift: shift bits of test mux address.

 * @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.
@@ -103,7 +102,6 @@ enum soc_type { 
 */

struct exynos_tmu_registers {

	u32	tmu_ctrl;

	u32     test_mux_addr_shift;

	u32	therm_trip_mode_shift;

	u32	therm_trip_mode_mask;

	u32	therm_trip_en_shift;

drivers/thermal/samsung/exynos_tmu_data.c

+0 −2
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = { 
#if defined(CONFIG_SOC_EXYNOS3250)

static const struct exynos_tmu_registers exynos3250_tmu_registers = {

	.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,

	.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,

	.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,
@@ -159,7 +158,6 @@ struct exynos_tmu_init_data const exynos3250_default_tmu_data = { 
#if defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250)

static const struct exynos_tmu_registers exynos4412_tmu_registers = {

	.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,

	.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,

	.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,