From 4ee06e10dd26e81371f7da25a8a7e4c2f348aa4f Mon Sep 17 00:00:00 2001 From: Gene Chen Date: Tue, 18 May 2021 01:33:08 +0800 Subject: mfd: mt6360: Combine mt6360 pmic/ldo resources into mt6360 regulator resources Combine mt6360 pmic/ldo resources into mt6360 regulator resources to simplify the similar resources object. Signed-off-by: Gene Chen Signed-off-by: Lee Jones --- drivers/mfd/mt6360-core.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c index 512480f7bd40..3553c7045829 100644 --- a/drivers/mfd/mt6360-core.c +++ b/drivers/mfd/mt6360-core.c @@ -266,7 +266,7 @@ static const struct resource mt6360_led_resources[] = { DEFINE_RES_IRQ_NAMED(MT6360_FLED1_STRB_TO_EVT, "fled1_strb_to_evt"), }; -static const struct resource mt6360_pmic_resources[] = { +static const struct resource mt6360_regulator_resources[] = { DEFINE_RES_IRQ_NAMED(MT6360_BUCK1_PGB_EVT, "buck1_pgb_evt"), DEFINE_RES_IRQ_NAMED(MT6360_BUCK1_OC_EVT, "buck1_oc_evt"), DEFINE_RES_IRQ_NAMED(MT6360_BUCK1_OV_EVT, "buck1_ov_evt"), @@ -279,9 +279,6 @@ static const struct resource mt6360_pmic_resources[] = { DEFINE_RES_IRQ_NAMED(MT6360_LDO7_OC_EVT, "ldo7_oc_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO6_PGB_EVT, "ldo6_pgb_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO7_PGB_EVT, "ldo7_pgb_evt"), -}; - -static const struct resource mt6360_ldo_resources[] = { DEFINE_RES_IRQ_NAMED(MT6360_LDO1_OC_EVT, "ldo1_oc_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO2_OC_EVT, "ldo2_oc_evt"), DEFINE_RES_IRQ_NAMED(MT6360_LDO3_OC_EVT, "ldo3_oc_evt"), @@ -299,10 +296,7 @@ static const struct mfd_cell mt6360_devs[] = { NULL, 0, 0, "mediatek,mt6360-chg"), MFD_CELL_OF("mt6360-led", mt6360_led_resources, NULL, 0, 0, "mediatek,mt6360-led"), - MFD_CELL_OF("mt6360-pmic", mt6360_pmic_resources, - NULL, 0, 0, "mediatek,mt6360-pmic"), - MFD_CELL_OF("mt6360-ldo", mt6360_ldo_resources, - NULL, 0, 0, "mediatek,mt6360-ldo"), + MFD_CELL_RES("mt6360-regulator", mt6360_regulator_resources), MFD_CELL_OF("mt6360-tcpc", NULL, NULL, 0, 0, "mediatek,mt6360-tcpc"), }; -- cgit v1.2.3-59-g8ed1b