|
@@ -19,44 +19,16 @@ DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
|
int board_init(void)
|
|
|
{
|
|
|
- struct udevice *pinctrl, *regulator;
|
|
|
int ret;
|
|
|
|
|
|
/*
|
|
|
- * The PWM does not have decicated interrupt number in dts and can
|
|
|
- * not get periph_id by pinctrl framework, so let's init them here.
|
|
|
- * The PWM2 and PWM3 are for pwm regulators.
|
|
|
+ * We need to call into regulators_enable_boot_on() again, as the call
|
|
|
+ * during SPL may have not included all regulators.
|
|
|
*/
|
|
|
- ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
|
|
|
- if (ret) {
|
|
|
- debug("%s: Cannot find pinctrl device\n", __func__);
|
|
|
- goto out;
|
|
|
- }
|
|
|
-
|
|
|
- ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_PWM2);
|
|
|
- if (ret) {
|
|
|
- debug("%s PWM2 pinctrl init fail!\n", __func__);
|
|
|
- goto out;
|
|
|
- }
|
|
|
-
|
|
|
- /* rk3399 need to init vdd_center to get the correct output voltage */
|
|
|
- ret = regulator_get_by_platname("vdd_center", ®ulator);
|
|
|
+ ret = regulators_enable_boot_on(false);
|
|
|
if (ret)
|
|
|
- debug("%s: Cannot get vdd_center regulator\n", __func__);
|
|
|
-
|
|
|
- ret = regulator_get_by_platname("vcc5v0_host", ®ulator);
|
|
|
- if (ret) {
|
|
|
- debug("%s vcc5v0_host init fail! ret %d\n", __func__, ret);
|
|
|
- goto out;
|
|
|
- }
|
|
|
-
|
|
|
- ret = regulator_set_enable(regulator, true);
|
|
|
- if (ret) {
|
|
|
- debug("%s vcc5v0-host-en set fail!\n", __func__);
|
|
|
- goto out;
|
|
|
- }
|
|
|
+ debug("%s: Cannot enable boot on regulator\n", __func__);
|
|
|
|
|
|
-out:
|
|
|
return 0;
|
|
|
}
|
|
|
|