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

Commit b35cecf9 authored by Thara Gopinath's avatar Thara Gopinath Committed by Kevin Hilman
Browse files

OMAP4: Smartreflex framework extensions 



This patch extends the smartreflex framework to support
OMAP4. The changes are minor like compiling smartreflex Kconfig
option for OMAP4 also, and a couple of OMAP4 checks in
the smartreflex framework.

The change in sr_device.c where new logic has to be introduced
for reading the efuse registers is due to the fact that in OMAP4
the efuse registers are 24 bit aligned. A __raw_readl will
fail for non-32 bit aligned address and hence the 8-bit read
and shift.

Signed-off-by: default avatarThara Gopinath <thara@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent fb200cfb

arch/arm/mach-omap2/smartreflex.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -153,7 +153,11 @@ static void sr_set_clk_length(struct omap_sr *sr) 
	struct clk *sys_ck;

	struct clk *sys_ck;

	u32 sys_clk_speed;

	u32 sys_clk_speed;





	if (cpu_is_omap34xx())

		sys_ck = clk_get(NULL, "sys_ck");

		sys_ck = clk_get(NULL, "sys_ck");

	else

		sys_ck = clk_get(NULL, "sys_clkin_ck");



	if (IS_ERR(sys_ck)) {

	if (IS_ERR(sys_ck)) {

		dev_err(&sr->pdev->dev, "%s: unable to get sys clk\n",

		dev_err(&sr->pdev->dev, "%s: unable to get sys clk\n",

			__func__);

			__func__);
@@ -193,7 +197,7 @@ static void sr_set_regfields(struct omap_sr *sr) 
	 * file or pmic specific data structure. In that case these structure

	 * file or pmic specific data structure. In that case these structure

	 * fields will have to be populated using the pdata or pmic structure.

	 * fields will have to be populated using the pdata or pmic structure.

	 */

	 */

	if (cpu_is_omap34xx()) {

	if (cpu_is_omap34xx() || cpu_is_omap44xx()) {

		sr->err_weight = OMAP3430_SR_ERRWEIGHT;

		sr->err_weight = OMAP3430_SR_ERRWEIGHT;

		sr->err_maxlimit = OMAP3430_SR_ERRMAXLIMIT;

		sr->err_maxlimit = OMAP3430_SR_ERRMAXLIMIT;

		sr->accum_data = OMAP3430_SR_ACCUMDATA;

		sr->accum_data = OMAP3430_SR_ACCUMDATA;

arch/arm/mach-omap2/sr_device.c

+16 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 




#include <linux/err.h>

#include <linux/err.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/io.h>





#include <plat/omap_device.h>

#include <plat/omap_device.h>

#include <plat/smartreflex.h>

#include <plat/smartreflex.h>
@@ -51,7 +52,21 @@ static void __init sr_set_nvalues(struct omap_volt_data *volt_data, 
			GFP_KERNEL);

			GFP_KERNEL);





	for (i = 0; i < count; i++) {

	for (i = 0; i < count; i++) {

		u32 v = omap_ctrl_readl(volt_data[i].sr_efuse_offs);

		u32 v;

		/*

		 * In OMAP4 the efuse registers are 24 bit aligned.

		 * A __raw_readl will fail for non-32 bit aligned address

		 * and hence the 8-bit read and shift.

		 */

		if (cpu_is_omap44xx()) {

			u16 offset = volt_data[i].sr_efuse_offs;



			v = omap_ctrl_readb(offset) |

				omap_ctrl_readb(offset + 1) << 8 |

				omap_ctrl_readb(offset + 2) << 16;

		} else {

			 v = omap_ctrl_readl(volt_data[i].sr_efuse_offs);

		}





		nvalue_table[i].efuse_offs = volt_data[i].sr_efuse_offs;

		nvalue_table[i].efuse_offs = volt_data[i].sr_efuse_offs;

		nvalue_table[i].nvalue = v;

		nvalue_table[i].nvalue = v;

arch/arm/plat-omap/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ config OMAP_DEBUG_LEDS 




config OMAP_SMARTREFLEX

config OMAP_SMARTREFLEX

	bool "SmartReflex support"

	bool "SmartReflex support"

	depends on ARCH_OMAP3 && PM

	depends on (ARCH_OMAP3 || ARCH_OMAP4) && PM

	help

	help

	  Say Y if you want to enable SmartReflex.

	  Say Y if you want to enable SmartReflex.