diff --git a/bdk/ianos/ianos.c b/bdk/ianos/ianos.c index 606b46f9..12a46442 100644 --- a/bdk/ianos/ianos.c +++ b/bdk/ianos/ianos.c @@ -21,7 +21,6 @@ #include "elfload/elfload.h" #include #include -#include #include #include diff --git a/bdk/power/bm92t36.c b/bdk/power/bm92t36.c index eda7db06..39b65dd4 100644 --- a/bdk/power/bm92t36.c +++ b/bdk/power/bm92t36.c @@ -55,7 +55,7 @@ #define STATUS1_INSERT BIT(7) // Cable inserted. #define VER_36 0x36 -#define MAX_ROHM 0x4B5 +#define MAN_ROHM 0x4B5 #define DEV_BM92T 0x3B0 #define PDO_TYPE_FIXED 0 @@ -89,10 +89,10 @@ int bm92t36_get_version(u32 *value) if (value) *value = (dev << 16) | version; - if (version == VER_36 && man == MAX_ROHM && dev == DEV_BM92T) + if (version == VER_36 && man == MAN_ROHM && dev == DEV_BM92T) return 0; else - return -1; + return 1; } void bm92t36_get_source_info(bool *inserted, usb_pd_objects_t *usb_pd) diff --git a/bdk/power/bq24193.c b/bdk/power/bq24193.c index 73b31f1f..ea4d5825 100644 --- a/bdk/power/bq24193.c +++ b/bdk/power/bq24193.c @@ -34,7 +34,7 @@ int bq24193_get_version(u32 *value) if (data == 0x2F) return 0; else - return -1; + return 1; } int bq24193_get_property(enum BQ24193_reg_prop prop, int *value) @@ -162,7 +162,7 @@ int bq24193_get_property(enum BQ24193_reg_prop prop, int *value) *value = (data & BQ24193_VENDORPART_PN_MASK) >> 3; break; default: - return -1; + return 1; } return 0; } diff --git a/bdk/power/max17050.c b/bdk/power/max17050.c index e17800a8..d4c868ac 100644 --- a/bdk/power/max17050.c +++ b/bdk/power/max17050.c @@ -69,7 +69,7 @@ int max17050_get_version(u32 *value) if (data == 0x00AC) return 0; else - return -1; + return 1; } int max17050_get_property(enum MAX17050_reg reg, int *value) @@ -138,7 +138,7 @@ int max17050_get_property(enum MAX17050_reg reg, int *value) *value = (int)(s16)data * 15625 / ADJ_RSENSE_MOHM / 10; /* Units of LSB = 1.5625uV / Rsense = 156.25uA */ break; default: - return -1; + return 1; } return 0; } @@ -247,7 +247,7 @@ static void _max17050_set_por_bit(u16 value) _max17050_write_verify_reg(MAX17050_STATUS, value); } -int max17050_fix_configuration() +void max17050_fix_configuration() { /* Init phase, set the POR bit */ _max17050_set_por_bit(STATUS_POR_BIT); @@ -281,8 +281,6 @@ int max17050_fix_configuration() // Sets POR, BI, BR. _max17050_set_por_bit(0x8801); - - return 0; } void max17050_dump_regs(void *buf) diff --git a/bdk/power/max17050.h b/bdk/power/max17050.h index 25555b4f..acb1338a 100644 --- a/bdk/power/max17050.h +++ b/bdk/power/max17050.h @@ -121,7 +121,7 @@ enum MAX17050_reg { int max17050_get_version(u32 *value); int max17050_get_property(enum MAX17050_reg reg, int *value); -int max17050_fix_configuration(); +void max17050_fix_configuration(); void max17050_dump_regs(void *buf); #endif /* __MAX17050_H_ */ diff --git a/bdk/power/max7762x.c b/bdk/power/max7762x.c index 6a2ffb04..fa087052 100644 --- a/bdk/power/max7762x.c +++ b/bdk/power/max7762x.c @@ -166,7 +166,7 @@ int max77620_regulator_get_status(u32 id) int max77620_regulator_config_fps(u32 id) { if (id > REGULATOR_LDO8) - return 0; + return 1; const max77620_regulator_t *reg = &_pmic_regulators[id]; @@ -177,22 +177,22 @@ int max77620_regulator_config_fps(u32 id) (reg->fps.pu_period << MAX77620_FPS_PU_PERIOD_SHIFT) | (reg->fps.pd_period << MAX77620_FPS_PD_PERIOD_SHIFT)); - return 1; + return 0; } int max7762x_regulator_set_voltage(u32 id, u32 uv) { if (id > REGULATOR_MAX) - return 0; + return 1; const max77620_regulator_t *reg = &_pmic_regulators[id]; if (uv < reg->uv_min || uv > reg->uv_max) - return 0; + return 1; u8 addr = _max7762x_get_i2c_address(id); if (!addr) - return 0; + return 1; // Calculate voltage multiplier. u32 mult = (uv + reg->uv_step - 1 - reg->uv_min) / reg->uv_step; @@ -209,7 +209,7 @@ int max7762x_regulator_set_voltage(u32 id, u32 uv) // Wait for ramp up/down delay. usleep(1000); - return 1; + return 0; } int max7762x_regulator_enable(u32 id, bool enable) @@ -220,7 +220,7 @@ int max7762x_regulator_enable(u32 id, bool enable) u8 enable_shift; if (id > REGULATOR_MAX) - return 0; + return 1; const max77620_regulator_t *reg = &_pmic_regulators[id]; @@ -252,12 +252,12 @@ int max7762x_regulator_enable(u32 id, bool enable) enable_shift = reg->enable.shift; break; default: - return 0; + return 1; } u8 addr = _max7762x_get_i2c_address(id); if (!addr) - return 0; + return 1; // Read and enable/disable. u8 val = i2c_recv_byte(I2C_5, addr, reg_addr); @@ -272,7 +272,7 @@ int max7762x_regulator_enable(u32 id, bool enable) // Wait for enable/disable ramp delay. usleep(1000); - return 1; + return 0; } void max77620_config_gpio(u32 gpio_id, bool enable)