Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit bbcaf41118809b2a4b05e69cf298d379ebb734d1

Authored by Linus Torvalds
2 parents 5c0a981fb1 a68de07461
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Merge tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator fixes from Mark Brown:
 "A few small, driver specific bug fixes, nothing exciting here but all
  needed if you happen to be using the affected hardware."

* tag 'regulator-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: palmas: fix regmap offsets for enable/disable
  regulator: tps6524x: Fix get_voltage_sel for fixed voltage
  regulator: tps65023: Fix mask for LDOs output voltage select control

Showing 3 changed files Side-by-side Diff

drivers/regulator/palmas-regulator.c
Diff comments   View file @ bbcaf41
... ... @@ -673,7 +673,9 @@
673 673 pmic->desc[id].ops = &palmas_ops_smps10;
674 674 pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;
675 675 pmic->desc[id].vsel_mask = SMPS10_VSEL;
676   - pmic->desc[id].enable_reg = PALMAS_SMPS10_STATUS;
  676 + pmic->desc[id].enable_reg =
  677 + PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
  678 + PALMAS_SMPS10_STATUS);
677 679 pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
678 680 }
679 681  
... ... @@ -739,7 +741,8 @@
739 741  
740 742 pmic->desc[id].type = REGULATOR_VOLTAGE;
741 743 pmic->desc[id].owner = THIS_MODULE;
742   - pmic->desc[id].enable_reg = palmas_regs_info[id].ctrl_addr;
  744 + pmic->desc[id].enable_reg = PALMAS_BASE_TO_REG(PALMAS_LDO_BASE,
  745 + palmas_regs_info[id].ctrl_addr);
743 746 pmic->desc[id].enable_mask = PALMAS_LDO1_CTRL_MODE_ACTIVE;
744 747  
745 748 if (pdata && pdata->reg_data)
drivers/regulator/tps65023-regulator.c
Diff comments   View file @ bbcaf41
... ... @@ -71,7 +71,7 @@
71 71  
72 72 /* LDO_CTRL bitfields */
73 73 #define TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_id) ((ldo_id)*4)
74   -#define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id) (0x0F << ((ldo_id)*4))
  74 +#define TPS65023_LDO_CTRL_LDOx_MASK(ldo_id) (0x07 << ((ldo_id)*4))
75 75  
76 76 /* Number of step-down converters available */
77 77 #define TPS65023_NUM_DCDC 3
drivers/regulator/tps6524x-regulator.c
Diff comments   View file @ bbcaf41
... ... @@ -482,7 +482,7 @@
482 482 info = &supply_info[rdev_get_id(rdev)];
483 483  
484 484 if (info->flags & FIXED_VOLTAGE)
485   - return info->fixed_voltage;
  485 + return 0;
486 486  
487 487 ret = read_field(hw, &info->voltage);
488 488 if (ret < 0)