Merge tag 'linux-watchdog-5.5-rc1' of git://www.linux-watchdog.org/linux-watchdog

[linux.git] / drivers / mfd / rk808.c

diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index 050478cabc95d045f3a42880353954e2a296a861..a69a6742ecdc3786e69652b5a79f304e11d74a2e 100644 (file)
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -109,11 +109,7 @@ static const struct regmap_config rk817_regmap_config = {
 };
 
 static struct resource rtc_resources[] = {
-       {
-               .start  = RK808_IRQ_RTC_ALARM,
-               .end    = RK808_IRQ_RTC_ALARM,
-               .flags  = IORESOURCE_IRQ,
-       }
+       DEFINE_RES_IRQ(RK808_IRQ_RTC_ALARM),
 };
 
 static struct resource rk817_rtc_resources[] = {
@@ -121,16 +117,8 @@ static struct resource rk817_rtc_resources[] = {
 };
 
 static struct resource rk805_key_resources[] = {
-       {
-               .start  = RK805_IRQ_PWRON_FALL,
-               .end    = RK805_IRQ_PWRON_FALL,
-               .flags  = IORESOURCE_IRQ,
-       },
-       {
-               .start  = RK805_IRQ_PWRON_RISE,
-               .end    = RK805_IRQ_PWRON_RISE,
-               .flags  = IORESOURCE_IRQ,
-       }
+       DEFINE_RES_IRQ(RK805_IRQ_PWRON_RISE),
+       DEFINE_RES_IRQ(RK805_IRQ_PWRON_FALL),
 };
 
 static struct resource rk817_pwrkey_resources[] = {
@@ -167,7 +155,7 @@ static const struct mfd_cell rk817s[] = {
        { .name = "rk808-clkout",},
        { .name = "rk808-regulator",},
        {
-               .name = "rk8xx-pwrkey",
+               .name = "rk805-pwrkey",
                .num_resources = ARRAY_SIZE(rk817_pwrkey_resources),
                .resources = &rk817_pwrkey_resources[0],
        },
@@ -215,7 +203,7 @@ static const struct rk808_reg_data rk808_pre_init_reg[] = {
 
 static const struct rk808_reg_data rk817_pre_init_reg[] = {
        {RK817_RTC_CTRL_REG, RTC_STOP, RTC_STOP},
-       {RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_H},
+       {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},
 };