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

Commit 8d31c41e authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Sasha Levin
Browse files

thermal: rcar: fix ENR register value 



[ Upstream commit 11313746547015ace605c4c347a40350753051e4 ]

On R-Mobile APE6, since it has 3 thermal zones, ENR register
has enable bits in bit 19-16, bit 11-8 and bit 3-0.

However, on R-Car gen2, since it has 1 thermal zone, ENR register has
enable bits in bit 3-0. (In other words, the write value should always
be 0 for bit 31-4 of ENR register.)

So, this patch fixes the ENR register value using I/O resource sets.

Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent c4a7bf89

drivers/thermal/rcar_thermal.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -372,6 +372,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
	int i;

	int i;

	int ret = -ENODEV;

	int ret = -ENODEV;

	int idle = IDLE_INTERVAL;

	int idle = IDLE_INTERVAL;

	u32 enr_bits = 0;





	common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL);

	common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL);

	if (!common)

	if (!common)
@@ -408,9 +409,6 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
		if (IS_ERR(common->base))

		if (IS_ERR(common->base))

			return PTR_ERR(common->base);

			return PTR_ERR(common->base);





		/* enable temperature comparation */

		rcar_thermal_common_write(common, ENR, 0x00030303);



		idle = 0; /* polling delay is not needed */

		idle = 0; /* polling delay is not needed */

	}

	}
@@ -452,8 +450,15 @@ static int rcar_thermal_probe(struct platform_device *pdev) 
			rcar_thermal_irq_enable(priv);

			rcar_thermal_irq_enable(priv);





		list_move_tail(&priv->list, &common->head);

		list_move_tail(&priv->list, &common->head);



		/* update ENR bits */

		enr_bits |= 3 << (i * 8);

	}

	}





	/* enable temperature comparation */

	if (irq)

		rcar_thermal_common_write(common, ENR, enr_bits);



	platform_set_drvdata(pdev, common);

	platform_set_drvdata(pdev, common);





	dev_info(dev, "%d sensor probed\n", i);

	dev_info(dev, "%d sensor probed\n", i);