Browse Source

pmic: axp15060pmic reset fail

it is caused by evb pmic module merger to vf2
no need to do this
revert it now

Signed-off-by: keith <keith.zhao@starfivetech.com>
keith.zhao 1 year ago
parent
commit
b8be97dadc
2 changed files with 4 additions and 68 deletions
  1. 4 55
      arch/riscv/dts/starfive_visionfive2.dts
  2. 0 13
      drivers/video/starfive/sf_vop.c

+ 4 - 55
arch/riscv/dts/starfive_visionfive2.dts

@@ -368,62 +368,11 @@
 		pagesize = <16>;
 	};
 
-	pmic: jh7110_evb_reg@36 {
-		compatible = "starfive,jh7110-evb-regulator";
-		reg = <0x36>;
-
-		regulators {
-			hdmi_1p8: ldo1 {
-				regulator-name = "lp8733-ldo1";
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <1800000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-			mipitx_1p8: ldo2 {
-				regulator-name = "lp8733-ldo2";
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <1800000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-			mipirx_1p8: ldo3 {
-				regulator-name = "lp8733-ldo3";
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <1800000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-			hdmi_0p9: ldo4 {
-				regulator-name = "lp8733-ldo4";
-				regulator-min-microvolt = <900000>;
-				regulator-max-microvolt = <900000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-			mipitx_0p9: ldo5 {
-				regulator-name = "lp8733-ldo5";
-				regulator-min-microvolt = <900000>;
-				regulator-max-microvolt = <900000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-			mipirx_0p9: ldo6 {
-				regulator-name = "lp8733-ldo6";
-				regulator-min-microvolt = <900000>;
-				regulator-max-microvolt = <900000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-			sdio_vdd: ldo7 {
-				regulator-name = "lp8733-ldo7";
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <3300000>;
-				regulator-boot-on;
-				regulator-always-on;
-			};
-		};
+	pmic: axp15060_reg@36 {
+               compatible = "stf,axp15060-regulator";
+               reg = <0x36>;
 	};
+
 };
 
 &gpioa {

+ 0 - 13
drivers/video/starfive/sf_vop.c

@@ -67,19 +67,6 @@ static int sf_vop_power(struct udevice *dev)
 		return ret;
 	}
 
-	ret = uclass_get_device_by_driver(UCLASS_PMIC,
-			  DM_DRIVER_GET(pmic_starfive), &dev_pmic);
-	if (ret) {
-		pr_err("failed to find PMIC: %d\n", ret);
-		return ret;
-	}
-
-	ret = pmic_clrsetbits(dev_pmic, POWER_SW_0_REG, 0x3f, 0x3f);
-	if (ret) {
-		pr_err("failed to update SD control register: %d", ret);
-		return ret;
-	}
-
 	return 0;
 }