Add RK816 PMIC support
Subsystems (6)
v3 cover Add RK816 PMIC support
This series aims to add support for Rockchip RK816 PMIC series. As per datasheet it's targeted for RK3126/RK3128 (RK816-1), RK1108 (RK816-2) and PX3-SE (RK816-3) but might be used for other SoCs as well. The MFD consists of an integrated RTC, a GPIO controller, two 32k clock outputs, a power key, 3 buck- and 6 ldo regulators, 3 regulator-switches, and charger with integrated fuel gauge. Charger and fuel gauge are not part of this series. Two of the switches (otg/boost) are part of the binding, but not of the driver. They must only ever be enabled if no battery charging is happening, but it will be enabled automatically if a battery is attached and an external power source is connected. Thus that needs some incorporation of a yet to be added charger driver.
Integration in the existing rk8xx-infrastructure was pretty straightforward and only needed very little tweaking. In order to not further bloat the driver(s) too much with additional #defines I tried to re-use existing ones wherever possible.
The patches are loosely based on the vendor's implementation, verified against the datasheet and tested/measured on a RK3126 board. As they are touching several subsystems I'm sending them (very) early for the 6.10.-cycle.
changes since v1:
- integrated Krzysztof's feedback for the bindings and the resulting driver changes
- fixed a sparse warning
link to v1:
https://lore.kernel.org/lkml/[email protected]/
changes since v2:
- integrated Krzysztof's feedback to v2 of the bindings and the resulting driver changes
link to v2:
https://lore.kernel.org/lkml/[email protected]/
Please see individual patches for details about the changes.
Alex Bee (5):
dt-bindings: mfd: Add rk816 binding
mfd: rk8xx: Add RK816 support
pinctrl: rk805: Add rk816 pinctrl support
regulator: rk808: Support apply_bit for
rk808_set_suspend_voltage_range
regulator: rk808: Add RK816 support
.../bindings/mfd/rockchip,rk816.yaml | 274 ++++++++++++++++++ drivers/mfd/Kconfig | 4 +- drivers/mfd/rk8xx-core.c | 103 +++++++ drivers/mfd/rk8xx-i2c.c | 45 ++- drivers/pinctrl/pinctrl-rk805.c | 69 +++++ drivers/regulator/rk808-regulator.c | 218 +++++++++++++- include/linux/mfd/rk808.h | 141 +++++++++ 7 files changed, 847 insertions(+), 7 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml
Signature · 1 line
2.43.2
PATCH v3 1/5 dt-bindings: mfd: Add rk816 binding
Add DT binding document for Rockchip's RK816 PMIC
---
changes since v1:
- lowercase/hyphens for regulator node names
- rename "-reg" to "-regulator" to make node names generic
- dropped superfluous description for clock-output-names and wakeup-source
- dropped "|" for text blocks that don't require to preserve formatting
- use full path for $refs
- added pins description to the binding
- added charger function to description
changes since v2:
- dropped "-regulator"-suffix from regulator device names
- use "'"-quotes consistently in the binding
- dropped "pin_fun"-prefix from pin-function names
- added pin to example
.../bindings/mfd/rockchip,rk816.yaml | 274 ++++++++++++++++++ 1 file changed, 274 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml
Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml new file +274 -0
@@ -0,0 +1,274 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/rockchip,rk816.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: RK816 Power Management Integrated Circuit + +maintainers: + - Chris Zhong <[email protected]> + - Zhang Qing <[email protected]> + +description: + Rockchip RK816 series PMIC. This device consists of an i2c controlled MFD + that includes regulators, a RTC, a GPIO controller, a power button, and a + battery charger manager with fuel gauge. + +properties: + compatible: + enum: + - rockchip,rk816 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + '#clock-cells': + description: + See <dt-bindings/clock/rockchip,rk808.h> for clock IDs. + const: 1 + + clock-output-names: + maxItems: 2 + + gpio-controller: true + + '#gpio-cells': + const: 2 + + system-power-controller: + type: boolean + description: + Telling whether or not this PMIC is controlling the system power. + + wakeup-source: + type: boolean + + vcc1-supply: + description: + The input supply for dcdc1. + + vcc2-supply: + description: + The input supply for dcdc2. + + vcc3-supply: + description: + The input supply for dcdc3. + + vcc4-supply: + description: + The input supply for dcdc4. + + vcc5-supply: + description: + The input supply for ldo1, ldo2, and ldo3. + + vcc6-supply: + description: + The input supply for ldo4, ldo5, and ldo6. + + vcc7-supply: + description: + The input supply for boost. + + vcc8-supply: + description: + The input supply for otg-switch. + + regulators: + type: object + patternProperties: + '^(boost|dcdc[1-4]|ldo[1-6]|otg-switch)$': + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false + unevaluatedProperties: false + +patternProperties: + '-pins$': + type: object + additionalProperties: false + $ref: /schemas/pinctrl/pinmux-node.yaml + + properties: + function: + enum: [gpio, thermistor] + + pins: + $ref: /schemas/types.yaml#/definitions/string + const: gpio0 + +required: + - compatible + - reg + - interrupts + - '#clock-cells' + +additionalProperties: false + +examples: + - | + #include <dt-bindings/pinctrl/rockchip.h> + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/gpio/gpio.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + rk816: pmic@1a { + compatible = "rockchip,rk816"; + reg = <0x1a>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>; + clock-output-names = "xin32k", "rk816-clkout2"; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_int_l>; + gpio-controller; + system-power-controller; + wakeup-source; + #clock-cells = <1>; + #gpio-cells = <2>; + + vcc1-supply = <&vcc_sys>; + vcc2-supply = <&vcc_sys>; + vcc3-supply = <&vcc_sys>; + vcc4-supply = <&vcc_sys>; + vcc5-supply = <&vcc33_io>; + vcc6-supply = <&vcc_sys>; + + regulators { + vdd_cpu: dcdc1 { + regulator-name = "vdd_cpu"; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <1450000>; + regulator-ramp-delay = <6001>; + regulator-initial-mode = <1>; + regulator-always-on; + regulator-boot-on; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_logic: dcdc2 { + regulator-name = "vdd_logic"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1250000>; + regulator-ramp-delay = <6001>; + regulator-initial-mode = <1>; + regulator-always-on; + regulator-boot-on; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1000000>; + }; + }; + + vcc_ddr: dcdc3 { + regulator-name = "vcc_ddr"; + regulator-initial-mode = <1>; + regulator-always-on; + regulator-boot-on; + + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc33_io: dcdc4 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc33_io"; + regulator-initial-mode = <1>; + regulator-always-on; + regulator-boot-on; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + + vccio_pmu: ldo1 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vccio_pmu"; + regulator-always-on; + regulator-boot-on; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + + vcc_tp: ldo2 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc_tp"; + + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_10: ldo3 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-name = "vdd_10"; + regulator-always-on; + regulator-boot-on; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1000000>; + }; + }; + + vcc18_lcd: ldo4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc18_lcd"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vccio_sd: ldo5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vccio_sd"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + + vdd10_lcd: ldo6 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-name = "vdd10_lcd"; + + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1000000>; + }; + }; + }; + + rk816_gpio_pins: gpio-pins { + function = "gpio"; + pins = "gpio0"; + }; + }; + };
Signature · 1 line
2.43.2
Re: [PATCH v3 1/5] dt-bindings: mfd: Add rk816 binding
Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml line 88
Quoted 12 lines · Alex Bee
Add DT binding document for Rockchip's RK816 PMIC
Signed-off-by Alex Bee <[email protected]>Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml new file +7
-0+ regulators: + type: object + patternProperties: + '^(boost|dcdc[1-4]|ldo[1-6]|otg-switch)$': + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false
This is good.
Quoted 1 line
+ unevaluatedProperties: false
I missed it last time, apologies. This (second) unevaluated should be "additionalProperties: false" instead.
With this fixed:
Best regards,
Krzysztof
Re: [PATCH v3 1/5] dt-bindings: mfd: Add rk816 binding
Am 23.03.24 um 15:32 schrieb Krzysztof Kozlowski:
Quoted 12 lines · Alex Bee
Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml line 88
Quoted 11 lines
Add DT binding document for Rockchip's RK816 PMIC
Signed-off-by Alex Bee <[email protected]>Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml new file +7
-0+ regulators: + type: object + patternProperties: + '^(boost|dcdc[1-4]|ldo[1-6]|otg-switch)$': + type: object + $ref: /schemas/regulator/regulator.yaml# + unevaluatedProperties: false
Quoted 5 lines
This is good.
Quoted 1 line
+ unevaluatedProperties: false
I missed it last time, apologies. This (second) unevaluated should be "additionalProperties: false" instead.
Alright. Since there are no driver changes required for this change, I'll give the other maintainers some time to review and fix it alongside in v4.
Alex
Quoted 8 lines
With this fixed:
Reviewed-by Krzysztof Kozlowski <[email protected]>Best regards,
Krzysztof
PATCH v3 2/5 mfd: rk8xx: Add RK816 support
In reply to Alex BeeThis integrates RK816 support in the this existing rk8xx mfd driver.
This version has unaligned interrupt registers, which requires to define a separate get_irq_reg callback for the regmap. Apart from that the integration is straightforward and the existing structures can be used as is. The initialization sequence has been taken from vendor kernel.
---
chnages since v1:
- un-constify rk816_get_irq_reg's return type
drivers/mfd/Kconfig | 4 +- drivers/mfd/rk8xx-core.c | 103 ++++++++++++++++++++++++++++ drivers/mfd/rk8xx-i2c.c | 45 +++++++++++- include/linux/mfd/rk808.h | 141 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 290 insertions(+), 3 deletions(-)
drivers/mfd/Kconfig +2 -2
@@ -1225,7 +1225,7 @@ config MFD_RK8XX select MFD_CORE config MFD_RK8XX_I2C - tristate "Rockchip RK805/RK808/RK809/RK817/RK818 Power Management Chip" + tristate "Rockchip RK805/RK808/RK809/RK816/RK817/RK818 Power Management Chip" depends on I2C && OF select MFD_CORE select REGMAP_I2C
@@ -1233,7 +1233,7 @@ config MFD_RK8XX_I2C select MFD_RK8XX help If you say yes here you get support for the RK805, RK808, RK809, - RK817 and RK818 Power Management chips. + RK816, RK817 and RK818 Power Management chips. This driver provides common support for accessing the device through I2C interface. The device supports multiple sub-devices including interrupts, RTC, LDO & DCDC regulators, and onkey.
drivers/mfd/rk8xx-core.c +103 -0
145 lines not on this page · raw message
drivers/mfd/rk8xx-i2c.c +44 -1
74 lines not on this page · raw message
include/linux/mfd/rk808.h +141 -0
159 lines not on this page · raw message
Signature · 1 line
2.43.2
Lee Jones
maintainerRe: [PATCH v3 2/5] mfd: rk8xx: Add RK816 support
Quoted 56 lines · Alex Bee
This integrates RK816 support in the this existing rk8xx mfd driver.
This version has unaligned interrupt registers, which requires to define a separate
get_irq_regcallback for the regmap. Apart from that the integration is straightforward and the existing structures can be used as is. The initialization sequence has been taken from vendor kernel.Signed-off-by Alex Bee <[email protected]>---
chnages since v1:
- un-constify rk816_get_irq_reg's return typedrivers/mfd/Kconfig | 4 +- drivers/mfd/rk8xx-core.c | 103 ++++++++++++++++++++++++++++ drivers/mfd/rk8xx-i2c.c | 45 +++++++++++- include/linux/mfd/rk808.h | 141 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 290 insertions(+), 3 deletions(-)drivers/mfd/Kconfig +2
-2@@ -1225,7 +1225,7 @@ config MFD_RK8XX select MFD_CORE config MFD_RK8XX_I2C - tristate "Rockchip RK805/RK808/RK809/RK817/RK818 Power Management Chip" + tristate "Rockchip RK805/RK808/RK809/RK816/RK817/RK818 Power Management Chip" depends on I2C && OF select MFD_CORE select REGMAP_I2C@@ -1233,7 +1233,7 @@ config MFD_RK8XX_I2C select MFD_RK8XX help If you say yes here you get support for the RK805, RK808, RK809, - RK817 and RK818 Power Management chips. + RK816, RK817 and RK818 Power Management chips. This driver provides common support for accessing the device through I2C interface. The device supports multiple sub-devices including interrupts, RTC, LDO & DCDC regulators, and onkey.drivers/mfd/rk8xx-core.c +4
-0@@ -28,6 +28,10 @@ static const struct resource rtc_resources[] = { DEFINE_RES_IRQ(RK808_IRQ_RTC_ALARM), }; +static const struct resource rk816_rtc_resources[] = { +DEFINE_RES_IRQ (RK816_IRQ_RTC_ALARM ), +}; +static const struct resource rk817_rtc_resources[] = {DEFINE_RES_IRQ (RK817_IRQ_RTC_ALARM ), };
drivers/mfd/rk8xx-core.c static const struct mfd_cell rk808s[] = { · line 98
Quoted 8 lines
drivers/mfd/rk8xx-core.c +5
-0@@ -87,6 +91,21 @@ static const struct mfd_cell rk808s[] = { }, }; +static const struct mfd_cell rk816s[] = { + { .name ="rk805-pinctrl" , }, + { .name ="rk808-clkout" , }, + { .name ="rk808-regulator" , }, + { .name ="rk805-pwrkey" ,
Newline after the '{'.
Quoted 32 lines
drivers/mfd/rk8xx-core.c +21
-0+ .num_resources = ARRAY_SIZE(rk805_key_resources), + .resources = rk805_key_resources, + }, + { + .name = "rk808-rtc", + .num_resources = ARRAY_SIZE(rk816_rtc_resources), + .resources = rk816_rtc_resources, + }, +}; +static const struct mfd_cell rk817s[] = { { .name ="rk808-clkout" , }, { .name ="rk808-regulator" , },@@ -148,6 +167,17 @@ static const struct rk808_reg_data rk808_pre_init_reg[] = { VB_LO_SEL_3500MV }, }; +static const struct rk808_reg_data rk816_pre_init_reg[] = { + {RK818_BUCK1_CONFIG_REG ,RK817_RAMP_RATE_MASK , +RK817_RAMP_RATE_12_5MV_PER_US }, + {RK818_BUCK2_CONFIG_REG ,RK817_RAMP_RATE_MASK , +RK817_RAMP_RATE_12_5MV_PER_US }, + {RK818_BUCK4_CONFIG_REG ,BUCK_ILMIN_MASK ,BUCK_ILMIN_250MA }, + {RK808_THERMAL_REG ,TEMP_HOTDIE_MSK ,TEMP105C }, + {RK808_VB_MON_REG ,VBAT_LOW_VOL_MASK |VBAT_LOW_ACT_MASK , +RK808_VBAT_LOW_3V0 |EN_VABT_LOW_SHUT_DOWN }, +}; +static const struct rk808_reg_data rk817_pre_init_reg[] = { {RK817_RTC_CTRL_REG ,RTC_STOP ,RTC_STOP },/* Codec specific registers */
drivers/mfd/rk8xx-core.c static const struct regmap_irq rk808_irqs[] = { · line 384
Quoted 5 lines
drivers/mfd/rk8xx-core.c +2
-0@@ -350,6 +380,59 @@ static const struct regmap_irq rk808_irqs[] = { }, }; +static const unsigned int rk816_irq_status_offsets[] = { + (RK816_INT_STS_REG1 -RK816_INT_STS_REG1 ),
Turn this into a macro please.
Quoted 347 lines
drivers/mfd/rk8xx-core.c +71
-0+ (RK816_INT_STS_REG2 -RK816_INT_STS_REG1 ), + (RK816_INT_STS_REG3 - RK816_INT_STS_REG1), +}; + +static const unsigned int rk816_irq_mask_offsets[] = { + (RK816_INT_STS_MSK_REG1 -RK816_INT_STS_MSK_REG1 ), + (RK816_INT_STS_MSK_REG2 -RK816_INT_STS_MSK_REG1 ), + (RK816_INT_STS_MSK_REG3 -RK816_INT_STS_MSK_REG1 ), +}; + +static unsigned int rk816_get_irq_reg (struct regmap_irq_chip_data *data, +unsigned int base,int index) +{ +unsigned int irq_reg = base; + +switch (base) { +case RK816_INT_STS_REG1 : + irq_reg += rk816_irq_status_offsets[index]; +break ; +case RK816_INT_STS_MSK_REG1 : + irq_reg += rk816_irq_mask_offsets[index]; +break ; + } + +return irq_reg; +}; + +static const struct regmap_irq rk816_irqs[] = { +/* INT_STS_REG1 IRQs */ +REGMAP_IRQ_REG (RK816_IRQ_PWRON_FALL ,0 ,RK816_INT_STS_PWRON_FALL ), +REGMAP_IRQ_REG (RK816_IRQ_PWRON_RISE ,0 ,RK816_INT_STS_PWRON_RISE ), + +/* INT_STS_REG2 IRQs */ +REGMAP_IRQ_REG (RK816_IRQ_VB_LOW ,1 ,RK816_INT_STS_VB_LOW ), +REGMAP_IRQ_REG (RK816_IRQ_PWRON ,1 ,RK816_INT_STS_PWRON ), +REGMAP_IRQ_REG (RK816_IRQ_PWRON_LP ,1 ,RK816_INT_STS_PWRON_LP ), +REGMAP_IRQ_REG (RK816_IRQ_HOTDIE ,1 ,RK816_INT_STS_HOTDIE ), +REGMAP_IRQ_REG (RK816_IRQ_RTC_ALARM ,1 ,RK816_INT_STS_RTC_ALARM ), +REGMAP_IRQ_REG (RK816_IRQ_RTC_PERIOD ,1 ,RK816_INT_STS_RTC_PERIOD ), +REGMAP_IRQ_REG (RK816_IRQ_USB_OV ,1 ,RK816_INT_STS_USB_OV ), + +/* INT_STS3 IRQs */ +REGMAP_IRQ_REG (RK816_IRQ_PLUG_IN ,2 ,RK816_INT_STS_PLUG_IN ), +REGMAP_IRQ_REG (RK816_IRQ_PLUG_OUT ,2 ,RK816_INT_STS_PLUG_OUT ), +REGMAP_IRQ_REG (RK816_IRQ_CHG_OK ,2 ,RK816_INT_STS_CHG_OK ), +REGMAP_IRQ_REG (RK816_IRQ_CHG_TE ,2 ,RK816_INT_STS_CHG_TE ), +REGMAP_IRQ_REG (RK816_IRQ_CHG_TS ,2 ,RK816_INT_STS_CHG_TS ), +REGMAP_IRQ_REG (RK816_IRQ_CHG_CVTLIM ,2 ,RK816_INT_STS_CHG_CVTLIM ), +REGMAP_IRQ_REG (RK816_IRQ_DISCHG_ILIM ,2 ,RK816_INT_STS_DISCHG_ILIM ), +}; +static const struct regmap_irq rk818_irqs[] = {/* INT_STS */ [RK818_IRQ_VOUT_LO ] = {@@ -482,6 +565,18 @@ static const struct regmap_irq_chip rk808_irq_chip = { .init_ack_masked = true, }; +static const struct regmap_irq_chip rk816_irq_chip = { + .name ="rk816" , + .irqs = rk816_irqs, + .num_irqs =ARRAY_SIZE (rk816_irqs), + .num_regs =3 , + .get_irq_reg = rk816_get_irq_reg, + .status_base =RK816_INT_STS_REG1 , + .mask_base =RK816_INT_STS_MSK_REG1 , + .ack_base =RK816_INT_STS_REG1 , + .init_ack_masked = true, +}; +static struct regmap_irq_chip rk817_irq_chip = { .name ="rk817" , .irqs = rk817_irqs,@@ -530,6 +625,7 @@ static int rk808_power_off(struct sys_off_data *data) reg =RK817_SYS_CFG (3 ); bit =DEV_OFF ;break ; +case RK816_ID :case RK818_ID : reg =RK818_DEVCTRL_REG ; bit =DEV_OFF ;@@ -637,6 +733,13 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap cells = rk808s; nr_cells =ARRAY_SIZE (rk808s);break ; +case RK816_ID : + rk808->regmap_irq_chip = &rk816_irq_chip; + pre_init_reg = rk816_pre_init_reg; + nr_pre_init_regs =ARRAY_SIZE (rk816_pre_init_reg); + cells = rk816s; + nr_cells =ARRAY_SIZE (rk816s); +break ;case RK818_ID : rk808->regmap_irq_chip = &rk818_irq_chip; pre_init_reg = rk818_pre_init_reg;drivers/mfd/rk8xx-i2c.c +44
-1@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Rockchip RK808/RK818 Core (I2C) driver +* Rockchip RK805/RK808/RK816/RK817/RK818 Core (I2C) driver * * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd * Copyright (C) 2016 PHYTEC Messtechnik GmbH @@ -49,6 +49,35 @@ static bool rk808_is_volatile_reg(struct device *dev, unsigned int reg)return false; } +static bool rk816_is_volatile_reg (struct device *dev,unsigned int reg) +{ +/* +* Technically the ROUND_30s bit makes RTC_CTRL_REG volatile, but +* we don't use that feature. It's better to cache. +*/ + +switch (reg) { + case RK808_SECONDS_REG ... RK808_WEEKS_REG: +case RK808_RTC_STATUS_REG : +case RK808_VB_MON_REG : +case RK808_THERMAL_REG : +case RK816_DCDC_EN_REG1 : +case RK816_DCDC_EN_REG2 : +case RK816_INT_STS_REG1 : +case RK816_INT_STS_REG2 : +case RK816_INT_STS_REG3 : +case RK808_DEVCTRL_REG : +case RK816_SUP_STS_REG : +case RK816_GGSTS_REG : +case RK816_ZERO_CUR_ADC_REGH : +case RK816_ZERO_CUR_ADC_REGL : + case RK816_GASCNT_REG(0) ... RK816_BAT_VOL_REGL: +return true; + } + +return false; +} +static bool rk817_is_volatile_reg (struct device *dev,unsigned int reg) {/* @@ -100,6 +129,14 @@ static const struct regmap_config rk808_regmap_config = { .volatile_reg = rk808_is_volatile_reg, }; +static const struct regmap_config rk816_regmap_config = { + .reg_bits =8 , + .val_bits =8 , + .max_register =RK816_DATA_REG (18 ), + .cache_type =REGCACHE_MAPLE , + .volatile_reg = rk816_is_volatile_reg, +}; +static const struct regmap_config rk817_regmap_config = { .reg_bits =8 , .val_bits =8 ,@@ -123,6 +160,11 @@ static const struct rk8xx_i2c_platform_data rk809_data = { .variant = RK809_ID, }; +static const struct rk8xx_i2c_platform_data rk816_data = { + .regmap_cfg = &rk816_regmap_config, + .variant =RK816_ID , +}; +static const struct rk8xx_i2c_platform_data rk817_data = { .regmap_cfg = &rk817_regmap_config, .variant =RK817_ID ,@@ -161,6 +203,7 @@ static const struct of_device_id rk8xx_i2c_of_match[] = { { .compatible = "rockchip,rk805", .data = &rk805_data }, { .compatible = "rockchip,rk808", .data = &rk808_data }, { .compatible = "rockchip,rk809", .data = &rk809_data }, + { .compatible = "rockchip,rk816", .data = &rk816_data }, { .compatible = "rockchip,rk817", .data = &rk817_data }, { .compatible = "rockchip,rk818", .data = &rk818_data }, { },include/linux/mfd/rk808.h +141
-0@@ -113,6 +113,145 @@ enum rk808_reg {#define RK808_INT_STS_MSK_REG2 0x4f#define RK808_IO_POL_REG 0x50 +/* RK816 */ +enum rk816_reg { +RK816_ID_DCDC1 , +RK816_ID_DCDC2 , +RK816_ID_DCDC3 , +RK816_ID_DCDC4 , +RK816_ID_LDO1 , +RK816_ID_LDO2 , +RK816_ID_LDO3 , +RK816_ID_LDO4 , +RK816_ID_LDO5 , +RK816_ID_LDO6 , +RK816_ID_BOOST , +RK816_ID_OTG_SW , +}; + +enum rk816_irqs { +/* INT_STS_REG1 */ +RK816_IRQ_PWRON_FALL , +RK816_IRQ_PWRON_RISE , + +/* INT_STS_REG2 */ +RK816_IRQ_VB_LOW , +RK816_IRQ_PWRON , +RK816_IRQ_PWRON_LP , +RK816_IRQ_HOTDIE , +RK816_IRQ_RTC_ALARM , +RK816_IRQ_RTC_PERIOD , +RK816_IRQ_USB_OV , + +/* INT_STS_REG3 */ +RK816_IRQ_PLUG_IN , +RK816_IRQ_PLUG_OUT , +RK816_IRQ_CHG_OK , +RK816_IRQ_CHG_TE , +RK816_IRQ_CHG_TS , +RK816_IRQ_CHG_CVTLIM , +RK816_IRQ_DISCHG_ILIM , +}; + +/* power channel registers */ +#define RK816_DCDC_EN_REG1 0x23 + +#define RK816_DCDC_EN_REG2 0x24 +#define RK816_BOOST_EN BIT(1) +#define RK816_OTG_EN BIT(2) +#define RK816_BOOST_EN_MSK BIT(5) +#define RK816_OTG_EN_MSK BIT(6) +#define RK816_BUCK_DVS_CONFIRM BIT(7) + +#define RK816_LDO_EN_REG1 0x27 + +#define RK816_LDO_EN_REG2 0x28 + +/* interrupt registers and irq definitions */ +#define RK816_INT_STS_REG1 0x49 +#define RK816_INT_STS_MSK_REG1 0x4a +#define RK816_INT_STS_PWRON_FALL BIT(5) +#define RK816_INT_STS_PWRON_RISE BIT(6) + +#define RK816_INT_STS_REG2 0x4c +#define RK816_INT_STS_MSK_REG2 0x4d +#define RK816_INT_STS_VB_LOW BIT(1) +#define RK816_INT_STS_PWRON BIT(2) +#define RK816_INT_STS_PWRON_LP BIT(3) +#define RK816_INT_STS_HOTDIE BIT(4) +#define RK816_INT_STS_RTC_ALARM BIT(5) +#define RK816_INT_STS_RTC_PERIOD BIT(6) +#define RK816_INT_STS_USB_OV BIT(7) + +#define RK816_INT_STS_REG3 0x4e +#define RK816_INT_STS_MSK_REG3 0x4f +#define RK816_INT_STS_PLUG_IN BIT(0) +#define RK816_INT_STS_PLUG_OUT BIT(1) +#define RK816_INT_STS_CHG_OK BIT(2) +#define RK816_INT_STS_CHG_TE BIT(3) +#define RK816_INT_STS_CHG_TS BIT(4) +#define RK816_INT_STS_CHG_CVTLIM BIT(6) +#define RK816_INT_STS_DISCHG_ILIM BIT(7) + +/* charger, boost and OTG registers */ +#define RK816_OTG_BUCK_LDO_CONFIG_REG 0x2a +#define RK816_CHRG_CONFIG_REG 0x2b +#define RK816_BOOST_ON_VESL_REG 0x54 +#define RK816_BOOST_SLP_VSEL_REG 0x55 +#define RK816_CHRG_BOOST_CONFIG_REG 0x9a +#define RK816_SUP_STS_REG 0xa0 +#define RK816_USB_CTRL_REG 0xa1 +#define RK816_CHRG_CTRL (x) (0xa3 + (x)) +#define RK816_BAT_CTRL_REG 0xa6 +#define RK816_BAT_HTS_TS_REG 0xa8 +#define RK816_BAT_LTS_TS_REG 0xa9 + +/* adc and fuel gauge registers */ +#define RK816_TS_CTRL_REG 0xac +#define RK816_ADC_CTRL_REG 0xad +#define RK816_GGCON_REG 0xb0 +#define RK816_GGSTS_REG 0xb1 +#define RK816_ZERO_CUR_ADC_REGH 0xb2 +#define RK816_ZERO_CUR_ADC_REGL 0xb3 +#define RK816_GASCNT_CAL_REG (x) (0xb7 - (x)) +#define RK816_GASCNT_REG (x) (0xbb - (x)) +#define RK816_BAT_CUR_AVG_REGH 0xbc +#define RK816_BAT_CUR_AVG_REGL 0xbd +#define RK816_TS_ADC_REGH 0xbe +#define RK816_TS_ADC_REGL 0xbf +#define RK816_USB_ADC_REGH 0xc0 +#define RK816_USB_ADC_REGL 0xc1 +#define RK816_BAT_OCV_REGH 0xc2 +#define RK816_BAT_OCV_REGL 0xc3 +#define RK816_BAT_VOL_REGH 0xc4 +#define RK816_BAT_VOL_REGL 0xc5 +#define RK816_RELAX_ENTRY_THRES_REGH 0xc6 +#define RK816_RELAX_ENTRY_THRES_REGL 0xc7 +#define RK816_RELAX_EXIT_THRES_REGH 0xc8 +#define RK816_RELAX_EXIT_THRES_REGL 0xc9 +#define RK816_RELAX_VOL1_REGH 0xca +#define RK816_RELAX_VOL1_REGL 0xcb +#define RK816_RELAX_VOL2_REGH 0xcc +#define RK816_RELAX_VOL2_REGL 0xcd +#define RK816_RELAX_CUR1_REGH 0xce +#define RK816_RELAX_CUR1_REGL 0xcf +#define RK816_RELAX_CUR2_REGH 0xd0 +#define RK816_RELAX_CUR2_REGL 0xd1 +#define RK816_CAL_OFFSET_REGH 0xd2 +#define RK816_CAL_OFFSET_REGL 0xd3 +#define RK816_NON_ACT_TIMER_CNT_REG 0xd4 +#define RK816_VCALIB0_REGH 0xd5 +#define RK816_VCALIB0_REGL 0xd6 +#define RK816_VCALIB1_REGH 0xd7 +#define RK816_VCALIB1_REGL 0xd8 +#define RK816_FCC_GASCNT_REG (x) (0xdc - (x)) +#define RK816_IOFFSET_REGH 0xdd +#define RK816_IOFFSET_REGL 0xde +#define RK816_SLEEP_CON_SAMP_CUR_REG 0xdf + +/* general purpose data registers 0xe0 ~ 0xf2 */ +#define RK816_DATA_REG (x) (0xe0 + (x)) +/* RK818 */ #define RK818_DCDC1 0#define RK818_LDO1 4@@ -791,6 +930,7 @@ enum rk806_dvs_mode {#define VOUT_LO_INT BIT(0)#define CLK32KOUT2_EN BIT(0) +#define TEMP105C 0x08#define TEMP115C 0x0c#define TEMP_HOTDIE_MSK 0x0c#define SLP_SD_MSK (0x3 << 2)@@ -1191,6 +1331,7 @@ enum {RK806_ID =0x8060 ,RK808_ID =0x0000 ,RK809_ID =0x8090 , +RK816_ID =0x8160 ,RK817_ID =0x8170 , RK818_ID = 0x8180, };Signature · 1 line
2.43.2
Signature · 1 line
Lee Jones [李琼斯]
PATCH v3 3/5 pinctrl: rk805: Add rk816 pinctrl support
In reply to Alex BeeThis adds support for RK816 to the exising rk805 pinctrl driver
It has a single pin which can be configured as input from a thermistor (for instance in an attached battery) or as a gpio.
---
changes since v1:
- rename pin-function names according to the updated binding
- added missing fun_reg for rk816_gpio_cfgs
changes since v2:
- aligned pin-function names with binding (dropped "pin_fun"-prefix)
drivers/pinctrl/pinctrl-rk805.c | 69 +++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+)
drivers/pinctrl/pinctrl-rk805.c +69 -0
@@ -93,6 +93,11 @@ enum rk806_pinmux_option { RK806_PINMUX_FUN5, }; +enum rk816_pinmux_option { +RK816_PINMUX_THERMISTOR , +RK816_PINMUX_GPIO , +}; +enum {RK805_GPIO0 ,RK805_GPIO1 ,
@@ -104,6 +109,10 @@ enum {RK806_GPIO_DVS3 }; +enum { +RK816_GPIO0 , +}; +static const char *const rk805_gpio_groups[] = {"gpio0" ,"gpio1" ,
@@ -115,6 +124,10 @@ static const char *const rk806_gpio_groups[] = { "gpio_pwrctrl3", }; +static const char *const rk816_gpio_groups[] = { +"gpio0" , +}; +/* RK805: 2 output only GPIOs */ static const struct pinctrl_pin_desc rk805_pins_desc[] = {PINCTRL_PIN (RK805_GPIO0 ,"gpio0" ),
@@ -128,6 +141,11 @@ static const struct pinctrl_pin_desc rk806_pins_desc[] = { PINCTRL_PIN(RK806_GPIO_DVS3, "gpio_pwrctrl3"), }; +/* RK816 */ +static const struct pinctrl_pin_desc rk816_pins_desc[] = { +PINCTRL_PIN (RK816_GPIO0 ,"gpio0" ), +}; +static const struct rk805_pin_function rk805_pin_functions[] = { { .name ="gpio" ,
@@ -176,6 +194,21 @@ static const struct rk805_pin_function rk806_pin_functions[] = { }, }; +static const struct rk805_pin_function rk816_pin_functions[] = { + { + .name ="gpio" , + .groups = rk816_gpio_groups, + .ngroups =ARRAY_SIZE (rk816_gpio_groups), + .mux_option =RK816_PINMUX_GPIO , + }, + { + .name ="thermistor" , + .groups = rk816_gpio_groups, + .ngroups =ARRAY_SIZE (rk816_gpio_groups), + .mux_option =RK816_PINMUX_THERMISTOR , + }, +}; +static const struct rk805_pin_group rk805_pin_groups[] = { { .name ="gpio0" ,
@@ -207,6 +240,14 @@ static const struct rk805_pin_group rk806_pin_groups[] = { } }; +static const struct rk805_pin_group rk816_pin_groups[] = { + { + .name ="gpio0" , + .pins = {RK816_GPIO0 }, + .npins =1 , + }, +}; +#define RK805_GPIO0_VAL_MSK BIT(0)#define RK805_GPIO1_VAL_MSK BIT(1)
@@ -255,6 +296,20 @@ static struct rk805_pin_config rk806_gpio_cfgs[] = { } }; +#define RK816_FUN_MASK BIT(2) +#define RK816_VAL_MASK BIT(3) +#define RK816_DIR_MASK BIT(4) + +static struct rk805_pin_config rk816_gpio_cfgs[] = { + { + .fun_reg =RK818_IO_POL_REG , + .fun_msk =RK816_FUN_MASK , + .reg =RK818_IO_POL_REG , + .val_msk =RK816_VAL_MASK , + .dir_msk =RK816_DIR_MASK , + }, +}; +/* generic gpio chip */ static int rk805_gpio_get (struct gpio_chip *chip,unsigned int offset) {
@@ -439,6 +494,8 @@ static int rk805_pinctrl_gpio_request_enable(struct pinctrl_dev *pctldev,return _rk805_pinctrl_set_mux (pctldev, offset,RK805_PINMUX_GPIO );case RK806_ID :return _rk805_pinctrl_set_mux (pctldev, offset,RK806_PINMUX_FUN5 ); +case RK816_ID : +return _rk805_pinctrl_set_mux (pctldev, offset,RK816_PINMUX_GPIO ); }return -ENOTSUPP ;
@@ -588,6 +645,18 @@ static int rk805_pinctrl_probe(struct platform_device *pdev) pci->pin_cfg = rk806_gpio_cfgs; pci->gpio_chip.ngpio =ARRAY_SIZE (rk806_gpio_cfgs);break ; +case RK816_ID : + pci->pins = rk816_pins_desc; + pci->num_pins =ARRAY_SIZE (rk816_pins_desc); + pci->functions = rk816_pin_functions; + pci->num_functions =ARRAY_SIZE (rk816_pin_functions); + pci->groups = rk816_pin_groups; + pci->num_pin_groups =ARRAY_SIZE (rk816_pin_groups); + pci->pinctrl_desc.pins = rk816_pins_desc; + pci->pinctrl_desc.npins =ARRAY_SIZE (rk816_pins_desc); + pci->pin_cfg = rk816_gpio_cfgs; + pci->gpio_chip.ngpio =ARRAY_SIZE (rk816_gpio_cfgs); +break ;default :dev_err (&pdev->dev,"unsupported RK805 ID %lu\n" , pci->rk808->variant);
Signature · 1 line
2.43.2
PATCH v3 4/5 regulator: rk808: Support apply_bit for rk808_set_suspend_voltage_range
In reply to Alex Beerk808_set_suspend_voltage_range currently does not account the existence of apply_bit/apply_reg.
This adds support for those in same way it is done in regulator_set_voltage_sel_regmap and is required for the upcoming RK816 support
---
changes since v1:
- none
drivers/regulator/rk808-regulator.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/regulator/rk808-regulator.c +13 -3
@@ -534,15 +534,25 @@ static int rk808_set_suspend_voltage_range(struct regulator_dev *rdev, int uv) {unsigned int reg;int sel =regulator_map_voltage_linear_range (rdev, uv, uv); +int ret;if (sel <0 )return -EINVAL ; reg = rdev->desc->vsel_reg +RK808_SLP_REG_OFFSET ; -return regmap_update_bits (rdev->regmap, reg, - rdev->desc->vsel_mask, - sel); + ret =regmap_update_bits (rdev->regmap, reg, + rdev->desc->vsel_mask, + sel); +if (ret) +return ret; + +if (rdev->desc->apply_bit) + ret =regmap_update_bits (rdev->regmap, rdev->desc->apply_reg, + rdev->desc->apply_bit, + rdev->desc->apply_bit); + +return ret; }static int rk805_set_suspend_enable (struct regulator_dev *rdev)
Signature · 1 line
2.43.2
PATCH v3 5/5 regulator: rk808: Add RK816 support
In reply to Alex BeeAdd support for rk816 to the existing rk808 regulator driver.
The infrastructure of the driver can be re-used as is. A peculiarity for this version is, that BUCK1/BUCK2 have a (common) bit which needs to toggled after a voltage change to confirm the change. Regulator regmap takes care of that by defining a apply_bit and apply_reg for those regulators.
---
changes since v1:
- align regulator's .name and .of_match with updated binding
changes since v2:
- align regulator's .name and .of_match with updated binding (dropped "-regulator" prefix)
drivers/regulator/rk808-regulator.c | 202 +++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 1 deletion(-)
drivers/regulator/rk808-regulator.c +201 -1
@@ -158,6 +158,11 @@RK8XX_DESC_COM (_id, _match, _supply, _min, _max, _step, _vreg, \ _vmask, _ereg, _emask, 0, 0, _etime, &rk808_reg_ops) +#define RK816_DESC (_id, _match, _supply, _min, _max, _step, _vreg, \ + _vmask, _ereg, _emask, _disval, _etime) \ + RK8XX_DESC_COM(_id, _match, _supply, _min, _max, _step, _vreg, \ + _vmask, _ereg, _emask, _emask, _disval, _etime, &rk816_reg_ops) +#define RK817_DESC (_id, _match, _supply, _min, _max, _step, _vreg, \ _vmask, _ereg, _emask, _disval, _etime) \ RK8XX_DESC_COM(_id, _match, _supply, _min, _max, _step, _vreg, \
@@ -258,7 +263,7 @@ static const unsigned int rk808_buck1_2_ramp_table[] = { 2000, 4000, 6000, 10000 }; -/* RK817 RK809 */ +/* RK817/RK809/RK816 (buck 1/2 only) */ static const unsigned int rk817_buck1_4_ramp_table[] = {3000 ,6300 ,12500 ,25000 };
@@ -640,6 +645,38 @@ static int rk808_set_suspend_disable(struct regulator_dev *rdev) rdev->desc->enable_mask); } +static const struct rk8xx_register_bit rk816_suspend_bits[] = { +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG1 ,0 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG1 ,1 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG1 ,2 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG1 ,3 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG2 ,0 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG2 ,1 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG2 ,2 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG2 ,3 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG2 ,4 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG2 ,5 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG1 ,5 ), +RK8XX_REG_BIT (RK818_SLEEP_SET_OFF_REG1 ,6 ), +}; + +static int rk816_set_suspend_enable (struct regulator_dev *rdev) +{ +int rid =rdev_get_id (rdev); + +return regmap_update_bits (rdev->regmap, rk816_suspend_bits[rid].reg, + rk816_suspend_bits[rid].bit, + rk816_suspend_bits[rid].bit); +} + +static int rk816_set_suspend_disable (struct regulator_dev *rdev) +{ +int rid =rdev_get_id (rdev); + +return regmap_update_bits (rdev->regmap, rk816_suspend_bits[rid].reg, + rk816_suspend_bits[rid].bit,0 ); +} +static int rk817_set_suspend_enable_ctrl (struct regulator_dev *rdev,unsigned int en) {
@@ -913,6 +950,54 @@ static const struct regulator_ops rk809_buck5_ops_range = { .set_suspend_disable = rk817_set_suspend_disable, }; +static const struct regulator_ops rk816_buck1_2_ops_ranges = { + .list_voltage = regulator_list_voltage_linear_range, + .map_voltage = regulator_map_voltage_linear_range, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .set_voltage_time_sel = regulator_set_voltage_time_sel, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, + .set_mode = rk8xx_set_mode, + .get_mode = rk8xx_get_mode, + .set_suspend_mode = rk8xx_set_suspend_mode, + .set_ramp_delay = regulator_set_ramp_delay_regmap, + .set_suspend_voltage = rk808_set_suspend_voltage_range, + .set_suspend_enable = rk816_set_suspend_enable, + .set_suspend_disable = rk816_set_suspend_disable, +}; + +static const struct regulator_ops rk816_buck4_ops_ranges = { + .list_voltage = regulator_list_voltage_linear_range, + .map_voltage = regulator_map_voltage_linear_range, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .set_voltage_time_sel = regulator_set_voltage_time_sel, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, + .set_mode = rk8xx_set_mode, + .get_mode = rk8xx_get_mode, + .set_suspend_mode = rk8xx_set_suspend_mode, + .set_suspend_voltage = rk808_set_suspend_voltage_range, + .set_suspend_enable = rk816_set_suspend_enable, + .set_suspend_disable = rk816_set_suspend_disable, +}; + +static const struct regulator_ops rk816_reg_ops = { + .list_voltage = regulator_list_voltage_linear, + .map_voltage = regulator_map_voltage_linear, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = rk8xx_is_enabled_wmsk_regmap, + .set_suspend_voltage = rk808_set_suspend_voltage, + .set_suspend_enable = rk816_set_suspend_enable, + .set_suspend_disable = rk816_set_suspend_disable, +}; +static const struct regulator_ops rk817_reg_ops = { .list_voltage = regulator_list_voltage_linear, .map_voltage = regulator_map_voltage_linear,
@@ -1392,6 +1477,117 @@ static const struct regulator_desc rk809_reg[] = { DISABLE_VAL(3)), }; +static const struct linear_range rk816_buck_4_voltage_ranges[] = { +REGULATOR_LINEAR_RANGE (800000 ,0 ,26 ,100000 ), +REGULATOR_LINEAR_RANGE (3500000 ,27 ,31 ,0 ), +}; + +static const struct regulator_desc rk816_reg[] = { + { + .name ="dcdc1" , + .supply_name ="vcc1" , + .of_match =of_match_ptr ("dcdc1" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =RK816_ID_DCDC1 , + .ops = &rk816_buck1_2_ops_ranges, + .type =REGULATOR_VOLTAGE , + .n_voltages =64 , + .linear_ranges = rk805_buck_1_2_voltage_ranges, + .n_linear_ranges =ARRAY_SIZE (rk805_buck_1_2_voltage_ranges), + .vsel_reg =RK818_BUCK1_ON_VSEL_REG , + .vsel_mask =RK818_BUCK_VSEL_MASK , + .apply_reg =RK816_DCDC_EN_REG2 , + .apply_bit =RK816_BUCK_DVS_CONFIRM , + .enable_reg =RK816_DCDC_EN_REG1 , + .enable_mask =BIT (4 ) |BIT (0 ), + .enable_val =BIT (4 ) |BIT (0 ), + .disable_val =BIT (4 ), + .ramp_reg =RK818_BUCK1_CONFIG_REG , + .ramp_mask =RK808_RAMP_RATE_MASK , + .ramp_delay_table = rk817_buck1_4_ramp_table, + .n_ramp_values =ARRAY_SIZE (rk817_buck1_4_ramp_table), + .of_map_mode = rk8xx_regulator_of_map_mode, + .owner =THIS_MODULE , + }, { + .name ="dcdc2" , + .supply_name ="vcc2" , + .of_match =of_match_ptr ("dcdc2" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =RK816_ID_DCDC2 , + .ops = &rk816_buck1_2_ops_ranges, + .type =REGULATOR_VOLTAGE , + .n_voltages =64 , + .linear_ranges = rk805_buck_1_2_voltage_ranges, + .n_linear_ranges =ARRAY_SIZE (rk805_buck_1_2_voltage_ranges), + .vsel_reg =RK818_BUCK2_ON_VSEL_REG , + .vsel_mask =RK818_BUCK_VSEL_MASK , + .apply_reg =RK816_DCDC_EN_REG2 , + .apply_bit =RK816_BUCK_DVS_CONFIRM , + .enable_reg =RK816_DCDC_EN_REG1 , + .enable_mask =BIT (5 ) |BIT (1 ), + .enable_val =BIT (5 ) |BIT (1 ), + .disable_val =BIT (5 ), + .ramp_reg =RK818_BUCK2_CONFIG_REG , + .ramp_mask =RK808_RAMP_RATE_MASK , + .ramp_delay_table = rk817_buck1_4_ramp_table, + .n_ramp_values =ARRAY_SIZE (rk817_buck1_4_ramp_table), + .of_map_mode = rk8xx_regulator_of_map_mode, + .owner =THIS_MODULE , + }, { + .name ="dcdc3" , + .supply_name ="vcc3" , + .of_match =of_match_ptr ("dcdc3" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =RK816_ID_DCDC3 , + .ops = &rk808_switch_ops, + .type =REGULATOR_VOLTAGE , + .n_voltages =1 , + .enable_reg =RK816_DCDC_EN_REG1 , + .enable_mask =BIT (6 ) |BIT (2 ), + .enable_val =BIT (6 ) |BIT (2 ), + .disable_val =BIT (6 ), + .of_map_mode = rk8xx_regulator_of_map_mode, + .owner =THIS_MODULE , + }, { + .name ="dcdc4" , + .supply_name ="vcc4" , + .of_match =of_match_ptr ("dcdc4" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =RK816_ID_DCDC4 , + .ops = &rk816_buck4_ops_ranges, + .type =REGULATOR_VOLTAGE , + .n_voltages =32 , + .linear_ranges = rk816_buck_4_voltage_ranges, + .n_linear_ranges =ARRAY_SIZE (rk816_buck_4_voltage_ranges), + .vsel_reg =RK818_BUCK4_ON_VSEL_REG , + .vsel_mask =RK818_BUCK4_VSEL_MASK , + .enable_reg =RK816_DCDC_EN_REG1 , + .enable_mask =BIT (7 ) |BIT (3 ), + .enable_val =BIT (7 ) |BIT (3 ), + .disable_val =BIT (7 ), + .of_map_mode = rk8xx_regulator_of_map_mode, + .owner =THIS_MODULE , + }, +RK816_DESC (RK816_ID_LDO1 ,"ldo1" ,"vcc5" ,800 ,3400 ,100 , +RK818_LDO1_ON_VSEL_REG ,RK818_LDO_VSEL_MASK , +RK816_LDO_EN_REG1 ,ENABLE_MASK (0 ),DISABLE_VAL (0 ),400 ), +RK816_DESC (RK816_ID_LDO2 ,"ldo2" ,"vcc5" ,800 ,3400 ,100 , +RK818_LDO2_ON_VSEL_REG ,RK818_LDO_VSEL_MASK , +RK816_LDO_EN_REG1 ,ENABLE_MASK (1 ),DISABLE_VAL (1 ),400 ), +RK816_DESC (RK816_ID_LDO3 ,"ldo3" ,"vcc5" ,800 ,3400 ,100 , +RK818_LDO3_ON_VSEL_REG ,RK818_LDO_VSEL_MASK , +RK816_LDO_EN_REG1 ,ENABLE_MASK (2 ),DISABLE_VAL (2 ),400 ), +RK816_DESC (RK816_ID_LDO4 ,"ldo4" ,"vcc6" ,800 ,3400 ,100 , +RK818_LDO4_ON_VSEL_REG ,RK818_LDO_VSEL_MASK , +RK816_LDO_EN_REG1 ,ENABLE_MASK (3 ),DISABLE_VAL (3 ),400 ), +RK816_DESC (RK816_ID_LDO5 ,"ldo5" ,"vcc6" ,800 ,3400 ,100 , +RK818_LDO5_ON_VSEL_REG ,RK818_LDO_VSEL_MASK , +RK816_LDO_EN_REG2 ,ENABLE_MASK (0 ),DISABLE_VAL (0 ),400 ), +RK816_DESC (RK816_ID_LDO6 ,"ldo6" ,"vcc6" ,800 ,3400 ,100 , +RK818_LDO6_ON_VSEL_REG ,RK818_LDO_VSEL_MASK , +RK816_LDO_EN_REG2 ,ENABLE_MASK (1 ),DISABLE_VAL (1 ),400 ), +}; +static const struct regulator_desc rk817_reg[] = { { .name ="DCDC_REG1" ,
@@ -1714,6 +1910,10 @@ static int rk808_regulator_probe(struct platform_device *pdev) regulators = rk809_reg; nregulators =RK809_NUM_REGULATORS ;break ; +case RK816_ID : + regulators = rk816_reg; + nregulators =ARRAY_SIZE (rk816_reg); +break ;case RK817_ID : regulators = rk817_reg; nregulators =RK817_NUM_REGULATORS ;
Signature · 1 line
2.43.2