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

Commit b4ead61e authored by Amit Kucheria's avatar Amit Kucheria Committed by Samuel Ortiz
Browse files

mfd: Add support for remapping twl4030-power power states 



The <RESOURCE>_REMAP register allows configuration of the <RESOURCE> in case
of a sleep or off transition.

Allow this property of resources to be configured (through twl4030_resconfig)
and add code to parse these values to program the registers accordingly.

Signed-off-by: default avatarAmit Kucheria <amit.kucheria@verdurent.com>
Cc: linux-omap@vger.kernel.org
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 890463f0

drivers/mfd/twl4030-power.c

+36 −0
Original line number Original line Diff line number Diff line
@@ -75,6 +75,8 @@ static u8 twl4030_start_script_address = 0x2b; 
*/

*/

#define DEV_GRP_OFFSET		0

#define DEV_GRP_OFFSET		0

#define TYPE_OFFSET		1

#define TYPE_OFFSET		1

#define REMAP_OFFSET		2

#define DEDICATED_OFFSET	3





/* Bit positions in the registers */

/* Bit positions in the registers */
@@ -88,6 +90,12 @@ static u8 twl4030_start_script_address = 0x2b; 
#define TYPE2_SHIFT		3

#define TYPE2_SHIFT		3

#define TYPE2_MASK		(3 << TYPE2_SHIFT)

#define TYPE2_MASK		(3 << TYPE2_SHIFT)





/* <RESOURCE>_REMAP */

#define SLEEP_STATE_SHIFT	0

#define SLEEP_STATE_MASK	(0xf << SLEEP_STATE_SHIFT)

#define OFF_STATE_SHIFT		4

#define OFF_STATE_MASK		(0xf << OFF_STATE_SHIFT)



static u8 res_config_addrs[] = {

static u8 res_config_addrs[] = {

	[RES_VAUX1]	= 0x17,

	[RES_VAUX1]	= 0x17,

	[RES_VAUX2]	= 0x1b,

	[RES_VAUX2]	= 0x1b,
@@ -325,6 +333,7 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig) 
	int err;

	int err;

	u8 type;

	u8 type;

	u8 grp;

	u8 grp;

	u8 remap;





	if (rconfig->resource > TOTAL_RESOURCES) {

	if (rconfig->resource > TOTAL_RESOURCES) {

		pr_err("TWL4030 Resource %d does not exist\n",

		pr_err("TWL4030 Resource %d does not exist\n",
@@ -380,6 +389,33 @@ static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig) 
		return err;

		return err;

	}

	}





	/* Set remap states */

	err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &remap,

				rconfig_addr + REMAP_OFFSET);

	if (err < 0) {

		pr_err("TWL4030 Resource %d remap could not be read\n",

			rconfig->resource);

		return err;

	}



	if (rconfig->remap_off >= 0) {

		remap &= ~OFF_STATE_MASK;

		remap |= rconfig->remap_off << OFF_STATE_SHIFT;

	}



	if (rconfig->remap_sleep >= 0) {

		remap &= ~SLEEP_STATE_MASK;

		remap |= rconfig->remap_off << SLEEP_STATE_SHIFT;

	}



	err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,

				remap,

				rconfig_addr + REMAP_OFFSET);

	if (err < 0) {

		pr_err("TWL4030 failed to program remap\n");

		return err;

	}



	return 0;

	return 0;

}

}

include/linux/i2c/twl4030.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -250,6 +250,7 @@ int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes); 




#define RES_TYPE_ALL		0x7

#define RES_TYPE_ALL		0x7





/* Resource states */

#define RES_STATE_WRST		0xF

#define RES_STATE_WRST		0xF

#define RES_STATE_ACTIVE	0xE

#define RES_STATE_ACTIVE	0xE

#define RES_STATE_SLEEP		0x8

#define RES_STATE_SLEEP		0x8
@@ -391,6 +392,8 @@ struct twl4030_resconfig { 
	u8 devgroup;	/* Processor group that Power resource belongs to */

	u8 devgroup;	/* Processor group that Power resource belongs to */

	u8 type;	/* Power resource addressed, 6 / broadcast message */

	u8 type;	/* Power resource addressed, 6 / broadcast message */

	u8 type2;	/* Power resource addressed, 3 / broadcast message */

	u8 type2;	/* Power resource addressed, 3 / broadcast message */

	u8 remap_off;	/* off state remapping */

	u8 remap_sleep;	/* sleep state remapping */

};

};





struct twl4030_power_data {

struct twl4030_power_data {