add DCDC5 configuration

This commit is contained in:
bunnie 2025-04-21 02:42:40 +08:00
parent 92427822a1
commit e22997874d
2 changed files with 15 additions and 9 deletions

View file

@ -130,10 +130,10 @@ impl From<usize> for WhichDcDc {
// which is +40k of code // which is +40k of code
// #[derive(Debug)] // #[derive(Debug)]
pub struct Axp2101 { pub struct Axp2101 {
pub dcdc_ena: [bool; 4], pub dcdc_ena: [bool; 5],
pub fast_ramp: bool, pub fast_ramp: bool,
pub force_ccm: bool, pub force_ccm: bool,
pub dcdc_v_dvm: [(f32, bool); 4], pub dcdc_v_dvm: [(f32, bool); 5],
pub ldo_ena: [bool; 9], pub ldo_ena: [bool; 9],
pub ldo_v: [f32; 9], pub ldo_v: [f32; 9],
} }
@ -141,10 +141,10 @@ pub struct Axp2101 {
impl Axp2101 { impl Axp2101 {
pub fn new(i2c: &mut dyn I2cApi) -> Result<Axp2101, xous::Error> { pub fn new(i2c: &mut dyn I2cApi) -> Result<Axp2101, xous::Error> {
let mut s = Axp2101 { let mut s = Axp2101 {
dcdc_ena: [false; 4], dcdc_ena: [false; 5],
fast_ramp: false, fast_ramp: false,
force_ccm: false, force_ccm: false,
dcdc_v_dvm: [(0.0, false); 4], dcdc_v_dvm: [(0.0, false); 5],
ldo_ena: [false; 9], ldo_ena: [false; 9],
ldo_v: [0.0; 9], ldo_v: [0.0; 9],
}; };
@ -162,6 +162,7 @@ impl Axp2101 {
parse_dcdc(buf[REG_DCDC2_V], WhichDcDc::Dcdc2), parse_dcdc(buf[REG_DCDC2_V], WhichDcDc::Dcdc2),
parse_dcdc(buf[REG_DCDC3_V], WhichDcDc::Dcdc3), parse_dcdc(buf[REG_DCDC3_V], WhichDcDc::Dcdc3),
parse_dcdc(buf[REG_DCDC4_V], WhichDcDc::Dcdc4), parse_dcdc(buf[REG_DCDC4_V], WhichDcDc::Dcdc4),
parse_dcdc(buf[REG_DCDC5_V], WhichDcDc::Dcdc5),
]; ];
for (i, ena) in self.ldo_ena.iter_mut().enumerate() { for (i, ena) in self.ldo_ena.iter_mut().enumerate() {
if i < 8 { if i < 8 {
@ -319,8 +320,8 @@ impl Axp2101 {
} }
} }
pub fn parse_dcdc_ena(d: u8) -> ([bool; 4], bool, bool) { pub fn parse_dcdc_ena(d: u8) -> ([bool; 5], bool, bool) {
let mut enable = [false; 4]; let mut enable = [false; 5];
let mut fast_ramp = false; let mut fast_ramp = false;
let mut force_ccm = false; let mut force_ccm = false;
@ -358,8 +359,13 @@ pub fn encode_dcdc(v: f32, dvm: bool, which: WhichDcDc) -> Option<u8> {
return None; return None;
} }
} else { } else {
// we haven't coded the DCDC5 path yet // must be Dcdc5
return None; if v < 1.4 || v > 3.7 {
return None;
} else {
let code = (v - 1.4) / 0.100;
return Some(code as u8);
}
} }
if v < 1.22 { if v < 1.22 {
let code = (v - 0.5) / 0.010; let code = (v - 0.5) / 0.010;

View file

@ -338,7 +338,7 @@ pub fn early_init() -> u32 {
pmic.set_ldo(&mut i2c, Some(2.5), cramium_hal::axp2101::WhichLdo::Aldo2).unwrap(); pmic.set_ldo(&mut i2c, Some(2.5), cramium_hal::axp2101::WhichLdo::Aldo2).unwrap();
pmic.set_dcdc(&mut i2c, Some((1.2, false)), cramium_hal::axp2101::WhichDcDc::Dcdc4).unwrap(); pmic.set_dcdc(&mut i2c, Some((1.2, false)), cramium_hal::axp2101::WhichDcDc::Dcdc4).unwrap();
pmic.set_dcdc(&mut i2c, Some((1.8, false)), cramium_hal::axp2101::WhichDcDc::Dcdc5).unwrap();
// This debug print creates a lot of extra code... // This debug print creates a lot of extra code...
// crate::println!("AXP2101 configure: {:?}", pmic); // crate::println!("AXP2101 configure: {:?}", pmic);