| Message ID | 20240304-rk3588-saradc-v3-2-7424e2ed5d3b@theobroma-systems.com |
|---|---|
| State | Accepted |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: add support for SARADCv2 and RK806 PMIC and regulators | expand |
Hello Quentin, On 2024-03-04 12:29, Quentin Schulz wrote: > From: Quentin Schulz <quentin.schulz@theobroma-systems.com> > > Those two functions had their last user removed in commit f9c68a566c4d > ("rockchip: phycore_rk3288: remove phycore_init() function") part of > v2023.01 release, so let's do some cleanup here. These functions could be used on the Pinephone Pro at some point, but it's still fine to remove them now. They can be re-added later. > Cc: Quentin Schulz <foss+uboot@0leil.net> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> > --- > drivers/power/regulator/rk8xx.c | 31 ------------------------------- > include/power/rk8xx_pmic.h | 2 -- > 2 files changed, 33 deletions(-) > > diff --git a/drivers/power/regulator/rk8xx.c > b/drivers/power/regulator/rk8xx.c > index e80bd6c3723..97d73ac95e0 100644 > --- a/drivers/power/regulator/rk8xx.c > +++ b/drivers/power/regulator/rk8xx.c > @@ -210,14 +210,6 @@ static const struct rk8xx_reg_info rk818_ldo[] = { > }; > #endif > > -static const u16 rk818_chrg_cur_input_array[] = { > - 450, 800, 850, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000 > -}; > - > -static const uint rk818_chrg_shutdown_vsel_array[] = { > - 2780000, 2850000, 2920000, 2990000, 3060000, 3130000, 3190000, > 3260000 > -}; > - > static const struct rk8xx_reg_info *get_buck_reg(struct udevice *pmic, > int num, int uvolt) > { > @@ -1160,26 +1152,3 @@ int rk8xx_spl_configure_buck(struct udevice > *pmic, int buck, int uvolt) > > return _buck_set_enable(pmic, buck, true); > } > - > -int rk818_spl_configure_usb_input_current(struct udevice *pmic, int > current_ma) > -{ > - uint i; > - > - for (i = 0; i < ARRAY_SIZE(rk818_chrg_cur_input_array); i++) > - if (current_ma <= rk818_chrg_cur_input_array[i]) > - break; > - > - return pmic_clrsetbits(pmic, REG_USB_CTRL, RK818_USB_ILIM_SEL_MASK, > i); > -} > - > -int rk818_spl_configure_usb_chrg_shutdown(struct udevice *pmic, int > uvolt) > -{ > - uint i; > - > - for (i = 0; i < ARRAY_SIZE(rk818_chrg_shutdown_vsel_array); i++) > - if (uvolt <= rk818_chrg_shutdown_vsel_array[i]) > - break; > - > - return pmic_clrsetbits(pmic, REG_USB_CTRL, > RK818_USB_CHG_SD_VSEL_MASK, > - i); > -} > diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h > index 3cbfc021956..0db82419d4f 100644 > --- a/include/power/rk8xx_pmic.h > +++ b/include/power/rk8xx_pmic.h > @@ -233,7 +233,5 @@ struct rk8xx_priv { > }; > > int rk8xx_spl_configure_buck(struct udevice *pmic, int buck, int > uvolt); > -int rk818_spl_configure_usb_input_current(struct udevice *pmic, int > current_ma); > -int rk818_spl_configure_usb_chrg_shutdown(struct udevice *pmic, int > uvolt); > > #endif
On 2024/3/4 19:29, Quentin Schulz wrote: > From: Quentin Schulz <quentin.schulz@theobroma-systems.com> > > Those two functions had their last user removed in commit f9c68a566c4d > ("rockchip: phycore_rk3288: remove phycore_init() function") part of > v2023.01 release, so let's do some cleanup here. > > Cc: Quentin Schulz <foss+uboot@0leil.net> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > drivers/power/regulator/rk8xx.c | 31 ------------------------------- > include/power/rk8xx_pmic.h | 2 -- > 2 files changed, 33 deletions(-) > > diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c > index e80bd6c3723..97d73ac95e0 100644 > --- a/drivers/power/regulator/rk8xx.c > +++ b/drivers/power/regulator/rk8xx.c > @@ -210,14 +210,6 @@ static const struct rk8xx_reg_info rk818_ldo[] = { > }; > #endif > > -static const u16 rk818_chrg_cur_input_array[] = { > - 450, 800, 850, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000 > -}; > - > -static const uint rk818_chrg_shutdown_vsel_array[] = { > - 2780000, 2850000, 2920000, 2990000, 3060000, 3130000, 3190000, 3260000 > -}; > - > static const struct rk8xx_reg_info *get_buck_reg(struct udevice *pmic, > int num, int uvolt) > { > @@ -1160,26 +1152,3 @@ int rk8xx_spl_configure_buck(struct udevice *pmic, int buck, int uvolt) > > return _buck_set_enable(pmic, buck, true); > } > - > -int rk818_spl_configure_usb_input_current(struct udevice *pmic, int current_ma) > -{ > - uint i; > - > - for (i = 0; i < ARRAY_SIZE(rk818_chrg_cur_input_array); i++) > - if (current_ma <= rk818_chrg_cur_input_array[i]) > - break; > - > - return pmic_clrsetbits(pmic, REG_USB_CTRL, RK818_USB_ILIM_SEL_MASK, i); > -} > - > -int rk818_spl_configure_usb_chrg_shutdown(struct udevice *pmic, int uvolt) > -{ > - uint i; > - > - for (i = 0; i < ARRAY_SIZE(rk818_chrg_shutdown_vsel_array); i++) > - if (uvolt <= rk818_chrg_shutdown_vsel_array[i]) > - break; > - > - return pmic_clrsetbits(pmic, REG_USB_CTRL, RK818_USB_CHG_SD_VSEL_MASK, > - i); > -} > diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h > index 3cbfc021956..0db82419d4f 100644 > --- a/include/power/rk8xx_pmic.h > +++ b/include/power/rk8xx_pmic.h > @@ -233,7 +233,5 @@ struct rk8xx_priv { > }; > > int rk8xx_spl_configure_buck(struct udevice *pmic, int buck, int uvolt); > -int rk818_spl_configure_usb_input_current(struct udevice *pmic, int current_ma); > -int rk818_spl_configure_usb_chrg_shutdown(struct udevice *pmic, int uvolt); > > #endif >
diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c index e80bd6c3723..97d73ac95e0 100644 --- a/drivers/power/regulator/rk8xx.c +++ b/drivers/power/regulator/rk8xx.c @@ -210,14 +210,6 @@ static const struct rk8xx_reg_info rk818_ldo[] = { }; #endif -static const u16 rk818_chrg_cur_input_array[] = { - 450, 800, 850, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000 -}; - -static const uint rk818_chrg_shutdown_vsel_array[] = { - 2780000, 2850000, 2920000, 2990000, 3060000, 3130000, 3190000, 3260000 -}; - static const struct rk8xx_reg_info *get_buck_reg(struct udevice *pmic, int num, int uvolt) { @@ -1160,26 +1152,3 @@ int rk8xx_spl_configure_buck(struct udevice *pmic, int buck, int uvolt) return _buck_set_enable(pmic, buck, true); } - -int rk818_spl_configure_usb_input_current(struct udevice *pmic, int current_ma) -{ - uint i; - - for (i = 0; i < ARRAY_SIZE(rk818_chrg_cur_input_array); i++) - if (current_ma <= rk818_chrg_cur_input_array[i]) - break; - - return pmic_clrsetbits(pmic, REG_USB_CTRL, RK818_USB_ILIM_SEL_MASK, i); -} - -int rk818_spl_configure_usb_chrg_shutdown(struct udevice *pmic, int uvolt) -{ - uint i; - - for (i = 0; i < ARRAY_SIZE(rk818_chrg_shutdown_vsel_array); i++) - if (uvolt <= rk818_chrg_shutdown_vsel_array[i]) - break; - - return pmic_clrsetbits(pmic, REG_USB_CTRL, RK818_USB_CHG_SD_VSEL_MASK, - i); -} diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h index 3cbfc021956..0db82419d4f 100644 --- a/include/power/rk8xx_pmic.h +++ b/include/power/rk8xx_pmic.h @@ -233,7 +233,5 @@ struct rk8xx_priv { }; int rk8xx_spl_configure_buck(struct udevice *pmic, int buck, int uvolt); -int rk818_spl_configure_usb_input_current(struct udevice *pmic, int current_ma); -int rk818_spl_configure_usb_chrg_shutdown(struct udevice *pmic, int uvolt); #endif