mfd: rk808: Split into core and i2c
authorSebastian Reichel <sebastian.reichel@collabora.com>
Thu, 4 May 2023 17:36:09 +0000 (19:36 +0200)
committerLee Jones <lee@kernel.org>
Mon, 15 May 2023 15:19:03 +0000 (16:19 +0100)
Split rk808 into a core and an i2c part in preparation for
SPI support.

Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> # for RTC
Tested-by: Diederik de Haas <didi.debian@cknow.org> # Rock64, Quartz64 Model A + B
Tested-by: Vincent Legoll <vincent.legoll@gmail.com> # Pine64 QuartzPro64
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Link: https://lore.kernel.org/r/20230504173618.142075-6-sebastian.reichel@collabora.com
Signed-off-by: Lee Jones <lee@kernel.org>
13 files changed:
drivers/clk/Kconfig
drivers/input/misc/Kconfig
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/rk808.c [deleted file]
drivers/mfd/rk8xx-core.c [new file with mode: 0644]
drivers/mfd/rk8xx-i2c.c [new file with mode: 0644]
drivers/pinctrl/Kconfig
drivers/power/supply/Kconfig
drivers/regulator/Kconfig
drivers/rtc/Kconfig
include/linux/mfd/rk808.h
sound/soc/codecs/Kconfig

index 016814e15536a97d81be6702af644e31abfd8af7..c0c8e526a1e953898d6144230a091b33f9fb2488 100644 (file)
@@ -82,7 +82,7 @@ config COMMON_CLK_MAX9485
 
 config COMMON_CLK_RK808
        tristate "Clock driver for RK805/RK808/RK809/RK817/RK818"
-       depends on MFD_RK808
+       depends on MFD_RK8XX
        help
          This driver supports RK805, RK809 and RK817, RK808 and RK818 crystal oscillator clock.
          These multi-function devices have two fixed-rate oscillators, clocked at 32KHz each.
index 81a54a59e13c4411e7f831e49f7c99424aae2750..8a320e6218e372a36b385bc04a8fa0bfb455cbd2 100644 (file)
@@ -609,7 +609,7 @@ config INPUT_PWM_VIBRA
 
 config INPUT_RK805_PWRKEY
        tristate "Rockchip RK805 PMIC power key support"
-       depends on MFD_RK808
+       depends on MFD_RK8XX
        help
          Select this option to enable power key driver for RK805.
 
index e90463c4441ce325e17d8cf11f2b34d88c59149d..de53e6c701fd7ea8fdb1ade5961fe53f4c8a8eb0 100644 (file)
@@ -1183,12 +1183,17 @@ config MFD_RC5T583
          Additional drivers must be enabled in order to use the
          different functionality of the device.
 
-config MFD_RK808
+config MFD_RK8XX
+       bool
+       select MFD_CORE
+
+config MFD_RK8XX_I2C
        tristate "Rockchip RK805/RK808/RK809/RK817/RK818 Power Management Chip"
        depends on I2C && OF
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
+       select MFD_RK8XX
        help
          If you say yes here you get support for the RK805, RK808, RK809,
          RK817 and RK818 Power Management chips.
index 1d2392f06f78a84ad5ed919ee9b0c063a58935ca..ba373193e9996395d70259ac9851713ce885908d 100644 (file)
@@ -214,7 +214,8 @@ obj-$(CONFIG_MFD_PALMAS)    += palmas.o
 obj-$(CONFIG_MFD_VIPERBOARD)    += viperboard.o
 obj-$(CONFIG_MFD_NTXEC)                += ntxec.o
 obj-$(CONFIG_MFD_RC5T583)      += rc5t583.o rc5t583-irq.o
