tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mfd: Switch twl4030-power over to defines in twl.h

use the new definitions on twl header for code
consistency.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Felipe Balbi and committed by
Samuel Ortiz 71084406 49e6f87e

+16 -14
+16 -14
drivers/mfd/twl4030-power.c
··· 63 63 #define R_MEMORY_ADDRESS PHY_TO_OFF_PM_MASTER(0x59) 64 64 #define R_MEMORY_DATA PHY_TO_OFF_PM_MASTER(0x5a) 65 65 66 - #define R_PROTECT_KEY 0x0E 67 - #define R_KEY_1 0xC0 68 - #define R_KEY_2 0x0C 69 - 70 66 /* resource configuration registers 71 67 <RESOURCE>_DEV_GRP at address 'n+0' 72 68 <RESOURCE>_TYPE at address 'n+1' ··· 461 465 { 462 466 int err = 0; 463 467 464 - err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_1, 465 - R_PROTECT_KEY); 468 + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 469 + TWL4030_PM_MASTER_KEY_CFG1, 470 + TWL4030_PM_MASTER_PROTECT_KEY); 466 471 if (err) { 467 472 pr_err("twl4030: unable to unlock PROTECT_KEY\n"); 468 473 return err; 469 474 } 470 475 471 - err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_2, 472 - R_PROTECT_KEY); 476 + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 477 + TWL4030_PM_MASTER_KEY_CFG2, 478 + TWL4030_PM_MASTER_PROTECT_KEY); 473 479 if (err) { 474 480 pr_err("twl4030: unable to unlock PROTECT_KEY\n"); 475 481 return err; ··· 502 504 return err; 503 505 } 504 506 505 - err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, R_PROTECT_KEY); 507 + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, 508 + TWL4030_PM_MASTER_PROTECT_KEY); 506 509 if (err) 507 510 pr_err("TWL4030 Unable to relock registers\n"); 508 511 ··· 517 518 struct twl4030_resconfig *resconfig; 518 519 u8 address = twl4030_start_script_address; 519 520 520 - err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_1, 521 - R_PROTECT_KEY); 521 + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 522 + TWL4030_PM_MASTER_KEY_CFG1, 523 + TWL4030_PM_MASTER_PROTECT_KEY); 522 524 if (err) 523 525 goto unlock; 524 526 525 - err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_2, 526 - R_PROTECT_KEY); 527 + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 528 + TWL4030_PM_MASTER_KEY_CFG2, 529 + TWL4030_PM_MASTER_PROTECT_KEY); 527 530 if (err) 528 531 goto unlock; 529 532 ··· 547 546 } 548 547 } 549 548 550 - err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, R_PROTECT_KEY); 549 + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, 550 + TWL4030_PM_MASTER_PROTECT_KEY); 551 551 if (err) 552 552 pr_err("TWL4030 Unable to relock registers\n"); 553 553 return;