Revert "[fio extras] iMX7ULP: PMIC: BD70528 5.4-based changes"

mike-scott · mike-scott · commit b3dfd5e95c6e · 2021-07-13T14:29:39.000-07:00
This commit was a WIP test to compare voltages to the 4.19 EA kernel. It was left in-tree by accident and should be reverted as it causes a crash when RPMSG regulator is used. This reverts commit d05451f. Signed-off-by: Michael Scott <mike@foundries.io>
diff --git a/drivers/regulator/pf1550-regulator-rpmsg.c b/drivers/regulator/pf1550-regulator-rpmsg.c
@@ -363,9 +363,6 @@ static struct regulator_desc bd70528_regulators[BD70528_MAX_REGULATOR] = {
 	.of_match = of_match_ptr("SW1"),
 	.id = BD70528_SW1,
 	.ops = &pf1550_sw_ops,
-	.n_voltages = (3400000 - 1200000) / 100000 + 1,
-	.min_uV = 1200000,
-	.uV_step = 100000,
 	.type = REGULATOR_VOLTAGE,
 	.owner = THIS_MODULE,
 },
@@ -374,29 +371,22 @@ static struct regulator_desc bd70528_regulators[BD70528_MAX_REGULATOR] = {
 	.of_match = of_match_ptr("SW2"),
 	.id = BD70528_SW2,
 	.ops = &pf1550_sw_ops,
-	.n_voltages = (3300000 - 1200000) / 100000 + 1,
-	.min_uV = 1200000,
-	.uV_step = 100000,
 	.type = REGULATOR_VOLTAGE,
 	.owner = THIS_MODULE,
 },
 {
 	.name = "SW3",
 	.of_match = of_match_ptr("SW3"),
 	.id = BD70528_SW3,
-	.ops = &pf1550_fixed_ops,
+	.ops = &pf1550_sw_ops,
 	.type = REGULATOR_VOLTAGE,
-	.fixed_uV = 1200000,
 	.owner = THIS_MODULE,
 },
 {
 	.name = "LDO1",
 	.of_match = of_match_ptr("LDO1"),
 	.id = BD70528_LDO1,
 	.ops = &pf1550_ldo_ops,
-	.n_voltages = (3300000 - 1650000) / 50000 + 1,
-	.min_uV = 1650000,
-	.uV_step = 50000,
 	.type = REGULATOR_VOLTAGE,
 	.owner = THIS_MODULE,
 },
@@ -405,9 +395,6 @@ static struct regulator_desc bd70528_regulators[BD70528_MAX_REGULATOR] = {
 	.of_match = of_match_ptr("LDO2"),
 	.id = BD70528_LDO2,
 	.ops = &pf1550_ldo_ops,
-	.n_voltages = (3300000 - 1650000) / 50000 + 1,
-	.min_uV = 1650000,
-	.uV_step = 50000,
 	.type = REGULATOR_VOLTAGE,
 	.owner = THIS_MODULE,
 },
@@ -416,9 +403,6 @@ static struct regulator_desc bd70528_regulators[BD70528_MAX_REGULATOR] = {
 	.of_match = of_match_ptr("LDO3"),
 	.id = BD70528_LDO3,
 	.ops = &pf1550_ldo_ops,
-	.n_voltages = (3300000 - 1650000) / 50000 + 1,
-	.min_uV = 1650000,
-	.uV_step = 50000,
 	.type = REGULATOR_VOLTAGE,
 	.owner = THIS_MODULE,
 },