-obj-$(CONFIG_MFD_RK808)                += rk808.o
+obj-$(CONFIG_MFD_RK8XX)                += rk8xx-core.o
+obj-$(CONFIG_MFD_RK8XX_I2C)    += rk8xx-i2c.o
 obj-$(CONFIG_MFD_RN5T618)      += rn5t618.o
 obj-$(CONFIG_MFD_SEC_CORE)     += sec-core.o sec-irq.o
 obj-$(CONFIG_MFD_SYSCON)       += syscon.o
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
deleted file mode 100644 (file)
index ce52307..0000000
+++ /dev/null
@@ -1,845 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * MFD core driver for Rockchip RK808/RK818
- *
- * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
- *
- * Author: Chris Zhong <zyw@rock-chips.com>
- * Author: Zhang Qing <zhangqing@rock-chips.com>
- *
- * Copyright (C) 2016 PHYTEC Messtechnik GmbH
- *
- * Author: Wadim Egorov <w.egorov@phytec.de>
- */
-
-#include <linux/i2c.h>
-#include <linux/interrupt.h>
-#include <linux/mfd/rk808.h>
-#include <linux/mfd/core.h>
-#include <linux/module.h>
-#include <linux/of_device.h>
-#include <linux/regmap.h>
-#include <linux/reboot.h>
-
-struct rk808_reg_data {
-       int addr;
-       int mask;
-       int value;
-};
-
-static bool rk808_is_volatile_reg(struct device *dev, unsigned int reg)
-{
-       /*
-        * Notes:
-        * - Technically the ROUND_30s bit makes RTC_CTRL_REG volatile, but
-        *   we don't use that feature.  It's better to cache.
-        * - It's unlikely we care that RK808_DEVCTRL_REG is volatile since
-        *   bits are cleared in case when we shutoff anyway, but better safe.
-        */
-
-       switch (reg) {
-       case RK808_SECONDS_REG ... RK808_WEEKS_REG:
-       case RK808_RTC_STATUS_REG:
-       case RK808_VB_MON_REG:
-       case RK808_THERMAL_REG:
-       case RK808_DCDC_UV_STS_REG:
-       case RK808_LDO_UV_STS_REG:
-       case RK808_DCDC_PG_REG:
-       case RK808_LDO_PG_REG:
-       case RK808_DEVCTRL_REG:
-       case RK808_INT_STS_REG1:
-       case RK808_INT_STS_REG2:
-               return true;
-       }
-
-       return false;
-}
-
-static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
-{
-       /*
-        * Notes:
-        * - 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 RK817_SECONDS_REG ... RK817_WEEKS_REG:
-       case RK817_RTC_STATUS_REG:
-       case RK817_CODEC_DTOP_LPT_SRST:
-       case RK817_GAS_GAUGE_ADC_CONFIG0 ... RK817_GAS_GAUGE_CUR_ADC_K0:
-       case RK817_PMIC_CHRG_STS:
-       case RK817_PMIC_CHRG_OUT:
-       case RK817_PMIC_CHRG_IN:
-       case RK817_INT_STS_REG0:
-       case RK817_INT_STS_REG1:
-       case RK817_INT_STS_REG2:
-       case RK817_SYS_STS:
-               return true;
-       }
-
-       return false;
-}
-
-static const struct regmap_config rk818_regmap_config = {
-       .reg_bits = 8,
-       .val_bits = 8,
-       .max_register = RK818_USB_CTRL_REG,
-       .cache_type = REGCACHE_RBTREE,
-       .volatile_reg = rk808_is_volatile_reg,
-};
-
-static const struct regmap_config rk805_regmap_config = {
-       .reg_bits = 8,
-       .val_bits = 8,
-       .max_register = RK805_OFF_SOURCE_REG,
-       .cache_type = REGCACHE_RBTREE,
-       .volatile_reg = rk808_is_volatile_reg,
-};
-
-static const struct regmap_config rk808_regmap_config = {
-       .reg_bits = 8,
-       .val_bits = 8,
-       .max_register = RK808_IO_POL_REG,
-       .cache_type = REGCACHE_RBTREE,
-       .volatile_reg = rk808_is_volatile_reg,
-};
-
-static const struct regmap_config rk817_regmap_config = {
-       .reg_bits = 8,
-       .val_bits = 8,
-       .max_register = RK817_GPIO_INT_CFG,
-       .cache_type = REGCACHE_NONE,
-       .volatile_reg = rk817_is_volatile_reg,
-};
-
-static const struct resource rtc_resources[] = {
-       DEFINE_RES_IRQ(RK808_IRQ_RTC_ALARM),
-};
-
-static const struct resource rk817_rtc_resources[] = {
-       DEFINE_RES_IRQ(RK817_IRQ_RTC_ALARM),
-};
-
-static const struct resource rk805_key_resources[] = {
-       DEFINE_RES_IRQ(RK805_IRQ_PWRON_RISE),
-       DEFINE_RES_IRQ(RK805_IRQ_PWRON_FALL),
-};
-
-static const struct resource rk817_pwrkey_resources[] = {
-       DEFINE_RES_IRQ(RK817_IRQ_PWRON_RISE),
-       DEFINE_RES_IRQ(RK817_IRQ_PWRON_FALL),
-};
-
-static const struct resource rk817_charger_resources[] = {
-       DEFINE_RES_IRQ(RK817_IRQ_PLUG_IN),
-       DEFINE_RES_IRQ(RK817_IRQ_PLUG_OUT),
-};
-
-static const struct mfd_cell rk805s[] = {
-       { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, },
-       { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, },
-       { .name = "rk805-pinctrl", .id = PLATFORM_DEVID_NONE, },
-       {
-               .name = "rk808-rtc",
-               .num_resources = ARRAY_SIZE(rtc_resources),
-               .resources = &rtc_resources[0],
-               .id = PLATFORM_DEVID_NONE,
-       },
-       {       .name = "rk805-pwrkey",
-               .num_resources = ARRAY_SIZE(rk805_key_resources),
-               .resources = &rk805_key_resources[0],
-               .id = PLATFORM_DEVID_NONE,
-       },
-};
-
-static const struct mfd_cell rk808s[] = {
-       { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, },
-       { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, },
-       {
-               .name = "rk808-rtc",
-               .num_resources = ARRAY_SIZE(rtc_resources),
-               .resources = rtc_resources,
-               .id = PLATFORM_DEVID_NONE,
-       },
-};
-
-static const struct mfd_cell rk817s[] = {
-       { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, },
-       { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, },
-       {
-               .name = "rk805-pwrkey",
-               .num_resources = ARRAY_SIZE(rk817_pwrkey_resources),
-               .resources = &rk817_pwrkey_resources[0],
-               .id = PLATFORM_DEVID_NONE,
-       },
-       {
-               .name = "rk808-rtc",
-               .num_resources = ARRAY_SIZE(rk817_rtc_resources),
-               .resources = &rk817_rtc_resources[0],
-               .id = PLATFORM_DEVID_NONE,
-       },
-       { .name = "rk817-codec", .id = PLATFORM_DEVID_NONE, },
-       {
-               .name = "rk817-charger",
-               .num_resources = ARRAY_SIZE(rk817_charger_resources),
-               .resources = &rk817_charger_resources[0],
-               .id = PLATFORM_DEVID_NONE,
-       },
-};
-
-static const struct mfd_cell rk818s[] = {
-       { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, },
-       { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, },
-       {
-               .name = "rk808-rtc",
-               .num_resources = ARRAY_SIZE(rtc_resources),
-               .resources = rtc_resources,
-               .id = PLATFORM_DEVID_NONE,
-       },
-};
-
-static const struct rk808_reg_data rk805_pre_init_reg[] = {
-       {RK805_BUCK1_CONFIG_REG, RK805_BUCK1_2_ILMAX_MASK,
-                                RK805_BUCK1_2_ILMAX_4000MA},
-       {RK805_BUCK2_CONFIG_REG, RK805_BUCK1_2_ILMAX_MASK,
-                                RK805_BUCK1_2_ILMAX_4000MA},
-       {RK805_BUCK3_CONFIG_REG, RK805_BUCK3_4_ILMAX_MASK,
-                                RK805_BUCK3_ILMAX_3000MA},
-       {RK805_BUCK4_CONFIG_REG, RK805_BUCK3_4_ILMAX_MASK,
-                                RK805_BUCK4_ILMAX_3500MA},
-       {RK805_BUCK4_CONFIG_REG, BUCK_ILMIN_MASK, BUCK_ILMIN_400MA},
-       {RK805_THERMAL_REG, TEMP_HOTDIE_MSK, TEMP115C},
-};
-
-static const struct rk808_reg_data rk808_pre_init_reg[] = {
-       { RK808_BUCK3_CONFIG_REG, BUCK_ILMIN_MASK,  BUCK_ILMIN_150MA },
-       { RK808_BUCK4_CONFIG_REG, BUCK_ILMIN_MASK,  BUCK_ILMIN_200MA },
-       { RK808_BOOST_CONFIG_REG, BOOST_ILMIN_MASK, BOOST_ILMIN_100MA },
-       { RK808_BUCK1_CONFIG_REG, BUCK1_RATE_MASK,  BUCK_ILMIN_200MA },
-       { RK808_BUCK2_CONFIG_REG, BUCK2_RATE_MASK,  BUCK_ILMIN_200MA },
-       { RK808_DCDC_UV_ACT_REG,  BUCK_UV_ACT_MASK, BUCK_UV_ACT_DISABLE},
-       { RK808_VB_MON_REG,       MASK_ALL,         VB_LO_ACT |
-                                                   VB_LO_SEL_3500MV },
-};
-
-static const struct rk808_reg_data rk817_pre_init_reg[] = {
-       {RK817_RTC_CTRL_REG, RTC_STOP, RTC_STOP},
-       /* Codec specific registers */
-       { RK817_CODEC_DTOP_VUCTL, MASK_ALL, 0x03 },
-       { RK817_CODEC_DTOP_VUCTIME, MASK_ALL, 0x00 },
-       { RK817_CODEC_DTOP_LPT_SRST, MASK_ALL, 0x00 },
-       { RK817_CODEC_DTOP_DIGEN_CLKE, MASK_ALL, 0x00 },
-       /* from vendor driver, CODEC_AREF_RTCFG0 not defined in data sheet */
-       { RK817_CODEC_AREF_RTCFG0, MASK_ALL, 0x00 },
-       { RK817_CODEC_AREF_RTCFG1, MASK_ALL, 0x06 },
-       { RK817_CODEC_AADC_CFG0, MASK_ALL, 0xc8 },
-       /* from vendor driver, CODEC_AADC_CFG1 not defined in data sheet */
-       { RK817_CODEC_AADC_CFG1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DADC_VOLL, MASK_ALL, 0x00 },
-       { RK817_CODEC_DADC_VOLR, MASK_ALL, 0x00 },
-       { RK817_CODEC_DADC_SR_ACL0, MASK_ALL, 0x00 },
-       { RK817_CODEC_DADC_ALC1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DADC_ALC2, MASK_ALL, 0x00 },
-       { RK817_CODEC_DADC_NG, MASK_ALL, 0x00 },
-       { RK817_CODEC_DADC_HPF, MASK_ALL, 0x00 },
-       { RK817_CODEC_DADC_RVOLL, MASK_ALL, 0xff },
-       { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
-       { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
-       { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
-       { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
-       { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
-       /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
-       { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
-       { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
-       { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
-       { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
-       { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
-       { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
-       { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
-       { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
-       { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
-       { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
-       /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
-       { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
-       { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
-       { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
-       { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
-       { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
-       { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
-       { RK817_CODEC_DDAC_RVOLR, MASK_ALL, 0xff },
-       { RK817_CODEC_AHP_ANTI0, MASK_ALL, 0x00 },
-       { RK817_CODEC_AHP_ANTI1, MASK_ALL, 0x00 },
-       { RK817_CODEC_AHP_CFG0, MASK_ALL, 0xe0 },
-       { RK817_CODEC_AHP_CFG1, MASK_ALL, 0x1f },
-       { RK817_CODEC_AHP_CP, MASK_ALL, 0x09 },
-       { RK817_CODEC_ACLASSD_CFG1, MASK_ALL, 0x69 },
-       { RK817_CODEC_ACLASSD_CFG2, MASK_ALL, 0x44 },
-       { RK817_CODEC_APLL_CFG0, MASK_ALL, 0x04 },
-       { RK817_CODEC_APLL_CFG1, MASK_ALL, 0x00 },
-       { RK817_CODEC_APLL_CFG2, MASK_ALL, 0x30 },
-       { RK817_CODEC_APLL_CFG3, MASK_ALL, 0x19 },
-       { RK817_CODEC_APLL_CFG4, MASK_ALL, 0x65 },
-       { RK817_CODEC_APLL_CFG5, MASK_ALL, 0x01 },
-       { RK817_CODEC_DI2S_CKM, MASK_ALL, 0x01 },
-       { RK817_CODEC_DI2S_RSD, MASK_ALL, 0x00 },
-       { RK817_CODEC_DI2S_RXCR1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DI2S_RXCR2, MASK_ALL, 0x17 },
-       { RK817_CODEC_DI2S_RXCMD_TSD, MASK_ALL, 0x00 },
-       { RK817_CODEC_DI2S_TXCR1, MASK_ALL, 0x00 },
-       { RK817_CODEC_DI2S_TXCR2, MASK_ALL, 0x17 },
-       { RK817_CODEC_DI2S_TXCR3_TXCMD, MASK_ALL, 0x00 },
-       {RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L},
-       {RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK,
-                                          RK817_HOTDIE_105 | RK817_TSD_140},
-};
-
-static const struct rk808_reg_data rk818_pre_init_reg[] = {
-       /* improve efficiency */
-       { RK818_BUCK2_CONFIG_REG, BUCK2_RATE_MASK,  BUCK_ILMIN_250MA },
-       { RK818_BUCK4_CONFIG_REG, BUCK_ILMIN_MASK,  BUCK_ILMIN_250MA },
-       { RK818_BOOST_CONFIG_REG, BOOST_ILMIN_MASK, BOOST_ILMIN_100MA },
-       { RK818_USB_CTRL_REG,     RK818_USB_ILIM_SEL_MASK,
-                                                   RK818_USB_ILMIN_2000MA },
-       /* close charger when usb lower then 3.4V */
-       { RK818_USB_CTRL_REG,     RK818_USB_CHG_SD_VSEL_MASK,
-                                                   (0x7 << 4) },
-       /* no action when vref */
-       { RK818_H5V_EN_REG,       BIT(1),           RK818_REF_RDY_CTRL },
-       /* enable HDMI 5V */
-       { RK818_H5V_EN_REG,       BIT(0),           RK818_H5V_EN },
-       { RK808_VB_MON_REG,       MASK_ALL,         VB_LO_ACT |
-                                                   VB_LO_SEL_3500MV },
-};
-
-static const struct regmap_irq rk805_irqs[] = {
-       [RK805_IRQ_PWRON_RISE] = {
-               .mask = RK805_IRQ_PWRON_RISE_MSK,
-               .reg_offset = 0,
-       },
-       [RK805_IRQ_VB_LOW] = {
-               .mask = RK805_IRQ_VB_LOW_MSK,
-               .reg_offset = 0,
-       },
-       [RK805_IRQ_PWRON] = {
-               .mask = RK805_IRQ_PWRON_MSK,
-               .reg_offset = 0,
-       },
-       [RK805_IRQ_PWRON_LP] = {
-               .mask = RK805_IRQ_PWRON_LP_MSK,
-               .reg_offset = 0,
-       },
-       [RK805_IRQ_HOTDIE] = {
-               .mask = RK805_IRQ_HOTDIE_MSK,
-               .reg_offset = 0,
-       },
-       [RK805_IRQ_RTC_ALARM] = {
-               .mask = RK805_IRQ_RTC_ALARM_MSK,
-               .reg_offset = 0,
-       },
-       [RK805_IRQ_RTC_PERIOD] = {
-               .mask = RK805_IRQ_RTC_PERIOD_MSK,
-               .reg_offset = 0,
-       },
-       [RK805_IRQ_PWRON_FALL] = {
-               .mask = RK805_IRQ_PWRON_FALL_MSK,
-               .reg_offset = 0,
-       },
-};
-
-static const struct regmap_irq rk808_irqs[] = {
-       /* INT_STS */
-       [RK808_IRQ_VOUT_LO] = {
-               .mask = RK808_IRQ_VOUT_LO_MSK,
-               .reg_offset = 0,
-       },
-       [RK808_IRQ_VB_LO] = {
-               .mask = RK808_IRQ_VB_LO_MSK,
-               .reg_offset = 0,
-       },
-       [RK808_IRQ_PWRON] = {
-               .mask = RK808_IRQ_PWRON_MSK,
-               .reg_offset = 0,
-       },
-       [RK808_IRQ_PWRON_LP] = {
-               .mask = RK808_IRQ_PWRON_LP_MSK,
-               .reg_offset = 0,
-       },
-       [RK808_IRQ_HOTDIE] = {
-               .mask = RK808_IRQ_HOTDIE_MSK,
-               .reg_offset = 0,
-       },
-       [RK808_IRQ_RTC_ALARM] = {
-               .mask = RK808_IRQ_RTC_ALARM_MSK,
-               .reg_offset = 0,
-       },
-       [RK808_IRQ_RTC_PERIOD] = {
-               .mask = RK808_IRQ_RTC_PERIOD_MSK,
-               .reg_offset = 0,
-       },
-
-       /* INT_STS2 */
-       [RK808_IRQ_PLUG_IN_INT] = {
-               .mask = RK808_IRQ_PLUG_IN_INT_MSK,
-               .reg_offset = 1,
-       },
-       [RK808_IRQ_PLUG_OUT_INT] = {
-               .mask = RK808_IRQ_PLUG_OUT_INT_MSK,
-               .reg_offset = 1,
-       },
-};
-
-static const struct regmap_irq rk818_irqs[] = {
-       /* INT_STS */
-       [RK818_IRQ_VOUT_LO] = {
-               .mask = RK818_IRQ_VOUT_LO_MSK,
-               .reg_offset = 0,
-       },
-       [RK818_IRQ_VB_LO] = {
-               .mask = RK818_IRQ_VB_LO_MSK,
-               .reg_offset = 0,
-       },
-       [RK818_IRQ_PWRON] = {
-               .mask = RK818_IRQ_PWRON_MSK,
-               .reg_offset = 0,
-       },
-       [RK818_IRQ_PWRON_LP] = {
-               .mask = RK818_IRQ_PWRON_LP_MSK,
-               .reg_offset = 0,
-       },
-       [RK818_IRQ_HOTDIE] = {
-               .mask = RK818_IRQ_HOTDIE_MSK,
-               .reg_offset = 0,
-       },
-       [RK818_IRQ_RTC_ALARM] = {
-               .mask = RK818_IRQ_RTC_ALARM_MSK,
-               .reg_offset = 0,
-       },
-       [RK818_IRQ_RTC_PERIOD] = {
-               .mask = RK818_IRQ_RTC_PERIOD_MSK,
-               .reg_offset = 0,
-       },
-       [RK818_IRQ_USB_OV] = {
-               .mask = RK818_IRQ_USB_OV_MSK,
-               .reg_offset = 0,
-       },
-
-       /* INT_STS2 */
-       [RK818_IRQ_PLUG_IN] = {
-               .mask = RK818_IRQ_PLUG_IN_MSK,
-               .reg_offset = 1,
-       },
-       [RK818_IRQ_PLUG_OUT] = {
-               .mask = RK818_IRQ_PLUG_OUT_MSK,
-               .reg_offset = 1,
-       },
-       [RK818_IRQ_CHG_OK] = {
-               .mask = RK818_IRQ_CHG_OK_MSK,
-               .reg_offset = 1,
-       },
-       [RK818_IRQ_CHG_TE] = {
-               .mask = RK818_IRQ_CHG_TE_MSK,
-               .reg_offset = 1,
-       },
-       [RK818_IRQ_CHG_TS1] = {
-               .mask = RK818_IRQ_CHG_TS1_MSK,
-               .reg_offset = 1,
-       },
-       [RK818_IRQ_TS2] = {
-               .mask = RK818_IRQ_TS2_MSK,
-               .reg_offset = 1,
-       },
-       [RK818_IRQ_CHG_CVTLIM] = {
-               .mask = RK818_IRQ_CHG_CVTLIM_MSK,
-               .reg_offset = 1,
-       },
-       [RK818_IRQ_DISCHG_ILIM] = {
-               .mask = RK818_IRQ_DISCHG_ILIM_MSK,
-               .reg_offset = 1,
-       },
-};
-
-static const struct regmap_irq rk817_irqs[RK817_IRQ_END] = {
-       REGMAP_IRQ_REG_LINE(0, 8),
-       REGMAP_IRQ_REG_LINE(1, 8),
-       REGMAP_IRQ_REG_LINE(2, 8),
-       REGMAP_IRQ_REG_LINE(3, 8),
-       REGMAP_IRQ_REG_LINE(4, 8),
-       REGMAP_IRQ_REG_LINE(5, 8),
-       REGMAP_IRQ_REG_LINE(6, 8),
-       REGMAP_IRQ_REG_LINE(7, 8),
-       REGMAP_IRQ_REG_LINE(8, 8),
-       REGMAP_IRQ_REG_LINE(9, 8),
-       REGMAP_IRQ_REG_LINE(10, 8),
-       REGMAP_IRQ_REG_LINE(11, 8),
-       REGMAP_IRQ_REG_LINE(12, 8),
-       REGMAP_IRQ_REG_LINE(13, 8),
-       REGMAP_IRQ_REG_LINE(14, 8),
-       REGMAP_IRQ_REG_LINE(15, 8),
-       REGMAP_IRQ_REG_LINE(16, 8),
-       REGMAP_IRQ_REG_LINE(17, 8),
-       REGMAP_IRQ_REG_LINE(18, 8),
-       REGMAP_IRQ_REG_LINE(19, 8),
-       REGMAP_IRQ_REG_LINE(20, 8),
-       REGMAP_IRQ_REG_LINE(21, 8),
-       REGMAP_IRQ_REG_LINE(22, 8),
-       REGMAP_IRQ_REG_LINE(23, 8)
-};
-
-static struct regmap_irq_chip rk805_irq_chip = {
-       .name = "rk805",
-       .irqs = rk805_irqs,
-       .num_irqs = ARRAY_SIZE(rk805_irqs),
-       .num_regs = 1,
-       .status_base = RK805_INT_STS_REG,
-       .mask_base = RK805_INT_STS_MSK_REG,
-       .ack_base = RK805_INT_STS_REG,
-       .init_ack_masked = true,
-};
-
-static const struct regmap_irq_chip rk808_irq_chip = {
-       .name = "rk808",
-       .irqs = rk808_irqs,
-       .num_irqs = ARRAY_SIZE(rk808_irqs),
-       .num_regs = 2,
-       .irq_reg_stride = 2,
-       .status_base = RK808_INT_STS_REG1,
-       .mask_base = RK808_INT_STS_MSK_REG1,
-       .ack_base = RK808_INT_STS_REG1,
-       .init_ack_masked = true,
-};
-
-static struct regmap_irq_chip rk817_irq_chip = {
-       .name = "rk817",
-       .irqs = rk817_irqs,
-       .num_irqs = ARRAY_SIZE(rk817_irqs),
-       .num_regs = 3,
-       .irq_reg_stride = 2,
-       .status_base = RK817_INT_STS_REG0,
-       .mask_base = RK817_INT_STS_MSK_REG0,
-       .ack_base = RK817_INT_STS_REG0,
-       .init_ack_masked = true,
-};
-
-static const struct regmap_irq_chip rk818_irq_chip = {
-       .name = "rk818",
-       .irqs = rk818_irqs,
-       .num_irqs = ARRAY_SIZE(rk818_irqs),
-       .num_regs = 2,
-       .irq_reg_stride = 2,
-       .status_base = RK818_INT_STS_REG1,
-       .mask_base = RK818_INT_STS_MSK_REG1,
-       .ack_base = RK818_INT_STS_REG1,
-       .init_ack_masked = true,
-};
-
-static int rk808_power_off(struct sys_off_data *data)
-{
-       struct rk808 *rk808 = data->cb_data;
-       int ret;
-       unsigned int reg, bit;
-
-       switch (rk808->variant) {
-       case RK805_ID:
-               reg = RK805_DEV_CTRL_REG;
-               bit = DEV_OFF;
-               break;
-       case RK808_ID:
-               reg = RK808_DEVCTRL_REG,
-               bit = DEV_OFF_RST;
-               break;
-       case RK809_ID:
-       case RK817_ID:
-               reg = RK817_SYS_CFG(3);
-               bit = DEV_OFF;
-               break;
-       case RK818_ID:
-               reg = RK818_DEVCTRL_REG;
-               bit = DEV_OFF;
-               break;
-       default:
-               return NOTIFY_DONE;
-       }
-       ret = regmap_update_bits(rk808->regmap, reg, bit, bit);
-       if (ret)
-               dev_err(rk808->dev, "Failed to shutdown device!\n");
-
-       return NOTIFY_DONE;
-}
-
-static int rk808_restart(struct sys_off_data *data)
-{
-       struct rk808 *rk808 = data->cb_data;
-       unsigned int reg, bit;
-       int ret;
-
-       switch (rk808->variant) {
-       case RK809_ID:
-       case RK817_ID:
-               reg = RK817_SYS_CFG(3);
-               bit = DEV_RST;
-               break;
-
-       default:
-               return NOTIFY_DONE;
-       }
-       ret = regmap_update_bits(rk808->regmap, reg, bit, bit);
-       if (ret)
-               dev_err(rk808->dev, "Failed to restart device!\n");
-
-       return NOTIFY_DONE;
-}
-
-static void rk8xx_shutdown(struct i2c_client *client)
-{
-       struct rk808 *rk808 = i2c_get_clientdata(client);
-       int ret;
-
-       switch (rk808->variant) {
-       case RK805_ID:
-               ret = regmap_update_bits(rk808->regmap,
-                                        RK805_GPIO_IO_POL_REG,
-                                        SLP_SD_MSK,
-                                        SHUTDOWN_FUN);
-               break;
-       case RK809_ID:
-       case RK817_ID:
-               ret = regmap_update_bits(rk808->regmap,
-                                        RK817_SYS_CFG(3),
-                                        RK817_SLPPIN_FUNC_MSK,
-                                        SLPPIN_DN_FUN);
-               break;
-       default:
-               return;
-       }
-       if (ret)
-               dev_warn(&client->dev,
-                        "Cannot switch to power down function\n");
-}
-
-static const struct of_device_id rk808_of_match[] = {
-       { .compatible = "rockchip,rk805" },
-       { .compatible = "rockchip,rk808" },
-       { .compatible = "rockchip,rk809" },
-       { .compatible = "rockchip,rk817" },
-       { .compatible = "rockchip,rk818" },
-       { },
-};
-MODULE_DEVICE_TABLE(of, rk808_of_match);
-
-static int rk808_probe(struct i2c_client *client)
-{
-       struct device_node *np = client->dev.of_node;
-       struct rk808 *rk808;
-       const struct rk808_reg_data *pre_init_reg;
-       const struct mfd_cell *cells;
-       int nr_pre_init_regs;
-       int nr_cells;
-       int msb, lsb;
-       unsigned char pmic_id_msb, pmic_id_lsb;
-       int ret;
-       int i;
-
-       rk808 = devm_kzalloc(&client->dev, sizeof(*rk808), GFP_KERNEL);
-       if (!rk808)
-               return -ENOMEM;
-
-       if (of_device_is_compatible(np, "rockchip,rk817") ||
-           of_device_is_compatible(np, "rockchip,rk809")) {
-               pmic_id_msb = RK817_ID_MSB;
-               pmic_id_lsb = RK817_ID_LSB;
-       } else {
-               pmic_id_msb = RK808_ID_MSB;
-               pmic_id_lsb = RK808_ID_LSB;
-       }
-
-       /* Read chip variant */
-       msb = i2c_smbus_read_byte_data(client, pmic_id_msb);
-       if (msb < 0)
-               return dev_err_probe(&client->dev, msb, "failed to read the chip id MSB\n");
-
-       lsb = i2c_smbus_read_byte_data(client, pmic_id_lsb);
-       if (lsb < 0)
-               return dev_err_probe(&client->dev, lsb, "failed to read the chip id LSB\n");
-
-       rk808->variant = ((msb << 8) | lsb) & RK8XX_ID_MSK;
-       dev_info(&client->dev, "chip id: 0x%x\n", (unsigned int)rk808->variant);
-
-       switch (rk808->variant) {
-       case RK805_ID:
-               rk808->regmap_cfg = &rk805_regmap_config;
-               rk808->regmap_irq_chip = &rk805_irq_chip;
-               pre_init_reg = rk805_pre_init_reg;
-               nr_pre_init_regs = ARRAY_SIZE(rk805_pre_init_reg);
-               cells = rk805s;
-               nr_cells = ARRAY_SIZE(rk805s);
-               break;
-       case RK808_ID:
-               rk808->regmap_cfg = &rk808_regmap_config;
-               rk808->regmap_irq_chip = &rk808_irq_chip;
-               pre_init_reg = rk808_pre_init_reg;
-               nr_pre_init_regs = ARRAY_SIZE(rk808_pre_init_reg);
-               cells = rk808s;
-               nr_cells = ARRAY_SIZE(rk808s);
-               break;
-       case RK818_ID:
-               rk808->regmap_cfg = &rk818_regmap_config;
-               rk808->regmap_irq_chip = &rk818_irq_chip;
-               pre_init_reg = rk818_pre_init_reg;
-               nr_pre_init_regs = ARRAY_SIZE(rk818_pre_init_reg);
-               cells = rk818s;
-               nr_cells = ARRAY_SIZE(rk818s);
-               break;
-       case RK809_ID:
-       case RK817_ID:
-               rk808->regmap_cfg = &rk817_regmap_config;
-               rk808->regmap_irq_chip = &rk817_irq_chip;
-               pre_init_reg = rk817_pre_init_reg;
-               nr_pre_init_regs = ARRAY_SIZE(rk817_pre_init_reg);
-               cells = rk817s;
-               nr_cells = ARRAY_SIZE(rk817s);
-               break;
-       default:
-               dev_err(&client->dev, "Unsupported RK8XX ID %lu\n",
-                       rk808->variant);
-               return -EINVAL;
-       }
-
-       rk808->dev = &client->dev;
-       i2c_set_clientdata(client, rk808);
-
-       rk808->regmap = devm_regmap_init_i2c(client, rk808->regmap_cfg);
-       if (IS_ERR(rk808->regmap))
-               return dev_err_probe(&client->dev, PTR_ERR(rk808->regmap),
-                                    "regmap initialization failed\n");
-
-       if (!client->irq)
-               return dev_err_probe(&client->dev, -EINVAL, "No interrupt support, no core IRQ\n");
-
-       ret = devm_regmap_add_irq_chip(&client->dev, rk808->regmap, client->irq,
-                                      IRQF_ONESHOT, -1,
-                                      rk808->regmap_irq_chip, &rk808->irq_data);
-       if (ret)
-               return dev_err_probe(&client->dev, ret, "Failed to add irq_chip\n");
-
-       for (i = 0; i < nr_pre_init_regs; i++) {
-               ret = regmap_update_bits(rk808->regmap,
-                                       pre_init_reg[i].addr,
-                                       pre_init_reg[i].mask,
-                                       pre_init_reg[i].value);
-               if (ret)
-                       return dev_err_probe(&client->dev, ret, "0x%x write err\n",
-                                            pre_init_reg[i].addr);
-       }
-
-       ret = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE,
-                             cells, nr_cells, NULL, 0,
-                             regmap_irq_get_domain(rk808->irq_data));
-       if (ret)
-               return dev_err_probe(&client->dev, ret, "failed to add MFD devices\n");
-
-       if (of_property_read_bool(np, "rockchip,system-power-controller")) {
-               ret = devm_register_sys_off_handler(&client->dev,
-                                   SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH,
-                                   &rk808_power_off, rk808);
-               if (ret)
-                       return dev_err_probe(&client->dev, ret,
-                                            "failed to register poweroff handler\n");
-
-               switch (rk808->variant) {
-               case RK809_ID:
-               case RK817_ID:
-                       ret = devm_register_sys_off_handler(&client->dev,
-                                                           SYS_OFF_MODE_RESTART, SYS_OFF_PRIO_HIGH,
-                                                           &rk808_restart, rk808);
-                       if (ret)
-                               dev_warn(&client->dev, "failed to register rst handler, %d\n", ret);
-                       break;
-               default:
-                       dev_dbg(&client->dev, "pmic controlled board reset not supported\n");
-                       break;
-               }
-       }
-
-       return 0;
-}
-
-static int __maybe_unused rk8xx_suspend(struct device *dev)
-{
-       struct rk808 *rk808 = i2c_get_clientdata(to_i2c_client(dev));
-       int ret = 0;
-
-       switch (rk808->variant) {
-       case RK805_ID:
-               ret = regmap_update_bits(rk808->regmap,
-                                        RK805_GPIO_IO_POL_REG,
-                                        SLP_SD_MSK,
-                                        SLEEP_FUN);
-               break;
-       case RK809_ID:
-       case RK817_ID:
-               ret = regmap_update_bits(rk808->regmap,
-                                        RK817_SYS_CFG(3),
-                                        RK817_SLPPIN_FUNC_MSK,
-                                        SLPPIN_SLP_FUN);
-               break;
-       default:
-               break;
-       }
-
-       return ret;
-}
-
-static int __maybe_unused rk8xx_resume(struct device *dev)
-{
-       struct rk808 *rk808 = i2c_get_clientdata(to_i2c_client(dev));
-       int ret = 0;
-
-       switch (rk808->variant) {
-       case RK809_ID:
-       case RK817_ID:
-               ret = regmap_update_bits(rk808->regmap,
-                                        RK817_SYS_CFG(3),
-                                        RK817_SLPPIN_FUNC_MSK,
-                                        SLPPIN_NULL_FUN);
-               break;
-       default:
-               break;
-       }
-
-       return ret;
-}
-static SIMPLE_DEV_PM_OPS(rk8xx_pm_ops, rk8xx_suspend, rk8xx_resume);
-
-static struct i2c_driver rk808_i2c_driver = {
-       .driver = {
-               .name = "rk808",
-               .of_match_table = rk808_of_match,
-               .pm = &rk8xx_pm_ops,
-       },
-       .probe_new = rk808_probe,
-       .shutdown = rk8xx_shutdown,
-};
-
-module_i2c_driver(rk808_i2c_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Chris Zhong <zyw@rock-chips.com>");
-MODULE_AUTHOR("Zhang Qing <zhangqing@rock-chips.com>");
-MODULE_AUTHOR("Wadim Egorov <w.egorov@phytec.de>");
-MODULE_DESCRIPTION("RK808/RK818 PMIC driver");
diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
new file mode 100644 (file)
index 0000000..5c0a5ac
--- /dev/null
@@ -0,0 +1,706 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * MFD core driver for Rockchip RK8XX
+ *
+ * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
+ * Copyright (C) 2016 PHYTEC Messtechnik GmbH
+ *
+ * Author: Chris Zhong <zyw@rock-chips.com>
+ * Author: Zhang Qing <zhangqing@rock-chips.com>
+ * Author: Wadim Egorov <w.egorov@phytec.de>
+ */
+
+#include <linux/interrupt.h>
+#include <linux/mfd/rk808.h>
+#include <linux/mfd/core.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/reboot.h>
+
+struct rk808_reg_data {
+       int addr;
+       int mask;
+       int value;
+};
+
+static const struct resource rtc_resources[] = {
+       DEFINE_RES_IRQ(RK808_IRQ_RTC_ALARM),
+};
+
+static const struct resource rk817_rtc_resources[] = {
+       DEFINE_RES_IRQ(RK817_IRQ_RTC_ALARM),
+};
+
+static const struct resource rk805_key_resources[] = {
+       DEFINE_RES_IRQ(RK805_IRQ_PWRON_RISE),
+       DEFINE_RES_IRQ(RK805_IRQ_PWRON_FALL),
+};
+
+static const struct resource rk817_pwrkey_resources[] = {
+       DEFINE_RES_IRQ(RK817_IRQ_PWRON_RISE),
+       DEFINE_RES_IRQ(RK817_IRQ_PWRON_FALL),
+};
+
+static const struct resource rk817_charger_resources[] = {
+       DEFINE_RES_IRQ(RK817_IRQ_PLUG_IN),
+       DEFINE_RES_IRQ(RK817_IRQ_PLUG_OUT),
+};
+
+static const struct mfd_cell rk805s[] = {
+       { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, },
+       { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, },
+       { .name = "rk805-pinctrl", .id = PLATFORM_DEVID_NONE, },
+       {
+               .name = "rk808-rtc",
+               .num_resources = ARRAY_SIZE(rtc_resources),
+               .resources = &rtc_resources[0],
+               .id = PLATFORM_DEVID_NONE,
+       },
+       {       .name = "rk805-pwrkey",
+               .num_resources = ARRAY_SIZE(rk805_key_resources),
+               .resources = &rk805_key_resources[0],
+               .id = PLATFORM_DEVID_NONE,
+       },
+};
+
+static const struct mfd_cell rk808s[] = {
+       { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, },
+       { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, },
+       {
+               .name = "rk808-rtc",
+               .num_resources = ARRAY_SIZE(rtc_resources),
+               .resources = rtc_resources,
+               .id = PLATFORM_DEVID_NONE,
+       },
+};
+
+static const struct mfd_cell rk817s[] = {
+       { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, },
+       { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, },
+       {
+               .name = "rk805-pwrkey",
+               .num_resources = ARRAY_SIZE(rk817_pwrkey_resources),
+               .resources = &rk817_pwrkey_resources[0],
+               .id = PLATFORM_DEVID_NONE,
+       },
+       {
+               .name = "rk808-rtc",
+               .num_resources = ARRAY_SIZE(rk817_rtc_resources),
+               .resources = &rk817_rtc_resources[0],
+               .id = PLATFORM_DEVID_NONE,
+       },
+       { .name = "rk817-codec", .id = PLATFORM_DEVID_NONE, },
+       {
+               .name = "rk817-charger",
+               .num_resources = ARRAY_SIZE(rk817_charger_resources),
+               .resources = &rk817_charger_resources[0],
+               .id = PLATFORM_DEVID_NONE,
+       },
+};
+
+static const struct mfd_cell rk818s[] = {
+       { .name = "rk808-clkout", .id = PLATFORM_DEVID_NONE, },
+       { .name = "rk808-regulator", .id = PLATFORM_DEVID_NONE, },
+       {
+               .name = "rk808-rtc",
+               .num_resources = ARRAY_SIZE(rtc_resources),
+               .resources = rtc_resources,
+               .id = PLATFORM_DEVID_NONE,
+       },
+};
+
+static const struct rk808_reg_data rk805_pre_init_reg[] = {
+       {RK805_BUCK1_CONFIG_REG, RK805_BUCK1_2_ILMAX_MASK,
+                                RK805_BUCK1_2_ILMAX_4000MA},
+       {RK805_BUCK2_CONFIG_REG, RK805_BUCK1_2_ILMAX_MASK,
+                                RK805_BUCK1_2_ILMAX_4000MA},
+       {RK805_BUCK3_CONFIG_REG, RK805_BUCK3_4_ILMAX_MASK,
+                                RK805_BUCK3_ILMAX_3000MA},
+       {RK805_BUCK4_CONFIG_REG, RK805_BUCK3_4_ILMAX_MASK,
+                                RK805_BUCK4_ILMAX_3500MA},
+       {RK805_BUCK4_CONFIG_REG, BUCK_ILMIN_MASK, BUCK_ILMIN_400MA},
+       {RK805_THERMAL_REG, TEMP_HOTDIE_MSK, TEMP115C},
+};
+
+static const struct rk808_reg_data rk808_pre_init_reg[] = {
+       { RK808_BUCK3_CONFIG_REG, BUCK_ILMIN_MASK,  BUCK_ILMIN_150MA },
+       { RK808_BUCK4_CONFIG_REG, BUCK_ILMIN_MASK,  BUCK_ILMIN_200MA },
+       { RK808_BOOST_CONFIG_REG, BOOST_ILMIN_MASK, BOOST_ILMIN_100MA },
+       { RK808_BUCK1_CONFIG_REG, BUCK1_RATE_MASK,  BUCK_ILMIN_200MA },
+       { RK808_BUCK2_CONFIG_REG, BUCK2_RATE_MASK,  BUCK_ILMIN_200MA },
+       { RK808_DCDC_UV_ACT_REG,  BUCK_UV_ACT_MASK, BUCK_UV_ACT_DISABLE},
+       { RK808_VB_MON_REG,       MASK_ALL,         VB_LO_ACT |
+                                                   VB_LO_SEL_3500MV },
+};
+
+static const struct rk808_reg_data rk817_pre_init_reg[] = {
+       {RK817_RTC_CTRL_REG, RTC_STOP, RTC_STOP},
+       /* Codec specific registers */
+       { RK817_CODEC_DTOP_VUCTL, MASK_ALL, 0x03 },
+       { RK817_CODEC_DTOP_VUCTIME, MASK_ALL, 0x00 },
+       { RK817_CODEC_DTOP_LPT_SRST, MASK_ALL, 0x00 },
+       { RK817_CODEC_DTOP_DIGEN_CLKE, MASK_ALL, 0x00 },
+       /* from vendor driver, CODEC_AREF_RTCFG0 not defined in data sheet */
+       { RK817_CODEC_AREF_RTCFG0, MASK_ALL, 0x00 },
+       { RK817_CODEC_AREF_RTCFG1, MASK_ALL, 0x06 },
+       { RK817_CODEC_AADC_CFG0, MASK_ALL, 0xc8 },
+       /* from vendor driver, CODEC_AADC_CFG1 not defined in data sheet */
+       { RK817_CODEC_AADC_CFG1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DADC_VOLL, MASK_ALL, 0x00 },
+       { RK817_CODEC_DADC_VOLR, MASK_ALL, 0x00 },
+       { RK817_CODEC_DADC_SR_ACL0, MASK_ALL, 0x00 },
+       { RK817_CODEC_DADC_ALC1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DADC_ALC2, MASK_ALL, 0x00 },
+       { RK817_CODEC_DADC_NG, MASK_ALL, 0x00 },
+       { RK817_CODEC_DADC_HPF, MASK_ALL, 0x00 },
+       { RK817_CODEC_DADC_RVOLL, MASK_ALL, 0xff },
+       { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
+       { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
+       { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
+       { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
+       { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
+       /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
+       { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
+       { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
+       { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
+       { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
+       { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
+       { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
+       { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
+       { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
+       { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
+       { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
+       /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
+       { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
+       { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
+       { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
+       { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
+       { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
+       { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
+       { RK817_CODEC_DDAC_RVOLR, MASK_ALL, 0xff },
+       { RK817_CODEC_AHP_ANTI0, MASK_ALL, 0x00 },
+       { RK817_CODEC_AHP_ANTI1, MASK_ALL, 0x00 },
+       { RK817_CODEC_AHP_CFG0, MASK_ALL, 0xe0 },
+       { RK817_CODEC_AHP_CFG1, MASK_ALL, 0x1f },
+       { RK817_CODEC_AHP_CP, MASK_ALL, 0x09 },
+       { RK817_CODEC_ACLASSD_CFG1, MASK_ALL, 0x69 },
+       { RK817_CODEC_ACLASSD_CFG2, MASK_ALL, 0x44 },
+       { RK817_CODEC_APLL_CFG0, MASK_ALL, 0x04 },
+       { RK817_CODEC_APLL_CFG1, MASK_ALL, 0x00 },
+       { RK817_CODEC_APLL_CFG2, MASK_ALL, 0x30 },
+       { RK817_CODEC_APLL_CFG3, MASK_ALL, 0x19 },
+       { RK817_CODEC_APLL_CFG4, MASK_ALL, 0x65 },
+       { RK817_CODEC_APLL_CFG5, MASK_ALL, 0x01 },
+       { RK817_CODEC_DI2S_CKM, MASK_ALL, 0x01 },
+       { RK817_CODEC_DI2S_RSD, MASK_ALL, 0x00 },
+       { RK817_CODEC_DI2S_RXCR1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DI2S_RXCR2, MASK_ALL, 0x17 },
+       { RK817_CODEC_DI2S_RXCMD_TSD, MASK_ALL, 0x00 },
+       { RK817_CODEC_DI2S_TXCR1, MASK_ALL, 0x00 },
+       { RK817_CODEC_DI2S_TXCR2, MASK_ALL, 0x17 },
+       { RK817_CODEC_DI2S_TXCR3_TXCMD, MASK_ALL, 0x00 },
+       {RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L},
+       {RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK,
+                                          RK817_HOTDIE_105 | RK817_TSD_140},
+};
+
+static const struct rk808_reg_data rk818_pre_init_reg[] = {
+       /* improve efficiency */
+       { RK818_BUCK2_CONFIG_REG, BUCK2_RATE_MASK,  BUCK_ILMIN_250MA },
+       { RK818_BUCK4_CONFIG_REG, BUCK_ILMIN_MASK,  BUCK_ILMIN_250MA },
+       { RK818_BOOST_CONFIG_REG, BOOST_ILMIN_MASK, BOOST_ILMIN_100MA },
+       { RK818_USB_CTRL_REG,     RK818_USB_ILIM_SEL_MASK,
+                                                   RK818_USB_ILMIN_2000MA },
+       /* close charger when usb lower then 3.4V */
+       { RK818_USB_CTRL_REG,     RK818_USB_CHG_SD_VSEL_MASK,
+                                                   (0x7 << 4) },
+       /* no action when vref */
+       { RK818_H5V_EN_REG,       BIT(1),           RK818_REF_RDY_CTRL },
+       /* enable HDMI 5V */
+       { RK818_H5V_EN_REG,       BIT(0),           RK818_H5V_EN },
+       { RK808_VB_MON_REG,       MASK_ALL,         VB_LO_ACT |
+                                                   VB_LO_SEL_3500MV },
+};
+
+static const struct regmap_irq rk805_irqs[] = {
+       [RK805_IRQ_PWRON_RISE] = {
+               .mask = RK805_IRQ_PWRON_RISE_MSK,
+               .reg_offset = 0,
+       },
+       [RK805_IRQ_VB_LOW] = {
+               .mask = RK805_IRQ_VB_LOW_MSK,
+               .reg_offset = 0,
+       },
+       [RK805_IRQ_PWRON] = {
+               .mask = RK805_IRQ_PWRON_MSK,
+               .reg_offset = 0,
+       },
+       [RK805_IRQ_PWRON_LP] = {
+               .mask = RK805_IRQ_PWRON_LP_MSK,
+               .reg_offset = 0,
+       },
+       [RK805_IRQ_HOTDIE] = {
+               .mask = RK805_IRQ_HOTDIE_MSK,
+               .reg_offset = 0,
+       },
+       [RK805_IRQ_RTC_ALARM] = {
+               .mask = RK805_IRQ_RTC_ALARM_MSK,
+               .reg_offset = 0,
+       },
+       [RK805_IRQ_RTC_PERIOD] = {
+               .mask = RK805_IRQ_RTC_PERIOD_MSK,
+               .reg_offset = 0,
+       },
+       [RK805_IRQ_PWRON_FALL] = {
+               .mask = RK805_IRQ_PWRON_FALL_MSK,
+               .reg_offset = 0,
+       },
+};
+
+static const struct regmap_irq rk808_irqs[] = {
+       /* INT_STS */
+       [RK808_IRQ_VOUT_LO] = {
+               .mask = RK808_IRQ_VOUT_LO_MSK,
+               .reg_offset = 0,
+       },
+       [RK808_IRQ_VB_LO] = {
+               .mask = RK808_IRQ_VB_LO_MSK,
+               .reg_offset = 0,
+       },
+       [RK808_IRQ_PWRON] = {
+               .mask = RK808_IRQ_PWRON_MSK,
+               .reg_offset = 0,
+       },
+       [RK808_IRQ_PWRON_LP] = {
+               .mask = RK808_IRQ_PWRON_LP_MSK,
+               .reg_offset = 0,
+       },
+       [RK808_IRQ_HOTDIE] = {
+               .mask = RK808_IRQ_HOTDIE_MSK,
+               .reg_offset = 0,
+       },
+       [RK808_IRQ_RTC_ALARM] = {
+               .mask = RK808_IRQ_RTC_ALARM_MSK,
+               .reg_offset = 0,
+       },
+       [RK808_IRQ_RTC_PERIOD] = {
+               .mask = RK808_IRQ_RTC_PERIOD_MSK,
+               .reg_offset = 0,
+       },
+
+       /* INT_STS2 */
+       [RK808_IRQ_PLUG_IN_INT] = {
+               .mask = RK808_IRQ_PLUG_IN_INT_MSK,
+               .reg_offset = 1,
+       },
+       [RK808_IRQ_PLUG_OUT_INT] = {
+               .mask = RK808_IRQ_PLUG_OUT_INT_MSK,
+               .reg_offset = 1,
+       },
+};
+
+static const struct regmap_irq rk818_irqs[] = {
+       /* INT_STS */
+       [RK818_IRQ_VOUT_LO] = {
+               .mask = RK818_IRQ_VOUT_LO_MSK,
+               .reg_offset = 0,
+       },
+       [RK818_IRQ_VB_LO] = {
+               .mask = RK818_IRQ_VB_LO_MSK,
+               .reg_offset = 0,
+       },
+       [RK818_IRQ_PWRON] = {
+               .mask = RK818_IRQ_PWRON_MSK,
+               .reg_offset = 0,
+       },
+       [RK818_IRQ_PWRON_LP] = {
+               .mask = RK818_IRQ_PWRON_LP_MSK,
+               .reg_offset = 0,
+       },
+       [RK818_IRQ_HOTDIE] = {
+               .mask = RK818_IRQ_HOTDIE_MSK,
+               .reg_offset = 0,
+       },
+       [RK818_IRQ_RTC_ALARM] = {
+               .mask = RK818_IRQ_RTC_ALARM_MSK,
+               .reg_offset = 0,
+       },
+       [RK818_IRQ_RTC_PERIOD] = {
+               .mask = RK818_IRQ_RTC_PERIOD_MSK,
+               .reg_offset = 0,
+       },
+       [RK818_IRQ_USB_OV] = {
+               .mask = RK818_IRQ_USB_OV_MSK,
+               .reg_offset = 0,
+       },
+
+       /* INT_STS2 */
+       [RK818_IRQ_PLUG_IN] = {
+               .mask = RK818_IRQ_PLUG_IN_MSK,
+               .reg_offset = 1,
+       },
+       [RK818_IRQ_PLUG_OUT] = {
+               .mask = RK818_IRQ_PLUG_OUT_MSK,
+               .reg_offset = 1,
+       },
+       [RK818_IRQ_CHG_OK] = {
+               .mask = RK818_IRQ_CHG_OK_MSK,
+               .reg_offset = 1,
+       },
+       [RK818_IRQ_CHG_TE] = {
+               .mask = RK818_IRQ_CHG_TE_MSK,
+               .reg_offset = 1,
+       },
+       [RK818_IRQ_CHG_TS1] = {
+               .mask = RK818_IRQ_CHG_TS1_MSK,
+               .reg_offset = 1,
+       },
+       [RK818_IRQ_TS2] = {
+               .mask = RK818_IRQ_TS2_MSK,
+               .reg_offset = 1,
+       },
+       [RK818_IRQ_CHG_CVTLIM] = {
+               .mask = RK818_IRQ_CHG_CVTLIM_MSK,
+               .reg_offset = 1,
+       },
+       [RK818_IRQ_DISCHG_ILIM] = {
+               .mask = RK818_IRQ_DISCHG_ILIM_MSK,
+               .reg_offset = 1,
+       },
+};
+
+static const struct regmap_irq rk817_irqs[RK817_IRQ_END] = {
+       REGMAP_IRQ_REG_LINE(0, 8),
+       REGMAP_IRQ_REG_LINE(1, 8),
+       REGMAP_IRQ_REG_LINE(2, 8),
+       REGMAP_IRQ_REG_LINE(3, 8),
+       REGMAP_IRQ_REG_LINE(4, 8),
+       REGMAP_IRQ_REG_LINE(5, 8),
+       REGMAP_IRQ_REG_LINE(6, 8),
+       REGMAP_IRQ_REG_LINE(7, 8),
+       REGMAP_IRQ_REG_LINE(8, 8),
+       REGMAP_IRQ_REG_LINE(9, 8),
+       REGMAP_IRQ_REG_LINE(10, 8),
+       REGMAP_IRQ_REG_LINE(11, 8),
+       REGMAP_IRQ_REG_LINE(12, 8),
+       REGMAP_IRQ_REG_LINE(13, 8),
+       REGMAP_IRQ_REG_LINE(14, 8),
+       REGMAP_IRQ_REG_LINE(15, 8),
+       REGMAP_IRQ_REG_LINE(16, 8),
+       REGMAP_IRQ_REG_LINE(17, 8),
+       REGMAP_IRQ_REG_LINE(18, 8),
+       REGMAP_IRQ_REG_LINE(19, 8),
+       REGMAP_IRQ_REG_LINE(20, 8),
+       REGMAP_IRQ_REG_LINE(21, 8),
+       REGMAP_IRQ_REG_LINE(22, 8),
+       REGMAP_IRQ_REG_LINE(23, 8)
+};
+
+static struct regmap_irq_chip rk805_irq_chip = {
+       .name = "rk805",
+       .irqs = rk805_irqs,
+       .num_irqs = ARRAY_SIZE(rk805_irqs),
+       .num_regs = 1,
+       .status_base = RK805_INT_STS_REG,
+       .mask_base = RK805_INT_STS_MSK_REG,
+       .ack_base = RK805_INT_STS_REG,
+       .init_ack_masked = true,
+};
+
+static const struct regmap_irq_chip rk808_irq_chip = {
+       .name = "rk808",
+       .irqs = rk808_irqs,
+       .num_irqs = ARRAY_SIZE(rk808_irqs),
+       .num_regs = 2,
+       .irq_reg_stride = 2,
+       .status_base = RK808_INT_STS_REG1,
+       .mask_base = RK808_INT_STS_MSK_REG1,
+       .ack_base = RK808_INT_STS_REG1,
+       .init_ack_masked = true,
+};
+
+static struct regmap_irq_chip rk817_irq_chip = {
+       .name = "rk817",
+       .irqs = rk817_irqs,
+       .num_irqs = ARRAY_SIZE(rk817_irqs),
+       .num_regs = 3,
+       .irq_reg_stride = 2,
+       .status_base = RK817_INT_STS_REG0,
+       .mask_base = RK817_INT_STS_MSK_REG0,
+       .ack_base = RK817_INT_STS_REG0,
+       .init_ack_masked = true,
+};
+
+static const struct regmap_irq_chip rk818_irq_chip = {
+       .name = "rk818",
+       .irqs = rk818_irqs,
+       .num_irqs = ARRAY_SIZE(rk818_irqs),
+       .num_regs = 2,
+       .irq_reg_stride = 2,
+       .status_base = RK818_INT_STS_REG1,
+       .mask_base = RK818_INT_STS_MSK_REG1,
+       .ack_base = RK818_INT_STS_REG1,
+       .init_ack_masked = true,
+};
+
+static int rk808_power_off(struct sys_off_data *data)
+{
+       struct rk808 *rk808 = data->cb_data;
+       int ret;
+       unsigned int reg, bit;
+
+       switch (rk808->variant) {
+       case RK805_ID:
+               reg = RK805_DEV_CTRL_REG;
+               bit = DEV_OFF;
+               break;
+       case RK808_ID:
+               reg = RK808_DEVCTRL_REG,
+               bit = DEV_OFF_RST;
+               break;
+       case RK809_ID:
+       case RK817_ID:
+               reg = RK817_SYS_CFG(3);
+               bit = DEV_OFF;
+               break;
+       case RK818_ID:
+               reg = RK818_DEVCTRL_REG;
+               bit = DEV_OFF;
+               break;
+       default:
+               return NOTIFY_DONE;
+       }
+       ret = regmap_update_bits(rk808->regmap, reg, bit, bit);
+       if (ret)
+               dev_err(rk808->dev, "Failed to shutdown device!\n");
+
+       return NOTIFY_DONE;
+}
+
+static int rk808_restart(struct sys_off_data *data)
+{
+       struct rk808 *rk808 = data->cb_data;
+       unsigned int reg, bit;
+       int ret;
+
+       switch (rk808->variant) {
+       case RK809_ID:
+       case RK817_ID:
+               reg = RK817_SYS_CFG(3);
+               bit = DEV_RST;
+               break;
+
+       default:
+               return NOTIFY_DONE;
+       }
+       ret = regmap_update_bits(rk808->regmap, reg, bit, bit);
+       if (ret)
+               dev_err(rk808->dev, "Failed to restart device!\n");
+
+       return NOTIFY_DONE;
+}
+
+void rk8xx_shutdown(struct device *dev)
+{
+       struct rk808 *rk808 = dev_get_drvdata(dev);
+       int ret;
+
+       switch (rk808->variant) {
+       case RK805_ID:
+               ret = regmap_update_bits(rk808->regmap,
+                                        RK805_GPIO_IO_POL_REG,
+                                        SLP_SD_MSK,
+                                        SHUTDOWN_FUN);
+               break;
+       case RK809_ID:
+       case RK817_ID:
+               ret = regmap_update_bits(rk808->regmap,
+                                        RK817_SYS_CFG(3),
+                                        RK817_SLPPIN_FUNC_MSK,
+                                        SLPPIN_DN_FUN);
+               break;
+       default:
+               return;
+       }
+       if (ret)
+               dev_warn(dev,
+                        "Cannot switch to power down function\n");
+}
+EXPORT_SYMBOL_GPL(rk8xx_shutdown);
+
+int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap *regmap)
+{
+       struct rk808 *rk808;
+       const struct rk808_reg_data *pre_init_reg;
+       const struct mfd_cell *cells;
+       int nr_pre_init_regs;
+       int nr_cells;
+       int ret;
+       int i;
+
+       rk808 = devm_kzalloc(dev, sizeof(*rk808), GFP_KERNEL);
+       if (!rk808)
+               return -ENOMEM;
+       rk808->dev = dev;
+       rk808->variant = variant;
+       rk808->regmap = regmap;
+       dev_set_drvdata(dev, rk808);
+
+       switch (rk808->variant) {
+       case RK805_ID:
+               rk808->regmap_irq_chip = &rk805_irq_chip;
+               pre_init_reg = rk805_pre_init_reg;
+               nr_pre_init_regs = ARRAY_SIZE(rk805_pre_init_reg);
+               cells = rk805s;
+               nr_cells = ARRAY_SIZE(rk805s);
+               break;
+       case RK808_ID:
+               rk808->regmap_irq_chip = &rk808_irq_chip;
+               pre_init_reg = rk808_pre_init_reg;
+               nr_pre_init_regs = ARRAY_SIZE(rk808_pre_init_reg);
+               cells = rk808s;
+               nr_cells = ARRAY_SIZE(rk808s);
+               break;
+       case RK818_ID:
+               rk808->regmap_irq_chip = &rk818_irq_chip;
+               pre_init_reg = rk818_pre_init_reg;
+               nr_pre_init_regs = ARRAY_SIZE(rk818_pre_init_reg);
+               cells = rk818s;
+               nr_cells = ARRAY_SIZE(rk818s);
+               break;
+       case RK809_ID:
+       case RK817_ID:
+               rk808->regmap_irq_chip = &rk817_irq_chip;
+               pre_init_reg = rk817_pre_init_reg;
+               nr_pre_init_regs = ARRAY_SIZE(rk817_pre_init_reg);
+               cells = rk817s;
+               nr_cells = ARRAY_SIZE(rk817s);
+               break;
+       default:
+               dev_err(dev, "Unsupported RK8XX ID %lu\n", rk808->variant);
+               return -EINVAL;
+       }
+
+       dev_info(dev, "chip id: 0x%x\n", (unsigned int)rk808->variant);
+
+       if (!irq)
+               return dev_err_probe(dev, -EINVAL, "No interrupt support, no core IRQ\n");
+
+       ret = devm_regmap_add_irq_chip(dev, rk808->regmap, irq,
+                                      IRQF_ONESHOT, -1,
+                                      rk808->regmap_irq_chip, &rk808->irq_data);
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to add irq_chip\n");
+
+       for (i = 0; i < nr_pre_init_regs; i++) {
+               ret = regmap_update_bits(rk808->regmap,
+                                       pre_init_reg[i].addr,
+                                       pre_init_reg[i].mask,
+                                       pre_init_reg[i].value);
+               if (ret)
+                       return dev_err_probe(dev, ret, "0x%x write err\n",
+                                            pre_init_reg[i].addr);
+       }
+
+       ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE,
+                             cells, nr_cells, NULL, 0,
+                             regmap_irq_get_domain(rk808->irq_data));
+       if (ret)
+               return dev_err_probe(dev, ret, "failed to add MFD devices\n");
+
+       if (device_property_read_bool(dev, "rockchip,system-power-controller")) {
+               ret = devm_register_sys_off_handler(dev,
+                                   SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH,
+                                   &rk808_power_off, rk808);
+               if (ret)
+                       return dev_err_probe(dev, ret,
+                                            "failed to register poweroff handler\n");
+
+               switch (rk808->variant) {
+               case RK809_ID:
+               case RK817_ID:
+                       ret = devm_register_sys_off_handler(dev,
+                                                           SYS_OFF_MODE_RESTART, SYS_OFF_PRIO_HIGH,
+                                                           &rk808_restart, rk808);
+                       if (ret)
+                               dev_warn(dev, "failed to register rst handler, %d\n", ret);
+                       break;
+               default:
+                       dev_dbg(dev, "pmic controlled board reset not supported\n");
+                       break;
+               }
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(rk8xx_probe);
+
+int rk8xx_suspend(struct device *dev)
+{
+       struct rk808 *rk808 = dev_get_drvdata(dev);
+       int ret = 0;
+
+       switch (rk808->variant) {
+       case RK805_ID:
+               ret = regmap_update_bits(rk808->regmap,
+                                        RK805_GPIO_IO_POL_REG,
+                                        SLP_SD_MSK,
+                                        SLEEP_FUN);
+               break;
+       case RK809_ID:
+       case RK817_ID:
+               ret = regmap_update_bits(rk808->regmap,
+                                        RK817_SYS_CFG(3),
+                                        RK817_SLPPIN_FUNC_MSK,
+                                        SLPPIN_SLP_FUN);
+               break;
+       default:
+               break;
+       }
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(rk8xx_suspend);
+
+int rk8xx_resume(struct device *dev)
+{
+       struct rk808 *rk808 = dev_get_drvdata(dev);
+       int ret = 0;
+
+       switch (rk808->variant) {
+       case RK809_ID:
+       case RK817_ID:
+               ret = regmap_update_bits(rk808->regmap,
+                                        RK817_SYS_CFG(3),
+                                        RK817_SLPPIN_FUNC_MSK,
+                                        SLPPIN_NULL_FUN);
+               break;
+       default:
+               break;
+       }
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(rk8xx_resume);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Chris Zhong <zyw@rock-chips.com>");
+MODULE_AUTHOR("Zhang Qing <zhangqing@rock-chips.com>");
+MODULE_AUTHOR("Wadim Egorov <w.egorov@phytec.de>");
+MODULE_DESCRIPTION("RK8xx PMIC core");
diff --git a/drivers/mfd/rk8xx-i2c.c b/drivers/mfd/rk8xx-i2c.c
new file mode 100644 (file)
index 0000000..6d121b5
--- /dev/null
@@ -0,0 +1,200 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Rockchip RK808/RK818 Core (I2C) driver
+ *
+ * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd
+ * Copyright (C) 2016 PHYTEC Messtechnik GmbH
+ *
+ * Author: Chris Zhong <zyw@rock-chips.com>
+ * Author: Zhang Qing <zhangqing@rock-chips.com>
+ * Author: Wadim Egorov <w.egorov@phytec.de>
+ */
+
+#include <linux/i2c.h>
+#include <linux/mfd/rk808.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+
+static bool rk808_is_volatile_reg(struct device *dev, unsigned int reg)
+{
+       /*
+        * Notes:
+        * - Technically the ROUND_30s bit makes RTC_CTRL_REG volatile, but
+        *   we don't use that feature.  It's better to cache.
+        * - It's unlikely we care that RK808_DEVCTRL_REG is volatile since
+        *   bits are cleared in case when we shutoff anyway, but better safe.
+        */
+
+       switch (reg) {
+       case RK808_SECONDS_REG ... RK808_WEEKS_REG:
+       case RK808_RTC_STATUS_REG:
+       case RK808_VB_MON_REG:
+       case RK808_THERMAL_REG:
+       case RK808_DCDC_UV_STS_REG:
+       case RK808_LDO_UV_STS_REG:
+       case RK808_DCDC_PG_REG:
+       case RK808_LDO_PG_REG:
+       case RK808_DEVCTRL_REG:
+       case RK808_INT_STS_REG1:
+       case RK808_INT_STS_REG2:
+               return true;
+       }
+
+       return false;
+}
+
+static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
+{
+       /*
+        * Notes:
+        * - 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 RK817_SECONDS_REG ... RK817_WEEKS_REG:
+       case RK817_RTC_STATUS_REG:
+       case RK817_CODEC_DTOP_LPT_SRST:
+       case RK817_GAS_GAUGE_ADC_CONFIG0 ... RK817_GAS_GAUGE_CUR_ADC_K0:
+       case RK817_PMIC_CHRG_STS:
+       case RK817_PMIC_CHRG_OUT:
+       case RK817_PMIC_CHRG_IN:
+       case RK817_INT_STS_REG0:
+       case RK817_INT_STS_REG1:
+       case RK817_INT_STS_REG2:
+       case RK817_SYS_STS:
+               return true;
+       }
+
+       return false;
+}
+
+
+static const struct regmap_config rk818_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+       .max_register = RK818_USB_CTRL_REG,
+       .cache_type = REGCACHE_RBTREE,
+       .volatile_reg = rk808_is_volatile_reg,
+};
+
+static const struct regmap_config rk805_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+       .max_register = RK805_OFF_SOURCE_REG,
+       .cache_type = REGCACHE_RBTREE,
+       .volatile_reg = rk808_is_volatile_reg,
+};
+
+static const struct regmap_config rk808_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+       .max_register = RK808_IO_POL_REG,
+       .cache_type = REGCACHE_RBTREE,
+       .volatile_reg = rk808_is_volatile_reg,
+};
+
+static const struct regmap_config rk817_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+       .max_register = RK817_GPIO_INT_CFG,
+       .cache_type = REGCACHE_NONE,
+       .volatile_reg = rk817_is_volatile_reg,
+};
+
+static int rk8xx_i2c_get_variant(struct i2c_client *client)
+{
+       u8 pmic_id_msb, pmic_id_lsb;
+       int msb, lsb;
+
+       if (of_device_is_compatible(client->dev.of_node, "rockchip,rk817") ||
+           of_device_is_compatible(client->dev.of_node, "rockchip,rk809")) {
+               pmic_id_msb = RK817_ID_MSB;
+               pmic_id_lsb = RK817_ID_LSB;
+       } else {
+               pmic_id_msb = RK808_ID_MSB;
+               pmic_id_lsb = RK808_ID_LSB;
+       }
+
+       /* Read chip variant */
+       msb = i2c_smbus_read_byte_data(client, pmic_id_msb);
+       if (msb < 0)
+               return dev_err_probe(&client->dev, msb, "failed to read the chip id MSB\n");
+
+       lsb = i2c_smbus_read_byte_data(client, pmic_id_lsb);
+       if (lsb < 0)
+               return dev_err_probe(&client->dev, lsb, "failed to read the chip id LSB\n");
+
+       return ((msb << 8) | lsb) & RK8XX_ID_MSK;
+}
+
+static int rk8xx_i2c_probe(struct i2c_client *client)
+{
+       const struct regmap_config *regmap_cfg;
+       struct regmap *regmap;
+       int variant;
+
+       variant = rk8xx_i2c_get_variant(client);
+       if (variant < 0)
+               return variant;
+
+       switch (variant) {
+       case RK805_ID:
+               regmap_cfg = &rk805_regmap_config;
+               break;
+       case RK808_ID:
+               regmap_cfg = &rk808_regmap_config;
+               break;
+       case RK818_ID:
+               regmap_cfg = &rk818_regmap_config;
+               break;
+       case RK809_ID:
+       case RK817_ID:
+               regmap_cfg = &rk817_regmap_config;
+               break;
+       default:
+               return dev_err_probe(&client->dev, -EINVAL, "Unsupported RK8XX ID %x\n", variant);
+       }
+
+       regmap = devm_regmap_init_i2c(client, regmap_cfg);
+       if (IS_ERR(regmap))
+               return dev_err_probe(&client->dev, PTR_ERR(regmap),
+                                    "regmap initialization failed\n");
+
+       return rk8xx_probe(&client->dev, variant, client->irq, regmap);
+}
+
+static void rk8xx_i2c_shutdown(struct i2c_client *client)
+{
+       rk8xx_shutdown(&client->dev);
+}
+
+static SIMPLE_DEV_PM_OPS(rk8xx_i2c_pm_ops, rk8xx_suspend, rk8xx_resume);
+
+static const struct of_device_id rk8xx_i2c_of_match[] = {
+       { .compatible = "rockchip,rk805" },
+       { .compatible = "rockchip,rk808" },
+       { .compatible = "rockchip,rk809" },
+       { .compatible = "rockchip,rk817" },
+       { .compatible = "rockchip,rk818" },
+       { },
+};
+MODULE_DEVICE_TABLE(of, rk8xx_i2c_of_match);
+
+static struct i2c_driver rk8xx_i2c_driver = {
+       .driver = {
+               .name = "rk8xx-i2c",
+               .of_match_table = rk8xx_i2c_of_match,
+               .pm = &rk8xx_i2c_pm_ops,
+       },
+       .probe_new = rk8xx_i2c_probe,
+       .shutdown  = rk8xx_i2c_shutdown,
+};
+module_i2c_driver(rk8xx_i2c_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Chris Zhong <zyw@rock-chips.com>");
+MODULE_AUTHOR("Zhang Qing <zhangqing@rock-chips.com>");
+MODULE_AUTHOR("Wadim Egorov <w.egorov@phytec.de>");
+MODULE_DESCRIPTION("RK8xx I2C PMIC driver");
index 5787c579dcf672c3072f11791b0ad3e172edb73d..77ff9a641aebfe963aecc477413c0f2ed5127c75 100644 (file)
@@ -407,7 +407,7 @@ config PINCTRL_PISTACHIO
 
 config PINCTRL_RK805
        tristate "Pinctrl and GPIO driver for RK805 PMIC"
-       depends on MFD_RK808
+       depends on MFD_RK8XX
        select GPIOLIB
        select PINMUX
        select GENERIC_PINCONF
index c78be9f322e6c6002fb06f87db1e0dd1c15b99c4..4a5e8e1d12374cb938ee6e494e1206225e2d6e1b 100644 (file)
@@ -706,7 +706,7 @@ config CHARGER_BQ256XX
 
 config CHARGER_RK817
        tristate "Rockchip RK817 PMIC Battery Charger"
-       depends on MFD_RK808
+       depends on MFD_RK8XX
        help
          Say Y to include support for Rockchip RK817 Battery Charger.
 
index e5f3613c15fa5b06a9903583c948962db3a9afda..f2881fe3e0a70ff8b28714b4042693d6ffa2b1a4 100644 (file)
@@ -1056,7 +1056,7 @@ config REGULATOR_RC5T583
 
 config REGULATOR_RK808
        tristate "Rockchip RK805/RK808/RK809/RK817/RK818 Power regulators"
-       depends on MFD_RK808
+       depends on MFD_RK8XX
        help
          Select this option to enable the power regulator of ROCKCHIP
          PMIC RK805,RK809&RK817,RK808 and RK818.
index 75387240861564405577aaf05c9150ef6aa91e54..ffca9a8bb878f221d513d8be02c063e0c8dc489f 100644 (file)
@@ -395,7 +395,7 @@ config RTC_DRV_NCT3018Y
 
 config RTC_DRV_RK808
        tristate "Rockchip RK805/RK808/RK809/RK817/RK818 RTC"
-       depends on MFD_RK808
+       depends on MFD_RK8XX
        help
          If you say yes here you will get support for the
          RTC of RK805, RK809 and RK817, RK808 and RK818 PMIC.
index a89ddd9ba68e04614d44e2767045705948d91ade..4183427a80fe9b04fd9ad0a3862e03e7c108a045 100644 (file)
@@ -794,4 +794,10 @@ struct rk808 {
        const struct regmap_config      *regmap_cfg;
        const struct regmap_irq_chip    *regmap_irq_chip;
 };
+
+void rk8xx_shutdown(struct device *dev);
+int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap *regmap);
+int rk8xx_suspend(struct device *dev);
+int rk8xx_resume(struct device *dev);
+
 #endif /* __LINUX_REGULATOR_RK808_H */
index 8020097d4e4c8078c9bb00c8ae87d96c96ab7c7e..0c4c5cbaa809a3d8ec9b5e5494a2a37ef10f4704 100644 (file)
@@ -1313,7 +1313,7 @@ config SND_SOC_RK3328
 
 config SND_SOC_RK817
        tristate "Rockchip RK817 audio CODEC"
-       depends on MFD_RK808 || COMPILE_TEST
+       depends on MFD_RK8XX || COMPILE_TEST
 
 config SND_SOC_RL6231
        tristate