target/linux/sunxi/patches-4.1/102-regulator-axp20x-add-support-for-axp22.patch

   1 From c3f89434c9d778572cf09e8327bd047b11d48b90 Mon Sep 17 00:00:00 2001
   2 From: Boris BREZILLON <boris.brezillon@free-electrons.com>
   3 Date: Fri, 10 Apr 2015 12:09:04 +0800
   4 Subject: [PATCH] regulator: axp20x: Add support for AXP22X regulators
   5
   6 Add AXP22X regulator definitions and variant id associations.
   7 This introduces a new "switch" type output for one of the regulators.
   8 It is a switchable secondary output of one regulator, with the same
   9 voltage level as the primary output.
  10
  11 Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
  12 [wens@csie.org: Moved variant choosing to multi family support patch]
  13 [wens@csie.org: Add dc-dc work frequency range]
  14 [wens@csie.org: Add "switch" type output regulator DC1SW]
  15 Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  16 Reviewed-by: Mark Brown <broonie@kernel.org>
  17 Signed-off-by: Lee Jones <lee.jones@linaro.org>
  18 ---
  19  drivers/regulator/axp20x-regulator.c | 96 ++++++++++++++++++++++++++++++++++++
  20  1 file changed, 96 insertions(+)
  21
  22 --- a/drivers/regulator/axp20x-regulator.c
  23 +++ b/drivers/regulator/axp20x-regulator.c
  24 @@ -27,8 +27,12 @@
  25  #define AXP20X_IO_ENABLED              0x03
  26  #define AXP20X_IO_DISABLED             0x07
  27
  28 +#define AXP22X_IO_ENABLED              0x04
  29 +#define AXP22X_IO_DISABLED             0x03
  30 +
  31  #define AXP20X_WORKMODE_DCDC2_MASK     BIT(2)
  32  #define AXP20X_WORKMODE_DCDC3_MASK     BIT(1)
  33 +#define AXP22X_WORKMODE_DCDCX_MASK(x)  BIT(x)
  34
  35  #define AXP20X_FREQ_DCDC_MASK          0x0f
  36
  37 @@ -74,6 +78,26 @@
  38                 .ops            = &axp20x_ops,                                  \
  39         }
  40
  41 +#define AXP_DESC_SW(_family, _id, _match, _supply, _min, _max, _step, _vreg,   \
  42 +                   _vmask, _ereg, _emask)                                      \
  43 +       [_family##_##_id] = {                                                   \
  44 +               .name           = #_id,                                         \
  45 +               .supply_name    = (_supply),                                    \
  46 +               .of_match       = of_match_ptr(_match),                         \
  47 +               .regulators_node = of_match_ptr("regulators"),                  \
  48 +               .type           = REGULATOR_VOLTAGE,                            \
  49 +               .id             = _family##_##_id,                              \
  50 +               .n_voltages     = (((_max) - (_min)) / (_step) + 1),            \
  51 +               .owner          = THIS_MODULE,                                  \
  52 +               .min_uV         = (_min) * 1000,                                \
  53 +               .uV_step        = (_step) * 1000,                               \
  54 +               .vsel_reg       = (_vreg),                                      \
  55 +               .vsel_mask      = (_vmask),                                     \
  56 +               .enable_reg     = (_ereg),                                      \
  57 +               .enable_mask    = (_emask),                                     \
  58 +               .ops            = &axp20x_ops_sw,                               \
  59 +       }
  60 +
  61  #define AXP_DESC_FIXED(_family, _id, _match, _supply, _volt)                   \
  62         [_family##_##_id] = {                                                   \
  63                 .name           = #_id,                                         \
  64 @@ -135,6 +159,14 @@ static struct regulator_ops axp20x_ops =
  65         .is_enabled             = regulator_is_enabled_regmap,
  66  };
  67
  68 +static struct regulator_ops axp20x_ops_sw = {
  69 +       .get_voltage_sel        = regulator_get_voltage_sel_regmap,
  70 +       .list_voltage           = regulator_list_voltage_linear,
  71 +       .enable                 = regulator_enable_regmap,
  72 +       .disable                = regulator_disable_regmap,
  73 +       .is_enabled             = regulator_is_enabled_regmap,
  74 +};
  75 +
  76  static const struct regulator_desc axp20x_regulators[] = {
  77         AXP_DESC(AXP20X, DCDC2, "dcdc2", "vin2", 700, 2275, 25,
  78                  AXP20X_DCDC2_V_OUT, 0x3f, AXP20X_PWR_OUT_CTRL, 0x10),
  79 @@ -152,6 +184,52 @@ static const struct regulator_desc axp20
  80                     AXP20X_IO_ENABLED, AXP20X_IO_DISABLED),
  81  };
  82
  83 +static const struct regulator_desc axp22x_regulators[] = {
  84 +       AXP_DESC(AXP22X, DCDC1, "dcdc1", "vin1", 1600, 3400, 100,
  85 +                AXP22X_DCDC1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(1)),
  86 +       AXP_DESC(AXP22X, DCDC2, "dcdc2", "vin2", 600, 1540, 20,
  87 +                AXP22X_DCDC2_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(2)),
  88 +       AXP_DESC(AXP22X, DCDC3, "dcdc3", "vin3", 600, 1860, 20,
  89 +                AXP22X_DCDC3_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(3)),
  90 +       AXP_DESC(AXP22X, DCDC4, "dcdc4", "vin4", 600, 1540, 20,
  91 +                AXP22X_DCDC4_V_OUT, 0x3f, AXP22X_PWR_OUT_CTRL1, BIT(3)),
  92 +       AXP_DESC(AXP22X, DCDC5, "dcdc5", "vin5", 1000, 2550, 50,
  93 +                AXP22X_DCDC5_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(4)),
  94 +       /* secondary switchable output of DCDC1 */
  95 +       AXP_DESC_SW(AXP22X, DC1SW, "dc1sw", "dcdc1", 1600, 3400, 100,
  96 +                   AXP22X_DCDC1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(7)),
  97 +       /* LDO regulator internally chained to DCDC5 */
  98 +       AXP_DESC(AXP22X, DC5LDO, "dc5ldo", "dcdc5", 700, 1400, 100,
  99 +                AXP22X_DC5LDO_V_OUT, 0x7, AXP22X_PWR_OUT_CTRL1, BIT(0)),
 100 +       AXP_DESC(AXP22X, ALDO1, "aldo1", "aldoin", 700, 3300, 100,
 101 +                AXP22X_ALDO1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(6)),
 102 +       AXP_DESC(AXP22X, ALDO2, "aldo2", "aldoin", 700, 3300, 100,
 103 +                AXP22X_ALDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(7)),
 104 +       AXP_DESC(AXP22X, ALDO3, "aldo3", "aldoin", 700, 3300, 100,
 105 +                AXP22X_ALDO3_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL3, BIT(7)),
 106 +       AXP_DESC(AXP22X, DLDO1, "dldo1", "dldoin", 700, 3300, 100,
 107 +                AXP22X_DLDO1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(3)),
 108 +       AXP_DESC(AXP22X, DLDO2, "dldo2", "dldoin", 700, 3300, 100,
 109 +                AXP22X_DLDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(4)),
 110 +       AXP_DESC(AXP22X, DLDO3, "dldo3", "dldoin", 700, 3300, 100,
 111 +                AXP22X_DLDO3_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(5)),
 112 +       AXP_DESC(AXP22X, DLDO4, "dldo4", "dldoin", 700, 3300, 100,
 113 +                AXP22X_DLDO4_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(6)),
 114 +       AXP_DESC(AXP22X, ELDO1, "eldo1", "eldoin", 700, 3300, 100,
 115 +                AXP22X_ELDO1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(0)),
 116 +       AXP_DESC(AXP22X, ELDO2, "eldo2", "eldoin", 700, 3300, 100,
 117 +                AXP22X_ELDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(1)),
 118 +       AXP_DESC(AXP22X, ELDO3, "eldo3", "eldoin", 700, 3300, 100,
 119 +                AXP22X_ELDO3_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(2)),
 120 +       AXP_DESC_IO(AXP22X, LDO_IO0, "ldo_io0", "ips", 1800, 3300, 100,
 121 +                   AXP22X_LDO_IO0_V_OUT, 0x1f, AXP20X_GPIO0_CTRL, 0x07,
 122 +                   AXP22X_IO_ENABLED, AXP22X_IO_DISABLED),
 123 +       AXP_DESC_IO(AXP22X, LDO_IO1, "ldo_io1", "ips", 1800, 3300, 100,
 124 +                   AXP22X_LDO_IO1_V_OUT, 0x1f, AXP20X_GPIO1_CTRL, 0x07,
 125 +                   AXP22X_IO_ENABLED, AXP22X_IO_DISABLED),
 126 +       AXP_DESC_FIXED(AXP22X, RTC_LDO, "rtc_ldo", "ips", 3000),
 127 +};
 128 +
 129  static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
 130  {
 131         struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
 132 @@ -165,6 +243,12 @@ static int axp20x_set_dcdc_freq(struct p
 133                 def = 1500;
 134                 step = 75;
 135                 break;
 136 +       case AXP221_ID:
 137 +               min = 1800;
 138 +               max = 4050;
 139 +               def = 3000;
 140 +               step = 150;
 141 +               break;
 142         default:
 143                 dev_err(&pdev->dev,
 144                         "Setting DCDC frequency for unsupported AXP variant\n");
 145 @@ -237,6 +321,14 @@ static int axp20x_set_dcdc_workmode(stru
 146                 workmode <<= ffs(mask) - 1;
 147                 break;
 148
 149 +       case AXP221_ID:
 150 +               if (id < AXP22X_DCDC1 || id > AXP22X_DCDC5)
 151 +                       return -EINVAL;
 152 +
 153 +               mask = AXP22X_WORKMODE_DCDCX_MASK(id - AXP22X_DCDC1);
 154 +               workmode <<= id - AXP22X_DCDC1;
 155 +               break;
 156 +
 157         default:
 158                 /* should not happen */
 159                 WARN_ON(1);
 160 @@ -265,6 +357,10 @@ static int axp20x_regulator_probe(struct
 161                 regulators = axp20x_regulators;
 162                 nregulators = AXP20X_REG_ID_MAX;
 163                 break;
 164 +       case AXP221_ID:
 165 +               regulators = axp22x_regulators;
 166 +               nregulators = AXP22X_REG_ID_MAX;
 167 +               break;
 168         default:
 169                 dev_err(&pdev->dev, "Unsupported AXP variant: %ld\n",
 170                         axp20x->variant);