From 65f9ac90a1a352b44cc85c09a01fb7301d179920 Mon Sep 17 00:00:00 2001 From: Jianlong Huang Date: Thu, 20 Oct 2022 09:23:51 +0800 Subject: [PATCH] regulator:axp15060:Remove sdio vdd regulator Visionfive2 emmc is default 1.8V, there is no need to controll the voltage. Remove sdio_vdd node and code. Signed-off-by: Jianlong Huang --- arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi | 8 -------- drivers/regulator/axp15060-regulator.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi index e3a66f1b4099..bbda90ded997 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi @@ -450,13 +450,6 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; - sdio_vdd: ALDO4 { - regulator-boot-on; - regulator-compatible = "sdio_vdd"; - regulator-name = "sdio_vdd"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; cpu_vdd: DCDC2 { regulator-boot-on; regulator-always-on; @@ -515,7 +508,6 @@ non-removable; cap-mmc-hw-reset; post-power-on-delay-ms = <200>; - vqmmc-supply = <&sdio_vdd>; status = "okay"; }; diff --git a/drivers/regulator/axp15060-regulator.c b/drivers/regulator/axp15060-regulator.c index fa3abee8a362..31367ff22c84 100644 --- a/drivers/regulator/axp15060-regulator.c +++ b/drivers/regulator/axp15060-regulator.c @@ -274,10 +274,6 @@ static const struct regulator_desc axp15060_regulators[] = { AXP15060_VOL_CTRL_ALDO_3, AXP15060_ALDO3_V_OUT_MASK, AXP15060_ON_OFF_CTRL_2, AXP15060_PWR_OUT_ALDO3_MASK), - AXP15060_DESC(ALDO4, "sdio_vdd", 700, 3300, 100, - AXP15060_VOL_CTRL_ALDO_4, AXP15060_ALDO4_V_OUT_MASK, - AXP15060_ON_OFF_CTRL_2, AXP15060_PWR_OUT_ALDO4_MASK), - AXP15060_DESC(ALDO5, "hdmi_0p9", 700, 3300, 100, AXP15060_VOL_CTRL_ALDO_5, AXP15060_ALDO5_V_OUT_MASK, AXP15060_ON_OFF_CTRL_2, AXP15060_PWR_OUT_ALDO5_MASK), @@ -291,7 +287,6 @@ static const struct regulator_desc axp15060_regulators[] = { static struct of_regulator_match axp15060_matches[] = { { .name = "mipi_0p9", }, { .name = "hdmi_1p8", }, - { .name = "sdio_vdd", }, { .name = "hdmi_0p9", }, { .name = "cpu_vdd", }, }; -- 2.34.1